@zodic/shared 0.0.114 → 0.0.116

package/app/services/ConceptService.ts

@@ -3,7 +3,7 @@ import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
 import { v4 as uuidv4 } from 'uuid';
 import { schema } from '../..';
-import { Concept, Languages } from '../../types';
+import { Concept, ControlNetConfig, Languages } from '../../types';
 import { KVConcept, sizes } from '../../types/scopes/legacy';
 import { leonardoInitImages } from '../../utils/initImages';
 import { buildConceptKVKey } from '../../utils/KVKeysBuilders';
@@ -168,19 +168,19 @@ export class ConceptService {
     const drizzle = this.context.drizzle();
     const { width, height } = sizes['alchemy']['post4:5'];
     const { generations, conceptCombinations, concepts } = schema;
-
+  
     const kvKey = buildConceptKVKey(language, conceptSlug, combinationString);
     console.log(
       `🚀 Queuing image generation for concept: ${conceptSlug}, combination: ${combinationString}, language: ${language}`
     );
-
+  
     const concept = await this.getKVConcept(kvKey);
     if (!concept.leonardoPrompt) {
       throw new Error(
         `❌ Leonardo prompt must be populated before generating images for concept: ${conceptSlug}`
       );
     }
-
+  
     const conceptRecord = await drizzle
       .select({
         id: concepts.id,
@@ -191,30 +191,29 @@ export class ConceptService {
       .from(concepts)
       .where(eq(concepts.slug, conceptSlug))
       .limit(1);
-
+  
     if (conceptRecord.length === 0) {
       throw new Error(`❌ No concept found for slug: ${conceptSlug}`);
     }
-
+  
     const { id: conceptId, planet1, planet2, planet3 } = conceptRecord[0];
     console.log(
       `✅ Retrieved conceptId: ${conceptId} for slug: ${conceptSlug}`
     );
-
+  
     const [planet1Sign, planet2Sign, planet3Sign] =
       combinationString.split('-');
-
+  
     if (!planet1Sign || !planet2Sign || !planet3Sign) {
       throw new Error(
         `❌ Invalid combinationString: ${combinationString} (Expected format: sign1-sign2-[sign3])`
       );
     }
-
+  
     console.log(
       `🔹 Extracted planet signs: ${planet1} -> ${planet1Sign}, ${planet2} -> ${planet2Sign}, ${planet3} -> ${planet3Sign}`
     );
-
-    // 🔍 Ensure Concept Combination exists
+  
     let [conceptCombination] = await drizzle
       .select({ id: conceptCombinations.id })
       .from(conceptCombinations)
@@ -225,12 +224,12 @@ export class ConceptService {
         )
       )
       .limit(1);
-
+  
     if (!conceptCombination) {
       console.log(
         `🔍 No existing conceptCombination found. Creating new entry for ${conceptSlug}:${combinationString}`
       );
-
+  
       const [insertedCombination] = await drizzle
         .insert(conceptCombinations)
         .values({
@@ -242,36 +241,31 @@ export class ConceptService {
           planet3Sign,
         })
         .returning({ id: conceptCombinations.id });
-
+  
       conceptCombination = insertedCombination;
     }
-
+  
     const conceptCombinationId = conceptCombination.id;
     console.log(
       `✅ Using conceptCombinationId: ${conceptCombinationId} for ${conceptSlug}:${combinationString}`
     );
-
+  
     console.log(`🎨 Requesting Leonardo AI image generation...`);
-
-    // 🔍 Check if there is a valid init image
-    const initImageId = leonardoInitImages.concepts[conceptSlug]?.imageId;
-    const controlNets = initImageId
-      ? ([
+  
+    const initImage = leonardoInitImages.concepts[conceptSlug];
+    const controlNets = initImage.imageId
+      ? [
           {
-            initImageId,
+            initImageId: initImage.imageId,
             initImageType: 'UPLOADED',
-            preprocessorId: 100, // Content reference
-            strengthType: 'Low',
+            preprocessorId: initImage.preprocessorId!,
+            ...(initImage.preprocessorId === 100
+              ? { strengthType: initImage.strengthType! }
+              : { weight: initImage.weight! }),
           },
-        ] as Array<{
-          initImageId: string;
-          initImageType: 'UPLOADED' | 'GENERATED';
-          preprocessorId: number;
-          strengthType: 'Low' | 'Mid' | 'High';
-        }>)
+        ]
       : [];
-
-    // 🎨 Call Leonardo with or without ControlNet
+  
     const leonardoResponse = await this.context
       .api()
       .callLeonardo.generateImage({
@@ -279,18 +273,18 @@ export class ConceptService {
         width,
         height,
         ...(controlNets.length > 0 ? { controlNets } : {}),
-        negPrompt: 'person, hands, face, body parts, people, animals, fingers'
+        negPrompt: 'person, hands, face, body parts, people, animals, fingers',
       });
-
+  
     const generationId = leonardoResponse?.sdGenerationJob?.generationId;
     if (!generationId) {
       throw new Error(
         `❌ Failed to retrieve generationId from Leonardo response`
       );
     }
-
+  
     console.log(`✅ Leonardo Generation ID received: ${generationId}`);
-
+  
     await drizzle.insert(generations).values({
       id: generationId,
       conceptCombinationId,
@@ -298,11 +292,11 @@ export class ConceptService {
       status: 'pending',
       createdAt: new Date(),
     });
-
+  
     console.log(
       `📝 Generation record created: ${generationId} for ${conceptSlug}:${combinationString}`
     );
-
+  
     console.log(
       `🎨 Leonardo AI image generation triggered for ${conceptSlug}:${combinationString}, tracking ID: ${generationId}`
     );

package/package.json

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

package/types/scopes/generic.ts

@@ -148,7 +148,7 @@ export type Concept =
   | 'lantern'
   | 'orb'
   | 'ring';
-  
+
 export type Concepts = ['crown', 'scepter', 'amulet', 'lantern', 'orb', 'ring'];
 export type ConceptQueueMessage = {
   conceptSlug: Concept;
@@ -296,4 +296,22 @@ export interface JWK {
 
 export interface JWKS {
   keys: JWK[];
-}
+}
+
+export type ControlNetStrenghtType = 'Low' | 'Mid' | 'High';
+
+export type ControlNetPreprocessorId = 100 | 19;
+
+export type ControlNetConfig =
+  | {
+      initImageId: string;
+      initImageType: 'UPLOADED' | 'GENERATED';
+      preprocessorId: 100; // Content Reference
+      strengthType: ControlNetStrenghtType;
+    }
+  | {
+      initImageId: string;
+      initImageType: 'UPLOADED' | 'GENERATED';
+      preprocessorId: 19; // Edge to Image
+      weight: string;
+    };

package/types/scopes/legacy.ts

@@ -1,5 +1,5 @@
 import { BackendBindings } from './cloudflare';
-import { Gender } from './generic';
+import { ControlNetConfig, Gender } from './generic';
 
 export const zodiacSigns = [
   'Aries',
@@ -25,12 +25,7 @@ export interface LeonardoGenerateImageParams {
   prompt: string;
   width: number;
   height: number;
-  controlNets?: Array<{
-    initImageId: string;
-    initImageType: 'UPLOADED' | 'GENERATED';
-    preprocessorId: number;
-    strengthType: 'Low' | 'Mid' | 'High';
-  }>;
+  controlNets?: Array<ControlNetConfig>;
   quantity?: number;
   negPrompt?: string | null;
 }

package/utils/conceptPrompts.ts

@@ -204,45 +204,35 @@ Write each section with clarity, insight, and emotional resonance. Avoid mention
 `;
 
 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. Describe the crown in detail, including its materials, structure, symbolic engravings, and intricate patterns. Focus on capturing its regal and radiant essence through meaningful motifs and elegant design elements, avoiding direct references to zodiac signs. Highlight the type of light it reflects or emits, the way it sits 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 artistic rendering details such as “ultra-realistic,” “8K resolution,” and “HDR” 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 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.
 `;
 
 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.
-
-Describe the scepter in detail, including its materials, structure, symbolic engravings, and artistic patterns. Focus on capturing its majestic and commanding essence through meaningful motifs and regal design elements, avoiding direct references to zodiac signs. Highlight the way it is held or displayed, the type of energy it radiates, and how its presence impacts the surrounding ambiance.
-
-Ensure the design elements convey strength, authority, and purpose, while maintaining an artistic and mystical tone. Include artistic rendering details such as "ultra-realistic," "8K resolution," and "HDR" 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.
-Make the prompt start with: "Create an ultra-realistic, 8K resolution, HDR image of a regal scepter that symbolizes influence and authority, crafted with meaningful engravings and glowing with a commanding presence."
+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.
 `;
 
 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.
 `;
 
 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.
-
 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.
+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.
 `;
 
 export const PROMPT_GENERATE_LANTERN_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 spiritual lantern that symbolizes transformation, resilience, and leadership. The design of the lantern must reflect the symbolic traits of a given zodiac sign combination.
-
-Describe the lantern in detail, including its materials, structure, symbolic engravings, and design elements. Focus on capturing its spiritual essence through meaningful motifs and patterns, avoiding direct references to zodiac signs. Highlight the type of light it emits, the ambiance it creates, and its placement in a visually compelling environment.
-
-Ensure the design elements reflect transformation, balance, and renewal, while maintaining an artistic, mystical tone. Include artistic rendering details such as "ultra-realistic," "8K resolution," and "HDR" 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.
-Make the prompt start with: "Create an ultra-realistic, 8K resolution, HDR image of a mystical lantern that emanates guidance and resilience, casting an ethereal glow and adorned with intricate, symbolic patterns."
+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 spiritual lantern that symbolizes transformation, resilience, and leadership. The design of the lantern 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 lantern in exquisite detail, focusing on its materials, structure, symbolic engravings, and intricate design elements. Avoid references to animal figures, replacing them with celestial, geometric, alchemical, or elemental motifs that embody wisdom and renewal. Highlight the type of light it emits, the ambiance it creates, and how its presence transforms the surrounding environment. Ensure the design elements convey transformation, balance, 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.
 `;
 
 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.
-
-Describe the Orb in detail, including its materials, structure, symbolic engravings, and artistic patterns. Focus on capturing its cosmic and ethereal essence through meaningful motifs and celestial design elements, avoiding direct references to zodiac signs. Highlight its glowing or 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 wisdom, mystery, and transcendence, while maintaining an artistic and mystical tone. Include artistic rendering details such as "ultra-realistic," "8K resolution," and "HDR" 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.
-Make the prompt start with: "Create an ultra-realistic, 8K resolution, HDR image of a celestial orb that embodies destiny and higher vision, shimmering with cosmic light and adorned with mesmerizing, intricate designs."
-
+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.
 `;

package/utils/initImages.ts

@@ -6,11 +6,15 @@ export const leonardoInitImages: LeonardoInitImages = {
       imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
       imageUrl:
         'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+      preprocessorId: 100,
+      strengthType: 'Low',
     },
     scepter: {
       imageId: '744169ef-3db4-416d-86dd-9bd814e33432',
       imageUrl:
         'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/744169ef-3db4-416d-86dd-9bd814e33432.jpg',
+      preprocessorId: 100,
+      strengthType: 'Low',
     },
     amulet: {
       imageId: null,
@@ -21,8 +25,11 @@ export const leonardoInitImages: LeonardoInitImages = {
       imageUrl: null,
     },
     orb: {
-      imageId: null,
-      imageUrl: null,
+      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',
     },
     ring: {
       imageId: null,
@@ -31,10 +38,30 @@ export const leonardoInitImages: LeonardoInitImages = {
   },
 };
 
-type ConceptsInitImages = Record<
-  Concept,
-  { imageId: string | null; imageUrl: string | null }
->;
+type ConceptsInitImages = Record<Concept, ControlNetSettings>;
+
+type ControlNetSettings =
+  | {
+      imageId: string;
+      imageUrl: string;
+      preprocessorId: 100;
+      strengthType: 'Low' | 'Mid' | 'High';
+      weight?: null;
+    }
+  | {
+      imageId: string;
+      imageUrl: string;
+      preprocessorId: 19;
+      weight: string;
+      strengthType?: null;
+    }
+  | {
+      imageId: null;
+      imageUrl: null;
+      preprocessorId?: undefined;
+      strengthType?: undefined;
+      weight?: undefined;
+    };
 
 type LeonardoInitImages = {
   concepts: ConceptsInitImages;