@zodic/shared 0.0.155 → 0.0.157

package/app/services/ConceptService.ts

@@ -28,22 +28,23 @@ export class ConceptService {
     console.log(
       `🚀 Generating basic info for concept: ${conceptSlug}, combination: ${combinationString}, override: ${override}`
     );
-  
+
     const kvStore = this.context.kvConceptsStore();
     const kvFailuresStore = this.context.kvConceptFailuresStore();
     const kvNamesStore = this.context.kvConceptNamesStore(); // ✅ New KV for storing names
     const kvKeyEN = buildConceptKVKey('en-us', conceptSlug, combinationString);
     const kvKeyPT = buildConceptKVKey('pt-br', conceptSlug, combinationString);
     const failureKey = `failures:basic-info:${conceptSlug}:${combinationString}`;
-  
-    const namesKeyEN = `${conceptSlug}:en-us`; // ✅ Key for English names
-    const namesKeyPT = `${conceptSlug}:pt-br`; // ✅ Key for Portuguese names
-  
+
+    const namesKeyEN = `${conceptSlug}:en-us`;
+    const namesKeyPT = `${conceptSlug}:pt-br`;
+    const reportKey = `report:${conceptSlug}`; // ✅ New tracking key
+
     // ✅ Check if data already exists
     if (!override) {
       const existingEN = await this.getKVConcept(kvKeyEN);
       const existingPT = await this.getKVConcept(kvKeyPT);
-  
+
       if (
         existingEN.name &&
         existingEN.description &&
@@ -60,16 +61,16 @@ export class ConceptService {
         return;
       }
     }
-  
+
     let attempts = 0;
     const maxAttempts = 3;
-  
+
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
         attempts++;
         console.log(`🔄 Attempt ${attempts} to generate basic info...`);
-  
+
         // ✅ Fetch the full name lists
         let allNamesEN = JSON.parse(
           (await kvNamesStore.get(namesKeyEN)) || '[]'
@@ -77,11 +78,11 @@ export class ConceptService {
         let allNamesPT = JSON.parse(
           (await kvNamesStore.get(namesKeyPT)) || '[]'
         ) as string[];
-  
+
         // ✅ Get only the last 50 names for AI context
         const recentNamesEN = allNamesEN.slice(-50);
         const recentNamesPT = allNamesPT.slice(-50);
-  
+
         // ✅ Build the messages to request content, ensuring uniqueness
         const messages = this.context
           .buildLLMMessages()
@@ -90,22 +91,22 @@ export class ConceptService {
             conceptSlug,
             existingNames: recentNamesEN, // 🔥 Pass only recent names
           });
-  
+
         // ✅ Call ChatGPT API
         let response = await this.context.api().callTogether.single(messages, {});
         if (!response) {
           throw new Error(`❌ AI returned an empty response`);
         }
-  
+
         phase = 'cleaning';
-        response = this.cleanAIResponse(response); // ✅ Early Cleaning Step
-  
+        response = this.cleanAIResponse(response);
+
         phase = 'parsing';
-  
+
         // ✅ Parse response for both languages
         let { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT } =
-          this.parseBasicInfoResponse(response);
-  
+          this.parseBasicInfoResponse(response, conceptSlug);
+
         // 🔥 Check if generated English name is unique
         if (allNamesEN.includes(nameEN)) {
           console.warn(`⚠️ Duplicate Crown Name Detected: "${nameEN}"`);
@@ -117,7 +118,7 @@ export class ConceptService {
           console.log('🔁 Retrying due to duplicate English name...');
           continue;
         }
-  
+
         // 🔥 Check if generated Portuguese name is unique
         if (allNamesPT.includes(namePT)) {
           console.warn(`⚠️ Duplicate Portuguese Name Detected: "${namePT}"`);
@@ -129,15 +130,15 @@ export class ConceptService {
           console.log('🔁 Retrying due to duplicate Portuguese name...');
           continue;
         }
-  
+
         // ✅ Append new names to the full list
         allNamesEN.push(nameEN);
         allNamesPT.push(namePT);
-  
+
         // ✅ Store updated name lists in KV
         await kvNamesStore.put(namesKeyEN, JSON.stringify(allNamesEN));
         await kvNamesStore.put(namesKeyPT, JSON.stringify(allNamesPT));
-  
+
         // 🌍 English version
         const conceptEN = await this.getKVConcept(kvKeyEN);
         Object.assign(conceptEN, {
@@ -147,7 +148,7 @@ export class ConceptService {
           status: 'idle',
         });
         await kvStore.put(kvKeyEN, JSON.stringify(conceptEN));
-  
+
         // 🇧🇷 Portuguese version
         const conceptPT = await this.getKVConcept(kvKeyPT);
         Object.assign(conceptPT, {
@@ -157,30 +158,43 @@ export class ConceptService {
           status: 'idle',
         });
         await kvStore.put(kvKeyPT, JSON.stringify(conceptPT));
-  
+
         console.log(
           `✅ Basic info stored for ${conceptSlug}, combination: ${combinationString}, in both languages.`
         );
+
+        // ✅ Increment report tracking successful inserts
+        let currentCount = parseInt(
+          (await kvNamesStore.get(reportKey)) || '0',
+          10
+        );
+        currentCount += 1;
+        await kvNamesStore.put(reportKey, currentCount.toString());
+
+        console.log(
+          `📊 Updated progress for ${conceptSlug}: ${currentCount} successful inserts.`
+        );
+
         return; // ✅ Exit loop if successful
       } catch (error) {
         console.error(
           `❌ Attempt ${attempts} failed at phase: ${phase}`,
           (error as Error).message
         );
-  
+
         // ✅ Store failure details in KV for manual review
         await kvFailuresStore.put(
           failureKey,
           JSON.stringify({
             error: (error as Error).message,
             attempt: attempts,
-            phase, // ✅ Identify if failure occurred in "generation", "cleaning", or "parsing"
+            phase,
             conceptSlug,
             combinationString,
             timestamp: new Date().toISOString(),
           })
         );
-  
+
         if (attempts >= maxAttempts) {
           console.error(
             `🚨 All ${maxAttempts} attempts failed during ${phase}. Logged failure.`
@@ -189,7 +203,7 @@ export class ConceptService {
             `Failed to generate basic info after ${maxAttempts} attempts`
           );
         }
-  
+
         console.log('🔁 Retrying...');
         await new Promise((resolve) => setTimeout(resolve, 500)); // ⏳ Small delay before retrying
       }
@@ -206,7 +220,10 @@ export class ConceptService {
       .trim();
   }
 
-  private parseBasicInfoResponse(response: string): {
+  private parseBasicInfoResponse(
+    response: string,
+    conceptSlug: Concept
+  ): {
     nameEN: string;
     descriptionEN: string;
     poemEN: string[];
@@ -237,25 +254,55 @@ export class ConceptService {
     const poemEN = enMatch[3]
       .trim()
       .split(/\n+/)
-      .map((line) => cleanText(line)); // ✅ Split into array & clean lines
+      .map((line) => cleanText(line));
   
     const namePT = cleanText(ptMatch[1]);
     const descriptionPT = cleanText(ptMatch[2]);
     const poemPT = ptMatch[3]
       .trim()
       .split(/\n+/)
-      .map((line) => cleanText(line)); // ✅ Split into array & clean lines
+      .map((line) => cleanText(line));
+  
+    // ✅ Determine appropriate replacement text based on conceptSlug
+    const conceptPlaceholder = `this ${conceptSlug.charAt(0).toUpperCase() + conceptSlug.slice(1)}`;
+    const conceptPlaceholderCapitalized =
+      `This ${conceptSlug.charAt(0).toUpperCase() + conceptSlug.slice(1)}`;
+  
+    // ✅ Function to replace occurrences of the name in a text while handling capitalization
+    const replaceConceptName = (text: string, conceptName: string) => {
+      return text.replace(
+        new RegExp(`(?<=\\.\\s*|^)${conceptName}`, 'g'),
+        conceptPlaceholderCapitalized
+      ).replace(new RegExp(conceptName, 'g'), conceptPlaceholder);
+    };
+  
+    // ✅ Ensure the concept name is not repeated in the description
+    const cleanedDescriptionEN = replaceConceptName(descriptionEN, nameEN);
+    const cleanedDescriptionPT = replaceConceptName(descriptionPT, namePT);
+  
+    // ✅ If the name appears in the poem, trigger a retry
+    if (poemEN.some((line) => line.includes(nameEN)) || poemPT.some((line) => line.includes(namePT))) {
+      console.error('❌ Concept name detected in poem, triggering a retry.');
+      throw new Error('Concept name found in poem, regenerating response.');
+    }
   
     console.log('✅ Successfully parsed and cleaned basic info:', {
       nameEN,
-      descriptionEN,
+      descriptionEN: cleanedDescriptionEN,
       poemEN,
       namePT,
-      descriptionPT,
+      descriptionPT: cleanedDescriptionPT,
       poemPT,
     });
   
-    return { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT };
+    return {
+      nameEN,
+      descriptionEN: cleanedDescriptionEN,
+      poemEN,
+      namePT,
+      descriptionPT: cleanedDescriptionPT,
+      poemPT,
+    };
   }
 
   /**

package/package.json

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

package/utils/conceptPrompts.ts

@@ -66,6 +66,7 @@ For the given combination, generate the following in both languages, ensuring th
 
 Rules & Formatting:
 	•	Do not mention zodiac signs or planets explicitly.
+  • Do not mention the Crown’s name in the description or poem.
 	•	Ensure both descriptions are structurally and emotionally equivalent.
 	•	Write the poem freely in each language to maximize impact, avoiding direct translation.
 	•	Use rich, symbolic language while keeping it accessible and inspiring.
@@ -99,22 +100,16 @@ For the given combination, generate the following in both languages, ensuring th
 
 3. Poetic Passage (Passagem Poética): Create two separate and independent poetic passages—one in English, one in Portuguese. Each should reflect the same essence but be uniquely crafted to best suit the flow and artistic qualities of its respective language. The passage should be long and evocative, 4 poetic lines, ensuring it deeply resonates and immerses the reader in a sense of confidence, power, and determination.
 
-  
 • Do not translate the poem directly—let each version flourish naturally in its own language.
-
 • Ensure the passage flows rhythmically, evoking strength and vision.
-
 • Avoid mentioning the Scepter itself or using the word “scepter.”
 
-  
 Rules & Formatting:
 
 • Do not mention zodiac signs or planets explicitly.
-
+• Do not mention the Scepter’s name in the description or poem.
 • Ensure both descriptions are structurally and emotionally equivalent.
-
 • Write the poem freely in each language to maximize impact, avoiding direct translation.
-
 • Use rich, symbolic language while keeping it accessible and inspiring.
 
 Response Format:
@@ -147,20 +142,16 @@ For the given combination, generate the following in both languages, ensuring th
 3. Poetic Passage (Passagem Poética): Create two separate and independent poetic passages—one in English, one in Portuguese. Each should reflect the same essence but be uniquely crafted to best suit the flow and artistic qualities of its respective language. The passage should be long and evocative, 4 poetic lines, ensuring it deeply resonates and immerses the reader in a sense of longing, connection, and destiny.
 
 • Do not translate the poem directly—let each version flourish naturally in its own language.
-
 • Ensure the passage flows rhythmically, evoking deep emotion and intimacy.
-
 • Avoid mentioning the Ring itself or using the word “ring.”
 
 
 Rules & Formatting:
 
 • Do not mention zodiac signs or planets explicitly.
-
+• Do not mention the Ring’s name in the description or poem.
 • Ensure both descriptions are structurally and emotionally equivalent.
-
 • Write the poem freely in each language to maximize impact, avoiding direct translation.
-
 • Use rich, symbolic language while keeping it accessible and inspiring.
 
 Response Format:
@@ -192,19 +183,15 @@ For the given combination, generate the following in both languages, ensuring th
 3. Poetic Passage (Passagem Poética): Create two separate and independent poetic passages—one in English, one in Portuguese. Each should reflect the same essence but be uniquely crafted to best suit the flow and artistic qualities of its respective language. The passage should be long and evocative, 4 poetic lines, ensuring it deeply resonates and immerses the reader in a sense of renewal, strength, and inner harmony.
 
 • Do not translate the poem directly—let each version flourish naturally in its own language.
-
 • Ensure the passage flows rhythmically, evoking protection, resilience, and healing.
-
 • Avoid mentioning the Amulet itself or using the word “amulet.”
 
 Rules & Formatting:
 
 • Do not mention zodiac signs or planets explicitly.
-
+• Do not mention the Amulet’s name in the description or poem.
 • Ensure both descriptions are structurally and emotionally equivalent.
-
 • Write the poem freely in each language to maximize impact, avoiding direct translation.
-
 • Use rich, symbolic language while keeping it accessible and inspiring.
 
 Response Format:
@@ -236,14 +223,13 @@ For the given combination, generate the following in both languages, ensuring th
 3. Poetic Passage (Passagem Poética): Create two separate and independent poetic passages—one in English, one in Portuguese. Each should reflect the same essence but be uniquely crafted to best suit the flow and artistic qualities of its respective language. The passage should be long and evocative, 4 poetic lines, ensuring it deeply resonates and immerses the reader in a sense of mystery, guidance, and inner awakening.
 
 • Do not translate the poem directly—let each version flourish naturally in its own language.
-
 • Ensure the passage flows rhythmically, evoking transformation and introspection.
-
 • Avoid mentioning the Lantern itself or using the word “lantern.”
 
 Rules & Formatting:
 
 • Do not mention zodiac signs or planets explicitly.
+• Do not mention the Lantern’s name in the description or poem.
 • Ensure both descriptions are structurally and emotionally equivalent.
 • Write the poem freely in each language to maximize impact, avoiding direct translation.
 • Use rich, symbolic language while keeping it accessible and inspiring.
@@ -277,19 +263,15 @@ For the given combination, generate the following in both languages, ensuring th
 3. Poetic Passage (Passagem Poética): Create two separate and independent poetic passages—one in English, one in Portuguese. Each should reflect the same essence but be uniquely crafted to best suit the flow and artistic qualities of its respective language. The passage should be long and evocative, 4 poetic lines, ensuring it deeply resonates and immerses the reader in a sense of aspiration, vision, and transcendence.
 
 • Do not translate the poem directly—let each version flourish naturally in its own language.
-
 • Ensure the passage flows rhythmically, evoking inspiration and a higher calling.
-
 • Avoid mentioning the Orb itself or using the word “orb.”
 
 Rules & Formatting:
 
 • Do not mention zodiac signs or planets explicitly.
-
+• Do not mention the Orb’s name in the description or poem.
 • Ensure both descriptions are structurally and emotionally equivalent.
-
 • Write the poem freely in each language to maximize impact, avoiding direct translation.
-
 • Use rich, symbolic language while keeping it accessible and inspiring.
 
 Response Format: