@zodic/shared 0.0.387 → 0.0.389

package/app/services/ArtifactService.ts

@@ -434,11 +434,11 @@ export class ArtifactService {
     const drizzle = this.context.drizzle();
     const { users, artifactFaceswap, cosmicMirrorImages, userArtifacts } =
       schema;
-
+  
     console.log(
       `Starting retryStaleCosmicMirror for userArtifactId: ${userArtifactId}`
     );
-
+  
     // Fetch userId from userArtifacts
     console.log('Fetching user artifact to get userId...');
     const [artifact] = await drizzle
@@ -446,7 +446,7 @@ export class ArtifactService {
       .from(userArtifacts)
       .where(eq(userArtifacts.id, userArtifactId))
       .limit(1);
-
+  
     if (!artifact || !artifact.userId) {
       console.error('User artifact or userId not found');
       return {
@@ -455,10 +455,10 @@ export class ArtifactService {
         statusCode: 400,
       };
     }
-
+  
     const userId = artifact.userId;
     console.log(`Fetched userId: ${userId}`);
-
+  
     // Fetch user photo
     console.log('Fetching user photo from database...');
     const [user] = await drizzle
@@ -469,9 +469,9 @@ export class ArtifactService {
       .from(users)
       .where(eq(users.id, userId))
       .limit(1);
-
+  
     console.log('User fetch result:', user);
-
+  
     const sourceImage = user?.userPhotoUrl || user?.userProfileImage;
     if (!sourceImage) {
       console.error('No user photo found for faceswap');
@@ -482,16 +482,16 @@ export class ArtifactService {
       };
     }
     console.log(`Source image URL: ${sourceImage}`);
-
+  
     // Get all images from D1
     console.log('Fetching images from D1 cosmicMirrorImages table...');
     const images = await drizzle
       .select()
       .from(cosmicMirrorImages)
       .where(eq(cosmicMirrorImages.userArtifactId, userArtifactId));
-
+  
     console.log('Images retrieved from D1:', images);
-
+  
     if (images.length === 0) {
       console.warn('No images found in D1 for this userArtifactId');
       return {
@@ -500,12 +500,12 @@ export class ArtifactService {
         statusCode: 400,
       };
     }
-
-    // Process faceswaps for all images
+  
+    // Process faceswaps for all images with a 2-second delay between calls
     let faceswapCount = 0;
-    for (const image of images) {
+    for (const [index, image] of images.entries()) {
       console.log(`Processing image with leonardoId: ${image.leonardoId}`);
-
+  
       if (!image.url) {
         console.warn(
           `Image with leonardoId ${image.leonardoId} does not contain a URL:`,
@@ -516,49 +516,71 @@ export class ArtifactService {
       console.log(
         `Target image URL for leonardoId ${image.leonardoId}: ${image.url}`
       );
-
+  
       console.log(
         `Calling faceSwap API for source: ${sourceImage}, target: ${image.url}`
       );
       let faceSwapResponse: any;
-      try {
-        // Add a timeout for the FaceSwap API call (8 seconds as specified)
-        const timeoutPromise = new Promise((_, reject) => {
-          setTimeout(
-            () =>
-              reject(new Error('FaceSwap API call timed out after 12 seconds')),
-            12000
+      let attempts = 0;
+      const maxAttempts = index === 0 ? 2 : 1; // Retry once for the first image
+      const timeoutDuration = index === 0 ? 20000 : 12000; // 20s for first image, 12s for others
+  
+      while (attempts < maxAttempts) {
+        try {
+          // Add a timeout for the FaceSwap API call
+          const timeoutPromise = new Promise((_, reject) => {
+            setTimeout(
+              () =>
+                reject(
+                  new Error(
+                    `FaceSwap API call timed out after ${timeoutDuration / 1000} seconds`
+                  )
+                ),
+              timeoutDuration
+            );
+          });
+  
+          faceSwapResponse = await Promise.race([
+            this.context.api().callPiApi.faceSwap({
+              sourceImageUrl: sourceImage,
+              targetImageUrl: image.url,
+            }),
+            timeoutPromise,
+          ]);
+  
+          // Log the response only if the API call succeeded (not timed out)
+          console.log(
+            `faceSwap response for leonardoId ${image.leonardoId}:`,
+            faceSwapResponse
           );
-        });
-
-        faceSwapResponse = await Promise.race([
-          this.context.api().callPiApi.faceSwap({
-            sourceImageUrl: sourceImage,
-            targetImageUrl: image.url,
-          }),
-          timeoutPromise,
-        ]);
-
-        console.log(
-          `faceSwap response for leonardoId ${image.leonardoId}:`,
-          faceSwapResponse
-        );
-      } catch (err) {
-        console.error(
-          `faceSwap API call failed for leonardoId ${image.leonardoId}:`,
-          err
-        );
-        continue;
+          break; // Exit retry loop on success
+        } catch (err) {
+          attempts++;
+          console.error(
+            `faceSwap API call attempt ${attempts}/${maxAttempts} failed for leonardoId ${image.leonardoId}:`,
+            err
+          );
+          if (attempts < maxAttempts) {
+            console.log('Retrying after 2 seconds...');
+            await new Promise((resolve) => setTimeout(resolve, 2000));
+          } else {
+            console.error(
+              `All attempts failed for leonardoId ${image.leonardoId}, skipping...`
+            );
+            continue; // Skip to the next image if all retries fail
+          }
+        }
       }
-
+  
+      // Skip if no valid response after retries
       if (!faceSwapResponse || !faceSwapResponse.taskId) {
         console.error(
-          `faceSwap response for leonardoId ${image.leonardoId} does not contain a taskId:`,
+          `faceSwap response for leonardoId ${image.leonardoId} does not contain a taskId or failed after retries:`,
           faceSwapResponse
         );
         continue;
       }
-
+  
       // Create faceswap record
       console.log(
         `Creating artifactFaceswap record for taskId: ${faceSwapResponse.taskId}`
@@ -582,8 +604,14 @@ export class ArtifactService {
         );
         continue;
       }
+  
+      // Introduce a 2-second delay before the next API call (if there are more images)
+      if (index < images.length - 1) {
+        console.log('Waiting 2 seconds before the next faceSwap API call...');
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+      }
     }
-
+  
     if (faceswapCount === 0) {
       console.error('No artifactFaceswap records were created');
       return {
@@ -592,7 +620,7 @@ export class ArtifactService {
         statusCode: 500,
       };
     }
-
+  
     // Update user artifact status
     console.log(
       `Updating userArtifacts status to 'faceswap' for userArtifactId: ${userArtifactId}`
@@ -614,7 +642,7 @@ export class ArtifactService {
         statusCode: 500,
       };
     }
-
+  
     console.log(
       `retryStaleCosmicMirror completed successfully. Created ${faceswapCount} faceswap records.`
     );

package/package.json

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

package/utils/conceptPrompts.ts

@@ -571,7 +571,7 @@ You are an expert creative writer specializing in crafting intricate and vivid p
 `;
 
 export const PROMPT_GENERATE_AMULET_LEONARDO = `
-You are an expert creative writer specializing in crafting intricate and vivid prompts for AI image generation. Your task is to create a detailed, high-quality prompt for a symbolic amulet that embodies healing, growth, and protection. The design of the amulet must reflect the symbolic traits of a given zodiac sign combination, but without directly mentioning zodiac signs or incorporating any animal-based descriptions.
+You are an expert creative writer specializing in crafting intricate and vivid prompts for AI image generation. Your task is to create a detailed, high-quality prompt for a symbolic amulet that embodies healing, growth, and protection. The design of the amulet must reflect the symbolic traits of a given zodiac sign combination, but without directly mentioning zodiac signs or incorporating any animal-based descriptions. The amulet must be some kind of pendant or necklace, avoid ambiguous descriptions that can lead to a ring or bracelet, or something else.
 Describe the amulet in exquisite detail, focusing on its materials, structure, symbolic engravings, and artistic patterns. Avoid references to animal figures, replacing them with abstract, elemental, celestial, alchemical, or geometric motifs that convey its protective and transformative essence. Highlight its aura or glow, the emotions it evokes, and how it would be worn or carried in a visually compelling way. Ensure the design elements reflect resilience, inner balance, and renewal while maintaining an artistic and mystical tone.
 Include rendering details such as ‘ultra-realistic,’ ‘8K resolution,’ and ‘HDR’ to guide the AI model. Keep the description concise, under 1500 characters, ensuring it is structured for direct use in Leonardo.ai. Respond with a single descriptive paragraph based on the given zodiac sign combination.
 `;