garriga 1.0.12 → 1.0.14

package/index.js

@@ -1,16 +1,55 @@
 const axios = require("axios");
 
+function normalizeGenerateResponseOptions(optionsOrUserToken, legacySource) {
+  if (
+    optionsOrUserToken &&
+    typeof optionsOrUserToken === "object" &&
+    !Array.isArray(optionsOrUserToken)
+  ) {
+    return {
+      userToken: optionsOrUserToken.userToken ?? null,
+      source: optionsOrUserToken.source ?? null,
+      modelOverride: optionsOrUserToken.modelOverride ?? null,
+    };
+  }
+
+  return {
+    userToken: optionsOrUserToken ?? null,
+    source: legacySource ?? null,
+    modelOverride: null,
+  };
+}
+
+function normalizeAdapterConfig(modelOrConfig) {
+  if (
+    modelOrConfig &&
+    typeof modelOrConfig === "object" &&
+    !Array.isArray(modelOrConfig)
+  ) {
+    return {
+      model: modelOrConfig.model ?? null,
+      baseUrl: modelOrConfig.baseUrl ?? null,
+    };
+  }
+
+  return {
+    model: modelOrConfig ?? null,
+    baseUrl: null,
+  };
+}
+
 class LLMAdapter {
-  constructor(provider = "chatgpt") {
+  constructor(provider = "chatgpt", modelOrConfig) {
+    const adapterConfig = normalizeAdapterConfig(modelOrConfig);
     switch (provider) {
       case "chatgpt":
-        this.adapter = new ChatGptAPI();
+        this.adapter = new ChatGptAPI(adapterConfig);
         break;
       case "localLLM":
-        this.adapter = new localLLM();
+        this.adapter = new localLLM(adapterConfig);
         break;
       case "gemini":
-        this.adapter = new GeminiAPI();
+        this.adapter = new GeminiAPI(adapterConfig);
         break;
 
       default:
@@ -18,8 +57,8 @@ class LLMAdapter {
     }
   }
 
-  async generateResponse(prompt, userToken, source) {
-    return this.adapter.generateResponse(prompt, userToken, source);
+  async generateResponse(prompt, optionsOrUserToken, source) {
+    return this.adapter.generateResponse(prompt, optionsOrUserToken, source);
   }
   async generateRateResponse(responseId, ratePoints, rateText, userToken) {
     return this.adapter.generateRateResponse(
@@ -38,10 +77,11 @@ class LLMAdapter {
 }
 
 class ChatGptAPI {
-  constructor() {
+  constructor(config) {
     this.apiKey = process.env.CHATGPTAPIKEY;
-    this.apiUrl = "https://api.openai.com/v1/chat/completions";
-    this.model = "gpt-3.5-turbo";
+    this.apiUrl =
+      config?.baseUrl || "https://api.openai.com/v1/chat/completions";
+    this.model = config?.model || "gpt-3.5-turbo";
   }
   async generateResponse(prompt) {
     try {
@@ -103,10 +143,12 @@ class ChatGptAPI {
 }
 
 class GeminiAPI {
-  constructor() {
+  constructor(config) {
     this.apiKey = process.env.GEMINIAPIKEY;
+    const modelName = config?.model || "gemini-2.0-flash";
     this.baseURL =
-      "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent";
+      config?.baseUrl ||
+      `https://generativelanguage.googleapis.com/v1beta/models/${modelName}:generateContent`;
   }
 
   get URL() {
@@ -172,14 +214,14 @@ class GeminiAPI {
 }
 
 class localLLM {
-  constructor() {
+  constructor(config) {
     this.apiUrlGetToken = "http://iaService:29000/token";
     this.apiUrlSendQuery = "http://iaService:29000/query";
     this.apiUrlRateResponse = "http://iaService:29000/rate-response";
     this.apiUrlHistorial = "http://iaService:29000/historial";
     this.apiUrlQueryTypes = "http://iaService:29000/query-types";
-    this.apiUrlOllama = "http://10.20.150.102:11434/api/generate";
-    this.model = "GrupoImpuLLMtec";
+    this.apiUrlOllama = config?.baseUrl || "http://10.20.150.102:11434/api/generate";
+    this.model = config?.model || "GrupoImpuLLMtec";
   }
   async getToken({ username, password }) {
     try {
@@ -204,20 +246,21 @@ class localLLM {
     }
   }
 
-  async generateResponse(
-    prompt,
-    userToken,
-    source = process.env.LOCALMODEL || "mistral7b-genei:latest",
-  ) {
+  async generateResponse(prompt, optionsOrUserToken, legacySource) {
+    const { userToken, source, modelOverride } =
+      normalizeGenerateResponseOptions(optionsOrUserToken, legacySource);
+    const effectiveModel = modelOverride || this.model || "mistral7b-genei:latest";
+    const effectiveSource = source ?? this.model ?? "GrupoImpuLLMtec";
+
     console.log(
-      `garriga, llamando al LLm local, modelo ${source} ya que process.env.LOCALMODEL es ${process.env.LOCALMODEL}`,
+      `garriga, llamando al LLm local, modelo ${effectiveModel} ya que process.env.LOCALMODEL es ${process.env.LOCALMODEL}`,
     );
 
     if (userToken === "modeloLocalOllama") {
       try {
         const ollamaPayload = {
           prompt,
-          model: source,
+          model: effectiveModel,
           stream: false,
           //format: "json",
 
@@ -226,14 +269,15 @@ class localLLM {
             num_ctx: +process.env.MAX_CONTEXT_FRAUD || 65536,
             temperature: +process.env.TEMPERATURE_FRAUD || 0.1,
             num_predict: +process.env.MAX_TOKENS_FRAUD || 2500,
-            top_k: 40,
-            top_p: 0.9,
+            top_k: +process.env.TOP_K_FRAUD || 40,
+            top_p: +process.env.TOP_P_FRAUD || 0.9,
           },
         };
         const response = await axios.post(this.apiUrlOllama, ollamaPayload, {
           headers: {
             "Content-Type": "application/json",
           },
+          timeout: +process.env.TIMEOUT_OLLAMA_FRAUD || 300000,
         });
 
         return response?.data.response;
@@ -254,7 +298,7 @@ class localLLM {
         {
           question: prompt,
           userToken,
-          source,
+          source: effectiveSource,
         },
         {
           headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "garriga",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "AI connector",
   "main": "index.js",
   "scripts": {