@zodic/shared 0.0.148 → 0.0.150

package/app/api/index.ts

@@ -28,7 +28,70 @@ const deepseek = (env: BackendBindings) =>
     baseURL: 'https://api.deepseek.com/v1',
   });
 
+const together = (env: BackendBindings) =>
+  new OpenAI({
+    apiKey: env.TOGETHER_API_KEY,
+    baseURL: 'https://api.together.xyz/v1',
+  });
+
 export const Api = (env: BackendBindings) => ({
+  callTogether: {
+    single: async (
+      messages: ChatMessages,
+      { model = 'deepseek-ai/DeepSeek-V3', options = {} }: DeepSeekOptions
+    ): Promise<string> => {
+      try {
+        const response = await together(env).chat.completions.create({
+          model,
+          messages,
+          ...options,
+        });
+
+        if (response.choices[0].message.content) {
+          return response.choices[0].message.content.trim();
+        } else {
+          throw new Error('Content is null');
+        }
+      } catch (err: any) {
+        console.error('Error calling DeepSeek API:', err.message);
+        throw err;
+      }
+    },
+
+    // batch: async (
+    //   batchItems: DeepSeekBatchInputItem[]
+    // ): Promise<DeepSeekBatchResponse> => {
+    //   console.log('Preparing to send DeepSeek batch request.');
+
+    //   try {
+    //     const responses: DeepSeekBatchResponse = [];
+
+    //     for (const item of batchItems) {
+    //       const { messages, options } = item;
+    //       const response = await deepseek(env).chat.completions.create({
+    //         model: options?.model || 'deepseek-v3',
+    //         messages,
+    //         ...options,
+    //       });
+
+    //       if (response.choices[0].message.content) {
+    //         responses.push({
+    //           input: item,
+    //           output: response.choices[0].message.content.trim(),
+    //         });
+    //       } else {
+    //         console.error('Content is null');
+    //       }
+    //     }
+
+    //     console.log('Batch processing completed successfully.');
+    //     return responses;
+    //   } catch (error) {
+    //     console.error('Error in callDeepSeekBatch:', error);
+    //     throw error;
+    //   }
+    // },
+  },
   callDeepSeek: {
     single: async (
       messages: ChatMessages,

package/app/services/ConceptService.ts

@@ -77,7 +77,7 @@ export class ConceptService {
         // ✅ Call ChatGPT API
         const response = await this.context
           .api()
-          .callChatGPT.single(messages, {});
+          .callTogether.single(messages, {});
         if (!response) {
           throw new Error(`❌ AI returned an empty response`);
         }
@@ -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 };
   }
 
@@ -239,7 +243,7 @@ export class ConceptService {
       });
   
     // ✅ Call ChatGPT API
-    const response = await this.context.api().callChatGPT.single(messages, {});
+    const response = await this.context.api().callTogether.single(messages, {});
     if (!response) {
       throw new Error(
         `❌ Failed to generate Leonardo prompt for concept: ${conceptSlug}`
@@ -327,7 +331,7 @@ export class ConceptService {
         // ✅ Call ChatGPT API
         const response = await this.context
           .api()
-          .callChatGPT.single(messages, {});
+          .callTogether.single(messages, {});
         if (!response) {
           throw new Error(`❌ AI returned an empty response`);
         }
@@ -388,19 +392,16 @@ export class ConceptService {
     structuredContentEN: StructuredConceptContent;
     structuredContentPT: StructuredConceptContent;
   } {
-    console.log(
-      '📌 Parsing structured content from ChatGPT response:',
-      response
-    );
-
-    const sections = [
+    console.log('📌 Parsing structured content from ChatGPT 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,39 +409,49 @@ 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]+)/);
-
+  
     if (!enMatches || !ptMatches) {
+      console.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();
-
+  
+    // ✅ Function to clean AI artifacts (removes * and trims text)
+    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|$)`);
+        // ✅ Improved regex: Ensures section detection even with different AI formatting
+        const regex = new RegExp(`${title}:\\s*([\\s\\S]+?)(?=\\n\\d|\\n[A-Z]|$)`);
         const match = text.match(regex);
-
+  
         if (!match) {
+          console.warn(`⚠️ 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));
+  
         return { type: 'section', title, content: paragraphs };
       });
     }
-
+  
+    // ✅ Return parsed and cleaned structured content
     return {
-      structuredContentEN: extractSections(enContent, sections),
+      structuredContentEN: extractSections(enContent, sectionsEN),
       structuredContentPT: extractSections(ptContent, sectionsPT),
     };
   }

package/package.json

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