@drax/ai-back 3.54.0 → 3.55.0

package/dist/config/AiConfig.js

@@ -0,0 +1,6 @@
+var AiConfig;
+(function (AiConfig) {
+    AiConfig["AiProvider"] = "AI_PROVIDER";
+})(AiConfig || (AiConfig = {}));
+export default AiConfig;
+export { AiConfig };

package/dist/factory/ai/AiProviderFactory.js

@@ -1,20 +1,25 @@
+import { DraxConfig } from "@drax/common-back";
+import AiConfig from "../../config/AiConfig.js";
 import OpenAiProviderFactory from "./OpenAiProviderFactory.js";
 import GoogleAiProviderFactory from "./GoogleAiProviderFactory.js";
 import OllamaAiProviderFactory from "./OllamaAiProviderFactory.js";
 import DeepSeekAiProviderFactory from "./DeepSeekAiProviderFactory.js";
 class AiProviderFactory {
-    static instance(provider = 'OpenAi') {
+    static instance(provider = DraxConfig.getOrLoad(AiConfig.AiProvider, "string", "OpenAi")) {
         if (!AiProviderFactory.singletons[provider]) {
             switch (provider) {
                 case 'OpenAi':
                     AiProviderFactory.singletons[provider] = OpenAiProviderFactory.instance();
                     break;
                 case 'GoogleAi':
+                case 'Google':
                     AiProviderFactory.singletons[provider] = GoogleAiProviderFactory.instance();
                     break;
                 case 'OllamaAi':
+                case 'Ollama':
                     AiProviderFactory.singletons[provider] = OllamaAiProviderFactory.instance();
                     break;
+                case 'DeepSeekAi':
                 case 'DeepSeek':
                     AiProviderFactory.singletons[provider] = DeepSeekAiProviderFactory.instance();
                     break;

package/dist/index.js

@@ -1,3 +1,4 @@
+import { AiConfig } from "./config/AiConfig.js";
 import { OpenAiConfig } from "./config/OpenAiConfig.js";
 import { GoogleAiConfig } from "./config/GoogleAiConfig.js";
 import { OllamaAiConfig } from "./config/OllamaAiConfig.js";
@@ -54,7 +55,7 @@ import DraxAgentRoutes from "./routes/DraxAgentRoutes.js";
 import AgentSessionRoutes from "./routes/AgentSessionRoutes.js";
 import { DraxAgent } from "./agents/DraxAgent.js";
 import { BuildContextTool } from "./tools/BuildContextTool.js";
-export { OpenAiConfig, GoogleAiConfig, OllamaAiConfig, DeepSeekConfig, ElevenLabsTTSConfig, AILogSchema, AILogBaseSchema, TTSVoiceSchema, TTSVoiceBaseSchema, TTSVoiceProviderSchema, TTSRequestSchema, TTSVoiceSettingsSchema, AILogModel, TTSVoiceModel, AILogMongoRepository, AILogSqliteRepository, TTSVoiceMongoRepository, TTSVoiceSqliteRepository, OpenAiProviderFactory, GoogleAiProviderFactory, OllamaAiProviderFactory, DeepSeekAiProviderFactory, AiProviderFactory, ElevenLabsTTSProviderFactory, TTSProviderFactory, DraxAgentFactory, AILogServiceFactory, TTSVoiceServiceFactory, OpenAiProvider, GoogleAiProvider, OllamaAiProvider, DeepSeekAiProvider, ElevenLabsTTSProvider, BuilderTool, BuildContextTool, 
+export { AiConfig, OpenAiConfig, GoogleAiConfig, OllamaAiConfig, DeepSeekConfig, ElevenLabsTTSConfig, AILogSchema, AILogBaseSchema, TTSVoiceSchema, TTSVoiceBaseSchema, TTSVoiceProviderSchema, TTSRequestSchema, TTSVoiceSettingsSchema, AILogModel, TTSVoiceModel, AILogMongoRepository, AILogSqliteRepository, TTSVoiceMongoRepository, TTSVoiceSqliteRepository, OpenAiProviderFactory, GoogleAiProviderFactory, OllamaAiProviderFactory, DeepSeekAiProviderFactory, AiProviderFactory, ElevenLabsTTSProviderFactory, TTSProviderFactory, DraxAgentFactory, AILogServiceFactory, TTSVoiceServiceFactory, OpenAiProvider, GoogleAiProvider, OllamaAiProvider, DeepSeekAiProvider, ElevenLabsTTSProvider, BuilderTool, BuildContextTool, 
 //Service
 KnowledgeService, AILogService, TTSVoiceService, TTSGenericService, PromptAudioService, 
 //Permissions

package/dist/providers/ai/AbstractAiProvider.js

@@ -3,6 +3,59 @@ class AbstractAiProvider {
         this.providerName = providerName;
         this._aiLogService = aiLogService;
     }
+    buildSystemPrompt(input) {
+        if (!input.systemPrompt) {
+            throw new Error("systemPrompt required");
+        }
+        let systemPrompt = input.systemPrompt;
+        if (input.memory && input.memory.length > 0) {
+            systemPrompt += `\n\n ${input.memoryHeader ?? '[MEMORIA]'}\n ${input.memory.map(m => `${m.key}: ${m.value}`).join('\n')}`;
+        }
+        if (input.knowledgeBase && input.knowledgeBase.length > 0) {
+            systemPrompt += `\n\n${input.knowledgeBaseHeader ?? '[BASE DE CONOCIMIENTO]'}\n ${input.knowledgeBase.join('\n')}`;
+        }
+        return systemPrompt;
+    }
+    resolvePromptModel(input, model, visionModel) {
+        return input.model ?? (this.hasImageInput(input) ? visionModel ?? model : model);
+    }
+    getDefaultToolParameters() {
+        return {
+            type: "object",
+            properties: {},
+            additionalProperties: false,
+        };
+    }
+    findToolOrThrow(toolName, tools = []) {
+        const tool = tools.find(t => t.name === toolName);
+        if (!tool) {
+            throw new Error(`Tool not found: ${toolName}`);
+        }
+        return tool;
+    }
+    parseToolArguments(args) {
+        if (!args) {
+            return {};
+        }
+        if (typeof args === "object") {
+            return args;
+        }
+        try {
+            return JSON.parse(args);
+        }
+        catch (e) {
+            throw new Error(`Invalid tool arguments: ${args}`);
+        }
+    }
+    serializeToolOutput(output) {
+        if (typeof output === "string") {
+            return output;
+        }
+        if (output === undefined) {
+            return "";
+        }
+        return JSON.stringify(output);
+    }
     hasImageInput(input) {
         if (input.userImages && input.userImages.length > 0) {
             return true;

package/dist/providers/ai/DeepSeekAiProvider.js

@@ -1,6 +1,8 @@
 import OpenAI from "openai";
-import OpenAiProvider from "./OpenAiProvider.js";
-class DeepSeekAiProvider extends OpenAiProvider {
+import { toJSONSchema } from "zod";
+import PromptAudioService from "../../services/PromptAudioService.js";
+import AbstractAiProvider from "./AbstractAiProvider.js";
+class DeepSeekAiProvider extends AbstractAiProvider {
     constructor(apiKey, model, baseUrl = "https://api.deepseek.com", visionModel, aiLogService) {
         if (!apiKey) {
             throw new Error("DeepSeek apiKey required");
@@ -8,11 +10,20 @@ class DeepSeekAiProvider extends OpenAiProvider {
         if (!model) {
             throw new Error("DeepSeek model required");
         }
-        super(apiKey, model, visionModel, aiLogService, "deepseek");
         if (!baseUrl) {
             throw new Error("DeepSeek baseUrl required");
         }
+        super("deepseek", aiLogService);
+        this._apiKey = apiKey;
+        this._model = model;
         this._baseUrl = baseUrl;
+        this._visionModel = visionModel;
+    }
+    get model() {
+        if (!this._model) {
+            throw new Error("DeepSeek model not found");
+        }
+        return this._model;
     }
     get client() {
         if (!this._client) {
@@ -23,6 +34,201 @@ class DeepSeekAiProvider extends OpenAiProvider {
         }
         return this._client;
     }
+    get visionModel() {
+        return this._visionModel;
+    }
+    buildUserContent(input) {
+        if (input.userContent && input.userContent.length > 0) {
+            return this.mapContentParts(input.userContent);
+        }
+        if (input.userImages && input.userImages.length > 0) {
+            const content = [];
+            if (input.userInput) {
+                content.push({ type: 'text', text: input.userInput });
+            }
+            content.push(...input.userImages.map(image => ({
+                type: 'image_url',
+                image_url: {
+                    url: image.url,
+                    ...(image.detail ? { detail: image.detail } : {}),
+                }
+            })));
+            return content;
+        }
+        return input.userInput ?? "";
+    }
+    mapContentParts(content) {
+        return content.map(part => {
+            if (part.type === 'text') {
+                return {
+                    type: 'text',
+                    text: part.text
+                };
+            }
+            return {
+                type: 'image_url',
+                image_url: {
+                    url: part.imageUrl,
+                    ...(part.detail ? { detail: part.detail } : {}),
+                }
+            };
+        });
+    }
+    mapHistory(history = []) {
+        return history.map(message => ({
+            role: message.role,
+            content: typeof message.content === 'string'
+                ? message.content
+                : this.mapContentParts(message.content)
+        }));
+    }
+    async generateEmbedding({ text, model = "text-embedding-ada-002" }) {
+        const response = await this.client.embeddings.create({
+            model: model,
+            input: text,
+        });
+        return response.data[0].embedding;
+    }
+    mapTools(tools = []) {
+        return tools.map(tool => ({
+            type: "function",
+            function: {
+                name: tool.name,
+                description: tool.description,
+                parameters: tool.parameters ?? this.getDefaultToolParameters(),
+            },
+        }));
+    }
+    normalizeJsonSchema(input) {
+        if (input.zodSchema) {
+            return toJSONSchema(input.zodSchema, {
+                target: "draft-7",
+            });
+        }
+        if (!input.jsonSchema) {
+            return undefined;
+        }
+        const jsonSchema = input.jsonSchema;
+        if (jsonSchema.type === "json_schema" && jsonSchema.json_schema?.schema) {
+            return jsonSchema.json_schema.schema;
+        }
+        if (jsonSchema.type === "json_object") {
+            return undefined;
+        }
+        return jsonSchema;
+    }
+    normalizeResponseFormat(input) {
+        if (input.zodSchema || input.jsonSchema) {
+            return { type: "json_object" };
+        }
+        return undefined;
+    }
+    buildDeepSeekSystemPrompt(input) {
+        const systemPrompt = this.buildSystemPrompt(input);
+        const jsonSchema = this.normalizeJsonSchema(input);
+        if (!jsonSchema) {
+            return systemPrompt;
+        }
+        return `${systemPrompt}
+
+Respond only with valid JSON matching this JSON Schema. Do not wrap the response in markdown or include any extra text.
+
+JSON Schema:
+${JSON.stringify(jsonSchema, null, 2)}`;
+    }
+    async buildToolMessages(toolCalls = [], tools = []) {
+        const toolMessages = [];
+        for (const toolCall of toolCalls) {
+            const toolName = toolCall.function?.name;
+            const tool = this.findToolOrThrow(toolName, tools);
+            const args = this.parseToolArguments(toolCall.function?.arguments);
+            const output = await tool.execute(args);
+            toolMessages.push({
+                role: "tool",
+                tool_call_id: toolCall.id,
+                content: this.serializeToolOutput(output),
+            });
+        }
+        return toolMessages;
+    }
+    async prompt(input) {
+        const systemPrompt = this.buildDeepSeekSystemPrompt(input);
+        const userInput = this.buildUserContent(input);
+        const model = this.resolvePromptModel(input, this.model, this.visionModel);
+        const startedAt = new Date();
+        const startTime = performance.now();
+        let tokens = 0;
+        let inputTokens = 0;
+        let outputTokens = 0;
+        try {
+            const messages = [
+                { role: 'system', content: systemPrompt },
+                ...this.mapHistory(input.history),
+                { role: 'user', content: userInput },
+            ];
+            const tools = input.tools ?? [];
+            const maxIterations = input.toolMaxIterations ?? 5;
+            const responseFormat = this.normalizeResponseFormat(input);
+            let output;
+            for (let iteration = 0; iteration < maxIterations; iteration++) {
+                const chatCompletion = await this.client.chat.completions.create({
+                    messages,
+                    ...(responseFormat ? { response_format: responseFormat } : {}),
+                    ...(tools.length > 0 ? { tools: this.mapTools(tools) } : {}),
+                    model: model,
+                });
+                tokens += chatCompletion.usage?.total_tokens ?? 0;
+                inputTokens += chatCompletion.usage?.prompt_tokens ?? 0;
+                outputTokens += chatCompletion.usage?.completion_tokens ?? 0;
+                const message = chatCompletion.choices[0].message;
+                const toolCalls = message.tool_calls ?? [];
+                if (toolCalls.length === 0) {
+                    output = message.content;
+                    break;
+                }
+                messages.push(message);
+                messages.push(...await this.buildToolMessages(toolCalls, tools));
+            }
+            if (output === undefined) {
+                throw new Error(`Tool max iterations reached: ${maxIterations}`);
+            }
+            const endTime = performance.now();
+            const time = endTime - startTime;
+            const endedAt = new Date();
+            const audio = await PromptAudioService.build(input, output);
+            await this.registerPromptLog(input, {
+                model,
+                systemPrompt,
+                startedAt,
+                endedAt,
+                inputTokens,
+                outputTokens,
+                tokens,
+                output,
+                success: true,
+            });
+            return {
+                output,
+                tokens,
+                inputTokens,
+                outputTokens,
+                time,
+                ...(audio ? { audio } : {}),
+            };
+        }
+        catch (e) {
+            const endedAt = new Date();
+            await this.registerPromptLog(input, {
+                model,
+                systemPrompt,
+                startedAt,
+                endedAt,
+                success: false,
+                errorMessage: e?.message,
+            });
+            throw e;
+        }
+    }
 }
 export default DeepSeekAiProvider;
 export { DeepSeekAiProvider };

package/dist/providers/ai/GoogleAiProvider.js

@@ -136,11 +136,7 @@ class GoogleAiProvider extends AbstractAiProvider {
                 functionDeclarations: tools.map(tool => ({
                     name: tool.name,
                     description: tool.description,
-                    parametersJsonSchema: tool.parameters ?? {
-                        type: "object",
-                        properties: {},
-                        additionalProperties: false,
-                    },
+                    parametersJsonSchema: tool.parameters ?? this.getDefaultToolParameters(),
                 }))
             }];
     }
@@ -177,10 +173,7 @@ class GoogleAiProvider extends AbstractAiProvider {
         const parts = [];
         for (const functionCall of functionCalls) {
             const toolName = functionCall.name;
-            const tool = tools.find(t => t.name === toolName);
-            if (!tool) {
-                throw new Error(`Tool not found: ${toolName}`);
-            }
+            const tool = this.findToolOrThrow(toolName, tools);
             const output = await tool.execute(functionCall.args ?? {});
             parts.push({
                 functionResponse: {
@@ -203,18 +196,9 @@ class GoogleAiProvider extends AbstractAiProvider {
         };
     }
     async prompt(input) {
-        if (!input.systemPrompt) {
-            throw new Error("systemPrompt required");
-        }
-        let systemPrompt = input.systemPrompt;
-        if (input.memory && input.memory.length > 0) {
-            systemPrompt += `\n\n ${input.memoryHeader ?? '[MEMORIA]'}\n ${input.memory.map(m => `${m.key}: ${m.value}`).join('\n')}`;
-        }
-        if (input.knowledgeBase && input.knowledgeBase.length > 0) {
-            systemPrompt += `\n\n${input.knowledgeBaseHeader ?? '[BASE DE CONOCIMIENTO]'}\n ${input.knowledgeBase.join('\n')}`;
-        }
+        const systemPrompt = this.buildSystemPrompt(input);
         const userInput = this.buildUserContent(input);
-        const model = input.model ?? (this.hasImageInput(input) ? this.visionModel ?? this.model : this.model);
+        const model = this.resolvePromptModel(input, this.model, this.visionModel);
         const startedAt = new Date();
         const startTime = performance.now();
         let tokens = 0;

package/dist/providers/ai/OllamaAiProvider.js

@@ -112,11 +112,7 @@ class OllamaAiProvider extends AbstractAiProvider {
             function: {
                 name: tool.name,
                 description: tool.description,
-                parameters: tool.parameters ?? {
-                    type: "object",
-                    properties: {},
-                    additionalProperties: false,
-                },
+                parameters: tool.parameters ?? this.getDefaultToolParameters(),
             },
         }));
     }
@@ -135,37 +131,11 @@ class OllamaAiProvider extends AbstractAiProvider {
         }
         return jsonSchema;
     }
-    parseToolArguments(args) {
-        if (!args) {
-            return {};
-        }
-        if (typeof args === "object") {
-            return args;
-        }
-        try {
-            return JSON.parse(args);
-        }
-        catch (e) {
-            throw new Error(`Invalid tool arguments: ${args}`);
-        }
-    }
-    serializeToolOutput(output) {
-        if (typeof output === "string") {
-            return output;
-        }
-        if (output === undefined) {
-            return "";
-        }
-        return JSON.stringify(output);
-    }
     async buildToolMessages(toolCalls = [], tools = []) {
         const toolMessages = [];
         for (const toolCall of toolCalls) {
             const toolName = toolCall.function?.name;
-            const tool = tools.find(t => t.name === toolName);
-            if (!tool) {
-                throw new Error(`Tool not found: ${toolName}`);
-            }
+            const tool = this.findToolOrThrow(toolName, tools);
             const args = this.parseToolArguments(toolCall.function?.arguments);
             const output = await tool.execute(args);
             toolMessages.push({
@@ -177,17 +147,8 @@ class OllamaAiProvider extends AbstractAiProvider {
         return toolMessages;
     }
     async prompt(input) {
-        if (!input.systemPrompt) {
-            throw new Error("systemPrompt required");
-        }
-        let systemPrompt = input.systemPrompt;
-        if (input.memory && input.memory.length > 0) {
-            systemPrompt += `\n\n ${input.memoryHeader ?? '[MEMORIA]'}\n ${input.memory.map(m => `${m.key}: ${m.value}`).join('\n')}`;
-        }
-        if (input.knowledgeBase && input.knowledgeBase.length > 0) {
-            systemPrompt += `\n\n${input.knowledgeBaseHeader ?? '[BASE DE CONOCIMIENTO]'}\n ${input.knowledgeBase.join('\n')}`;
-        }
-        const model = input.model ?? (this.hasImageInput(input) ? this.visionModel ?? this.model : this.model);
+        const systemPrompt = this.buildSystemPrompt(input);
+        const model = this.resolvePromptModel(input, this.model, this.visionModel);
         const startedAt = new Date();
         const startTime = performance.now();
         let tokens = 0;

package/dist/providers/ai/OpenAiProvider.js

@@ -90,42 +90,15 @@ class OpenAiProvider extends AbstractAiProvider {
             function: {
                 name: tool.name,
                 description: tool.description,
-                parameters: tool.parameters ?? {
-                    type: "object",
-                    properties: {},
-                    additionalProperties: false,
-                },
+                parameters: tool.parameters ?? this.getDefaultToolParameters(),
             },
         }));
     }
-    parseToolArguments(args) {
-        if (!args) {
-            return {};
-        }
-        try {
-            return JSON.parse(args);
-        }
-        catch (e) {
-            throw new Error(`Invalid tool arguments: ${args}`);
-        }
-    }
-    serializeToolOutput(output) {
-        if (typeof output === "string") {
-            return output;
-        }
-        if (output === undefined) {
-            return "";
-        }
-        return JSON.stringify(output);
-    }
     async buildToolMessages(toolCalls = [], tools = []) {
         const toolMessages = [];
         for (const toolCall of toolCalls) {
             const toolName = toolCall.function?.name;
-            const tool = tools.find(t => t.name === toolName);
-            if (!tool) {
-                throw new Error(`Tool not found: ${toolName}`);
-            }
+            const tool = this.findToolOrThrow(toolName, tools);
             const args = this.parseToolArguments(toolCall.function?.arguments);
             const output = await tool.execute(args);
             toolMessages.push({
@@ -137,18 +110,9 @@ class OpenAiProvider extends AbstractAiProvider {
         return toolMessages;
     }
     async prompt(input) {
-        if (!input.systemPrompt) {
-            throw new Error("systemPrompt required");
-        }
-        let systemPrompt = input.systemPrompt;
-        if (input.memory && input.memory.length > 0) {
-            systemPrompt += `\n\n ${input.memoryHeader ?? '[MEMORIA]'}\n ${input.memory.map(m => `${m.key}: ${m.value}`).join('\n')}`;
-        }
-        if (input.knowledgeBase && input.knowledgeBase.length > 0) {
-            systemPrompt += `\n\n${input.knowledgeBaseHeader ?? '[BASE DE CONOCIMIENTO]'}\n ${input.knowledgeBase.join('\n')}`;
-        }
+        const systemPrompt = this.buildSystemPrompt(input);
         const userInput = this.buildUserContent(input);
-        const model = input.model ?? (this.hasImageInput(input) ? this.visionModel ?? this.model : this.model);
+        const model = this.resolvePromptModel(input, this.model, this.visionModel);
         const startedAt = new Date();
         const startTime = performance.now();
         let tokens = 0;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.54.0",
+  "version": "3.55.0",
   "description": "Ai utils",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -19,7 +19,7 @@
   "license": "ISC",
   "dependencies": {
     "@drax/ai-share": "^3.52.0",
-    "@drax/crud-back": "^3.54.0",
+    "@drax/crud-back": "^3.54.1",
     "mongoose": "^8.23.0",
     "mongoose-paginate-v2": "^1.8.3"
   },
@@ -46,5 +46,5 @@
     "typescript": "^5.9.3",
     "vitest": "^3.0.8"
   },
-  "gitHead": "e7b0f29f3f68e352e8accb9d70c66b6f745a3278"
+  "gitHead": "4b9f6eb08041ce382b5244984f6c6e07e2b3c52c"
 }

package/src/config/AiConfig.ts

@@ -0,0 +1,10 @@
+enum AiConfig {
+
+    AiProvider = "AI_PROVIDER",
+
+}
+
+
+export default AiConfig;
+
+export {AiConfig}

package/src/factory/ai/AiProviderFactory.ts

@@ -1,4 +1,6 @@
 import type {IAIProvider} from "../../interfaces/IAIProvider.js"
+import {DraxConfig} from "@drax/common-back";
+import AiConfig from "../../config/AiConfig.js";
 import OpenAiProviderFactory from "./OpenAiProviderFactory.js";
 import GoogleAiProviderFactory from "./GoogleAiProviderFactory.js";
 import OllamaAiProviderFactory from "./OllamaAiProviderFactory.js";
@@ -7,18 +9,21 @@ import DeepSeekAiProviderFactory from "./DeepSeekAiProviderFactory.js";
 class AiProviderFactory {
     private static singletons: Record<string, IAIProvider> = {};
 
-    public static instance(provider: string = 'OpenAi'): IAIProvider {
+    public static instance(provider: string = DraxConfig.getOrLoad(AiConfig.AiProvider, "string", "OpenAi")): IAIProvider {
         if (!AiProviderFactory.singletons[provider]) {
             switch (provider) {
                 case 'OpenAi':
                     AiProviderFactory.singletons[provider] =  OpenAiProviderFactory.instance()
                     break;
                 case 'GoogleAi':
+                case 'Google':
                     AiProviderFactory.singletons[provider] =  GoogleAiProviderFactory.instance()
                     break;
                 case 'OllamaAi':
+                case 'Ollama':
                     AiProviderFactory.singletons[provider] =  OllamaAiProviderFactory.instance()
                     break;
+                case 'DeepSeekAi':
                 case 'DeepSeek':
                     AiProviderFactory.singletons[provider] =  DeepSeekAiProviderFactory.instance()
                     break;

package/src/index.ts

@@ -1,3 +1,4 @@
+import {AiConfig} from "./config/AiConfig.js";
 import {OpenAiConfig} from "./config/OpenAiConfig.js";
 import {GoogleAiConfig} from "./config/GoogleAiConfig.js";
 import {OllamaAiConfig} from "./config/OllamaAiConfig.js";
@@ -160,6 +161,7 @@ export type {
 }
 
 export {
+    AiConfig,
     OpenAiConfig,
     GoogleAiConfig,
     OllamaAiConfig,