Merge pull request #36 from sjdonado/fix/workers-free-plan-limitation…

…s-workaround Fix/workers free plan limitations workaround
sjdonado · Apr 14, 2024 · b3bc196 · b3bc196
2 parents 262b4f0 + be8a633
commit b3bc196
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 29 deletions.
diff --git a/app/jobs/search.server.ts b/app/jobs/search.server.ts
@@ -54,10 +54,10 @@ export async function startOrCheckSearchJob(context: AppLoadContext, key: string
   const encodeMessage = (message: string, percentage: number, time = Date.now()) =>
     encoder.encode(`data: ${time},${(percentage * 100).toFixed(1)},${message}\n\n`);
 
-  // if job has finished (if has failed to retry is allowed)
-  if (job.state === SearchJobState.Success) {
+  // check if job is not running or completed
+  if ([SearchJobState.Running, SearchJobState.Success].includes(job.state)) {
     console.log(
-      `[${startOrCheckSearchJob.name}] (${key}) finished with status ${job.state} (${job.stage})`
+      `[${startOrCheckSearchJob.name}] (${key}) already running or completed: ${job.state}`
     );
 
     return encodeMessage(DONE_JOB_MESSAGE, 1);
@@ -213,11 +213,11 @@ export async function startOrCheckSearchJob(context: AppLoadContext, key: string
 
               sendEvent(
                 `Fetching photos for "${place.displayName.text}"...`,
-                increaseProgress(progress < 0.6 ? 0.6 - progress : 0)
+                increaseProgress(0.05)
               );
 
               await Promise.all(
-                (place.photos ?? []).slice(0, 5).map(async (photo, photoIdx) => {
+                (place.photos ?? []).slice(0, 4).map(async (photo, photoIdx) => {
                   const binary = await downloadPlacePhoto(context, photo.name);
                   const caption = await runImageToTextRequest(context, binary);
 
@@ -266,10 +266,13 @@ export async function startOrCheckSearchJob(context: AppLoadContext, key: string
             })
           );
 
-          const [placesDescriptions, placesThumbnails] = await Promise.all([
-            placesDescriptionsPromise,
-            placesThumbnailsPromise,
-          ]);
+          // Not supported by workers in the free plan https://developers.cloudflare.com/workers/platform/limits/#simultaneous-open-connections
+          // const [placesDescriptions, placesThumbnails] = await Promise.all([
+          //   placesDescriptionsPromise,
+          //   placesThumbnailsPromise,
+          // ]);
+          const placesDescriptions = await placesDescriptionsPromise;
+          const placesThumbnails = await placesThumbnailsPromise;
 
           sendEvent(
             `Almost done! Parsing results...`,

diff --git a/app/routes/_main.history.tsx b/app/routes/_main.history.tsx
@@ -13,14 +13,7 @@ export const loader = async ({ context }: LoaderFunctionArgs) => {
 
   const searches = await Promise.all(
     records.map(async record => {
-      // TEMPFIX: safeParse ignores previous results with different schema (it can be removed if KV is purged)
-      const result = await SearchJobSerializedSchema.safeParseAsync({
-        id: record.id,
-        input: record.input,
-        state: record.state,
-        places: record.places,
-        createdAt: record.createdAt,
-      });
+      const result = await SearchJobSerializedSchema.safeParseAsync(record);
 
       if (result.success) {
         return result.data;
@@ -29,7 +22,7 @@ export const loader = async ({ context }: LoaderFunctionArgs) => {
   );
 
   const sortedSearches = searches
-    .filter(Boolean) // TEMPFIX: didn't find a way to purge the KV local cache
+    .filter(Boolean)
     .sort((a, b) => new Date(b!.createdAt).getTime() - new Date(a!.createdAt).getTime());
 
   return {

diff --git a/app/routes/_main.search.tsx b/app/routes/_main.search.tsx
@@ -14,7 +14,7 @@ import {
   useSearchParams,
 } from '@remix-run/react';
 
-import { DONE_JOB_MESSAGE, SearchJobState } from '~/constants/job';
+import { DONE_JOB_MESSAGE, SearchJobStage, SearchJobState } from '~/constants/job';
 
 import { SearchSchema } from '~/schemas/search';
 import type { SearchJobSerialized } from '~/schemas/job';
@@ -71,7 +71,8 @@ export default function SearchPage() {
 
   const startSearchJob = useCallback(async () => {
     if (
-      searchJob?.state === SearchJobState.Created ||
+      (searchJob?.state === SearchJobState.Created &&
+        searchJob?.stage === SearchJobStage.Initial) ||
       (retry && searchJob?.state === SearchJobState.Failure)
     ) {
       const eventSource = new EventSource(`/search/job/${jobId}`);

diff --git a/app/schemas/job.ts b/app/schemas/job.ts
@@ -28,6 +28,7 @@ export const SearchJobParsedSchema = SearchJobSchema.extend({
 export const SearchJobSerializedSchema = SearchJobSchema.pick({
   input: true,
   state: true,
+  stage: true,
   logs: true,
   createdAt: true,
 })

diff --git a/app/services/cloudflare.server.ts b/app/services/cloudflare.server.ts
@@ -53,7 +53,7 @@ export async function runLLMRequest(
     stream: false,
   });
 
-  console.log(`[${runLLMRequest.name}] ${JSON.stringify({ prompt, data }, null, 2)}`);
+  // console.log(`[${runLLMRequest.name}] ${JSON.stringify({ prompt, data }, null, 2)}`);
 
   return (data as { response: string }).response;
 }
@@ -74,13 +74,13 @@ export async function runSummarizationRequest(
     max_length: 3072, // the default is 1024
   });
 
-  console.log(
-    `[${runSummarizationRequest.name}] ${JSON.stringify(
-      { input, output: data.summary },
-      null,
-      2
-    )}`
-  );
+  // console.log(
+  //   `[${runSummarizationRequest.name}] ${JSON.stringify(
+  //     { input, output: data.summary },
+  //     null,
+  //     2
+  //   )}`
+  // );
 
   return data.summary;
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "culefilo",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "private": true,
   "sideEffects": false,
   "type": "module",