@zodic/shared 0.0.116 → 0.0.118

package/app/api/index.ts

@@ -16,9 +16,7 @@ import {
   HouseCuspsReport,
   LeonardoGenerateImageParams,
   LeonardoGenerateImageResponse,
-  LeonardoGeneratePresignedUrlParams,
   LeonardoRequestBody,
-  LeonardoUploadImageParams,
   NatalHouseCuspReport,
   TimezoneResponse,
 } from '../../types/scopes/legacy';
@@ -236,13 +234,24 @@ export const Api = (env: BackendBindings) => ({
         num_images: quantity,
       };
 
+      // ✅ Dynamically add `controlNets` based on available settings
       if (controlNets.length > 0) {
-        body['controlnets'] = controlNets.map((net) => ({
-          initImageId: net.initImageId,
-          initImageType: net.initImageType,
-          preprocessorId: net.preprocessorId,
-          strengthType: net.strengthType,
-        }));
+        // @ts-expect-error
+        body['controlnets'] = controlNets.map((net) => {
+          const baseNet = {
+            initImageId: net.initImageId,
+            initImageType: net.initImageType,
+            preprocessorId: net.preprocessorId,
+          };
+
+          if (net.preprocessorId === 100) {
+            return { ...baseNet, strengthType: net.strengthType };
+          } else if (net.preprocessorId === 19) {
+            return { ...baseNet, weight: net.weight };
+          }
+
+          return baseNet;
+        });
       }
 
       if (initImageId) {
@@ -259,123 +268,18 @@ export const Api = (env: BackendBindings) => ({
 
         if (!response.ok) {
           const error = await response.json();
-          console.error('Error from Leonardo API:', error);
+          console.error('❌ Error from Leonardo API:', error);
           throw new Error(`Leonardo API Error: ${response.status}`);
         }
 
         const data = (await response.json()) as LeonardoGenerateImageResponse;
         return data;
       } catch (err: any) {
-        console.error('Error calling Leonardo API:', err.message);
+        console.error('❌ Error calling Leonardo API:', err.message);
         throw err;
       }
     },
-    generatePresignedUrl: async ({
-      extension,
-    }: LeonardoGeneratePresignedUrlParams): Promise<{
-      url: string;
-      fields: string;
-      id: string;
-      key: string;
-    }> => {
-      console.log('Generating presigned URL with extension:', extension);
-
-      const endpoint = 'https://cloud.leonardo.ai/api/rest/v1/init-image';
-      const headers = {
-        Authorization: `Bearer ${env.LEONARDO_API_KEY}`,
-        'Content-Type': 'application/json',
-      };
-
-      if (!extension) {
-        throw new Error('Invalid MIME type');
-      }
-
-      const body = JSON.stringify({
-        extension,
-      });
-
-      try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers,
-          body,
-        });
-
-        if (!response.ok) {
-          const error = await response.text();
-          console.error('Leonardo API error:', error);
-          throw new Error(
-            `Presigned URL generation failed: ${response.status}`
-          );
-        }
-
-        const rawResponse = (await response.json()) as any;
-        console.log('Presigned URL response:', rawResponse);
-
-        if (
-          !rawResponse.uploadInitImage ||
-          !rawResponse.uploadInitImage.url ||
-          !rawResponse.uploadInitImage.fields
-        ) {
-          throw new Error('Invalid presigned URL response');
-        }
-
-        return rawResponse.uploadInitImage;
-      } catch (error: any) {
-        console.error('Error generating presigned URL:', error.message);
-        throw error;
-      }
-    },
-    uploadImage: async ({
-      presignedUrl,
-      fields,
-      file,
-    }: LeonardoUploadImageParams) => {
-      console.log('Starting image upload to:', presignedUrl);
-
-      if (!(file instanceof Blob)) {
-        throw new Error('Invalid file type for upload');
-      }
-
-      try {
-        console.log('Parsing fields...');
-        const parsedFields = JSON.parse(fields);
-
-        if (!parsedFields || typeof parsedFields !== 'object') {
-          throw new Error('Invalid fields format');
-        }
-
-        console.log('Parsed fields:', parsedFields);
-
-        const formData = new FormData();
-
-        Object.entries(parsedFields).forEach(([key, value]) => {
-          formData.append(key, value as string);
-        });
-
-        formData.append('file', file);
-
-        console.log('Uploading with FormData:', Array.from(formData.entries()));
-
-        const response = await fetch(presignedUrl, {
-          method: 'POST',
-          body: formData,
-        });
-
-        if (!response.ok) {
-          const errorDetails = await response.text();
-          console.error('Upload failed:', errorDetails);
-          throw new Error(`Image upload failed: ${response.status}`);
-        }
-
-        console.log('Image uploaded successfully');
-      } catch (error: any) {
-        console.error('Error during uploadImage:', error.message);
-        throw error;
-      }
-    },
   },
-
   callImageDescriber: async (imageUrl: string): Promise<string> => {
     const mimeType = 'image/png';
     const endpoint =

package/app/services/ConceptService.ts

@@ -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,29 +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}`
     );
-  
+
     let [conceptCombination] = await drizzle
       .select({ id: conceptCombinations.id })
       .from(conceptCombinations)
@@ -224,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({
@@ -241,31 +241,36 @@ 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...`);
-  
+
     const initImage = leonardoInitImages.concepts[conceptSlug];
-    const controlNets = initImage.imageId
+    const controlNets: ControlNetConfig[] = initImage.imageId
       ? [
-          {
-            initImageId: initImage.imageId,
-            initImageType: 'UPLOADED',
-            preprocessorId: initImage.preprocessorId!,
-            ...(initImage.preprocessorId === 100
-              ? { strengthType: initImage.strengthType! }
-              : { weight: initImage.weight! }),
-          },
+          initImage.preprocessorId === 100
+            ? {
+                initImageId: initImage.imageId,
+                initImageType: 'UPLOADED',
+                preprocessorId: 100,
+                strengthType: initImage.strengthType!,
+              }
+            : {
+                initImageId: initImage.imageId,
+                initImageType: 'UPLOADED',
+                preprocessorId: 19,
+                weight: initImage.weight!,
+              },
         ]
       : [];
-  
+
     const leonardoResponse = await this.context
       .api()
       .callLeonardo.generateImage({
@@ -275,16 +280,16 @@ export class ConceptService {
         ...(controlNets.length > 0 ? { controlNets } : {}),
         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,
@@ -292,11 +297,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.116",
+  "version": "0.0.118",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/types/scopes/generic.ts

@@ -313,5 +313,5 @@ export type ControlNetConfig =
       initImageId: string;
       initImageType: 'UPLOADED' | 'GENERATED';
       preprocessorId: 19; // Edge to Image
-      weight: string;
+      weight: number;
     };

package/types/scopes/legacy.ts

@@ -157,12 +157,7 @@ export interface LeonardoRequestBody {
   modelId: string;
   presetStyle: string;
   alchemy: boolean;
-  controlnets?: Array<{
-    initImageId: string;
-    initImageType: string;
-    preprocessorId: number;
-    strengthType: string;
-  }>;
+  controlnets?: Array<ControlNetConfig>;
   init_generation_image_id?: string;
   init_strength?: number;
 }

package/utils/initImages.ts

@@ -29,7 +29,7 @@ export const leonardoInitImages: LeonardoInitImages = {
       imageUrl:
         'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/c489e496-00c4-4958-8bcd-4460a43a43bf.jpg',
       preprocessorId: 19,
-      weight: '0.3',
+      weight: 0.3,
     },
     ring: {
       imageId: null,
@@ -52,7 +52,7 @@ type ControlNetSettings =
       imageId: string;
       imageUrl: string;
       preprocessorId: 19;
-      weight: string;
+      weight: number;
       strengthType?: null;
     }
   | {