@zodic/shared 0.0.247 → 0.0.248

package/app/services/ConceptService.ts

@@ -2011,14 +2011,28 @@ 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, whereClause;
 
+    // Log the params for debugging
+    console.log(
+      `🔍 Received params: reportType=${params.reportType}, featureType=${
+        (params as any).featureType || 'N/A'
+      }, subtype=${(params as any).subtype || 'N/A'}`
+    );
+
     // Determine table and where clause
     switch (params.reportType) {
-      case "sign":
+      case 'sign':
+        console.log(
+          `🗂️ Handling sign report: type=${params.type}, pointName=${params.pointName}, sign=${params.sign}`
+        );
         table = astroReports;
         whereClause = and(
           eq(astroReports.name, params.pointName),
@@ -2026,7 +2040,10 @@ export class ConceptService {
           isNull(astroReports.house)
         );
         break;
-      case "house":
+      case 'house':
+        console.log(
+          `🗂️ Handling house report: type=${params.type}, pointName=${params.pointName}, house=${params.house}`
+        );
         table = astroReports;
         whereClause = and(
           eq(astroReports.name, params.pointName),
@@ -2034,14 +2051,20 @@ export class ConceptService {
           isNull(astroReports.sign)
         );
         break;
-      case "signInHouse":
+      case 'signInHouse':
+        console.log(
+          `🗂️ Handling signInHouse report: sign=${params.sign}, houseNumber=${params.houseNumber}`
+        );
         table = houseReports;
         whereClause = and(
           eq(houseReports.sign, params.sign),
           eq(houseReports.house, params.houseNumber)
         );
         break;
-      case "aspect":
+      case 'aspect':
+        console.log(
+          `🗂️ Handling aspect report: aspectingPlanet=${params.aspectingPlanet}, aspectedPlanet=${params.aspectedPlanet}, aspectingType=${params.aspectingType}`
+        );
         table = aspectReports;
         whereClause = and(
           eq(aspectReports.aspectingPlanet, params.aspectingPlanet),
@@ -2049,37 +2072,61 @@ export class ConceptService {
           eq(aspectReports.aspect, params.aspectingType)
         );
         break;
-        case "feature":
-          table = astroFeatureReports;
-          let nameValue: string;
-          if (params.featureType === "element") {
-            switch (params.subtype) {
-              case "balanced":
-                nameValue = "balanced";
-                break;
-              case "pure":
-                nameValue = params.dominantElement;
-                break;
-              case "preponderant_lacking":
-                nameValue = `${params.dominantElement}-${params.lackingElement}`;
-                break;
-              default:
-                throw new Error(`Unknown element subtype: ${(params as any).subtype}`);
-            }
-          } else {
-            nameValue = params.name;
+      case 'feature':
+        console.log(
+          `🗂️ Handling feature report: featureType=${
+            params.featureType
+          }, ${JSON.stringify(params)}`
+        );
+        table = astroFeatureReports;
+        let nameValue: string;
+        if (params.featureType === 'element') {
+          if (!('subtype' in params))
+            throw new Error('Missing subtype for element feature report');
+          switch (params.subtype) {
+            case 'balanced':
+              nameValue = 'balanced';
+              break;
+            case 'pure':
+              if (!('dominantElement' in params))
+                throw new Error(
+                  'Missing dominantElement for pure element report'
+                );
+              nameValue = params.dominantElement;
+              break;
+            case 'preponderant_lacking':
+              if (
+                !('dominantElement' in params) ||
+                !('lackingElement' in params)
+              )
+                throw new Error(
+                  'Missing dominantElement or lackingElement for preponderant_lacking element report'
+                );
+              nameValue = `${params.dominantElement}-${params.lackingElement}`;
+              break;
+            default:
+              throw new Error(`Unknown element subtype: ${params}`);
           }
-          whereClause = and(
-            eq(astroFeatureReports.featureType, params.featureType),
-            eq(astroFeatureReports.name, nameValue)
-          );
-          break;
+        } else {
+          if (!('name' in params))
+            throw new Error('Missing name for non-element feature report');
+          nameValue = params.name;
+        }
+        whereClause = and(
+          eq(astroFeatureReports.featureType, params.featureType),
+          eq(astroFeatureReports.name, nameValue)
+        );
+        break;
       default:
-        throw new Error(`Unknown report type: ${(params as any).reportType}`);
+        console.error(
+          `❌ Unknown report type: ${params}. Params: ${JSON.stringify(params)}`
+        );
+        throw new Error(`Unknown report type: ${params}`);
     }
 
     const report = await db.select().from(table).where(whereClause).get();
     if (!report) {
+      console.error(`❌ No report found for ${JSON.stringify(params)}`);
       throw new Error(`❌ No report found for ${JSON.stringify(params)}`);
     }
 
@@ -2095,21 +2142,37 @@ 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...`);
+        console.log(
+          `🔄 Attempt ${attempts} to generate report content for ${id}...`
+        );
 
-        const messages = this.context.buildLLMMessages().generateAstroReportContent({ params });
+        const messages = this.context
+          .buildLLMMessages()
+          .generateAstroReportContent({ params });
+        console.log(`📨 Sending messages to AI: ${JSON.stringify(messages)}`);
 
-        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`);
+          throw new Error(`❌ AI returned an empty response for ${id}`);
         }
 
-        phase = "parsing";
+        phase = 'parsing';
+        console.log(
+          `📝 Received AI response for ${id}: ${response.slice(0, 200)}${
+            response.length > 200 ? '...' : ''
+          }`
+        );
 
-        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
@@ -2124,7 +2187,10 @@ 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} for ${id}`,
+          (error as Error).message
+        );
 
         const failureKey = `failures:astro:${params.reportType}:${id}`;
         await this.context.kvConceptFailuresStore().put(
@@ -2139,11 +2205,15 @@ 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} for ${id}`
+          );
+          throw new Error(
+            `Failed to generate content for ${id} after ${maxAttempts} attempts`
+          );
         }
 
-        console.log("🔁 Retrying...");
+        console.log('🔁 Retrying...');
         await new Promise((resolve) => setTimeout(resolve, 2000));
       }
     }
@@ -2200,40 +2270,48 @@ export class ConceptService {
   }
 
   private parseAstrologicalReport(response: string): AstrologicalReport[] {
-    console.log("📌 Starting parseAstrologicalReport");
-  
+    console.log('📌 Starting parseAstrologicalReport');
+
     const reports: AstrologicalReport[] = [];
     const languageSections = response
       .split(/--\s*(EN|PT)\s*\n/)
       .filter(Boolean);
     console.log(`🔍 Split response into ${languageSections.length} sections`);
-  
+
     for (let i = 0; i < languageSections.length; i += 2) {
       const language = languageSections[i].trim();
       const content = languageSections[i + 1]?.trim();
       console.log(`🚀 Processing section ${i / 2 + 1}: Language = ${language}`);
-  
+
       if (!content || !language.match(/^(EN|PT)$/)) {
-        console.warn(`⚠️ Skipping section ${i / 2 + 1}: Invalid content or language (${language})`);
+        console.warn(
+          `⚠️ Skipping section ${
+            i / 2 + 1
+          }: Invalid content or language (${language})`
+        );
         continue;
       }
-  
-      console.log(`📜 Raw content for ${language}:\n${content.slice(0, 500)}${content.length > 500 ? "..." : ""}`);
-  
+
+      console.log(
+        `📜 Raw content for ${language}:\n${content.slice(0, 500)}${
+          content.length > 500 ? '...' : ''
+        }`
+      );
+
       const report: AstrologicalReport = {
         language,
         title: [],
         sections: {},
       };
-  
+
       const lines = content.split('\n').map((line) => line.trim());
       console.log(`🔢 Split into ${lines.length} lines`);
-  
+
       let currentSection = '';
       for (let j = 0; j < lines.length; j++) {
         const line = lines[j];
         console.log(`📏 Processing line ${j + 1}: "${line}"`);
-  
+
         if (line.startsWith('### ') && report.title.length === 0) {
           const titleContent = cleanText(line.replace('### ', ''));
           console.log(`🏷️ Found title: "${titleContent}"`);
@@ -2243,40 +2321,52 @@ export class ConceptService {
           });
           continue;
         }
-  
+
         if (line.startsWith('#### ')) {
           currentSection = cleanText(line.replace('#### ', '').trim());
           console.log(`🗂️ New section: "${currentSection}"`);
-          report.sections[currentSection] = report.sections[currentSection] || [];
+          report.sections[currentSection] =
+            report.sections[currentSection] || [];
           continue;
         }
-  
+
         if (!line || !currentSection) {
-          console.log(`⏩ Skipping line: ${!line ? "Empty" : "No current section"}`);
+          console.log(
+            `⏩ Skipping line: ${!line ? 'Empty' : 'No current section'}`
+          );
           continue;
         }
-  
+
         if (line.match(/^\d+\.\s/) || line.startsWith('- ')) {
           const listItem = line.replace(/^\d+\.\s|- /, '').trim();
           console.log(`🔹 Bullet point detected: "${listItem}"`);
           const boldMatch = listItem.match(/^\*\*(.+?)\*\*[:\s]*(.+)?$/); // Updated to allow standalone bold
-  
+
           if (boldMatch) {
             const title = cleanText(boldMatch[1]);
             let content = boldMatch[2] ? cleanText(boldMatch[2]) : '';
-  
+
             // Look ahead for content if none on the same line
             if (!content && j + 1 < lines.length) {
               const nextLine = lines[j + 1];
               console.log(`🔍 Checking next line for content: "${nextLine}"`);
-              if (nextLine && !nextLine.match(/^\d+\.\s|- /) && !nextLine.startsWith('#### ') && !nextLine.startsWith('### ')) {
+              if (
+                nextLine &&
+                !nextLine.match(/^\d+\.\s|- /) &&
+                !nextLine.startsWith('#### ') &&
+                !nextLine.startsWith('### ')
+              ) {
                 content = cleanText(nextLine);
                 console.log(`✅ Found content in next line: "${content}"`);
                 j++; // Skip the next line since we’ve consumed it
               }
             }
-  
-            console.log(`✅ Bold match found - Title: "${title}", Content: "${content || 'None'}"`);
+
+            console.log(
+              `✅ Bold match found - Title: "${title}", Content: "${
+                content || 'None'
+              }"`
+            );
             report.sections[currentSection].push({
               type: 'bullet-point',
               title,
@@ -2291,18 +2381,24 @@ export class ConceptService {
           }
           continue;
         }
-  
+
         console.log(`📝 Paragraph: "${line}"`);
         report.sections[currentSection].push({
           type: 'p',
           content: cleanText(line),
         });
       }
-  
-      console.log(`🏁 Finished parsing ${language} section. Result:\n${JSON.stringify(report, null, 2)}`);
+
+      console.log(
+        `🏁 Finished parsing ${language} section. Result:\n${JSON.stringify(
+          report,
+          null,
+          2
+        )}`
+      );
       reports.push(report);
     }
-  
+
     console.log(`🎉 Parsing complete. Total reports: ${reports.length}`);
     return reports;
   }

package/package.json

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