@zodic/shared 0.0.199 → 0.0.201

package/app/services/ConceptService.ts

@@ -29,181 +29,100 @@ export class ConceptService {
     combinationString: string,
     override: boolean = false
   ): Promise<void> {
-    console.log(
-      `🚀 Generating basic info for concept: ${conceptSlug}, combination: ${combinationString}, override: ${override}`
-    );
-
+    console.log(`🚀 Generating basic info for concept: ${conceptSlug}, combination: ${combinationString}, override: ${override}`);
+  
     const kvStore = this.context.kvConceptsStore();
     const kvFailuresStore = this.context.kvConceptFailuresStore();
     const kvKeyEN = buildConceptKVKey('en-us', conceptSlug, combinationString);
     const kvKeyPT = buildConceptKVKey('pt-br', conceptSlug, combinationString);
-
+  
     // ✅ Use Durable Object stub
     const id = this.context.env.CONCEPT_NAMES_DO.idFromName(conceptSlug);
     const stub = this.context.env.CONCEPT_NAMES_DO.get(id);
-
+  
     console.log(`📡 Fetching existing KV data for ${conceptSlug}...`);
     const existingEN = await this.getKVConcept(kvKeyEN);
     const existingPT = await this.getKVConcept(kvKeyPT);
-
-    // ✅ IMMEDIATE SKIP if already exists and override is false
+  
     if (!override && existingEN.name && existingPT.name) {
       console.log(`⚡ Basic info already exists for ${conceptSlug}, skipping.`);
       return;
     }
-
+  
     let attempts = 0;
     const maxAttempts = 3;
-
+  
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
         attempts++;
-        console.log(
-          `🔄 Attempt ${attempts} to generate basic info for ${conceptSlug}...`
-        );
-
-        // ✅ Fetch the latest name list from Durable Object
-        console.log(
-          `📡 Fetching names from Durable Object for ${conceptSlug}...`
-        );
+        console.log(`🔄 Attempt ${attempts} to generate basic info for ${conceptSlug}...`);
+  
         let allNamesEN: string[] = [];
         let allNamesPT: string[] = [];
         const response = await stub.fetch(`https://internal/names`);
-
+  
         if (response.ok) {
-          const data = (await response.json()) as {
-            'en-us': string[];
-            'pt-br': string[];
-          };
+          const data = (await response.json()) as { 'en-us': string[]; 'pt-br': string[] };
           allNamesEN = data['en-us'] || [];
           allNamesPT = data['pt-br'] || [];
         }
-
+  
         console.log(`✏️ Generating new name...`);
-        const messages = this.context
-          .buildLLMMessages()
-          .generateConceptBasicInfo({
-            combination: combinationString,
-            conceptSlug,
-            existingNames: allNamesEN.slice(-40),
-          });
-
-        let aiResponse = await this.context
-          .api()
-          .callTogether.single(messages, {});
+        const messages = this.context.buildLLMMessages().generateConceptBasicInfo({
+          combination: combinationString,
+          conceptSlug,
+          existingNames: allNamesEN.length > 100 ? allNamesEN.slice(-100) : allNamesEN,
+        });
+  
+        let aiResponse = await this.context.api().callTogether.single(messages, {});
         if (!aiResponse) throw new Error(`❌ AI returned an empty response`);
-
+  
         phase = 'cleaning';
         aiResponse = this.cleanAIResponse(aiResponse);
-
+  
         phase = 'parsing';
-        let { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT } =
-          this.parseBasicInfoResponse(aiResponse, conceptSlug);
-
+        let { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT } = this.parseBasicInfoResponse(aiResponse, conceptSlug);
+  
         console.log(`🎭 Generated names: EN - "${nameEN}", PT - "${namePT}"`);
-
-        // ✅ **Check name length and retry if too long**
-        const MAX_NAME_LENGTH = 44; // Adjust if needed
-        if (
-          nameEN.length > MAX_NAME_LENGTH ||
-          namePT.length > MAX_NAME_LENGTH
-        ) {
-          console.warn(
-            `⚠️ Name too long: "${nameEN}" | "${namePT}". Retrying...`
-          );
-
-          // ✅ **Register name in Durable Object as blocked**
-          await stub.fetch(`https://internal/add-name`, {
-            method: 'POST',
-            body: JSON.stringify({ language: 'en-us', name: nameEN }),
-            headers: { 'Content-Type': 'application/json' },
-          });
-
-          await stub.fetch(`https://internal/add-name`, {
-            method: 'POST',
-            body: JSON.stringify({ language: 'pt-br', name: namePT }),
-            headers: { 'Content-Type': 'application/json' },
-          });
-
-          console.log(`✅ Added long name to DO blocklist, retrying...`);
+  
+        // ✅ Name length check
+        const MAX_NAME_LENGTH = 44;
+        if (nameEN.length > MAX_NAME_LENGTH || namePT.length > MAX_NAME_LENGTH) {
+          console.warn(`⚠️ Name too long: "${nameEN}" | "${namePT}". Retrying...`);
+          allNamesEN.push(nameEN);
+          allNamesPT.push(namePT);
           continue;
         }
-
+  
         // ✅ Check uniqueness before storing
         if (allNamesEN.includes(nameEN) || allNamesPT.includes(namePT)) {
-          console.warn(
-            `⚠️ Duplicate Name Detected: "${nameEN}" or "${namePT}"`
-          );
-
-          // ✅ **On third attempt, store the name anyway & register in kvFailures**
+          console.warn(`⚠️ Duplicate Name Detected: "${nameEN}" or "${namePT}"`);
           if (attempts >= maxAttempts) {
-            console.log(
-              `🚨 Max attempts reached. Storing name despite duplicate.`
-            );
-
+            console.log(`🚨 Max attempts reached. Storing name despite duplicate.`);
             await kvFailuresStore.put(
               `failures:duplicates:${conceptSlug}:${combinationString}`,
-              JSON.stringify({
-                nameEN,
-                namePT,
-                attempts,
-                conceptSlug,
-                combinationString,
-                timestamp: new Date().toISOString(),
-              })
-            );
-
-            console.log(
-              `✅ Stored duplicate name after max retries: ${nameEN}, ${namePT}`
+              JSON.stringify({ nameEN, namePT, attempts, conceptSlug, combinationString, timestamp: new Date().toISOString() })
             );
             break;
           }
-
-          console.log('🔁 Retrying due to duplicate name...');
           continue;
         }
-
+  
         console.log(`📝 Storing names in Durable Object...`);
-        // ✅ **Immediately update Durable Object with the new name**
-        await stub.fetch(`https://internal/add-name`, {
-          method: 'POST',
-          body: JSON.stringify({ language: 'en-us', name: nameEN }),
-          headers: { 'Content-Type': 'application/json' },
-        });
-
-        await stub.fetch(`https://internal/add-name`, {
-          method: 'POST',
-          body: JSON.stringify({ language: 'pt-br', name: namePT }),
-          headers: { 'Content-Type': 'application/json' },
-        });
-
-        // ✅ Store the generated basic info in KV
-        Object.assign(existingEN, {
-          name: nameEN,
-          description: descriptionEN,
-          poem: poemEN,
-          status: 'idle',
-        });
+        await stub.fetch(`https://internal/add-name`, { method: 'POST', body: JSON.stringify({ language: 'en-us', name: nameEN }), headers: { 'Content-Type': 'application/json' } });
+        await stub.fetch(`https://internal/add-name`, { method: 'POST', body: JSON.stringify({ language: 'pt-br', name: namePT }), headers: { 'Content-Type': 'application/json' } });
+  
+        Object.assign(existingEN, { name: nameEN, description: descriptionEN, poem: poemEN, status: 'idle' });
         await kvStore.put(kvKeyEN, JSON.stringify(existingEN));
-
-        Object.assign(existingPT, {
-          name: namePT,
-          description: descriptionPT,
-          poem: poemPT,
-          status: 'idle',
-        });
+  
+        Object.assign(existingPT, { name: namePT, description: descriptionPT, poem: poemPT, status: 'idle' });
         await kvStore.put(kvKeyPT, JSON.stringify(existingPT));
-
-        console.log(
-          `✅ Stored basic info for ${conceptSlug}, combination: ${combinationString}.`
-        );
+  
+        console.log(`✅ Stored basic info for ${conceptSlug}, combination: ${combinationString}.`);
         return;
       } catch (error) {
-        console.error(
-          `❌ Attempt ${attempts} failed at phase: ${phase}`,
-          (error as Error).message
-        );
+        console.error(`❌ Attempt ${attempts} failed at phase: ${phase}`, error);
       }
     }
   }

package/data/index.ts

@@ -0,0 +1 @@
+export * from './zodiacSignCombinations';

package/index.ts

@@ -1,4 +1,5 @@
 export * from './app';
+export * from './data';
 export * as schema from './db/schema';
 export * from './middleware';
 export * from './types';

package/package.json

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