@zodic/shared 0.0.115 → 0.0.117

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

@@ -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';
@@ -214,7 +214,6 @@ export class ConceptService {
       `🔹 Extracted planet signs: ${planet1} -> ${planet1Sign}, ${planet2} -> ${planet2Sign}, ${planet3} -> ${planet3Sign}`
     );
 
-    // 🔍 Ensure Concept Combination exists
     let [conceptCombination] = await drizzle
       .select({ id: conceptCombinations.id })
       .from(conceptCombinations)
@@ -253,25 +252,25 @@ export class ConceptService {
 
     console.log(`🎨 Requesting Leonardo AI image generation...`);
 
-    // 🔍 Check if there is a valid init image
-    const initImageId = leonardoInitImages.concepts[conceptSlug]?.imageId;
-    const controlNets = initImageId
-      ? ([
-          {
-            initImageId,
-            initImageType: 'UPLOADED',
-            preprocessorId: 100, // Content reference
-            strengthType: 'Low',
-          },
-        ] as Array<{
-          initImageId: string;
-          initImageType: 'UPLOADED' | 'GENERATED';
-          preprocessorId: number;
-          strengthType: 'Low' | 'Mid' | 'High';
-        }>)
+    const initImage = leonardoInitImages.concepts[conceptSlug];
+    const controlNets: ControlNetConfig[] = initImage.imageId
+      ? [
+          initImage.preprocessorId === 100
+            ? {
+                initImageId: initImage.imageId,
+                initImageType: 'UPLOADED',
+                preprocessorId: 100,
+                strengthType: initImage.strengthType!,
+              }
+            : {
+                initImageId: initImage.imageId,
+                initImageType: 'UPLOADED',
+                preprocessorId: 19,
+                weight: initImage.weight!,
+              },
+        ]
       : [];
 
-    // 🎨 Call Leonardo with or without ControlNet
     const leonardoResponse = await this.context
       .api()
       .callLeonardo.generateImage({
@@ -279,7 +278,7 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.115",
+  "version": "0.0.117",
   "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;
 }
@@ -162,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

@@ -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;