@zodic/shared 0.0.149 → 0.0.151

package/app/api/index.ts

@@ -38,7 +38,7 @@ export const Api = (env: BackendBindings) => ({
   callTogether: {
     single: async (
       messages: ChatMessages,
-      { model = 'deepseek-ai/DeepSeek-V3', options = {} }: DeepSeekOptions
+      { model = 'deepseek-ai/DeepSeek-V3', options = { } }: DeepSeekOptions
     ): Promise<string> => {
       try {
         const response = await together(env).chat.completions.create({

package/app/services/ConceptService.ts

@@ -155,34 +155,38 @@ export class ConceptService {
     poemPT: string[];
   } {
     console.log('📌 Parsing basic info response from ChatGPT:', response);
-
+  
     const enMatch = response.match(
       /EN:\s*•\s*Name:\s*(.+?)\s*•\s*Description:\s*([\s\S]+?)\s*•\s*Poetic Passage:\s*([\s\S]+?)\s*(?=PT:|$)/
     );
     const ptMatch = response.match(
       /PT:\s*•\s*Nome:\s*(.+?)\s*•\s*Descrição:\s*([\s\S]+?)\s*•\s*Passagem Poética:\s*([\s\S]+)/
     );
-
+  
     if (!enMatch || !ptMatch) {
       console.error('❌ Invalid basic info response format:', response);
       throw new Error('Invalid basic info response format');
     }
-
-    const nameEN = enMatch[1].trim();
-    const descriptionEN = enMatch[2].trim();
+  
+    // ✅ Function to clean text (removes leading/trailing spaces & unwanted "*")
+    const cleanText = (text: string) => text.trim().replace(/\*/g, '');
+  
+    // ✅ Parse and clean extracted content
+    const nameEN = cleanText(enMatch[1]);
+    const descriptionEN = cleanText(enMatch[2]);
     const poemEN = enMatch[3]
       .trim()
       .split(/\n+/)
-      .map((line) => line.trim()); // ✅ Split into array
-
-    const namePT = ptMatch[1].trim();
-    const descriptionPT = ptMatch[2].trim();
+      .map((line) => cleanText(line)); // ✅ Split into array & clean lines
+  
+    const namePT = cleanText(ptMatch[1]);
+    const descriptionPT = cleanText(ptMatch[2]);
     const poemPT = ptMatch[3]
       .trim()
       .split(/\n+/)
-      .map((line) => line.trim()); // ✅ Split into array
-
-    console.log('✅ Successfully parsed basic info:', {
+      .map((line) => cleanText(line)); // ✅ Split into array & clean lines
+  
+    console.log('✅ Successfully parsed and cleaned basic info:', {
       nameEN,
       descriptionEN,
       poemEN,
@@ -190,7 +194,7 @@ export class ConceptService {
       descriptionPT,
       poemPT,
     });
-
+  
     return { nameEN, descriptionEN, poemEN, namePT, descriptionPT, poemPT };
   }
 
@@ -388,19 +392,17 @@ export class ConceptService {
     structuredContentEN: StructuredConceptContent;
     structuredContentPT: StructuredConceptContent;
   } {
-    console.log(
-      '📌 Parsing structured content from ChatGPT response:',
-      response
-    );
-
-    const sections = [
+    console.log('📌 [START] Parsing structured content from ChatGPT response.');
+    console.log('🔹 [RAW RESPONSE]:', response);
+  
+    const sectionsEN = [
       'Core Identity',
       'Strengths and Challenges',
       'Path to Fulfillment',
       'Emotional Depth',
       'Vision and Aspirations',
     ];
-
+  
     const sectionsPT = [
       'Identidade Essencial',
       'Forças e Desafios',
@@ -408,40 +410,66 @@ export class ConceptService {
       'Profundidade Emocional',
       'Visão e Aspirações',
     ];
-
+  
     // ✅ Match English and Portuguese content separately
-    const enMatches = response.match(/EN:\s*([\s\S]+?)\s*PT:/);
-    const ptMatches = response.match(/PT:\s*([\s\S]+)/);
-
+    const enMatches = response.match(/### EN:\s*([\s\S]+?)\s*### PT:/);
+    const ptMatches = response.match(/### PT:\s*([\s\S]+)/);
+  
     if (!enMatches || !ptMatches) {
+      console.error('❌ [ERROR] Missing English or Portuguese content in response.');
       throw new Error('❌ Missing English or Portuguese content in response.');
     }
-
+  
     const enContent = enMatches[1].trim();
     const ptContent = ptMatches[1].trim();
-
+  
+    console.log('✅ [MATCH SUCCESS] Extracted English Content:', enContent.slice(0, 500) + '...'); // Log first 500 chars
+    console.log('✅ [MATCH SUCCESS] Extracted Portuguese Content:', ptContent.slice(0, 500) + '...'); // Log first 500 chars
+  
+    // ✅ Function to clean AI artifacts (*, extra spaces, etc.)
+    function cleanText(text: string): string {
+      return text.replace(/\*/g, '').trim();
+    }
+  
+    // ✅ Function to extract structured sections from text
     function extractSections(text: string, sectionTitles: string[]) {
       return sectionTitles.map((title) => {
-        const regex = new RegExp(`${title}:\\s*([\\s\\S]+?)(?=\\n\\d|$)`);
+        console.log(`🔍 [PROCESSING] Extracting section: "${title}"`);
+  
+        // ✅ Improved regex: Ensures section detection even with different AI formatting
+        const regex = new RegExp(`\\d+\\.\\s*${title}:\\s*([\\s\\S]+?)(?=\\n\\d+\\.\\s*[A-Z]|$)`);
         const match = text.match(regex);
-
+  
         if (!match) {
+          console.warn(`⚠️ [WARNING] Missing section: "${title}"`);
           return { type: 'section', title, content: ['❌ Section Missing'] };
         }
-
-        // ✅ Split content into paragraphs
+  
+        // ✅ Split content into paragraphs and clean them
         const paragraphs = match[1]
           .trim()
-          .split(/\n\n+/)
-          .map((p) => p.trim());
-
+          .split(/\n{2,}/) // Handles cases where paragraphs are separated by multiple new lines
+          .map((p) => cleanText(p))
+          .filter((p) => p.length > 0); // Removes empty paragraphs
+  
+        console.log(`✅ [EXTRACTED] "${title}" - Parsed Content:`, paragraphs);
+  
         return { type: 'section', title, content: paragraphs };
       });
     }
-
+  
+    // ✅ Return parsed and cleaned structured content
+    const structuredContentEN = extractSections(enContent, sectionsEN);
+    const structuredContentPT = extractSections(ptContent, sectionsPT);
+  
+    console.log('🎯 [FINAL RESULT] Parsed English Content:', JSON.stringify(structuredContentEN, null, 2));
+    console.log('🎯 [FINAL RESULT] Parsed Portuguese Content:', JSON.stringify(structuredContentPT, null, 2));
+  
+    console.log('✅ [COMPLETE] Structured content parsing finished successfully.');
+  
     return {
-      structuredContentEN: extractSections(enContent, sections),
-      structuredContentPT: extractSections(ptContent, sectionsPT),
+      structuredContentEN,
+      structuredContentPT,
     };
   }
 

package/package.json

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