@digipair/skill-dsp 0.15.2 → 0.15.3

package/index.cjs.js

@@ -40840,15 +40840,28 @@ let DspService = class DspService {
         const result = await gen.forward(input);
         return result;
     }
+    async react(params, _pinsSettingsList, context) {
+        // const { AxChainOfThought } = await eval(`import('@ax-llm/ax')`);
+        const { model = context.privates.MODEL_DSP, functions = [], signature, input } = params;
+        const modelInstance = await executePinsList(model, context);
+        const gen = new AxReAct(modelInstance, signature, {
+            functions: await this.prepareFunctions(functions, context)
+        });
+        const result = await gen.forward(input);
+        return result;
+    }
     async agent(params, _pinsSettingsList, context) {
         // const { AxAgent } = await eval(`import('@ax-llm/ax')`);
-        const { model = context.privates.MODEL_DSP, functions = [], demos = [], name, description, signature } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], agents = [], name, description, signature } = params;
         const modelInstance = await executePinsList(model, context);
         const agent = new AxAgent(modelInstance, {
             name,
             description,
             signature,
-            functions: await this.prepareFunctions(functions, context)
+            functions: await this.prepareFunctions(functions, context),
+            agents: await Promise.all(agents.map(async (execute)=>await executePinsList([
+                    execute
+                ], context)))
         });
         return agent;
     }
@@ -40866,9 +40879,19 @@ const modelOpenAI = (params, pinsSettingsList, context)=>new DspService().modelO
 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);
+const chainOfThought = (params, pinsSettingsList, context)=>new DspService().chainOfThought(params, pinsSettingsList, context);
+const react = (params, pinsSettingsList, context)=>new DspService().react(params, pinsSettingsList, context);
+const agent = (params, pinsSettingsList, context)=>new DspService().agent(params, pinsSettingsList, context);
+const forward = (params, pinsSettingsList, context)=>new DspService().forward(params, pinsSettingsList, context);
+const jsInterpreter = (params, pinsSettingsList, context)=>new DspService().jsInterpreter(params, pinsSettingsList, context);
 
+exports.agent = agent;
+exports.chainOfThought = chainOfThought;
+exports.forward = forward;
 exports.generate = generate;
+exports.jsInterpreter = jsInterpreter;
 exports.model = model;
 exports.modelAzureOpenAi = modelAzureOpenAi;
 exports.modelOllama = modelOllama;
 exports.modelOpenAI = modelOpenAI;
+exports.react = react;

package/index.esm.js

@@ -23499,14 +23499,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 tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$6(tokens1).concat([
             token
@@ -23525,7 +23525,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23544,9 +23544,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, i = i1, tokens = tokens1, "continue";
         }
-        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+        return nextMatch = nextMatch1, i = i1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -40809,15 +40809,28 @@ let DspService = class DspService {
         const result = await gen.forward(input);
         return result;
     }
+    async react(params, _pinsSettingsList, context) {
+        // const { AxChainOfThought } = await eval(`import('@ax-llm/ax')`);
+        const { model = context.privates.MODEL_DSP, functions = [], signature, input } = params;
+        const modelInstance = await executePinsList(model, context);
+        const gen = new AxReAct(modelInstance, signature, {
+            functions: await this.prepareFunctions(functions, context)
+        });
+        const result = await gen.forward(input);
+        return result;
+    }
     async agent(params, _pinsSettingsList, context) {
         // const { AxAgent } = await eval(`import('@ax-llm/ax')`);
-        const { model = context.privates.MODEL_DSP, functions = [], demos = [], name, description, signature } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], agents = [], name, description, signature } = params;
         const modelInstance = await executePinsList(model, context);
         const agent = new AxAgent(modelInstance, {
             name,
             description,
             signature,
-            functions: await this.prepareFunctions(functions, context)
+            functions: await this.prepareFunctions(functions, context),
+            agents: await Promise.all(agents.map(async (execute)=>await executePinsList([
+                    execute
+                ], context)))
         });
         return agent;
     }
@@ -40835,5 +40848,10 @@ const modelOpenAI = (params, pinsSettingsList, context)=>new DspService().modelO
 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);
+const chainOfThought = (params, pinsSettingsList, context)=>new DspService().chainOfThought(params, pinsSettingsList, context);
+const react = (params, pinsSettingsList, context)=>new DspService().react(params, pinsSettingsList, context);
+const agent = (params, pinsSettingsList, context)=>new DspService().agent(params, pinsSettingsList, context);
+const forward = (params, pinsSettingsList, context)=>new DspService().forward(params, pinsSettingsList, context);
+const jsInterpreter = (params, pinsSettingsList, context)=>new DspService().jsInterpreter(params, pinsSettingsList, context);
 
-export { generate, model, modelAzureOpenAi, modelOllama, modelOpenAI };
+export { agent, chainOfThought, forward, generate, jsInterpreter, model, modelAzureOpenAi, modelOllama, modelOpenAI, react };

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

@@ -1,7 +1,16 @@
 import { PinsSettings } from '@digipair/engine';
-import { AxAI, AxAIOpenAI, AxAIAzureOpenAI, AxAIOllama } from '@ax-llm/ax';
+import { AxAI, AxAIOpenAI, AxAIAzureOpenAI, AxAIOllama, AxAgent, AxJSInterpreter } from '@ax-llm/ax';
 export declare const model: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxAI>;
 export declare const modelOpenAI: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxAIOpenAI<string, string>>;
 export declare const modelAzureOpenAi: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxAIAzureOpenAI>;
 export declare const modelOllama: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxAIOllama>;
 export declare const generate: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<import("@ax-llm/ax").AxGenerateResult<import("@ax-llm/ax").AxGenOut>>;
+export declare const chainOfThought: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<import("@ax-llm/ax").AxGenOut & {
+    reason: string;
+}>;
+export declare const react: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<import("@ax-llm/ax").AxGenOut & {
+    reason: string;
+}>;
+export declare const agent: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxAgent<import("@ax-llm/ax").AxGenIn, import("@ax-llm/ax").AxGenOut>>;
+export declare const forward: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const jsInterpreter: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<AxJSInterpreter>;

package/package.json

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

package/schema.json

@@ -231,14 +231,262 @@
             "schema": {
               "type": "object"
             }
+          },
+          {
+            "name": "functions",
+            "summary": "Fonctions DSP",
+            "required": false,
+            "description": "Fonctions utilisables pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/Function"
+              }
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/chainOfThought": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Chaine de pensée DSP",
+        "parameters": [
+          {
+            "name": "model",
+            "summary": "Modèle",
+            "required": false,
+            "description": "Modèle LLM à utiliser pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
+          {
+            "name": "signature",
+            "summary": "Signature",
+            "required": true,
+            "description": "Signature des données à extraire",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "input",
+            "summary": "Données à traiter",
+            "required": true,
+            "description": "Données d'entrées à traiter",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "functions",
+            "summary": "Fonctions DSP",
+            "required": false,
+            "description": "Fonctions utilisables pour la chaine de pensée",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/Function"
+              }
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/react": {
+      "post": {
+        "tags": ["service"],
+        "summary": "ReAct DSP",
+        "parameters": [
+          {
+            "name": "model",
+            "summary": "Modèle",
+            "required": false,
+            "description": "Modèle LLM à utiliser pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
+          {
+            "name": "signature",
+            "summary": "Signature",
+            "required": true,
+            "description": "Signature des données à extraire",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "input",
+            "summary": "Données à traiter",
+            "required": true,
+            "description": "Données d'entrées à traiter",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "functions",
+            "summary": "Fonctions DSP",
+            "required": false,
+            "description": "Fonctions utilisables pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/Function"
+              }
+            }
           }
         ],
         "x-events": []
       }
+    },
+    "/agent": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Agent DSP",
+        "parameters": [
+          {
+            "name": "model",
+            "summary": "Modèle",
+            "required": false,
+            "description": "Modèle LLM à utiliser pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
+          {
+            "name": "name",
+            "summary": "Nom",
+            "required": true,
+            "description": "Nom de l'agent",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "description",
+            "summary": "Description",
+            "required": true,
+            "description": "Description de l'agent",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "signature",
+            "summary": "Signature",
+            "required": true,
+            "description": "Signature des données à extraire",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "functions",
+            "summary": "Fonctions DSP",
+            "required": false,
+            "description": "Fonctions utilisables pour la génération",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/Function"
+              }
+            }
+          },
+          {
+            "name": "agents",
+            "summary": "Agents DSP",
+            "required": false,
+            "description": "Autres agents utilisables par l'agent",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/forward": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Execute un agent DSP",
+        "parameters": [
+          {
+            "name": "agents",
+            "summary": "Agents DSP",
+            "required": false,
+            "description": "Autres agents utilisables par l'agent",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
+          {
+            "name": "input",
+            "summary": "Données à traiter",
+            "required": true,
+            "description": "Données d'entrées à traiter",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/jsInterpreter": {
+      "post": {
+        "tags": ["service"],
+        "summary": "Fonction DSP d'execution de code JS",
+        "parameters": [],
+        "x-events": []
+      }
     }
   },
   "components": {
-    "schemas": {}
+    "schemas": {
+      "Function": {
+        "tags": ["service"],
+        "summary": "Fonction DSP",
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "descriptions": {
+            "type": "string"
+          },
+          "parameters": {
+            "type": "object"
+          },
+          "func": {
+            "type": "array",
+            "items": {
+              "$ref": "https://schemas.digipair.ai/pinsSettings"
+            }
+          }
+        },
+        "required": ["name", "description", "parameters", "func"]
+      }
+    }
   },
   "x-scene-blocks": {}
 }