@digipair/skill-dsp 0.72.9 → 0.72.14

package/index.cjs.js

@@ -114935,10 +114935,10 @@ var apiCall = function() {
                     timeoutMs = (_api_timeout = api.timeout) !== null && _api_timeout !== void 0 ? _api_timeout : defaultTimeoutMs;
                     metrics = createRequestMetrics();
                     baseUrl = new URL((_process_env_PROXY = process.env["PROXY"]) !== null && _process_env_PROXY !== void 0 ? _process_env_PROXY : api.url);
-                    apiPath = [
+                    apiPath = "".concat([
                         baseUrl.pathname,
                         api.name
-                    ].filter(Boolean).join("/").replace(/\/+/g, "/");
+                    ].filter(Boolean).join("/").replace(/\/+/g, "/")).concat(baseUrl.search);
                     apiUrl = new URL(apiPath, baseUrl);
                     requestId = crypto.randomUUID();
                     if (!api.validateRequest) return [
@@ -120415,16 +120415,36 @@ var validateValue = function(field, value) {
 };
 function mergeProgramUsage(usages) {
     var usageMap = {};
-    usages.forEach(function(usage) {
-        var key = "".concat(usage.ai, ":").concat(usage.model);
-        if (!usageMap[key]) {
-            usageMap[key] = _object_spread({}, usage);
-            return;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = usages[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var usage = _step.value;
+            var key = "".concat(usage.ai, ":").concat(usage.model);
+            if (!usageMap[key]) {
+                usageMap[key] = _object_spread({}, usage);
+                continue;
+            }
+            var currentUsage = usageMap[key];
+            if (currentUsage) {
+                currentUsage.promptTokens += usage.promptTokens;
+                currentUsage.completionTokens += usage.completionTokens;
+                currentUsage.totalTokens += usage.totalTokens;
+            }
         }
-        usageMap[key].promptTokens += usage.promptTokens;
-        usageMap[key].completionTokens += usage.completionTokens;
-        usageMap[key].totalTokens += usage.totalTokens;
-    });
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
     return Object.values(usageMap);
 }
 var parseMarkdownList = function(input) {
@@ -120451,9 +120471,7 @@ var parseMarkdownList = function(input) {
                 list.push(trimmedLine.slice(1).trim());
             } else if (numberedListRegex.test(trimmedLine)) {
                 list.push(trimmedLine.replace(numberedListRegex, "").trim());
-            } else if (list.length === 0) {
-                continue;
-            } else {
+            } else if (list.length === 0) {} else {
                 throw new Error("Could not parse markdown list: mixed content detected");
             }
         }
@@ -120570,7 +120588,7 @@ function matchesContent(content, prefix) {
     var contentEnd = content.slice(Math.max(startIndex, content.length - prefix.length));
     for(var i = 0; i < prefixes.length - 1; i++){
         var partialPrefix = prefixes[i];
-        if (contentEnd.endsWith(partialPrefix)) {
+        if (partialPrefix && contentEnd.endsWith(partialPrefix)) {
             return -2;
         }
     }
@@ -120887,7 +120905,7 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
         var renderedExamples = examples ? [
             {
                 type: "text",
-                text: "## Examples:\n"
+                text: "\n\n## Examples\n"
             }
         ].concat(_to_consumable_array(_this.renderExamples(examples))) : [];
         var renderedDemos = demos ? _this.renderDemos(demos) : [];
@@ -120982,6 +121000,7 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
         try {
             var _loop = function() {
                 var _step_value = _sliced_to_array(_step.value, 2), index = _step_value[0], item = _step_value[1];
+                var _renderedItem_;
                 var renderedInputItem = _this.sig.getInputFields().map(function(field) {
                     return _this.renderInField(field, item, true);
                 }).filter(function(v) {
@@ -120996,6 +121015,12 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
                     throw new Error("Output fields are required in examples: index: ".concat(index, ", data: ").concat(JSON.stringify(item)));
                 }
                 var renderedItem = _to_consumable_array(renderedInputItem).concat(_to_consumable_array(renderedOutputItem));
+                if (index > 0 && renderedItem.length > 0 && ((_renderedItem_ = renderedItem[0]) === null || _renderedItem_ === void 0 ? void 0 : _renderedItem_.type) === "text") {
+                    list.push({
+                        type: "text",
+                        text: "---\n\n"
+                    });
+                }
                 renderedItem.forEach(function(v) {
                     if ("text" in v) {
                         v.text = v.text + "\n";
@@ -121278,10 +121303,7 @@ var processValue = function(field, value) {
     if (typeof value === "string") {
         return value;
     }
-    if (Array.isArray(value)) {
-        return value;
-    }
-    return JSON.stringify(value);
+    return JSON.stringify(value, null, 2);
 };
 var toFieldType = function(type) {
     var baseType = function() {
@@ -122775,6 +122797,12 @@ var AxGen = /*#__PURE__*/ function(AxProgramWithSignature) {
                                     delta: result.content
                                 }, sessionId);
                                 skip = streamingExtractValues(_this.signature, values, xstate, content, streamingValidation);
+                                if (skip) {
+                                    return [
+                                        3,
+                                        12
+                                    ];
+                                }
                                 if (!(_this.streamingAsserts.length !== 0)) return [
                                     3,
                                     6
@@ -122805,12 +122833,6 @@ var AxGen = /*#__PURE__*/ function(AxProgramWithSignature) {
                                 ];
                             case 9:
                                 _state.sent();
-                                if (skip) {
-                                    return [
-                                        3,
-                                        12
-                                    ];
-                                }
                                 return [
                                     4,
                                     _await_async_generator(assertAssertions(_this.asserts, values))

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, nextMatch = nextMatch1, tokens = tokens1, {
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "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, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "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, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
         }
-        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+        return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
             v: nextMatch1
         };
     };
@@ -142874,10 +142874,10 @@ var apiCall = function() {
                     timeoutMs = (_api_timeout = api.timeout) !== null && _api_timeout !== void 0 ? _api_timeout : defaultTimeoutMs;
                     metrics = createRequestMetrics();
                     baseUrl = new URL((_process_env_PROXY = process.env["PROXY"]) !== null && _process_env_PROXY !== void 0 ? _process_env_PROXY : api.url);
-                    apiPath = [
+                    apiPath = "".concat([
                         baseUrl.pathname,
                         api.name
-                    ].filter(Boolean).join("/").replace(/\/+/g, "/");
+                    ].filter(Boolean).join("/").replace(/\/+/g, "/")).concat(baseUrl.search);
                     apiUrl = new URL(apiPath, baseUrl);
                     requestId = crypto.randomUUID();
                     if (!api.validateRequest) return [
@@ -148354,16 +148354,36 @@ var validateValue = function(field, value) {
 };
 function mergeProgramUsage(usages) {
     var usageMap = {};
-    usages.forEach(function(usage) {
-        var key = "".concat(usage.ai, ":").concat(usage.model);
-        if (!usageMap[key]) {
-            usageMap[key] = _object_spread({}, usage);
-            return;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = usages[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var usage = _step.value;
+            var key = "".concat(usage.ai, ":").concat(usage.model);
+            if (!usageMap[key]) {
+                usageMap[key] = _object_spread({}, usage);
+                continue;
+            }
+            var currentUsage = usageMap[key];
+            if (currentUsage) {
+                currentUsage.promptTokens += usage.promptTokens;
+                currentUsage.completionTokens += usage.completionTokens;
+                currentUsage.totalTokens += usage.totalTokens;
+            }
         }
-        usageMap[key].promptTokens += usage.promptTokens;
-        usageMap[key].completionTokens += usage.completionTokens;
-        usageMap[key].totalTokens += usage.totalTokens;
-    });
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
     return Object.values(usageMap);
 }
 var parseMarkdownList = function(input) {
@@ -148390,9 +148410,7 @@ var parseMarkdownList = function(input) {
                 list.push(trimmedLine.slice(1).trim());
             } else if (numberedListRegex.test(trimmedLine)) {
                 list.push(trimmedLine.replace(numberedListRegex, "").trim());
-            } else if (list.length === 0) {
-                continue;
-            } else {
+            } else if (list.length === 0) {} else {
                 throw new Error("Could not parse markdown list: mixed content detected");
             }
         }
@@ -148509,7 +148527,7 @@ function matchesContent(content, prefix) {
     var contentEnd = content.slice(Math.max(startIndex, content.length - prefix.length));
     for(var i = 0; i < prefixes.length - 1; i++){
         var partialPrefix = prefixes[i];
-        if (contentEnd.endsWith(partialPrefix)) {
+        if (partialPrefix && contentEnd.endsWith(partialPrefix)) {
             return -2;
         }
     }
@@ -148826,7 +148844,7 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
         var renderedExamples = examples ? [
             {
                 type: "text",
-                text: "## Examples:\n"
+                text: "\n\n## Examples\n"
             }
         ].concat(_to_consumable_array(_this.renderExamples(examples))) : [];
         var renderedDemos = demos ? _this.renderDemos(demos) : [];
@@ -148921,6 +148939,7 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
         try {
             var _loop = function() {
                 var _step_value = _sliced_to_array(_step.value, 2), index = _step_value[0], item = _step_value[1];
+                var _renderedItem_;
                 var renderedInputItem = _this.sig.getInputFields().map(function(field) {
                     return _this.renderInField(field, item, true);
                 }).filter(function(v) {
@@ -148935,6 +148954,12 @@ var AxPromptTemplate = function AxPromptTemplate(sig, functions, fieldTemplates)
                     throw new Error("Output fields are required in examples: index: ".concat(index, ", data: ").concat(JSON.stringify(item)));
                 }
                 var renderedItem = _to_consumable_array(renderedInputItem).concat(_to_consumable_array(renderedOutputItem));
+                if (index > 0 && renderedItem.length > 0 && ((_renderedItem_ = renderedItem[0]) === null || _renderedItem_ === void 0 ? void 0 : _renderedItem_.type) === "text") {
+                    list.push({
+                        type: "text",
+                        text: "---\n\n"
+                    });
+                }
                 renderedItem.forEach(function(v) {
                     if ("text" in v) {
                         v.text = v.text + "\n";
@@ -149217,10 +149242,7 @@ var processValue = function(field, value) {
     if (typeof value === "string") {
         return value;
     }
-    if (Array.isArray(value)) {
-        return value;
-    }
-    return JSON.stringify(value);
+    return JSON.stringify(value, null, 2);
 };
 var toFieldType = function(type) {
     var baseType = function() {
@@ -150714,6 +150736,12 @@ var AxGen = /*#__PURE__*/ function(AxProgramWithSignature) {
                                     delta: result.content
                                 }, sessionId);
                                 skip = streamingExtractValues(_this.signature, values, xstate, content, streamingValidation);
+                                if (skip) {
+                                    return [
+                                        3,
+                                        12
+                                    ];
+                                }
                                 if (!(_this.streamingAsserts.length !== 0)) return [
                                     3,
                                     6
@@ -150744,12 +150772,6 @@ var AxGen = /*#__PURE__*/ function(AxProgramWithSignature) {
                                 ];
                             case 9:
                                 _state.sent();
-                                if (skip) {
-                                    return [
-                                        3,
-                                        12
-                                    ];
-                                }
                                 return [
                                     4,
                                     _await_async_generator(assertAssertions(_this.asserts, values))

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@digipair/skill-dsp",
-  "version": "0.72.9",
+  "version": "0.72.14",
   "dependencies": {
-    "@ax-llm/ax": "^9.0.28"
+    "@ax-llm/ax": "^11.0.29"
   },
   "main": "./index.cjs.js",
   "module": "./index.esm.js"