@zodic/shared 0.0.370 → 0.0.372

package/app/services/ConceptService.ts

@@ -340,14 +340,14 @@ export class ConceptService {
     override: boolean = false
   ): Promise<{ generatedPrompt: string }> {
     console.log(
-      `🚀 Generating Leonardo prompt for concept: ${conceptSlug}, combination: ${combinationString}, override: ${override}`
+      `[${new Date().toISOString()}] 🚀 Generating Leonardo prompt for concept: ${conceptSlug}, combination: ${combinationString}, override: ${override}`
     );
 
     const db = drizzle(this.context.env.DB); // ✅ Initialize Drizzle with Cloudflare D1
 
     // ✅ Fetch concept data from D1 for both languages
     console.log(
-      `📡 Fetching concept data for ${conceptSlug}:${combinationString}`
+      `[${new Date().toISOString()}] 📡 Fetching concept data for ${conceptSlug}:${combinationString}`
     );
 
     const conceptEntries = await db
@@ -382,12 +382,18 @@ export class ConceptService {
       throw new Error(`❌ Could not find both EN and PT versions.`);
     }
 
+    const leonardoPromptExistsEN =
+      conceptEN.leonardoPrompt && conceptEN.leonardoPrompt.length > 4;
+
+    const leonardoPromptExistsPT =
+      conceptPT.leonardoPrompt && conceptPT.leonardoPrompt.length > 4;
+
     // ✅ Check if prompt already exists and skip if override is false
-    if (!override && conceptEN.leonardoPrompt && conceptPT.leonardoPrompt) {
+    if (!override && leonardoPromptExistsEN && leonardoPromptExistsPT) {
       console.log(
-        `⚡ Leonardo prompt already exists for ${conceptSlug}, skipping.`
+        `[${new Date().toISOString()}] ⚡ Leonardo prompt already exists for ${conceptSlug}, skipping.`
       );
-      return { generatedPrompt: conceptEN.leonardoPrompt };
+      return { generatedPrompt: conceptEN.leonardoPrompt! };
     }
 
     // ✅ Ensure basic info is present
@@ -420,11 +426,30 @@ export class ConceptService {
       );
     }
 
-    const generatedPrompt = response.trim();
+    // Clean the response to remove unwanted elements
+    let generatedPrompt = response.trim();
+
+    // Step 1: Remove **Prompt:** or Prompt: from the start
+    generatedPrompt = generatedPrompt.replace(
+      /^(?:\*\*Prompt:\*\*|Prompt:)\s*/,
+      ''
+    );
+
+    // Step 2: Remove character count suffix (e.g., *(Character count: 749)* or *(1498 characters)*)
+    generatedPrompt = generatedPrompt.replace(/\s*\*\([^()]*\)*\s*$/, '');
+
+    // Step 3: Remove surrounding quotes if they wrap the entire prompt
+    if (generatedPrompt.startsWith('"') && generatedPrompt.endsWith('"')) {
+      generatedPrompt = generatedPrompt.slice(1, -1).trim();
+    }
+
+    console.log(
+      `[${new Date().toISOString()}] ✨ Cleaned generated prompt: "${generatedPrompt}"`
+    );
 
     // ✅ Store the generated prompt in D1 for both languages
     console.log(
-      `💾 Storing Leonardo prompt for ${conceptSlug}:${combinationString} in D1...`
+      `[${new Date().toISOString()}] 💾 Storing Leonardo prompt for ${conceptSlug}:${combinationString} in D1...`
     );
     await db.batch([
       db
@@ -448,7 +473,7 @@ export class ConceptService {
     ]);
 
     console.log(
-      `✅ Leonardo prompt stored for concept: ${conceptSlug}, combination: ${combinationString}, in both languages.`
+      `[${new Date().toISOString()}] ✅ Leonardo prompt stored for concept: ${conceptSlug}, combination: ${combinationString}, in both languages.`
     );
 
     return { generatedPrompt };
@@ -1801,41 +1826,44 @@ export class ConceptService {
       .limit(1)
       .execute();
 
-    return !!conceptData?.leonardoPrompt && conceptData.leonardoPrompt.length > 10;
+    return (
+      !!conceptData?.leonardoPrompt && conceptData.leonardoPrompt.length > 10
+    );
   }
 
-// src/services/ConceptService.ts
-async checkConceptCompletion(
-  conceptSlug: Concept,
-  combinationString: string,
-  lang: string = 'en-us'
-): Promise<boolean> {
-  const db = this.context.drizzle();
-  const [conceptData] = await db
-    .select({
-      leonardoPrompt: schema.conceptsData.leonardoPrompt,
-      postImages: schema.conceptsData.postImages,
-      reelImages: schema.conceptsData.reelImages,
-    })
-    .from(schema.conceptsData)
-    .where(
-      and(
-        eq(schema.conceptsData.conceptSlug, conceptSlug),
-        eq(schema.conceptsData.combination, combinationString),
-        eq(schema.conceptsData.language, lang)
+  // src/services/ConceptService.ts
+  async checkConceptCompletion(
+    conceptSlug: Concept,
+    combinationString: string,
+    lang: string = 'en-us'
+  ): Promise<boolean> {
+    const db = this.context.drizzle();
+    const [conceptData] = await db
+      .select({
+        leonardoPrompt: schema.conceptsData.leonardoPrompt,
+        postImages: schema.conceptsData.postImages,
+        reelImages: schema.conceptsData.reelImages,
+      })
+      .from(schema.conceptsData)
+      .where(
+        and(
+          eq(schema.conceptsData.conceptSlug, conceptSlug),
+          eq(schema.conceptsData.combination, combinationString),
+          eq(schema.conceptsData.language, lang)
+        )
       )
-    )
-    .limit(1)
-    .execute();
-
-  if (!conceptData) return false; // No concept data found
+      .limit(1)
+      .execute();
 
-  // Check if postImages and reelImages are valid non-empty JSON arrays
-  const hasPostImages =
-    conceptData.postImages &&
-    conceptData.postImages.trim().length > 4 && // Ensures length > 4 to exclude "[]"
-    JSON.parse(conceptData.postImages).length > 2;
+    if (!conceptData) return false; // No concept data found
+    const hasPrompt =
+      !!conceptData?.leonardoPrompt && conceptData.leonardoPrompt.length > 10;
+    // Check if postImages and reelImages are valid non-empty JSON arrays
+    const hasPostImages =
+      conceptData.postImages &&
+      conceptData.postImages.trim().length > 4 && // Ensures length > 4 to exclude "[]"
+      JSON.parse(conceptData.postImages).length > 2;
 
-  return !!conceptData.leonardoPrompt && !!hasPostImages;
-}
+    return hasPrompt && !!hasPostImages;
+  }
 }

package/app/workflow/ConceptWorkflow.ts

@@ -1,7 +1,9 @@
 import { inject, injectable } from 'inversify';
+import { schema } from '../..';
 import { Concept } from '../../types';
 import { AppContext } from '../base';
 import { ConceptService } from '../services';
+import { and, eq } from 'drizzle-orm';
 
 @injectable()
 export class ConceptWorkflow {
@@ -14,6 +16,7 @@ export class ConceptWorkflow {
     userId: string,
     conceptSlug: Concept,
     combinationString: string,
+    conceptCombinationId: string,
     lang: string = 'en-us'
   ) {
     console.log(
@@ -21,6 +24,26 @@ export class ConceptWorkflow {
       { userId, lang }
     );
 
+    const pendingGeneration = await this.context
+      .drizzle()
+      .select({ id: schema.generations.id })
+      .from(schema.generations)
+      .where(
+        and(
+          eq(schema.generations.conceptCombinationId, conceptCombinationId),
+          eq(schema.generations.status, 'pending')
+        )
+      )
+      .limit(1)
+      .execute();
+
+    if (pendingGeneration.length) {
+      console.log(
+        `[${new Date().toISOString()}] ⏳ Found pending generation for combination ${conceptCombinationId}`
+      );
+      return;
+    }
+
     try {
       // Step 1: Generate Leonardo prompt if missing
       const hasPrompt = await this.conceptService.checkHasPrompt(

package/package.json

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

package/utils/conceptPrompts.ts

@@ -559,19 +559,15 @@ PT:
 `;
 
 export const PROMPT_GENERATE_CROWN_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 majestic crown that symbolizes core identity, inner power, and essence. The design of the crown must reflect the symbolic traits of a given zodiac sign combination, but without directly mentioning zodiac signs or incorporating any animal-based descriptions.
-Describe the crown in exquisite detail, focusing on its materials, structure, symbolic engravings, and intricate patterns. Avoid references to animal figures, replacing them with celestial, geometric, alchemical, or elemental motifs that embody nobility and profound self-awareness. Highlight the type of light the crown reflects or emits, the way it rests atop its pedestal or bearer, and the aura of authority and grace it projects. Ensure the design elements convey dignity, individuality, and inner strength 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.
+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 majestic crown that symbolizes core identity, inner power, and essence. The design must reflect the symbolic traits of a specific zodiac sign combination, without directly referencing zodiac signs or using animal-based imagery. Describe only the crown—avoid any depiction of heads, people, or additional objects. The background should be minimal yet evocative, enhancing the crown’s mystical presence without introducing unrelated elements. Focus on the crown’s materials, structure, symbolic engravings, and intricate patterns. Replace animal motifs with celestial, geometric, alchemical, or elemental symbols that evoke nobility and profound self-awareness. Describe the type of light the crown reflects or emits, and the aura of grace, power, and individuality it projects. Maintain a mystical and refined tone throughout. Include rendering cues such as “ultra-realistic,” “8K resolution,” and “HDR.” Ensure the final description is a single, elegant paragraph under 1500 characters, formatted with no labels or metadata—just the descriptive text for image generation.
 `;
 
 export const PROMPT_GENERATE_SCEPTER_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 scepter that embodies external influence, action, and empowerment. The design of the scepter must reflect the symbolic traits of a given zodiac sign combination, but without directly mentioning zodiac signs or incorporating any animal-based descriptions.
-Describe the scepter in exquisite detail, focusing on its materials, structure, symbolic engravings, and artistic patterns. Avoid references to animal figures, replacing them with celestial, geometric, alchemical, or elemental motifs that convey its regal and commanding presence. Highlight how the scepter is held or displayed, the energy it radiates, and how its presence shapes the surrounding ambiance. Ensure the design elements reflect strength, authority, and purpose 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.
+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 scepter that embodies external influence, action, and empowerment. The design must reflect the symbolic traits of a specific zodiac sign combination, without directly referencing zodiac signs or using animal-based imagery. Describe only the scepter—exclude hands, figures, or unrelated objects. The background should be visually appealing and thematically aligned with the scepter’s symbolism, incorporating mystical, celestial, or elemental elements that enhance its presence without overshadowing it. Focus on the scepter’s materials, structure, symbolic engravings, and artistic patterns. Replace animal motifs with celestial, geometric, alchemical, or elemental designs that convey strength, authority, and purpose. Highlight the energy it radiates and how it subtly shapes the surrounding ambiance. Maintain an artistic, regal, and mystical tone throughout. Include rendering cues like “ultra-realistic,” “8K resolution,” and “HDR.” Ensure the final output is a single descriptive paragraph under 1500 characters, with no titles, labels, or metadata—just the prompt for image generation.
 `;
 
 export const PROMPT_GENERATE_RING_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 ring that embodies love and bonds. The design of the ring must reflect the mystical and fated nature of deep relationships, shaped by a given zodiac sign combination. Describe the ring in detail, including its materials, structure, engravings, and artistic patterns. Focus on capturing the essence of attraction, karmic ties, and emotional depth through meaningful motifs and elegant, symbolic elements, avoiding direct references to zodiac signs. Highlight the aura or glow the ring emanates, the emotions it evokes, and the way it would be worn as a symbol of fate and devotion. Ensure the design conveys a sense of destined connection, passion, and spiritual intimacy, while maintaining an artistic and mystical tone. Include artistic rendering details such as “ultra-realistic,” “8K resolution,” “HDR lighting,” and “intricate details” to guide the AI model. Keep the description concise, under 1500 characters, and ensure it can be used directly with Leonardo.ai for image generation. Respond with a single descriptive paragraph based on the given zodiac sign combination.
+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 ring that embodies love and bonds. The design of the ring must reflect the mystical and fated nature of deep relationships, shaped by a given zodiac sign combination. Describe the ring in detail, including its materials, structure, engravings, and artistic patterns. Focus on capturing the essence of attraction, karmic ties, and emotional depth through meaningful motifs and elegant, symbolic elements, avoiding direct references to zodiac signs. Highlight the aura or glow the ring emanates, the emotions it evokes, and the way it would be worn as a symbol of fate and devotion. Ensure the design conveys a sense of destined connection, passion, and spiritual intimacy, while maintaining an artistic and mystical tone. Include artistic rendering details such as “ultra-realistic,” “8K resolution,” “HDR lighting,” and “intricate details” to guide the AI model. Keep the description concise, under 1500 characters, and ensure it can be used directly with Leonardo.ai for image generation. Respond with a single descriptive paragraph based on the given zodiac sign combination. Ensure the final output is a single descriptive paragraph under 1500 characters, with no titles, labels, or metadata, just the prompt for image generation.
 `;
 
 export const PROMPT_GENERATE_AMULET_LEONARDO = `
@@ -589,5 +585,5 @@ Include rendering details such as ‘ultra-realistic,’ ‘8K resolution,’ an
 export const PROMPT_GENERATE_ORB_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 mystical Orb that symbolizes destiny, purpose, and higher vision. The design of the Orb must reflect the symbolic traits of a given zodiac sign combination, but without directly mentioning zodiac signs or incorporating any animal-based descriptions.
 Describe the Orb in exquisite detail, focusing on its materials, structure, symbolic engravings, and artistic patterns. Avoid references to animal figures, replacing them with celestial, geometric, alchemical, or elemental motifs that evoke wisdom and transcendence. Highlight the Orb’s radiant energy, the depth of its swirling patterns, and how it is displayed—whether floating, resting on an ornate pedestal, or encased in a symbolic frame.
-Ensure the design elements convey mystery, enlightenment, and cosmic significance 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.
+Ensure the design elements convey mystery, enlightenment, and cosmic significance 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. Ensure the final output is a single descriptive paragraph under 1500 characters, with no titles, labels, or metadata, just the prompt for image generation.
 `;

package/utils/initImages.ts

@@ -3,16 +3,16 @@ import { Concept } from '../types';
 export const leonardoInitImages: LeonardoInitImages = {
   concepts: {
     crown: {
-      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageId: '65081af2-eaf5-47b4-8f3f-d0255db28f58',
       imageUrl:
-        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/65081af2-eaf5-47b4-8f3f-d0255db28f58.jpg',
       preprocessorId: 100,
       strengthType: 'Low',
     },
     scepter: {
-      imageId: '744169ef-3db4-416d-86dd-9bd814e33432',
+      imageId: '7a448a58-5bec-44ce-8bc8-eca125d46794',
       imageUrl:
-        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/744169ef-3db4-416d-86dd-9bd814e33432.jpg',
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/7a448a58-5bec-44ce-8bc8-eca125d46794.jpg',
       preprocessorId: 100,
       strengthType: 'Low',
     },
@@ -28,8 +28,8 @@ export const leonardoInitImages: LeonardoInitImages = {
       imageId: 'c489e496-00c4-4958-8bcd-4460a43a43bf',
       imageUrl:
         'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/c489e496-00c4-4958-8bcd-4460a43a43bf.jpg',
-      preprocessorId: 19,
-      weight: 0.3,
+      preprocessorId: 100,
+      strengthType: 'Low',
     },
     ring: {
       imageId: null,