@zodic/shared 0.0.90 → 0.0.92

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 { Languages } from '../../types';
+import { Concept, Languages } from '../../types';
 import { KVConcept, sizes } from '../../types/scopes/legacy';
 import { leonardoInitImages } from '../../utils/initImages';
 import { buildConceptKVKey } from '../../utils/KVKeysBuilders';
@@ -18,7 +18,7 @@ export class ConceptService {
    */
   async generateBasicInfo(
     language: Languages,
-    conceptSlug: string,
+    conceptSlug: Concept,
     combinationString: string
   ): Promise<void> {
     const kvKey = buildConceptKVKey(language, conceptSlug, combinationString);
@@ -54,20 +54,26 @@ export class ConceptService {
     description: string;
     poem: string;
   } {
-    console.log('Parsing basic info response from ChatGPT');
-    const nameMatch = response.match(/- Name: (.+)/);
-    const descriptionMatch = response.match(/- Description: (.+)/);
-    const poemMatch = response.match(/- Poem: (.+)/);
+    console.log('📌 Parsing basic info response from ChatGPT:', response);
+
+    const nameMatch = response.match(/1\.\s*Name:\s*(.+)/);
+    const descriptionMatch = response.match(
+      /2\.\s*Description:\s*([\s\S]+?)\s*3\./
+    );
+    const poemMatch = response.match(/3\.\s*Poem\/Quote:\s*([\s\S]+)/);
 
     if (!nameMatch || !descriptionMatch || !poemMatch) {
+      console.error('❌ Invalid basic info response format:', response);
       throw new Error('Invalid basic info response format');
     }
 
-    return {
-      name: nameMatch[1].trim(),
-      description: descriptionMatch[1].trim(),
-      poem: poemMatch[1].trim(),
-    };
+    const name = nameMatch[1].trim();
+    const description = descriptionMatch[1].trim();
+    const poem = poemMatch[1].trim();
+
+    console.log('✅ Parsed basic info:', { name, description, poem });
+
+    return { name, description, poem };
   }
 
   /**
@@ -75,7 +81,7 @@ export class ConceptService {
    */
   async generatePrompt(
     language: Languages,
-    conceptSlug: string,
+    conceptSlug: Concept,
     combinationString: string
   ): Promise<void> {
     const kvKey = buildConceptKVKey(language, conceptSlug, combinationString);
@@ -116,7 +122,7 @@ export class ConceptService {
    */
   async generateContent(
     language: Languages,
-    conceptSlug: string,
+    conceptSlug: Concept,
     combinationString: string
   ): Promise<void> {
     const kvKey = buildConceptKVKey(language, conceptSlug, combinationString);
@@ -156,7 +162,7 @@ export class ConceptService {
    */
   async generateImages(
     language: Languages,
-    conceptSlug: string,
+    conceptSlug: Concept,
     combinationString: string
   ): Promise<void> {
     const drizzle = this.context.drizzle();
@@ -165,7 +171,7 @@ export class ConceptService {
 
     const kvKey = buildConceptKVKey(language, conceptSlug, combinationString);
     console.log(
-      `🚀 Queuing image generation for concept: ${conceptSlug}, combination: ${combinationString}, language: ${language}`
+      `Queuing image generation for concept: ${conceptSlug}, combination: ${combinationString}, language: ${language}`
     );
 
     const concept = await this.getKVConcept(kvKey);
@@ -175,7 +181,6 @@ export class ConceptService {
       );
     }
 
-    // 🔍 Fetch Concept ID using conceptSlug
     const conceptRecord = await drizzle
       .select({
         id: concepts.id,
@@ -206,7 +211,7 @@ export class ConceptService {
     }
 
     console.log(
-      `🌌 Extracted planet signs: ${planet1} -> ${planet1Sign}, ${planet2} -> ${planet2Sign}, ${planet3} -> ${planet3Sign}`
+      `Extracted planet signs: ${planet1} -> ${planet1Sign}, ${planet2} -> ${planet2Sign}, ${planet3} -> ${planet3Sign}`
     );
 
     // 🔍 Ensure Concept Combination exists
@@ -234,7 +239,7 @@ export class ConceptService {
           conceptId,
           planet1Sign,
           planet2Sign,
-          planet3Sign, // Ensure null if planet3 is not used
+          planet3Sign,
         })
         .returning({ id: conceptCombinations.id });
 
@@ -246,8 +251,7 @@ export class ConceptService {
       `✅ Using conceptCombinationId: ${conceptCombinationId} for ${conceptSlug}:${combinationString}`
     );
 
-    // 🎨 Request Leonardo AI image generation
-    console.log(`🎨 Requesting Leonardo AI image generation...`);
+    console.log(`Requesting Leonardo AI image generation...`);
     const leonardoResponse = await this.context
       .api()
       .callLeonardo.generateImage({
@@ -256,12 +260,12 @@ export class ConceptService {
         height,
         controlNets: [
           {
-            "initImageId": leonardoInitImages.concetps.crown.imageId,
-            "initImageType": "UPLOADED",
-            "preprocessorId": 100, // content reference
-            "strengthType": "Low",
-        },
-        ]
+            initImageId: leonardoInitImages.concepts[conceptSlug].imageId,
+            initImageType: 'UPLOADED',
+            preprocessorId: 100, // content reference
+            strengthType: 'Low',
+          },
+        ],
       });
 
     const generationId = leonardoResponse?.sdGenerationJob?.generationId;
@@ -273,9 +277,8 @@ export class ConceptService {
 
     console.log(`✅ Leonardo Generation ID received: ${generationId}`);
 
-    // 📝 Insert Generation Record with the received generationId
     await drizzle.insert(generations).values({
-      id: generationId, // Use the ID from Leonardo
+      id: generationId,
       conceptCombinationId,
       type: 'concept_image',
       status: 'pending',
@@ -287,7 +290,7 @@ export class ConceptService {
     );
 
     console.log(
-      `🎨 Leonardo AI image generation triggered for ${conceptSlug}:${combinationString}, tracking ID: ${generationId}`
+      `Leonardo AI image generation triggered for ${conceptSlug}:${combinationString}, tracking ID: ${generationId}`
     );
   }
   /**

package/app/services/LeonardoService.ts

@@ -26,7 +26,6 @@ export class LeonardoService {
       visualDescription: string;
     }> = [];
 
-    // Fetch archetypes that need prompts
     for (const gender of VALID_GENDERS_ARRAY) {
       for (let index = 1; index <= 3; index++) {
         const kvKey = buildCosmicMirrorArchetypeKVKey(
@@ -57,7 +56,6 @@ export class LeonardoService {
 
     console.log('Archetypes requiring prompt generation:', promptsToGenerate);
 
-    // Generate prompts
     const archetypes = promptsToGenerate.map(({ name, visualDescription }) => ({
       name,
       visualDescription,
@@ -69,7 +67,6 @@ export class LeonardoService {
       throw new Error('Mismatch between archetypes and generated prompts.');
     }
 
-    // Update KV with generated prompts
     for (const [index, promptSet] of leonardoPrompts.entries()) {
       const { kvKey } = promptsToGenerate[index];
       console.log(`Updating KV with prompts for archetype: ${kvKey}`);
@@ -256,7 +253,6 @@ export class LeonardoService {
     console.log('Starting uploadImageByUrl with imageUrl:', imageUrl);
 
     try {
-      // Fetch the image from the provided URL
       console.log('Fetching image from URL...');
       const response = await fetch(imageUrl);
 
@@ -279,7 +275,6 @@ export class LeonardoService {
         mimeType,
       });
 
-      // Request a presigned URL for uploading
       console.log('Requesting presigned URL...');
       const presignedUrlData = await this.context
         .api()
@@ -297,7 +292,6 @@ export class LeonardoService {
 
       console.log('Presigned URL obtained:', presignedUrlData);
 
-      // Prepare the file to upload
       const file = new File([blob], `upload.${fileExtension}`, {
         type: mimeType,
       });

package/package.json

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

package/types/scopes/cloudflare.ts

@@ -43,12 +43,12 @@ export type CentralBindings = {
   ISSUER: string;
   GOOGLE_API_KEY: string;
   GOOGLE_SERVER_URL: string;
-  GOOGLE_CLIENT_ID: string;
-  GOOGLE_CLIENT_SECRET: string;
+  GOOGLE_OAUTH_CLIENT_ID: string;
+  GOOGLE_OAUTH_CLIENT_SECRET: string;
   GOOGLE_TIMEZONE_API_KEY: string;
   FACEBOOK_SERVER_URL: string;
-  FACEBOOK_CLIENT_ID: string;
-  FACEBOOK_CLIENT_SECRET: string;
+  FACEBOOK_OAUTH_CLIENT_ID: string;
+  FACEBOOK_OAUTH_CLIENT_SECRET: string;
   OAUTH_REDIRECT_URI: string;
   ASTROLOGY_WESTERN_USER_ID: string;
   ASTROLOGY_WESTERN_API_KEY: string;
@@ -100,11 +100,7 @@ export type BackendBindings = Env &
     | 'GOOGLE_API_KEY'
     | 'GOOGLE_TIMEZONE_API_KEY'
     | 'GOOGLE_SERVER_URL'
-    | 'GOOGLE_CLIENT_ID'
-    | 'GOOGLE_CLIENT_SECRET'
     | 'FACEBOOK_SERVER_URL'
-    | 'FACEBOOK_CLIENT_ID'
-    | 'FACEBOOK_CLIENT_SECRET'
     | 'OAUTH_REDIRECT_URI'
     | 'ASTROLOGY_WESTERN_API_KEY'
     | 'ASTROLOGY_WESTERN_USER_ID'
@@ -151,11 +147,11 @@ export type AuthBindings = Env &
   Pick<
     CentralBindings,
     | 'JWT_SECRET'
-    | 'GOOGLE_CLIENT_ID'
-    | 'GOOGLE_CLIENT_SECRET'
+    | 'GOOGLE_OAUTH_CLIENT_ID'
+    | 'GOOGLE_OAUTH_CLIENT_SECRET'
     | 'GOOGLE_SERVER_URL'
-    | 'FACEBOOK_CLIENT_ID'
-    | 'FACEBOOK_CLIENT_SECRET'
+    | 'FACEBOOK_OAUTH_CLIENT_ID'
+    | 'FACEBOOK_OAUTH_CLIENT_SECRET'
     | 'FACEBOOK_SERVER_URL'
     | 'OAUTH_REDIRECT_URI'
     | 'ISSUER'

package/types/scopes/generic.ts

@@ -141,7 +141,15 @@ export interface Crown {
   moon: string;
 }
 
-export type Concept = 'crown' | 'scepter' | 'amulet' | 'lantern' | 'orb';
+export type Concept =
+  | 'crown'
+  | 'scepter'
+  | 'amulet'
+  | 'lantern'
+  | 'orb'
+  | 'ring';
+  
+export type Concepts = ['crown', 'scepter', 'amulet', 'lantern', 'orb', 'ring'];
 export type ConceptQueueMessage = {
   conceptSlug: string;
   combinationString: string;

package/utils/conceptPrompts.ts

@@ -1,13 +1,12 @@
-import { BackendBindings } from '../types';
+import { BackendBindings, Concept } from '../types';
 
 export const conceptPrompts: (
   env: BackendBindings
-) => Record<string, Record<string, string>> = (
-  env
-) => ({
+) => Record<string, Record<Concept, string>> = (env) => ({
   basicInfo: {
     crown: PROMPT_GENERATE_CROWN,
     scepter: PROMPT_GENERATE_SCEPTER,
+    ring: PROMPT_GENERATE_RING,
     amulet: PROMPT_GENERATE_AMULET,
     lantern: PROMPT_GENERATE_LANTERN,
     orb: PROMPT_GENERATE_ORB,
@@ -15,6 +14,7 @@ export const conceptPrompts: (
   content: {
     crown: PROMPT_GENERATE_CROWN_CONTENT,
     scepter: PROMPT_GENERATE_SCEPTER_CONTENT,
+    ring: PROMPT_GENERATE_RING_CONTENT,
     amulet: PROMPT_GENERATE_AMULET_CONTENT,
     lantern: PROMPT_GENERATE_LANTERN_CONTENT,
     orb: PROMPT_GENERATE_ORB_CONTENT,
@@ -22,6 +22,7 @@ export const conceptPrompts: (
   leonardoPrompt: {
     crown: PROMPT_GENERATE_CROWN_LEONARDO,
     scepter: PROMPT_GENERATE_SCEPTER_LEONARDO,
+    ring: PROMPT_GENERATE_RING_LEONARDO,
     amulet: PROMPT_GENERATE_AMULET_LEONARDO,
     lantern: PROMPT_GENERATE_LANTERN_LEONARDO,
     orb: PROMPT_GENERATE_ORB_LEONARDO,
@@ -72,6 +73,17 @@ For the given combination:
 Do not mention zodiac signs or planets explicitly in the content. Ensure the output is insightful, symbolic, and emotionally resonant.
 `;
 
+export const PROMPT_GENERATE_RING = `
+You are a skilled creative writer specializing in astrology and symbolic storytelling. Your task is to craft a name, description, and poetic quote for the Scepter concept. The Scepter reflects external influence and action, symbolizing leadership, initiative, and the ability to shape one’s surroundings, as influenced by a given zodiac sign combination.
+
+For the given combination:
+1. Name: Keep it sober and descriptive, focusing on the Scepter’s symbolic purpose. It should start with “The Scepter of…”.
+2. Description: Write a concise, grounded narrative that links the Scepter’s qualities to the traits of the zodiac combination. Emphasize themes of authority, initiative, and action.
+3. Poem/Quote: Provide a short rhyming poetic paragraph or couplet (1-2 sentences) that encapsulates the Scepter’s essence. Use rhyme to inspire and evoke confidence.
+
+Do not mention zodiac signs or planets explicitly in the content. Ensure the output is insightful, symbolic, and emotionally resonant.
+`;
+
 export const PROMPT_GENERATE_AMULET = `
 You are a skilled creative writer specializing in astrology and symbolic storytelling. Your task is to craft a name, description, and poetic quote for the Amulet concept. The Amulet reflects healing and growth, representing protection, stability, and resilience, as influenced by a given zodiac sign combination.
 
@@ -131,6 +143,24 @@ For the provided Scepter name, description, and zodiac combination, expand on th
 Write each section with clarity, insight, and emotional resonance. Avoid mentioning zodiac signs or planets explicitly in the text. Ensure the content is symbolic, inspiring, and deeply aligned with the Scepter’s themes. Keep the response concise and meaningful.
 `;
 
+export const PROMPT_GENERATE_RING_CONTENT = `
+You are a skilled creative writer specializing in astrology and symbolic storytelling. Your task is to craft five distinct sections of descriptive content for the Ring concept. The Ring symbolizes Love and Bonds, representing the unseen forces of attraction, karmic connections, and the lessons woven into relationships, as influenced by a given zodiac sign combination.
+
+For the provided Ring name, description, and zodiac combination, expand on the following themes:
+
+1. Magnetic Pull – Explore what the bearer unconsciously attracts in love, the qualities they draw into their life, and the recurring patterns that shape their relationships.
+
+2. Hidden Desires – Reveal the unspoken parts of the bearer’s romantic self, the emotions, needs, and passions that influence their approach to love, whether acknowledged or not.
+
+3. The Fated Dance – Describe how destiny and unseen forces shape the bearer’s relationships, including karmic encounters, serendipitous connections, and lessons bound by fate.
+
+4. Unveiling the Shadows – Reflect on the hidden lessons of past loves, the patterns that must be understood, and how past relationships contribute to emotional wisdom and healing.
+
+5. Your Love Power – Explore the bearer’s unique way of loving, their capacity for connection, and how they can embrace and express love in its truest, most fulfilling form.
+
+Write each section with clarity, insight, and emotional resonance. Avoid mentioning zodiac signs or planets explicitly in the text. Ensure the content is symbolic, poetic, and deeply aligned with the Ring’s themes. Keep the response concise and meaningful.
+`;
+
 export const PROMPT_GENERATE_AMULET_CONTENT = `
 You are a skilled creative writer specializing in astrology and symbolic storytelling. Your task is to craft five distinct sections of descriptive content for the Amulet concept. The Amulet symbolizes Healing and Growth, representing protection, resilience, and nurturing energy, as influenced by a given zodiac sign combination.
 
@@ -183,6 +213,10 @@ Ensure the design elements convey strength, authority, and purpose, while mainta
 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."
 `;
 
+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."
+`;
+
 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.
 

package/utils/initImages.ts

@@ -1,9 +1,45 @@
-export const leonardoInitImages = {
-  concetps: {
+import { Concept } from '../types';
+
+export const leonardoInitImages: LeonardoInitImages = {
+  concepts: {
     crown: {
       imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
       imageUrl:
         'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
     },
+    scepter: {
+      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageUrl:
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+    },
+    amulet: {
+      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageUrl:
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+    },
+    lantern: {
+      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageUrl:
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+    },
+    orb: {
+      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageUrl:
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+    },
+    ring: {
+      imageId: '450076a1-c6bb-4877-8a0b-c0d3ba72fca7',
+      imageUrl:
+        'https://cdn.leonardo.ai/users/b117a933-e5c9-45b2-96aa-4b619c2d74ba/initImages/450076a1-c6bb-4877-8a0b-c0d3ba72fca7.jpg',
+    },
   },
 };
+
+type ConceptsInitImages = Record<
+  Concept,
+  { imageId: string; imageUrl: string }
+>;
+
+type LeonardoInitImages = {
+  concepts: ConceptsInitImages;
+};