@zodic/shared 0.0.188 → 0.0.190

package/app/api/index.ts

@@ -46,51 +46,51 @@ export const Api = (env: BackendBindings) => ({
           messages,
           ...options,
         });
-
-        if (response.choices[0].message.content) {
-          return response.choices[0].message.content.trim();
-        } else {
+  
+        if (!response.choices[0].message.content) {
           throw new Error('Content is null');
         }
+  
+        // ✅ Extract API usage data
+        const { usage } = response;
+        if (usage) {
+          console.log(`📊 API Usage: Tokens - ${usage.total_tokens}`);
+  
+          if (env.KV_API_USAGE) {
+            // ✅ Check how many usage logs exist
+            const { keys } = await env.KV_API_USAGE.list({ prefix: 'usage:' });
+  
+            if (keys.length < 10) {
+              // ✅ Store new entry ONLY if there are less than 10
+              const timestamp = new Date().toISOString();
+              const logEntry = {
+                model,
+                total_tokens: usage.total_tokens,
+                prompt_tokens: usage.prompt_tokens,
+                completion_tokens: usage.completion_tokens,
+                timestamp,
+              };
+  
+              await env.KV_API_USAGE.put(`usage:${timestamp}`, JSON.stringify(logEntry), {
+                expirationTtl: 60 * 60 * 24 * 7, // ✅ Store for 7 days
+              });
+  
+              console.log(`✅ Logged API usage (Entry ${keys.length + 1}/10)`);
+            } else {
+              console.log(`⏳ API usage logging skipped: 10 records already exist.`);
+            }
+          }
+        } else {
+          console.warn('⚠️ API Usage Data Missing');
+        }
+  
+        return response.choices[0].message.content.trim();
+        
       } catch (err: any) {
-        console.error('Error calling DeepSeek API:', err.message);
+        console.error('❌ Error calling Together API:', err.message);
         throw err;
       }
     },
-
-    // batch: async (
-    //   batchItems: DeepSeekBatchInputItem[]
-    // ): Promise<DeepSeekBatchResponse> => {
-    //   console.log('Preparing to send DeepSeek batch request.');
-
-    //   try {
-    //     const responses: DeepSeekBatchResponse = [];
-
-    //     for (const item of batchItems) {
-    //       const { messages, options } = item;
-    //       const response = await deepseek(env).chat.completions.create({
-    //         model: options?.model || 'deepseek-v3',
-    //         messages,
-    //         ...options,
-    //       });
-
-    //       if (response.choices[0].message.content) {
-    //         responses.push({
-    //           input: item,
-    //           output: response.choices[0].message.content.trim(),
-    //         });
-    //       } else {
-    //         console.error('Content is null');
-    //       }
-    //     }
-
-    //     console.log('Batch processing completed successfully.');
-    //     return responses;
-    //   } catch (error) {
-    //     console.error('Error in callDeepSeekBatch:', error);
-    //     throw error;
-    //   }
-    // },
   },
   callDeepSeek: {
     single: async (

package/app/durable/ConceptNameDO.ts

@@ -85,10 +85,22 @@ export class ConceptNameDO {
     ratePerMinute: number;
     estimatedTimeMinutes: number | 'N/A';
   }> {
+    console.log(`📡 Fetching progress...`);
+  
+    // 🔥 Fetch latest names directly from storage
+    const storedNames = await this.state.storage.get<{ 'en-us': string[]; 'pt-br': string[] }>('names');
+    if (storedNames) {
+      this.names = storedNames;
+    } else {
+      this.names = { 'en-us': [], 'pt-br': [] };
+    }
+  
     await this.loadCount();
     await this.loadTimestamps();
     await this.loadLastIndex(); // ✅ Ensure latest lastIndex is fetched
   
+    console.log(`🔍 Current stored names (DO): ${JSON.stringify(this.names)}`);
+  
     const now = Date.now();
     const oneMinuteAgo = now - 60 * 1000;
   
@@ -96,7 +108,11 @@ export class ConceptNameDO {
     const ratePerMinute = recentTimestamps.length;
   
     // 🔥 Only count the `en-us` names to reflect progress properly
-    const enUsCount = this.names['en-us'].length;
+    const enUsCount = Array.isArray(this.names['en-us']) ? this.names['en-us'].length : 0;
+  
+    console.log(
+      `🛠️ Debugging Progress: count=${this.count}, en-us=${enUsCount}, lastIndex=${this.lastIndex}`
+    );
   
     const remainingNames = ConceptNameDO.TOTAL_NAMES - enUsCount;
     const estimatedTimeMinutes =

package/package.json

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

package/types/scopes/cloudflare.ts

@@ -24,6 +24,7 @@ export type CentralBindings = {
   KV_ASTRO: KVNamespace;
   KV_CONCEPT_FAILURES: KVNamespace;
   KV_CONCEPT_NAMES: KVNamespace;
+  KV_API_USAGE: KVNamespace;
   CONCEPT_GENERATION_QUEUE: Queue;
   CONCEPT_NAMES_DO: DurableObjectNamespace;
   CROWN_QUEUE: Queue;
@@ -128,6 +129,7 @@ export type BackendBindings = Env &
     | 'RING_QUEUE'
     | 'LANTERN_QUEUE'
     | 'ORB_QUEUE'
+    | 'KV_API_USAGE'
   >;
 
 export type BackendCtx = Context<
@@ -147,6 +149,7 @@ export type FrontendBindings = Pick<
   | 'PUBLIC_APP_NAME'
   | 'PUBLIC_APP_VERSION'
   | 'PUBLIC_ANALYTICS_ID'
+  | 'KV_API_USAGE'
 >;
 
 export type FrontCtx = Context<