@zodic/shared 0.0.296 → 0.0.298

package/app/services/ArchetypeService.ts

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { and, eq } from 'drizzle-orm';
 import { inject, injectable } from 'inversify';
 import { ChatMessages, schema } from '../..';
 import { KVArchetype, ZodiacSignSlug } from '../../types/scopes/legacy';
@@ -289,15 +289,11 @@ export class ArchetypeService {
     combination: string,
     overrideExisting: boolean = false
   ) {
+    const db = this.context.drizzle();
     const [sun, ascendant, moon] = combination.split('-') as ZodiacSignSlug[];
 
     const prompt = generateArchetypePrompt([{ sun, ascendant, moon }]);
-    const messages: ChatMessages = [
-      {
-        role: 'user',
-        content: prompt,
-      },
-    ];
+    const messages: ChatMessages = [{ role: 'user', content: prompt }];
     const response = await this.context.api().callTogether.single(messages, {});
 
     if (!response) {
@@ -306,17 +302,33 @@ export class ArchetypeService {
       );
     }
 
-    const blocks = response
-      .split('-EN')[1]
-      .split('-PT')[0]
-      .trim()
-      .split(/\n\d\.\s*\n?/)
-      .filter(Boolean);
-    const ptBlocks = response
-      .split('-PT')[1]
-      .trim()
-      .split(/\n\d\.\s*\n?/)
-      .filter(Boolean);
+    let blocks: string[] = [];
+    let ptBlocks: string[] = [];
+
+    try {
+      blocks = response
+        .split('-EN')[1]
+        .split('-PT')[0]
+        .trim()
+        .split(/\n\d\.\s*\n?/)
+        .filter(Boolean);
+
+      ptBlocks = response
+        .split('-PT')[1]
+        .trim()
+        .split(/\n\d\.\s*\n?/)
+        .filter(Boolean);
+    } catch (err) {
+      console.error(`Parsing failed for combination: ${combination}`, err);
+      await db.insert(schema.archetypeNameDumps).values({
+        id: combination,
+        combination,
+        rawText: response,
+        parsedSuccessfully: 0,
+        createdAt: Date.now(),
+      });
+      return;
+    }
 
     const englishNames = blocks.map((block) => {
       const nameMatch = block.match(/• Name:\s*(.+)/);
@@ -334,16 +346,37 @@ export class ArchetypeService {
       return { masc, fem, essenceLine: essence };
     });
 
-    const db = this.context.drizzle();
+    // Duplicate helper
+    async function isEnglishNameDuplicate(name: string): Promise<boolean> {
+      const result = await db
+        .select({ name: schema.archetypesData.name })
+        .from(schema.archetypesData)
+        .where(
+          and(
+            eq(schema.archetypesData.language, 'en-us'),
+            eq(schema.archetypesData.name, name)
+          )
+        )
+        .limit(1)
+        .execute();
+
+      return result.length > 0;
+    }
 
     await Promise.all(
       englishNames.map(async (entry, i) => {
         const index = (i + 1).toString();
         const ptVariant = portugueseVariants[i];
 
+        if (await isEnglishNameDuplicate(entry.name)) {
+          console.warn(`Duplicate name detected: "${entry.name}" — skipping.`);
+          return;
+        }
+
         for (const gender of ['male', 'female']) {
           const enId = `${combination}:${gender}:${index}`;
           const ptId = `${combination}:${gender}:${index}:pt`;
+          const ptName = gender === 'female' ? ptVariant.fem : ptVariant.masc;
 
           const existingEn = await db
             .select({ id: schema.archetypesData.id })
@@ -374,8 +407,6 @@ export class ArchetypeService {
               });
           }
 
-          const ptName = gender === 'female' ? ptVariant.fem : ptVariant.masc;
-
           const existingPt = await db
             .select({ id: schema.archetypesData.id })
             .from(schema.archetypesData)
@@ -413,6 +444,8 @@ export class ArchetypeService {
     entries: Array<{ combination: string }>,
     overrideExisting: boolean = false
   ) {
+    const db = this.context.drizzle();
+
     const prompts = entries.map(({ combination }) => {
       const [sun, ascendant, moon] = combination.split('-') as ZodiacSignSlug[];
       return { sun, ascendant, moon };
@@ -426,18 +459,47 @@ export class ArchetypeService {
       throw new Error('No response when generating batch archetype names');
     }
 
-    const db = this.context.drizzle();
-
     const blocks = response
       .split(/Composition \d+/)
       .slice(1)
       .map((b) => b.trim());
 
+    async function isEnglishNameDuplicate(name: string): Promise<boolean> {
+      const result = await db
+        .select({ name: schema.archetypesData.name })
+        .from(schema.archetypesData)
+        .where(
+          and(
+            eq(schema.archetypesData.language, 'en-us'),
+            eq(schema.archetypesData.name, name)
+          )
+        )
+        .limit(1)
+        .execute();
+
+      return result.length > 0;
+    }
+
     for (let i = 0; i < entries.length; i++) {
       const { combination } = entries[i];
       const block = blocks[i];
-      const en = block.split('-EN')[1].split('-PT')[0].trim();
-      const pt = block.split('-PT')[1].trim();
+
+      let en = '';
+      let pt = '';
+      try {
+        en = block.split('-EN')[1].split('-PT')[0].trim();
+        pt = block.split('-PT')[1].trim();
+      } catch (err) {
+        console.error(`Parsing failed for composition ${combination}`, err);
+        await db.insert(schema.archetypeNameDumps).values({
+          id: combination,
+          combination,
+          rawText: block,
+          parsedSuccessfully: 0,
+          createdAt: Date.now(),
+        });
+        continue;
+      }
 
       const english = en
         .split(/\n\d\.\s*\n?/)
@@ -461,6 +523,13 @@ export class ArchetypeService {
         const englishEntry = english[j];
         const ptEntry = portuguese[j];
 
+        if (await isEnglishNameDuplicate(englishEntry.name)) {
+          console.warn(
+            `Duplicate English name "${englishEntry.name}" — skipping.`
+          );
+          continue;
+        }
+
         for (const gender of ['male', 'female']) {
           const enId = `${combination}:${gender}:${index}`;
           const ptId = `${combination}:${gender}:${index}:pt`;

package/db/migrations/0013_lean_frightful_four.sql

@@ -0,0 +1,7 @@
+CREATE TABLE `archetype_name_dumps` (
+	`id` text PRIMARY KEY NOT NULL,
+	`combination` text NOT NULL,
+	`raw_text` text NOT NULL,
+	`parsed_successfully` integer DEFAULT 0,
+	`created_at` integer DEFAULT CURRENT_TIMESTAMP
+);