@zodic/shared 0.0.167 → 0.0.168

package/app/services/ConceptService.ts

@@ -28,63 +28,63 @@ 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 Durable Object
     const kvKeyEN = buildConceptKVKey('en-us', conceptSlug, combinationString);
     const kvKeyPT = buildConceptKVKey('pt-br', conceptSlug, combinationString);
     const failureKey = `failures:basic-info:${conceptSlug}:${combinationString}`;
-
-    // ✅ Check if data already exists
-    if (!override) {
-      const existingEN = await this.getKVConcept(kvKeyEN);
-      const existingPT = await this.getKVConcept(kvKeyPT);
-      if (
-        existingEN.name &&
-        existingEN.description &&
-        Array.isArray(existingEN.poem) &&
-        existingEN.poem.length > 0 &&
-        existingPT.name &&
-        existingPT.description &&
-        Array.isArray(existingPT.poem) &&
-        existingPT.poem.length > 0
-      ) {
-        console.log(
-          `⚡ Basic info already exists for ${conceptSlug}, skipping.`
-        );
-        return;
-      }
-    }
-
+  
+    const doUrl = `${this.context.env.API_BASE_URL}/concept-names/${conceptSlug}`;
+  
     let attempts = 0;
     const maxAttempts = 3;
-
+  
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
         attempts++;
         console.log(`🔄 Attempt ${attempts} to generate basic info...`);
-
-        // ✅ Fetch the latest name list **directly from Durable Object**
-        const response = await fetch(
-          `${this.context.env.API_BASE_URL}/concept-names/${conceptSlug}`
-        );
+  
+        // ✅ Fetch the latest name list from Durable Object
         let allNamesEN: string[] = [];
         let allNamesPT: string[] = [];
+        const response = await fetch(doUrl);
         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'] || [];
         }
-
-        const recentNamesEN = allNamesEN.slice(-144); // 🔥 Only pass the last 144 names
-        const recentNamesPT = allNamesPT.slice(-144);
-
-        // ✅ Generate content ensuring uniqueness
+  
+        // ✅ Fetch existing KV data to backfill Durable Object if necessary
+        const existingEN = await this.getKVConcept(kvKeyEN);
+        const existingPT = await this.getKVConcept(kvKeyPT);
+  
+        // 🔥 If names already exist in KV but not in DO, add them
+        if (existingEN.name && !allNamesEN.includes(existingEN.name)) {
+          console.log(`⚡ Backfilling existing name to DO: ${existingEN.name}`);
+          await fetch(`${doUrl}/add`, {
+            method: 'POST',
+            body: JSON.stringify({ language: 'en-us', name: existingEN.name }),
+            headers: { 'Content-Type': 'application/json' },
+          });
+        }
+        if (existingPT.name && !allNamesPT.includes(existingPT.name)) {
+          console.log(`⚡ Backfilling existing name to DO: ${existingPT.name}`);
+          await fetch(`${doUrl}/add`, {
+            method: 'POST',
+            body: JSON.stringify({ language: 'pt-br', name: existingPT.name }),
+            headers: { 'Content-Type': 'application/json' },
+          });
+        }
+  
+        // ✅ Skip generation if basic info already exists and override is false
+        if (!override && existingEN.name && existingPT.name) {
+          console.log(`⚡ Basic info already exists for ${conceptSlug}, skipping.`);
+          return;
+        }
+  
+        const recentNamesEN = allNamesEN.slice(-144);
         const messages = this.context
           .buildLLMMessages()
           .generateConceptBasicInfo({
@@ -92,92 +92,79 @@ export class ConceptService {
             conceptSlug,
             existingNames: recentNamesEN,
           });
-
-        let aiResponse = await this.context
-          .api()
-          .callTogether.single(messages, {});
-        if (!aiResponse) {
-          throw new Error(`❌ AI returned an empty response`);
-        }
-
+  
+        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);
-
-        // ✅ Check if generated names are unique **right after parsing**
+  
+        // ✅ Check uniqueness before storing
         if (allNamesEN.includes(nameEN) || allNamesPT.includes(namePT)) {
-          console.warn(
-            `⚠️ Duplicate Name Detected: "${nameEN}" or "${namePT}"`
-          );
-          if (attempts >= maxAttempts) {
-            throw new Error(
-              `🚨 Could not generate a unique name after ${maxAttempts} attempts.`
-            );
-          }
+          console.warn(`⚠️ Duplicate Name Detected: "${nameEN}" or "${namePT}"`);
+          if (attempts >= maxAttempts) throw new Error(`🚨 Could not generate a unique name`);
           console.log('🔁 Retrying due to duplicate name...');
           continue;
         }
-
+  
         // ✅ **Immediately update Durable Object with the new name**
-        await fetch(
-          `${this.context.env.API_BASE_URL}/concept-names/${conceptSlug}/add`,
-          {
-            method: 'POST',
-            body: JSON.stringify({ language: 'en-us', name: nameEN }),
-            headers: { 'Content-Type': 'application/json' },
-          }
-        );
-
-        await fetch(
-          `${this.context.env.API_BASE_URL}/concept-names/${conceptSlug}/add`,
-          {
-            method: 'POST',
-            body: JSON.stringify({ language: 'pt-br', name: namePT }),
-            headers: { 'Content-Type': 'application/json' },
-          }
-        );
-
+        await fetch(`${doUrl}/add`, {
+          method: 'POST',
+          body: JSON.stringify({ language: 'en-us', name: nameEN }),
+          headers: { 'Content-Type': 'application/json' },
+        });
+  
+        await fetch(`${doUrl}/add`, {
+          method: 'POST',
+          body: JSON.stringify({ language: 'pt-br', name: namePT }),
+          headers: { 'Content-Type': 'application/json' },
+        });
+  
         // ✅ Store the generated basic info in KV
-        const conceptEN = await this.getKVConcept(kvKeyEN);
-        Object.assign(conceptEN, {
+        Object.assign(existingEN, {
           name: nameEN,
           description: descriptionEN,
           poem: poemEN,
           status: 'idle',
         });
-        await kvStore.put(kvKeyEN, JSON.stringify(conceptEN));
-
-        const conceptPT = await this.getKVConcept(kvKeyPT);
-        Object.assign(conceptPT, {
+        await kvStore.put(kvKeyEN, JSON.stringify(existingEN));
+  
+        Object.assign(existingPT, {
           name: namePT,
           description: descriptionPT,
           poem: poemPT,
           status: 'idle',
         });
-        await kvStore.put(kvKeyPT, JSON.stringify(conceptPT));
-
-        console.log(
-          `✅ Stored basic info for ${conceptSlug}, combination: ${combinationString}.`
-        );
-
-        return; // ✅ Exit loop if successful
+        await kvStore.put(kvKeyPT, JSON.stringify(existingPT));
+  
+        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 as Error).message);
+  
+        // ✅ Store failure details in KV for debugging
+        await kvFailuresStore.put(
+          failureKey,
+          JSON.stringify({
+            error: (error as Error).message,
+            attempt: attempts,
+            phase,
+            conceptSlug,
+            combinationString,
+            timestamp: new Date().toISOString(),
+          })
         );
+  
         if (attempts >= maxAttempts) {
           console.error(`🚨 All ${maxAttempts} attempts failed.`);
-          throw new Error(
-            `Failed to generate basic info after ${maxAttempts} attempts.`
-          );
+          throw new Error(`Failed to generate basic info after ${maxAttempts} attempts.`);
         }
         console.log('🔁 Retrying...');
-        await new Promise((resolve) => setTimeout(resolve, 500)); // ⏳ Small delay before retrying
+        await new Promise((resolve) => setTimeout(resolve, 500));
       }
     }
   }

package/package.json

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

package/types/scopes/cloudflare.ts

@@ -1,7 +1,6 @@
 import {
   Ai,
   D1Database,
-  DurableObject,
   DurableObjectNamespace,
   KVNamespace,
   Queue,