@zodic/shared 0.0.365 → 0.0.367

package/app/services/ConceptService.ts

@@ -1529,30 +1529,22 @@ export class ConceptService {
   }
 
   async generateAstroReportContent(
-    params:
-      | AstroReportParams
-      | { entityType: string; name: string; override?: boolean },
+    params: AstroReportParams | { entityType: string; name: string; override?: boolean },
     override: boolean = false
   ): Promise<void> {
     console.log(
-      `🚀 Generating content for ${JSON.stringify(
-        params
-      )}, override: ${override}`
+      `🚀 Generating content for ${JSON.stringify(params)}, override: ${override}`
     );
-
+  
     const db = drizzle(this.context.env.DB);
     let table, whereClause;
-
+  
     let report: AstroReportRow | DescriptionTemplateRow;
     const isReport = 'reportType' in params;
-
+  
     if (isReport) {
-      // Handle existing report types (sign, house, signInHouse, aspect, feature)
       switch (params.reportType) {
         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),
@@ -1561,9 +1553,6 @@ export class ConceptService {
           );
           break;
         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),
@@ -1572,9 +1561,6 @@ export class ConceptService {
           );
           break;
         case 'signInHouse':
-          console.log(
-            `🗂️ Handling signInHouse report: sign=${params.sign}, houseNumber=${params.houseNumber}`
-          );
           table = houseReports;
           whereClause = and(
             eq(houseReports.sign, params.sign),
@@ -1582,9 +1568,6 @@ export class ConceptService {
           );
           break;
         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),
@@ -1593,11 +1576,6 @@ export class ConceptService {
           );
           break;
         case 'feature':
-          console.log(
-            `🗂️ Handling feature report: featureType=${
-              params.featureType
-            }, ${JSON.stringify(params)}`
-          );
           table = astroFeatureReports;
           let nameValue: string;
           if (params.featureType === 'element') {
@@ -1609,25 +1587,18 @@ export class ConceptService {
                 break;
               case 'pure':
                 if (!('dominantElement' in params))
-                  throw new Error(
-                    'Missing dominantElement for pure element report'
-                  );
+                  throw new Error('Missing dominantElement for pure element report');
                 nameValue = params.dominantElement;
                 break;
               case 'preponderant_lacking':
-                if (
-                  !('dominantElement' in params) ||
-                  !('lackingElement' in params)
-                )
+                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 as any).subtype}`
-                );
+                throw new Error(`Unknown element subtype: ${(params as any).subtype}`);
             }
           } else {
             if (!('name' in params))
@@ -1648,10 +1619,6 @@ export class ConceptService {
         .where(whereClause)
         .get()) as AstroReportRow;
     } else {
-      // Handle description templates
-      console.log(
-        `🗂️ Handling description template: entityType=${params.entityType}, name=${params.name}`
-      );
       table = astroDescriptionTemplates;
       whereClause = and(
         eq(astroDescriptionTemplates.entityType, params.entityType),
@@ -1663,24 +1630,21 @@ export class ConceptService {
         .where(whereClause)
         .get()) as DescriptionTemplateRow;
     }
-
+  
     const id = report.id;
     const hasContent = isReport
-      ? (report as AstroReportRow).enReport &&
-        (report as AstroReportRow).ptReport
-      : (report as DescriptionTemplateRow).enDescription !==
-          'Pending generation' &&
-        (report as DescriptionTemplateRow).ptDescription !==
-          'Pendente de geração';
-
+      ? (report as AstroReportRow).enReport && (report as AstroReportRow).ptReport
+      : (report as DescriptionTemplateRow).enDescription !== 'Pending generation' &&
+        (report as DescriptionTemplateRow).ptDescription !== 'Pendente de geração';
+  
     if (!override && hasContent) {
       console.log(`⚡ Content already exists for ${id}, skipping`);
       return;
     }
-
+  
     let attempts = 0;
     const maxAttempts = 2;
-
+  
     while (attempts < maxAttempts) {
       let phase = 'generation';
       try {
@@ -1690,7 +1654,7 @@ export class ConceptService {
             isReport ? 'report' : 'description'
           } content for ${id}...`
         );
-
+  
         let messages: ChatMessages;
         if (isReport) {
           messages = this.context
@@ -1701,7 +1665,7 @@ export class ConceptService {
         } else {
           messages = this.generateDescriptionMessages(params);
         }
-
+  
         console.log(`📨 Sending messages to AI: ${JSON.stringify(messages)}`);
         const response = await this.context
           .api()
@@ -1709,20 +1673,19 @@ export class ConceptService {
         if (!response) {
           throw new Error(`❌ AI returned an empty response for ${id}`);
         }
-
+  
         phase = 'parsing';
         console.log(
           `📝 Received AI response for ${id}: ${response.slice(0, 200)}${
             response.length > 200 ? '...' : ''
           }`
         );
-
+  
         if (isReport) {
-          const { enReport, ptReport } =
-            await this.parseAstrologicalReportContent(
-              (params as AstroReportParams).reportType,
-              response
-            );
+          const { enReport, ptReport } = await this.parseAstrologicalReportContent(
+            (params as AstroReportParams).reportType,
+            response
+          );
           console.log(`💾 Storing report content for ${id}`);
           await db
             .update(table as any)
@@ -1733,8 +1696,7 @@ export class ConceptService {
             .where(eq((table as any).id, id))
             .run();
         } else {
-          const { enDescription, ptDescription } =
-            await this.parseDescriptionContent(response);
+          const { enDescription, ptDescription } = await this.parseDescriptionContent(response);
           console.log(`💾 Storing description content for ${id}`);
           await db
             .update(table as any)
@@ -1745,17 +1707,16 @@ export class ConceptService {
             .where(eq(astroDescriptionTemplates.id, id))
             .run();
         }
-
+  
         console.log(
           `✅ ${isReport ? 'Report' : 'Description'} content stored for ${id}`
         );
         return;
       } catch (error) {
         console.error(
-          `❌ Attempt ${attempts} failed at phase: ${phase} for ${id}`,
-          (error as Error).message
+          `❌ Attempt ${attempts} failed at phase: ${phase} for ${id}: ${(error as Error).message}`
         );
-
+  
         const failureKey = `failures:astro:${
           isReport ? (params as AstroReportParams).reportType : 'description'
         }:${id}`;
@@ -1769,7 +1730,7 @@ export class ConceptService {
             timestamp: new Date().toISOString(),
           })
         );
-
+  
         if (attempts >= maxAttempts) {
           console.error(
             `🚨 All ${maxAttempts} attempts failed at phase ${phase} for ${id}`
@@ -1780,7 +1741,7 @@ export class ConceptService {
             } for ${id} after ${maxAttempts} attempts`
           );
         }
-
+  
         console.log('🔁 Retrying...');
         await new Promise((resolve) => setTimeout(resolve, 2000));
       }
@@ -1901,47 +1862,58 @@ export class ConceptService {
 
   private parseAstrologicalReport(response: string): AstrologicalReport[] {
     console.log('📌 Starting parseAstrologicalReport');
-
-    const reports: AstrologicalReport[] = [];
+  
+    // Step 1: Strip any unexpected introductory text
+    const prefixRegex = /^[\s\S]*?(?=--\s*(EN|PT)\s*\n)/;
+    response = response.replace(prefixRegex, '').trim();
+    console.log(`📝 Cleaned response:\n${response.slice(0, 200)}${response.length > 200 ? '...' : ''}`);
+  
+    // Step 2: Split into language sections
     const languageSections = response
       .split(/--\s*(EN|PT)\s*\n/)
       .filter(Boolean);
     console.log(`🔍 Split response into ${languageSections.length} sections`);
-
+  
+    // Validate: Expect exactly 4 parts (EN, content, PT, content)
+    if (languageSections.length !== 4) {
+      throw new Error(
+        `Invalid response format: Expected exactly 2 sections (EN and PT), got ${languageSections.length / 2}`
+      );
+    }
+  
+    const reports: AstrologicalReport[] = [];
+  
     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})`
+        throw new Error(
+          `Invalid section ${i / 2 + 1}: Language must be "EN" or "PT", got "${language}"`
         );
-        continue;
       }
-
+  
       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}"`);
@@ -1951,32 +1923,43 @@ 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'}`
           );
           continue;
         }
-
+  
+        // Validate language consistency
+        const hasPortuguese = /[ãáâéêíóôõúç]/i.test(line);
+        const hasEnglish = /[a-zA-Z]/.test(line); // Fixed regex to check for English letters
+        if (hasPortuguese && language === 'EN') {
+          throw new Error(
+            `Invalid content in EN section: Portuguese characters detected in "${line}"`
+          );
+        } else if (!hasPortuguese && language === 'PT' && !hasEnglish) {
+          console.warn(
+            `⚠️ Possible invalid content in PT section: No recognizable characters in "${line}"`
+          );
+        }
+  
         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
-
+          const boldMatch = listItem.match(/^\*\*(.+?)\*\*[:\s]*(.+)?$/);
+  
           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}"`);
@@ -1988,10 +1971,10 @@ export class ConceptService {
               ) {
                 content = cleanText(nextLine);
                 console.log(`✅ Found content in next line: "${content}"`);
-                j++; // Skip the next line since we’ve consumed it
+                j++;
               }
             }
-
+  
             console.log(
               `✅ Bold match found - Title: "${title}", Content: "${
                 content || 'None'
@@ -2000,7 +1983,7 @@ export class ConceptService {
             report.sections[currentSection].push({
               type: 'bullet-point',
               title,
-              content: content || '', // Empty string if no content found
+              content: content || '',
             });
           } else {
             console.log(`❌ No bold match - Full content: "${listItem}"`);
@@ -2011,14 +1994,14 @@ 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,
@@ -2028,7 +2011,7 @@ export class ConceptService {
       );
       reports.push(report);
     }
-
+  
     console.log(`🎉 Parsing complete. Total reports: ${reports.length}`);
     return reports;
   }

package/db/schema.ts

@@ -168,11 +168,11 @@ export const astroAspects = sqliteTable(
     userId: text('user_id')
       .notNull()
       .references(() => users.id, { onDelete: 'cascade' }), // Links to the user
-    aspectingPlanet: text('aspecting_planet').notNull(), // E.g., "Sun"
-    aspectedPlanet: text('aspected_planet').notNull(), // E.g., "Mercury"
-    aspectingPlanetId: integer('aspecting_planet_id').notNull(), // Index of the aspecting planet
-    aspectedPlanetId: integer('aspected_planet_id').notNull(), // Index of the aspected planet
-    type: text('type').notNull(), // E.g., "Conjunction", "Square"
+    aspectingPlanet: text('aspecting_planet').notNull(), // E.g., "sun" - planets + ascendant and midheaven at first
+    aspectedPlanet: text('aspected_planet').notNull(), // E.g., "mercury"
+    aspectingPlanetId: integer('aspecting_planet_id').notNull(), // Index of the aspecting planet in the api's list (0 for sun, 1 for moon)
+    aspectedPlanetId: integer('aspected_planet_id').notNull(), // Index of the aspected planet, same as aspecting id
+    type: text('type').notNull(), // E.g., "conjunction", "square"
     orb: real('orb').notNull(), // Orb value
     diff: real('diff').notNull(), // Difference value
   },

package/package.json

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

package/utils/astroPrompts/index.ts

@@ -137,20 +137,35 @@ export const astroPrompts = {
     aspectingType,
   }: AspectParams): string => {
     return `
-      Make me a report for the astrological aspect: ${
+      Generate a report for the astrological aspect: ${
         pointNameMap[aspectingPlanet] || aspectingPlanet
       } ${aspectingType} ${pointNameMap[aspectedPlanet] || aspectedPlanet}.
-      The response should include an English version and a Portuguese version.
-      Use "###" for titles and "####" for subtitles.
-      The response format should be exactly like this:
-
+      The response must include an English version (EN) and a Portuguese version (PT).
+      Use "###" for titles and "####" for subtitles. Do not use the "—" character.
+      Do not include any introductory text like "Here’s your report" or similar phrases.
+      The response must start with "-- EN" and follow this exact format:
+  
       -- EN
-
-      [English Report - structured with headings, sections, and detailed explanations]
-
+  
+      ### Title of the Report
+  
+      #### Section 1
+      - **Bold Item 1**: Content for item 1.
+      - **Bold Item 2**: Content for item 2.
+  
+      #### Section 2
+      Paragraph content here.
+  
       -- PT
-
-      [Portuguese Report - structured exactly the same as the English version]
+  
+      ### Título do Relatório
+  
+      #### Seção 1
+      - **Item em Negrito 1**: Conteúdo do item 1.
+      - **Item em Negrito 2**: Conteúdo do item 2.
+  
+      #### Seção 2
+      Conteúdo do parágrafo aqui.
     `.trim();
   },