@zodic/shared 0.0.180 → 0.0.182

package/app/durable/ConceptNameDO.ts

@@ -99,19 +99,34 @@ export class ConceptNameDO {
   }
 
   async addName(language: 'en-us' | 'pt-br', name: string): Promise<void> {
-    await this.getNames(); // Ensure latest state
+    await this.getNames(); // Ensure latest name list is loaded
+    await this.loadCount(); // ✅ Load latest count before modifying
 
     if (!this.names[language].includes(name)) {
       this.names[language].push(name);
-      this.count++;
+      this.count += 1; // ✅ Increment count correctly
+
       this.recordTimestamp();
 
-      // ✅ **Batch storage writes** instead of multiple separate `put()` calls
+      // ✅ **Store all updated values in a single put() call**
       await this.state.storage.put({
         names: this.names,
-        count: this.count,
+        count: this.count, // ✅ Store updated count properly
         timestamps: this.timestamps,
       });
+
+      console.log(
+        `✅ Added name "${name}" to ${language}, count is now ${this.count}`
+      );
+    }
+  }
+
+  async loadCount(): Promise<void> {
+    const storedCount = await this.state.storage.get<number>('count');
+    if (typeof storedCount === 'number') {
+      this.count = storedCount; // ✅ Ensure we always load the latest count
+    } else {
+      this.count = 0; // ✅ Ensure count is initialized properly
     }
   }
 

package/app/services/ConceptService.ts

@@ -28,51 +28,51 @@ 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 kvKeyEN = buildConceptKVKey('en-us', conceptSlug, combinationString);
     const kvKeyPT = buildConceptKVKey('pt-br', conceptSlug, combinationString);
     const failureKey = `failures:basic-info:${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);
-
+  
     let attempts = 0;
     const maxAttempts = 3;
-
+  
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
         attempts++;
-        console.log(`🔄 Attempt ${attempts} to generate basic info...`);
-
+        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}...`);
         let allNamesEN: string[] = [];
         let allNamesPT: string[] = [];
-        const response = await stub.fetch(
-          `https://internal/names`
-        );
+        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(`✅ Retrieved ${allNamesEN.length} EN names and ${allNamesPT.length} PT names.`);
         } else {
-          console.log(`!-- Error fetching names from DO for ${conceptSlug}`);
-          console.log('!-- Response:', await response.text());
+          console.log(`❌ Error fetching names from DO for ${conceptSlug}: ${await response.text()}`);
         }
-
+  
         // ✅ Fetch existing KV data to backfill Durable Object if necessary
+        console.log(`📡 Fetching existing KV data for ${conceptSlug}...`);
         const existingEN = await this.getKVConcept(kvKeyEN);
         const existingPT = await this.getKVConcept(kvKeyPT);
-
-        // 🔥 If names already exist in KV but not in DO, add them
+  
+        console.log(`📝 Existing EN name: ${existingEN.name || 'None'}, PT name: ${existingPT.name || 'None'}`);
+  
+        // 🔥 If names 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}`);
+          console.log(`⚡ Backfilling existing EN name to DO: ${existingEN.name}`);
           await stub.fetch(`https://internal/add-name`, {
             method: 'POST',
             body: JSON.stringify({ language: 'en-us', name: existingEN.name }),
@@ -80,23 +80,22 @@ export class ConceptService {
           });
         }
         if (existingPT.name && !allNamesPT.includes(existingPT.name)) {
-          console.log(`⚡ Backfilling existing name to DO: ${existingPT.name}`);
+          console.log(`⚡ Backfilling existing PT name to DO: ${existingPT.name}`);
           await stub.fetch(`https://internal/add-name`, {
             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.`
-          );
+          console.log(`⚡ Basic info already exists for ${conceptSlug}, skipping.`);
           return;
         }
-
-        const recentNamesEN = allNamesEN.slice(-144);
+  
+        console.log(`✏️ Generating new name...`);
+        const recentNamesEN = allNamesEN.slice(-60);
         const messages = this.context
           .buildLLMMessages()
           .generateConceptBasicInfo({
@@ -104,43 +103,44 @@ export class ConceptService {
             conceptSlug,
             existingNames: recentNamesEN,
           });
-
-        let aiResponse = await this.context
-          .api()
-          .callTogether.single(messages, {});
+  
+        let aiResponse = await this.context.api().callTogether.single(messages, {});
         if (!aiResponse) throw new Error(`❌ AI returned an empty response`);
-
+  
         phase = 'cleaning';
+        console.log(`🧼 Cleaning AI response...`);
         aiResponse = this.cleanAIResponse(aiResponse);
-
+  
         phase = 'parsing';
+        console.log(`📜 Parsing AI response...`);
         let { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT } =
           this.parseBasicInfoResponse(aiResponse, conceptSlug);
-
+  
+        console.log(`🎭 Generated names: EN - "${nameEN}", PT - "${namePT}"`);
+  
         // ✅ Check uniqueness before storing
         if (allNamesEN.includes(nameEN) || allNamesPT.includes(namePT)) {
-          console.warn(
-            `⚠️ Duplicate Name Detected: "${nameEN}" or "${namePT}"`
-          );
+          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;
         }
-
+  
+        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,
@@ -149,7 +149,7 @@ export class ConceptService {
           status: 'idle',
         });
         await kvStore.put(kvKeyEN, JSON.stringify(existingEN));
-
+  
         Object.assign(existingPT, {
           name: namePT,
           description: descriptionPT,
@@ -157,17 +157,12 @@ export class ConceptService {
           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 as Error).message);
+  
         // ✅ Store failure details in KV for debugging
         await kvFailuresStore.put(
           failureKey,
@@ -180,12 +175,10 @@ export class ConceptService {
             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));

package/package.json

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