@digipair/skill-dsp 0.8.22 → 0.8.24

package/index.cjs.js

@@ -23510,14 +23510,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23536,7 +23536,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23555,9 +23555,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
-        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
             v: nextMatch1
         };
     };
@@ -27463,29 +27463,54 @@ const preparePinsSettings = async (settings, context)=>{
     });
 };
 
-var _process_env_OLLAMA_SERVER;
-const OLLAMA_SERVER = (_process_env_OLLAMA_SERVER = process.env['OLLAMA_SERVER']) != null ? _process_env_OLLAMA_SERVER : 'http://localhost:11434';
 let DspService = class DspService {
     async model(params, _pinsSettingsList, _context) {
         const { AI } = await eval(`import('llmclient')`);
-        const { apiKey = 'none', modelName = 'mistral', temperature = 0, keepAlive = 0, baseUrl = OLLAMA_SERVER, debug = false } = params;
-        const model = AI('openai', {
+        const { name, options } = params;
+        const modelInstance = AI(name, options);
+        return modelInstance;
+    }
+    async modelOpenAI(params, _pinsSettingsList, context) {
+        const { OpenAI } = await eval(`import('llmclient')`);
+        var _context_privates_OPENAI_API_KEY, _context_privates_OPENAI_SERVER;
+        const { apiKey = (_context_privates_OPENAI_API_KEY = context.privates.OPENAI_API_KEY) != null ? _context_privates_OPENAI_API_KEY : process.env['OPENAI_API_KEY'], apiURL = (_context_privates_OPENAI_SERVER = context.privates.OPENAI_SERVER) != null ? _context_privates_OPENAI_SERVER : process.env['OPENAI_SERVER'], config, options } = params;
+        const modelInstance = OpenAI({
             apiKey,
-            apiURL: baseUrl + '/v1',
-            config: {
-                model: modelName,
-                temperature,
-                keepAlive
-            },
-            options: {
-                debug
-            }
+            apiURL,
+            config,
+            options
+        });
+        return modelInstance;
+    }
+    async modelAzureOpenAi(params, _pinsSettingsList, context) {
+        const { AzureOpenAi } = await eval(`import('llmclient')`);
+        var _context_privates_AZURE_OPENAI_API_KEY, _context_privates_AZURE_OPENAI_API_INSTANCE_NAME, _context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME, _context_privates_AZURE_OPENAI_API_VERSION;
+        const { apiKey = (_context_privates_AZURE_OPENAI_API_KEY = context.privates.AZURE_OPENAI_API_KEY) != null ? _context_privates_AZURE_OPENAI_API_KEY : process.env['AZURE_OPENAI_API_KEY'], resourceName = (_context_privates_AZURE_OPENAI_API_INSTANCE_NAME = context.privates.AZURE_OPENAI_API_INSTANCE_NAME) != null ? _context_privates_AZURE_OPENAI_API_INSTANCE_NAME : process.env['AZURE_OPENAI_API_INSTANCE_NAME'], deploymentName = (_context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME = context.privates.AZURE_OPENAI_API_DEPLOYMENT_NAME) != null ? _context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME : process.env['AZURE_OPENAI_API_DEPLOYMENT_NAME'], version = (_context_privates_AZURE_OPENAI_API_VERSION = context.privates.AZURE_OPENAI_API_VERSION) != null ? _context_privates_AZURE_OPENAI_API_VERSION : process.env['AZURE_OPENAI_API_VERSION'], config, options } = params;
+        const modelInstance = AzureOpenAi({
+            apiKey,
+            resourceName,
+            deploymentName,
+            version,
+            config,
+            options
+        });
+        return modelInstance;
+    }
+    async modelOllama(params, _pinsSettingsList, context) {
+        const { Ollama } = await eval(`import('llmclient')`);
+        const { model, url = context.privates.OLLAMA_SERVER ? context.privates.OLLAMA_SERVER + '/v1' : process.env['OLLAMA_SERVER'] ? process.env['OLLAMA_SERVER'] + '/v1' : 'http://localhost:11434/v1', apiKey, config, options } = params;
+        const modelInstance = Ollama({
+            model,
+            url,
+            apiKey,
+            config,
+            options
         });
-        return model;
+        return modelInstance;
     }
     async generate(params, _pinsSettingsList, context) {
         const { Generate } = await eval(`import('llmclient')`);
-        const { model = context.privates.DSP_MODEL, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, signature, input } = params;
         const modelInstance = await executePinsList(model, context);
         const gen = new Generate(modelInstance, signature);
         const result = await gen.forward(input);
@@ -27493,7 +27518,13 @@ let DspService = class DspService {
     }
 };
 const model = (params, pinsSettingsList, context)=>new DspService().model(params, pinsSettingsList, context);
+const modelOpenAI = (params, pinsSettingsList, context)=>new DspService().modelOpenAI(params, pinsSettingsList, context);
+const modelAzureOpenAi = (params, pinsSettingsList, context)=>new DspService().modelAzureOpenAi(params, pinsSettingsList, context);
+const modelOllama = (params, pinsSettingsList, context)=>new DspService().modelOllama(params, pinsSettingsList, context);
 const generate = (params, pinsSettingsList, context)=>new DspService().generate(params, pinsSettingsList, context);
 
 exports.generate = generate;
 exports.model = model;
+exports.modelAzureOpenAi = modelAzureOpenAi;
+exports.modelOllama = modelOllama;
+exports.modelOpenAI = modelOpenAI;

package/index.esm.js

@@ -23488,14 +23488,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23514,7 +23514,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23533,9 +23533,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
-        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+        return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -27441,29 +27441,54 @@ const preparePinsSettings = async (settings, context)=>{
     });
 };
 
-var _process_env_OLLAMA_SERVER;
-const OLLAMA_SERVER = (_process_env_OLLAMA_SERVER = process.env['OLLAMA_SERVER']) != null ? _process_env_OLLAMA_SERVER : 'http://localhost:11434';
 let DspService = class DspService {
     async model(params, _pinsSettingsList, _context) {
         const { AI } = await eval(`import('llmclient')`);
-        const { apiKey = 'none', modelName = 'mistral', temperature = 0, keepAlive = 0, baseUrl = OLLAMA_SERVER, debug = false } = params;
-        const model = AI('openai', {
+        const { name, options } = params;
+        const modelInstance = AI(name, options);
+        return modelInstance;
+    }
+    async modelOpenAI(params, _pinsSettingsList, context) {
+        const { OpenAI } = await eval(`import('llmclient')`);
+        var _context_privates_OPENAI_API_KEY, _context_privates_OPENAI_SERVER;
+        const { apiKey = (_context_privates_OPENAI_API_KEY = context.privates.OPENAI_API_KEY) != null ? _context_privates_OPENAI_API_KEY : process.env['OPENAI_API_KEY'], apiURL = (_context_privates_OPENAI_SERVER = context.privates.OPENAI_SERVER) != null ? _context_privates_OPENAI_SERVER : process.env['OPENAI_SERVER'], config, options } = params;
+        const modelInstance = OpenAI({
             apiKey,
-            apiURL: baseUrl + '/v1',
-            config: {
-                model: modelName,
-                temperature,
-                keepAlive
-            },
-            options: {
-                debug
-            }
+            apiURL,
+            config,
+            options
+        });
+        return modelInstance;
+    }
+    async modelAzureOpenAi(params, _pinsSettingsList, context) {
+        const { AzureOpenAi } = await eval(`import('llmclient')`);
+        var _context_privates_AZURE_OPENAI_API_KEY, _context_privates_AZURE_OPENAI_API_INSTANCE_NAME, _context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME, _context_privates_AZURE_OPENAI_API_VERSION;
+        const { apiKey = (_context_privates_AZURE_OPENAI_API_KEY = context.privates.AZURE_OPENAI_API_KEY) != null ? _context_privates_AZURE_OPENAI_API_KEY : process.env['AZURE_OPENAI_API_KEY'], resourceName = (_context_privates_AZURE_OPENAI_API_INSTANCE_NAME = context.privates.AZURE_OPENAI_API_INSTANCE_NAME) != null ? _context_privates_AZURE_OPENAI_API_INSTANCE_NAME : process.env['AZURE_OPENAI_API_INSTANCE_NAME'], deploymentName = (_context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME = context.privates.AZURE_OPENAI_API_DEPLOYMENT_NAME) != null ? _context_privates_AZURE_OPENAI_API_DEPLOYMENT_NAME : process.env['AZURE_OPENAI_API_DEPLOYMENT_NAME'], version = (_context_privates_AZURE_OPENAI_API_VERSION = context.privates.AZURE_OPENAI_API_VERSION) != null ? _context_privates_AZURE_OPENAI_API_VERSION : process.env['AZURE_OPENAI_API_VERSION'], config, options } = params;
+        const modelInstance = AzureOpenAi({
+            apiKey,
+            resourceName,
+            deploymentName,
+            version,
+            config,
+            options
+        });
+        return modelInstance;
+    }
+    async modelOllama(params, _pinsSettingsList, context) {
+        const { Ollama } = await eval(`import('llmclient')`);
+        const { model, url = context.privates.OLLAMA_SERVER ? context.privates.OLLAMA_SERVER + '/v1' : process.env['OLLAMA_SERVER'] ? process.env['OLLAMA_SERVER'] + '/v1' : 'http://localhost:11434/v1', apiKey, config, options } = params;
+        const modelInstance = Ollama({
+            model,
+            url,
+            apiKey,
+            config,
+            options
         });
-        return model;
+        return modelInstance;
     }
     async generate(params, _pinsSettingsList, context) {
         const { Generate } = await eval(`import('llmclient')`);
-        const { model = context.privates.DSP_MODEL, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, signature, input } = params;
         const modelInstance = await executePinsList(model, context);
         const gen = new Generate(modelInstance, signature);
         const result = await gen.forward(input);
@@ -27471,6 +27496,9 @@ let DspService = class DspService {
     }
 };
 const model = (params, pinsSettingsList, context)=>new DspService().model(params, pinsSettingsList, context);
+const modelOpenAI = (params, pinsSettingsList, context)=>new DspService().modelOpenAI(params, pinsSettingsList, context);
+const modelAzureOpenAi = (params, pinsSettingsList, context)=>new DspService().modelAzureOpenAi(params, pinsSettingsList, context);
+const modelOllama = (params, pinsSettingsList, context)=>new DspService().modelOllama(params, pinsSettingsList, context);
 const generate = (params, pinsSettingsList, context)=>new DspService().generate(params, pinsSettingsList, context);
 
-export { generate, model };
+export { generate, model, modelAzureOpenAi, modelOllama, modelOpenAI };

package/libs/skill-dsp/src/lib/skill-dsp.d.ts

@@ -1,3 +1,6 @@
 import { PinsSettings } from '@digipair/engine';
 export declare const model: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const modelOpenAI: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const modelAzureOpenAi: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const modelOllama: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const generate: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-dsp",
-  "version": "0.8.22",
+  "version": "0.8.24",
   "dependencies": {},
   "main": "./index.cjs.js",
   "module": "./index.esm.js"

package/schema.json

@@ -11,10 +11,10 @@
     "/model": {
       "post": {
         "tags": ["service"],
-        "summary": "Modèle DSP",
+        "summary": "Modèle Générique",
         "parameters": [
           {
-            "name": "modelName",
+            "name": "name",
             "summary": "Nom du model",
             "required": false,
             "description": "Nom du model LLM à utiliser pour le résumé système",
@@ -23,22 +23,175 @@
             }
           },
           {
-            "name": "temperature",
-            "summary": "Temperature",
+            "name": "options",
+            "summary": "Options",
             "required": false,
-            "description": "Temperature du model LLM",
+            "description": "Options du modèle LLM",
             "schema": {
-              "type": "number"
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/modelOpenAi": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Modèle Générique",
+        "parameters": [
+          {
+            "name": "apiKey",
+            "summary": "Api Key",
+            "required": false,
+            "description": "Api Key OpenAI",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "apiURL",
+            "summary": "Adresse du serveur",
+            "required": false,
+            "description": "Adresse du serveur OpenAI",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "config",
+            "summary": "Configuration",
+            "required": false,
+            "description": "Configuration du modèle OpenAI",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "options",
+            "summary": "Options",
+            "required": false,
+            "description": "Options du modèle OpenAI",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/modelAzureOpenAi": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Modèle Générique",
+        "parameters": [
+          {
+            "name": "apiKey",
+            "summary": "Api Key",
+            "required": false,
+            "description": "Api Key Azure OpenAI",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "resourceName",
+            "summary": "Nom de la ressource",
+            "required": false,
+            "description": "Nom de la ressource Azure OpenAI",
+            "schema": {
+              "type": "string"
             }
           },
           {
-            "name": "baseUrl",
-            "summary": "Url du serveur LLM",
+            "name": "deploymentName",
+            "summary": "Nom du déploiement",
             "required": false,
-            "description": "Url du serveur LLM compatible Openai",
+            "description": "Nom du déploiement Azure OpenAI",
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "version",
+            "summary": "Version",
+            "required": false,
+            "description": "Version d'API OpenAI",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "config",
+            "summary": "Configuration",
+            "required": false,
+            "description": "Configuration du modèle OpenAI",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "options",
+            "summary": "Options",
+            "required": false,
+            "description": "Options du modèle OpenAI",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/modelOllama": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Modèle Générique",
+        "parameters": [
+          {
+            "name": "model",
+            "summary": "Modèle",
+            "required": false,
+            "description": "Nom du modèle Ollama à utiliser pour la génération",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "url",
+            "summary": "Adresse du serveur",
+            "required": false,
+            "description": "Addresse du serveur Ollama à utiliser pour la génération",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "apiKey",
+            "summary": "Api Key",
+            "required": false,
+            "description": "Api Key Ollama",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "config",
+            "summary": "Configuration",
+            "required": false,
+            "description": "Configuration du modèle Ollama",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "options",
+            "summary": "Options",
+            "required": false,
+            "description": "Options du modèle Ollama",
+            "schema": {
+              "type": "object"
+            }
           }
         ],
         "x-events": []
@@ -47,13 +200,13 @@
     "/generate": {
       "post": {
         "tags": ["service"],
-        "summary": "generate",
+        "summary": "Génération DSP",
         "parameters": [
           {
             "name": "model",
-            "summary": "Modèle DSP",
+            "summary": "Modèle",
             "required": false,
-            "description": "Modèle DSP à utiliser pour la génération",
+            "description": "Modèle LLM à utiliser pour la génération",
             "schema": {
               "type": "string"
             }