@digipair/skill-dsp 0.72.14 → 0.73.0

package/index.cjs.js

@@ -124439,6 +124439,30 @@ let DspService = class DspService {
                     }), `${context.__PATH__}.functions[${i}]`)
             })));
     }
+    mergeDeltas(base, delta) {
+        for (const key of Object.keys(delta)){
+            const baseValue = base[key];
+            const deltaValue = delta[key];
+            if (baseValue === undefined && Array.isArray(deltaValue)) {
+                base[key] = [
+                    ...deltaValue
+                ];
+            } else if (Array.isArray(baseValue) && Array.isArray(deltaValue)) {
+                // Concatenate arrays
+                base[key] = [
+                    ...baseValue != null ? baseValue : [],
+                    ...deltaValue
+                ];
+            } else if ((baseValue === undefined || typeof baseValue === 'string') && typeof deltaValue === 'string') {
+                // Concatenate strings
+                base[key] = (baseValue != null ? baseValue : '') + deltaValue;
+            } else {
+                // For all other types, overwrite with the new value
+                base[key] = deltaValue;
+            }
+        }
+        return base;
+    }
     async model(params, _pinsSettingsList, _context) {
         const { name, options } = params;
         const modelInstance = new AxAI(_extends({
@@ -124485,12 +124509,25 @@ let DspService = class DspService {
         return modelInstance;
     }
     async generate(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], options = {}, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], options = {}, streaming, signature, input } = params;
         const modelInstance = await engine.executePinsList(model, context, `${context.__PATH__}.model`);
         const gen = new AxGen(signature, {
             functions: await this.prepareFunctions(functions, context)
         });
-        const result = await gen.forward(modelInstance, input, options);
+        const generator = gen.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await engine.executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;
@@ -124500,12 +124537,25 @@ let DspService = class DspService {
         return result;
     }
     async chainOfThought(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], options = {}, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], options = {}, streaming, signature, input } = params;
         const modelInstance = await engine.executePinsList(model, context, `${context.__PATH__}.model`);
         const gen = new AxChainOfThought(signature, {
             functions: await this.prepareFunctions(functions, context)
         });
-        const result = await gen.forward(modelInstance, input, options);
+        const generator = gen.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await engine.executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;
@@ -124515,7 +124565,7 @@ let DspService = class DspService {
         return result;
     }
     async agent(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], agents = [], forward = true, options = {}, name, description, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], agents = [], forward = true, options = {}, streaming, name, description, signature, input } = params;
         const modelInstance = await engine.executePinsList(model, context, `${context.__PATH__}.model`);
         const agent = new AxAgent({
             name,
@@ -124533,7 +124583,20 @@ let DspService = class DspService {
         if (!forward) {
             return agent;
         }
-        const result = await agent.forward(modelInstance, input, options);
+        const generator = agent.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await engine.executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;

package/index.esm.js

@@ -23951,14 +23951,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 i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$5(tokens1).concat([
             token
@@ -23977,7 +23977,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23996,9 +23996,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -152378,6 +152378,30 @@ let DspService = class DspService {
                     }), `${context.__PATH__}.functions[${i}]`)
             })));
     }
+    mergeDeltas(base, delta) {
+        for (const key of Object.keys(delta)){
+            const baseValue = base[key];
+            const deltaValue = delta[key];
+            if (baseValue === undefined && Array.isArray(deltaValue)) {
+                base[key] = [
+                    ...deltaValue
+                ];
+            } else if (Array.isArray(baseValue) && Array.isArray(deltaValue)) {
+                // Concatenate arrays
+                base[key] = [
+                    ...baseValue != null ? baseValue : [],
+                    ...deltaValue
+                ];
+            } else if ((baseValue === undefined || typeof baseValue === 'string') && typeof deltaValue === 'string') {
+                // Concatenate strings
+                base[key] = (baseValue != null ? baseValue : '') + deltaValue;
+            } else {
+                // For all other types, overwrite with the new value
+                base[key] = deltaValue;
+            }
+        }
+        return base;
+    }
     async model(params, _pinsSettingsList, _context) {
         const { name, options } = params;
         const modelInstance = new AxAI(_extends({
@@ -152424,12 +152448,25 @@ let DspService = class DspService {
         return modelInstance;
     }
     async generate(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], options = {}, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], options = {}, streaming, signature, input } = params;
         const modelInstance = await executePinsList(model, context, `${context.__PATH__}.model`);
         const gen = new AxGen(signature, {
             functions: await this.prepareFunctions(functions, context)
         });
-        const result = await gen.forward(modelInstance, input, options);
+        const generator = gen.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;
@@ -152439,12 +152476,25 @@ let DspService = class DspService {
         return result;
     }
     async chainOfThought(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], options = {}, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], options = {}, streaming, signature, input } = params;
         const modelInstance = await executePinsList(model, context, `${context.__PATH__}.model`);
         const gen = new AxChainOfThought(signature, {
             functions: await this.prepareFunctions(functions, context)
         });
-        const result = await gen.forward(modelInstance, input, options);
+        const generator = gen.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;
@@ -152454,7 +152504,7 @@ let DspService = class DspService {
         return result;
     }
     async agent(params, _pinsSettingsList, context) {
-        const { model = context.privates.MODEL_DSP, functions = [], agents = [], forward = true, options = {}, name, description, signature, input } = params;
+        const { model = context.privates.MODEL_DSP, functions = [], agents = [], forward = true, options = {}, streaming, name, description, signature, input } = params;
         const modelInstance = await executePinsList(model, context, `${context.__PATH__}.model`);
         const agent = new AxAgent({
             name,
@@ -152472,7 +152522,20 @@ let DspService = class DspService {
         if (!forward) {
             return agent;
         }
-        const result = await agent.forward(modelInstance, input, options);
+        const generator = agent.streamingForward(modelInstance, input, options);
+        let buffer = {};
+        let currentVersion = 0;
+        for await (const item of generator){
+            if (streaming) {
+                await executePinsList(streaming, context, `${context.__PATH__}.streaming`);
+            }
+            if (item.version !== currentVersion) {
+                buffer = {};
+            }
+            currentVersion = item.version;
+            buffer = this.mergeDeltas(buffer, item.delta);
+        }
+        const result = buffer;
         var _modelInstance_ia;
         // add comsumption
         const ai = (_modelInstance_ia = modelInstance.ia) != null ? _modelInstance_ia : modelInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-dsp",
-  "version": "0.72.14",
+  "version": "0.73.0",
   "dependencies": {
     "@ax-llm/ax": "^11.0.29"
   },

package/schema.fr.json

@@ -214,6 +214,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Evènement déclenché lors du streaming",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "signature",
             "summary": "Signature",
@@ -274,6 +286,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Evènement déclenché lors du streaming",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "signature",
             "summary": "Signature",
@@ -334,6 +358,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Evènement déclenché lors du streaming",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "name",
             "summary": "Nom",

package/schema.json

@@ -214,6 +214,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Streaming event for the generation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "signature",
             "summary": "Signature",
@@ -274,6 +286,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Streaming event for the generation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "signature",
             "summary": "Signature",
@@ -334,6 +358,18 @@
               }
             }
           },
+          {
+            "name": "streaming",
+            "summary": "Streaming",
+            "required": false,
+            "description": "Streaming event for the generation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "https://schemas.digipair.ai/pinsSettings"
+              }
+            }
+          },
           {
             "name": "name",
             "summary": "Name",

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

@@ -1,11 +1,9 @@
 import { PinsSettings } from '@digipair/engine';
-import { AxAI, AxAIAzureOpenAI, AxAIOllama, AxAgent, AxAIOpenAIBase } from '@ax-llm/ax';
+import { AxAI, AxAIAzureOpenAI, AxAIOllama, AxAIOpenAIBase } 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<AxAIOpenAIBase<unknown, unknown>>;
 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 agent: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<import("@ax-llm/ax").AxGenOut | AxAgent<import("@ax-llm/ax").AxGenIn, import("@ax-llm/ax").AxGenOut>>;
+export declare const generate: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const chainOfThought: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const agent: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;