Merge branch 'main' into v1-webscraper

apps/api/src/controllers/v0/scrape.ts

@@ -61,6 +61,12 @@ export async function scrapeHelper(
           error: "Request timed out",
           returnCode: 408,
         }
+      } else if (typeof e === "string" && (e.includes("Error generating completions: ") || e.includes("Invalid schema for function"))) {
+        return {
+          success: false,
+          error: e,
+          returnCode: 500,
+        };
       } else {
         throw e;
       }
@@ -211,6 +217,6 @@ export async function scrapeController(req: Request, res: Response) {
   } catch (error) {
     Sentry.captureException(error);
     Logger.error(error);
-    return res.status(500).json({ error: error.message });
+    return res.status(500).json({ error: typeof error === "string" ? error : (error?.message ?? "Internal Server Error") });
   }
 }

apps/api/src/services/queue-jobs.ts

@@ -53,9 +53,15 @@ export function waitForJob(jobId: string, timeout: number) {
       if (Date.now() >= start + timeout) {
         clearInterval(int);
         reject(new Error("Job wait "));
-      } else if (await getScrapeQueue().getJobState(jobId) === "completed") {
+      } else {
-        clearInterval(int);
+        const state = await getScrapeQueue().getJobState(jobId);
-        resolve((await getScrapeQueue().getJob(jobId)).returnvalue);
+        if (state === "completed") {
+          clearInterval(int);
+          resolve((await getScrapeQueue().getJob(jobId)).returnvalue);
+        } else if (state === "failed") {
+          clearInterval(int);
+          reject((await getScrapeQueue().getJob(jobId)).failedReason);
+        }
       }
     }, 1000);
   })