@zodic/shared 0.0.241 → 0.0.243

package/app/services/ConceptService.ts

@@ -2,7 +2,7 @@ import {
   KVNamespaceListKey,
   KVNamespaceListResult,
 } from '@cloudflare/workers-types';
-import { and, eq, inArray, sql } from 'drizzle-orm';
+import { and, eq, inArray, isNull, sql } from 'drizzle-orm';
 import { drizzle } from 'drizzle-orm/d1';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
@@ -2010,42 +2010,49 @@ export class ConceptService {
     params: AstroReportParams,
     override: boolean = false
   ): Promise<void> {
-    console.log(
-      `🚀 Generating report content for ${JSON.stringify(
-        params
-      )}, override: ${override}`
-    );
+    console.log(`🚀 Generating report content for ${JSON.stringify(params)}, override: ${override}`);
 
     const db = drizzle(this.context.env.DB);
-    let table, idField, whereClause;
+    let table, whereClause;
 
-    // Determine table and ID
+    // Determine table and where clause
     switch (params.reportType) {
-      case 'sign':
-      case 'house':
+      case "sign":
         table = astroReports;
-        idField =
-          params.reportType === 'sign'
-            ? sql`SELECT id FROM astro_reports WHERE name = ${params.pointName} AND sign = ${params.sign} AND house IS NULL`
-            : sql`SELECT id FROM astro_reports WHERE name = ${params.pointName} AND house = ${params.house} AND sign IS NULL`;
+        whereClause = and(
+          eq(astroReports.name, params.pointName),
+          eq(astroReports.sign, params.sign),
+          isNull(astroReports.house)
+        );
         break;
-      case 'signInHouse':
+      case "house":
+        table = astroReports;
+        whereClause = and(
+          eq(astroReports.name, params.pointName),
+          eq(astroReports.house, params.house),
+          isNull(astroReports.sign)
+        );
+        break;
+      case "signInHouse":
         table = houseReports;
-        idField = sql`SELECT id FROM house_reports WHERE sign = ${params.sign} AND house = ${params.houseNumber}`;
+        whereClause = and(
+          eq(houseReports.sign, params.sign),
+          eq(houseReports.house, params.houseNumber)
+        );
         break;
-      case 'aspect':
+      case "aspect":
         table = aspectReports;
-        idField = sql`SELECT id FROM aspect_reports WHERE aspecting_planet = ${params.aspectingPlanet} AND aspected_planet = ${params.aspectedPlanet} AND aspect = ${params.aspectingType}`;
+        whereClause = and(
+          eq(aspectReports.aspectingPlanet, params.aspectingPlanet),
+          eq(aspectReports.aspectedPlanet, params.aspectedPlanet),
+          eq(aspectReports.aspect, params.aspectingType)
+        );
         break;
       default:
         throw new Error(`Unknown report type: ${(params as any).reportType}`);
     }
 
-    const report = await db
-      .select()
-      .from(table)
-      .where(sql`${idField}`)
-      .get();
+    const report = await db.select().from(table).where(whereClause).get();
     if (!report) {
       throw new Error(`❌ No report found for ${JSON.stringify(params)}`);
     }
@@ -2062,30 +2069,21 @@ export class ConceptService {
     const maxAttempts = 2;
 
     while (attempts < maxAttempts) {
-      let phase = 'generation';
+      let phase = "generation";
       try {
         attempts++;
         console.log(`🔄 Attempt ${attempts} to generate report content...`);
 
-        // Use buildLLMMessages().generateAstroReportContent
-        const messages = this.context
-          .buildLLMMessages()
-          .generateAstroReportContent({ params });
+        const messages = this.context.buildLLMMessages().generateAstroReportContent({ params });
 
-        const response = await this.context
-          .api()
-          .callTogether.single(messages, {});
+        const response = await this.context.api().callTogether.single(messages, {});
         if (!response) {
           throw new Error(`❌ AI returned an empty response`);
         }
 
-        phase = 'parsing';
+        phase = "parsing";
 
-        const { enReport, ptReport } =
-          await this.parseAstrologicalReportContent(
-            params.reportType,
-            response
-          );
+        const { enReport, ptReport } = await this.parseAstrologicalReportContent(params.reportType, response);
 
         console.log(`💾 Storing report content for ${id}`);
         await db
@@ -2100,10 +2098,7 @@ export class ConceptService {
         console.log(`✅ Report content stored for ${id}`);
         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);
 
         const failureKey = `failures:astro:${params.reportType}:${id}`;
         await this.context.kvConceptFailuresStore().put(
@@ -2118,15 +2113,11 @@ export class ConceptService {
         );
 
         if (attempts >= maxAttempts) {
-          console.error(
-            `🚨 All ${maxAttempts} attempts failed at phase ${phase}`
-          );
-          throw new Error(
-            `Failed to generate content after ${maxAttempts} attempts`
-          );
+          console.error(`🚨 All ${maxAttempts} attempts failed at phase ${phase}`);
+          throw new Error(`Failed to generate content after ${maxAttempts} attempts`);
         }
 
-        console.log('🔁 Retrying...');
+        console.log("🔁 Retrying...");
         await new Promise((resolve) => setTimeout(resolve, 2000));
       }
     }
@@ -2187,21 +2178,21 @@ export class ConceptService {
     const languageSections = response
       .split(/--\s*(EN|PT)\s*\n/)
       .filter(Boolean);
-
+  
     for (let i = 0; i < languageSections.length; i += 2) {
       const language = languageSections[i].trim();
       const content = languageSections[i + 1]?.trim();
       if (!content || !language.match(/^(EN|PT)$/)) continue;
-
+  
       const report: AstrologicalReport = {
         language,
         title: [],
         sections: {},
       };
-
+  
       const lines = content.split('\n').map((line) => line.trim());
       let currentSection = '';
-
+  
       for (const line of lines) {
         if (line.startsWith('### ') && report.title.length === 0) {
           report.title.push({
@@ -2210,19 +2201,18 @@ export class ConceptService {
           });
           continue;
         }
-
+  
         if (line.startsWith('#### ')) {
           currentSection = cleanText(line.replace('#### ', '').trim());
-          report.sections[currentSection] =
-            report.sections[currentSection] || [];
+          report.sections[currentSection] = report.sections[currentSection] || [];
           continue;
         }
-
+  
         if (!line || !currentSection) continue;
-
+  
         if (line.match(/^\d+\.\s/) || line.startsWith('- ')) {
           const listItem = line.replace(/^\d+\.\s|- /, '').trim();
-          const boldMatch = listItem.match(/^\*\*(.+?)\*\*:\s*(.+)$/);
+          const boldMatch = listItem.match(/^\*\*(.+?)\*\*[:\s]*(.+)$/); // Updated regex
           if (boldMatch) {
             report.sections[currentSection].push({
               type: 'bullet-point',
@@ -2237,16 +2227,16 @@ export class ConceptService {
           }
           continue;
         }
-
+  
         report.sections[currentSection].push({
           type: 'p',
           content: cleanText(line),
         });
       }
-
+  
       reports.push(report);
     }
-
+  
     return reports;
   }
 }

package/package.json

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