@zodic/shared 0.0.115 → 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.115",
+  "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/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;