@zodic/shared 0.0.363 → 0.0.364

package/app/services/ImageDescriberService.ts

@@ -6,41 +6,79 @@ import { AppContext } from '../base';
 export class ImageDescriberService {
   constructor(@inject(AppContext) private context: AppContext) {}
 
+  // Helper function to add a delay
+  private delay(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
   async describeImage({ imageUrl }: { imageUrl: string }): Promise<string> {
     console.log('ImageDescriber imageUrl ->', imageUrl);
-    try {
-      const response = await this.context.api().callTogether.single(
-        [
-          {
-            role: 'user',
-            content: [
-              {
-                type: 'text',
-                text: 'Describe the following traits of the person in the picture:\n- Hair color, size and style\n- Skin color\n\nReturn the result in the following format:\n\nHair: hair description\nSkin: skin description',
-              },
-              {
-                type: 'image_url',
-                image_url: {
-                  url: imageUrl,
+
+    // Define the models to try in sequence
+    const models = [
+      'meta-llama/Llama-Vision-Free',
+      'meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo',
+      'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo',
+    ];
+
+    // Delay between retries (in milliseconds)
+    const RETRY_DELAY_MS = 1000;
+
+    let lastError: Error | null = null;
+
+    // Attempt to describe the image with each model in sequence
+    for (let i = 0; i < models.length; i++) {
+      const model = models[i];
+      console.log(`Attempting to describe image with model: ${model} (Attempt ${i + 1}/${models.length})`);
+
+      try {
+        const response = await this.context.api().callTogether.single(
+          [
+            {
+              role: 'user',
+              content: [
+                {
+                  type: 'text',
+                  text: 'Describe the following traits of the person in the picture:\n- Hair color, size and style\n- Skin color\n\nReturn the result in the following format:\n\nHair: hair description\nSkin: skin description',
                 },
-              },
-            ],
-          },
-        ],
-        {
-          model: 'meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo',
-          temperature: 0.3,
+                {
+                  type: 'image_url',
+                  image_url: {
+                    url: imageUrl,
+                  },
+                },
+              ],
+            },
+          ],
+          {
+            model,
+            temperature: 0.3,
+          }
+        );
+
+        if (!response) {
+          throw new Error(`No response received from model ${model}`);
         }
-      );
 
-      if (!response) {
-        throw new Error('Failed to generate image description');
-      }
+        console.log(`Successfully described image with model: ${model}`);
+        return response;
+      } catch (error) {
+        lastError = error as Error;
+        console.error(`Error describing image with model ${model}:`, error);
 
-      return response;
-    } catch (error) {
-      console.error('Error describing image:', error);
-      throw error;
+        // If this is not the last model, wait before retrying
+        if (i < models.length - 1) {
+          console.log(`Waiting ${RETRY_DELAY_MS}ms before retrying with the next model...`);
+          await this.delay(RETRY_DELAY_MS); // Add delay before the next attempt
+          console.log(`Retrying with the next model...`);
+        } else {
+          // If this is the last model, throw the final error
+          console.error('All models failed to describe the image.');
+        }
+      }
     }
+
+    // If we reach here, all retries failed; throw the last error
+    throw lastError || new Error('Failed to generate image description after all retries');
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.363",
+  "version": "0.0.364",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {