@zodic/shared 0.0.250 → 0.0.252

package/app/services/ConceptService.ts

@@ -2012,22 +2012,30 @@ 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}`);
+    console.log(
+      `🚀 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;
+    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}`);
+        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),
@@ -2035,8 +2043,10 @@ export class ConceptService {
             isNull(astroReports.house)
           );
           break;
-        case "house":
-          console.log(`🗂️ Handling house report: type=${params.type}, pointName=${params.pointName}, house=${params.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),
@@ -2044,16 +2054,20 @@ export class ConceptService {
             isNull(astroReports.sign)
           );
           break;
-        case "signInHouse":
-          console.log(`🗂️ Handling signInHouse report: sign=${params.sign}, houseNumber=${params.houseNumber}`);
+        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":
-          console.log(`🗂️ Handling aspect report: aspectingPlanet=${params.aspectingPlanet}, aspectedPlanet=${params.aspectedPlanet}, aspectingType=${params.aspectingType}`);
+        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),
@@ -2061,29 +2075,46 @@ export class ConceptService {
             eq(aspectReports.aspect, params.aspectingType)
           );
           break;
-        case "feature":
-          console.log(`🗂️ Handling feature report: featureType=${params.featureType}, ${JSON.stringify(params)}`);
+        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");
+          if (params.featureType === 'element') {
+            if (!('subtype' in params))
+              throw new Error('Missing subtype for element feature report');
             switch (params.subtype) {
-              case "balanced":
-                nameValue = "balanced";
+              case 'balanced':
+                nameValue = 'balanced';
                 break;
-              case "pure":
-                if (!("dominantElement" in params)) throw new Error("Missing dominantElement for pure element report");
+              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");
+              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 as any).subtype}`);
+                throw new Error(
+                  `Unknown element subtype: ${(params as any).subtype}`
+                );
             }
           } else {
-            if (!("name" in params)) throw new Error("Missing name for non-element feature report");
+            if (!('name' in params))
+              throw new Error('Missing name for non-element feature report');
             nameValue = params.name;
           }
           whereClause = and(
@@ -2094,22 +2125,36 @@ export class ConceptService {
         default:
           throw new Error(`Unknown report type: ${(params as any).reportType}`);
       }
-      report = await db.select().from(table as any).where(whereClause).get() as AstroReportRow;
+      report = (await db
+        .select()
+        .from(table as any)
+        .where(whereClause)
+        .get()) as AstroReportRow;
     } else {
       // Handle description templates
-      console.log(`🗂️ Handling description template: entityType=${params.entityType}, name=${params.name}`);
+      console.log(
+        `🗂️ Handling description template: entityType=${params.entityType}, name=${params.name}`
+      );
       table = astroDescriptionTemplates;
       whereClause = and(
         eq(astroDescriptionTemplates.entityType, params.entityType),
         eq(astroDescriptionTemplates.name, params.name)
       );
-      report = await db.select().from(table as any).where(whereClause).get() as DescriptionTemplateRow;
+      report = (await db
+        .select()
+        .from(table as any)
+        .where(whereClause)
+        .get()) as DescriptionTemplateRow;
     }
 
     const id = report.id;
     const hasContent = isReport
-      ? (report as AstroReportRow).enReport && (report as AstroReportRow).ptReport
-      : (report as DescriptionTemplateRow).enDescription && (report as DescriptionTemplateRow).ptDescription;
+      ? (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`);
@@ -2120,29 +2165,47 @@ export class ConceptService {
     const maxAttempts = 2;
 
     while (attempts < maxAttempts) {
-      let phase = "generation";
+      let phase = 'generation';
       try {
         attempts++;
-        console.log(`🔄 Attempt ${attempts} to generate ${isReport ? "report" : "description"} content for ${id}...`);
+        console.log(
+          `🔄 Attempt ${attempts} to generate ${
+            isReport ? 'report' : 'description'
+          } content for ${id}...`
+        );
 
         let messages: ChatMessages;
         if (isReport) {
-          messages = this.context.buildLLMMessages().generateAstroReportContent({ params: params as AstroReportParams });
+          messages = this.context
+            .buildLLMMessages()
+            .generateAstroReportContent({
+              params: params as AstroReportParams,
+            });
         } else {
           messages = this.generateDescriptionMessages(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 for ${id}`);
         }
 
-        phase = "parsing";
-        console.log(`📝 Received AI response for ${id}: ${response.slice(0, 200)}${response.length > 200 ? "..." : ""}`);
+        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)
@@ -2153,7 +2216,8 @@ 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)
@@ -2165,12 +2229,19 @@ export class ConceptService {
             .run();
         }
 
-        console.log(`✅ ${isReport ? "Report" : "Description"} content stored for ${id}`);
+        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);
+        console.error(
+          `❌ Attempt ${attempts} failed at phase: ${phase} for ${id}`,
+          (error as Error).message
+        );
 
-        const failureKey = `failures:astro:${isReport ? (params as AstroReportParams).reportType : "description"}:${id}`;
+        const failureKey = `failures:astro:${
+          isReport ? (params as AstroReportParams).reportType : 'description'
+        }:${id}`;
         await this.context.kvConceptFailuresStore().put(
           failureKey,
           JSON.stringify({
@@ -2183,11 +2254,17 @@ export class ConceptService {
         );
 
         if (attempts >= maxAttempts) {
-          console.error(`🚨 All ${maxAttempts} attempts failed at phase ${phase} for ${id}`);
-          throw new Error(`Failed to generate ${isReport ? "report" : "description"} for ${id} after ${maxAttempts} attempts`);
+          console.error(
+            `🚨 All ${maxAttempts} attempts failed at phase ${phase} for ${id}`
+          );
+          throw new Error(
+            `Failed to generate ${
+              isReport ? 'report' : 'description'
+            } for ${id} after ${maxAttempts} attempts`
+          );
         }
 
-        console.log("🔁 Retrying...");
+        console.log('🔁 Retrying...');
         await new Promise((resolve) => setTimeout(resolve, 2000));
       }
     }

package/db/migrations/0003_thin_valeria_richards.sql

@@ -0,0 +1,28 @@
+CREATE TABLE `astro_description_templates` (
+	`id` text PRIMARY KEY NOT NULL,
+	`entity_type` text NOT NULL,
+	`name` text NOT NULL,
+	`en_name` text,
+	`pt_name` text,
+	`en_description` text NOT NULL,
+	`pt_description` text NOT NULL,
+	`created_at` integer DEFAULT CURRENT_TIMESTAMP,
+	`updated_at` integer DEFAULT CURRENT_TIMESTAMP
+);
+--> statement-breakpoint
+CREATE INDEX `astro_description_templates_type_name_idx` ON `astro_description_templates` (`entity_type`,`name`);--> statement-breakpoint
+ALTER TABLE `aspect_reports` ADD `description_template_id` text REFERENCES astro_description_templates(id);--> statement-breakpoint
+CREATE INDEX `aspect_reports_description_template_idx` ON `aspect_reports` (`description_template_id`);--> statement-breakpoint
+ALTER TABLE `aspect_reports` DROP COLUMN `en_description`;--> statement-breakpoint
+ALTER TABLE `aspect_reports` DROP COLUMN `pt_description`;--> statement-breakpoint
+ALTER TABLE `astro_feature_reports` ADD `description_template_id` text REFERENCES astro_description_templates(id);--> statement-breakpoint
+CREATE INDEX `astro_feature_reports_description_template_idx` ON `astro_feature_reports` (`description_template_id`);--> statement-breakpoint
+ALTER TABLE `astro_feature_reports` DROP COLUMN `en_description`;--> statement-breakpoint
+ALTER TABLE `astro_feature_reports` DROP COLUMN `pt_description`;--> statement-breakpoint
+ALTER TABLE `astro_reports` ADD `description_template_id` text REFERENCES astro_description_templates(id);--> statement-breakpoint
+ALTER TABLE `astro_reports` DROP COLUMN `en_description`;--> statement-breakpoint
+ALTER TABLE `astro_reports` DROP COLUMN `pt_description`;--> statement-breakpoint
+ALTER TABLE `house_reports` ADD `description_template_id` text REFERENCES astro_description_templates(id);--> statement-breakpoint
+CREATE INDEX `house_reports_description_template_idx` ON `house_reports` (`description_template_id`);--> statement-breakpoint
+ALTER TABLE `house_reports` DROP COLUMN `en_description`;--> statement-breakpoint
+ALTER TABLE `house_reports` DROP COLUMN `pt_description`;