@digipair/skill-dsp 0.21.15 → 0.22.1

package/index.cjs.js

@@ -20358,7 +20358,6 @@ about the parse state.
                 var _a;
                 var depth = action >> 19 /* Action.ReduceDepthShift */ , type = action & 65535 /* Action.ValueMask */ ;
                 var parser = this.p.parser;
-                if (this.reducePos < this.pos - 25 /* Lookahead.Margin */ ) this.setLookAhead(this.pos);
                 var dPrec = parser.dynamicPrecedence(type);
                 if (dPrec) this.score += dPrec;
                 if (depth == 0) {
@@ -21311,7 +21310,7 @@ function cutAt(tree, pos, side) {
     cursor.moveTo(pos);
     for(;;){
         if (!(side < 0 ? cursor.childBefore(pos) : cursor.childAfter(pos))) for(;;){
-            if ((side < 0 ? cursor.to < pos : cursor.from > pos) && !cursor.type.isError) return side < 0 ? Math.max(0, Math.min(cursor.to - 1, pos - 25 /* Lookahead.Margin */ )) : Math.min(tree.length, Math.max(cursor.from + 1, pos + 25 /* Lookahead.Margin */ ));
+            if ((side < 0 ? cursor.to < pos : cursor.from > pos) && !cursor.type.isError) return side < 0 ? Math.max(0, Math.min(cursor.to - 1, pos - 25 /* Safety.Margin */ )) : Math.min(tree.length, Math.max(cursor.from + 1, pos + 25 /* Safety.Margin */ ));
             if (side < 0 ? cursor.prevSibling() : cursor.nextSibling()) break;
             if (!cursor.parent()) return side < 0 ? 0 : tree.length;
         }
@@ -21434,7 +21433,7 @@ var TokenCache = /*#__PURE__*/ function() {
                         token.mask = mask;
                         token.context = context;
                     }
-                    if (token.lookAhead > token.end + 25 /* Lookahead.Margin */ ) lookAhead = Math.max(token.lookAhead, lookAhead);
+                    if (token.lookAhead > token.end + 25 /* Safety.Margin */ ) lookAhead = Math.max(token.lookAhead, lookAhead);
                     if (token.value != 0 /* Term.Err */ ) {
                         var startIndex = actionIndex;
                         if (token.extended > -1) actionIndex = this.addActions(stack, token.extended, token.end, actionIndex);
@@ -24375,7 +24374,6 @@ var parser = LRParser.deserialize({
     },
     dynamicPrecedences: {
         "31": -1,
-        "67": 1,
         "71": -1,
         "73": -1
     },
@@ -28637,7 +28635,7 @@ var axBaseAIDefaultConfig = function() {
 };
 var AxBaseAI = /*#__PURE__*/ function() {
     function AxBaseAI(param) {
-        var name = param.name, apiURL = param.apiURL, headers = param.headers, modelInfo = param.modelInfo, models = param.models, _param_options = param.options, options = _param_options === void 0 ? {} : _param_options, supportFor = param.supportFor, modelMap = param.modelMap;
+        var name = param.name, apiURL = param.apiURL, headers = param.headers, modelInfo = param.modelInfo, models = param.models, _param_options = param.options, options = _param_options === void 0 ? {} : _param_options, supportFor = param.supportFor;
         _class_call_check$p(this, AxBaseAI);
         _define_property$p(this, "generateChatReq", void 0);
         _define_property$p(this, "generateEmbedReq", void 0);
@@ -28649,29 +28647,48 @@ var AxBaseAI = /*#__PURE__*/ function() {
         _define_property$p(this, "fetch", void 0);
         _define_property$p(this, "tracer", void 0);
         _define_property$p(this, "modelMap", void 0);
-        _define_property$p(this, "modelInfo", void 0);
+        _define_property$p(this, "embedModelMap", void 0);
         _define_property$p(this, "modelUsage", void 0);
         _define_property$p(this, "embedModelUsage", void 0);
-        _define_property$p(this, "models", void 0);
         _define_property$p(this, "apiURL", void 0);
         _define_property$p(this, "name", void 0);
         _define_property$p(this, "headers", void 0);
+        _define_property$p(this, "modelInfo", void 0);
+        _define_property$p(this, "embedModelInfo", void 0);
         _define_property$p(this, "supportFor", void 0);
         this.name = name;
         this.apiURL = apiURL;
         this.headers = headers;
         this.supportFor = supportFor;
         this.tracer = options.tracer;
-        this.modelInfo = modelInfo;
-        this.modelMap = modelMap;
-        var _modelMap_models_model, _models_embedModel, _modelMap_;
-        this.models = {
-            model: (_modelMap_models_model = modelMap === null || modelMap === void 0 ? void 0 : modelMap[models.model]) !== null && _modelMap_models_model !== void 0 ? _modelMap_models_model : models.model,
-            embedModel: (_modelMap_ = modelMap === null || modelMap === void 0 ? void 0 : modelMap[(_models_embedModel = models.embedModel) !== null && _models_embedModel !== void 0 ? _models_embedModel : ""]) !== null && _modelMap_ !== void 0 ? _modelMap_ : models.embedModel
-        };
-        if (!models.model || typeof models.model !== "string" || models.model === "") {
+        var model = this.getModel(models.model);
+        var embedModel = this.getEmbedModel(models.embedModel);
+        if (typeof model === "string") {
+            var modelName = model.replace(/-0\d+$|-\d{2,}$/, "");
+            var _modelInfo_filter_at;
+            this.modelInfo = (_modelInfo_filter_at = modelInfo.filter(function(v) {
+                return v.name === modelName;
+            }).at(0)) !== null && _modelInfo_filter_at !== void 0 ? _modelInfo_filter_at : {
+                name: model,
+                currency: "usd",
+                promptTokenCostPer1M: 0,
+                completionTokenCostPer1M: 0
+            };
+        } else {
             throw new Error("No model defined");
         }
+        if (typeof embedModel === "string") {
+            var embedModelName = embedModel === null || embedModel === void 0 ? void 0 : embedModel.replace(/-0\d+$|-\d{2,}$/, "");
+            var _modelInfo_filter_at1;
+            this.embedModelInfo = (_modelInfo_filter_at1 = modelInfo.filter(function(v) {
+                return v.name === embedModelName;
+            }).at(0)) !== null && _modelInfo_filter_at1 !== void 0 ? _modelInfo_filter_at1 : {
+                name: embedModel !== null && embedModel !== void 0 ? embedModel : "",
+                currency: "usd",
+                promptTokenCostPer1M: 0,
+                completionTokenCostPer1M: 0
+            };
+        }
         this.setOptions(options);
     }
     _create_class$c(AxBaseAI, [
@@ -28711,27 +28728,21 @@ var AxBaseAI = /*#__PURE__*/ function() {
             }
         },
         {
-            key: "_getModelInfo",
-            value: function _getModelInfo(model) {
-                var _this_modelMap;
-                var _this_modelMap_model;
-                var _model = (_this_modelMap_model = (_this_modelMap = this.modelMap) === null || _this_modelMap === void 0 ? void 0 : _this_modelMap[model]) !== null && _this_modelMap_model !== void 0 ? _this_modelMap_model : model;
-                var modelName = _model.replace(/-0\d+$|-\d{2,}$/, "");
-                var _this_modelInfo_filter_at;
-                return (_this_modelInfo_filter_at = this.modelInfo.filter(function(v) {
-                    return v.name === modelName;
-                }).at(0)) !== null && _this_modelInfo_filter_at !== void 0 ? _this_modelInfo_filter_at : {
-                    name: model,
-                    currency: "usd",
-                    promptTokenCostPer1M: 0,
-                    completionTokenCostPer1M: 0
-                };
+            key: "setModelMap",
+            value: function setModelMap(modelMap) {
+                this.modelMap = modelMap;
+            }
+        },
+        {
+            key: "setEmbedModelMap",
+            value: function setEmbedModelMap(embedModelMap) {
+                this.embedModelMap = embedModelMap;
             }
         },
         {
             key: "getModelInfo",
             value: function getModelInfo() {
-                return _object_spread_props$8(_object_spread$h({}, this._getModelInfo(this.models.model)), {
+                return _object_spread_props$8(_object_spread$h({}, this.modelInfo), {
                     provider: this.name
                 });
             }
@@ -28739,17 +28750,9 @@ var AxBaseAI = /*#__PURE__*/ function() {
         {
             key: "getEmbedModelInfo",
             value: function getEmbedModelInfo() {
-                if (this.models.embedModel) {
-                    return _object_spread_props$8(_object_spread$h({}, this._getModelInfo(this.models.embedModel)), {
-                        provider: this.name
-                    });
-                }
-            }
-        },
-        {
-            key: "getModelMap",
-            value: function getModelMap() {
-                return this.modelMap;
+                return this.embedModelInfo ? _object_spread_props$8(_object_spread$h({}, this.embedModelInfo), {
+                    provider: this.name
+                }) : undefined;
             }
         },
         {
@@ -28772,14 +28775,13 @@ var AxBaseAI = /*#__PURE__*/ function() {
         },
         {
             key: "chat",
-            value: function chat(req, options) {
+            value: function chat(_req, options) {
                 var _this = this;
                 return _async_to_generator$7(function() {
-                    var _this_modelMap, _this_modelMap_req_model, model, _mc_stopSequences, _this_tracer, mc, _obj;
+                    var _mc_stopSequences, _this_tracer, mc, _obj;
                     return _ts_generator$8(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                model = req.model ? (_this_modelMap_req_model = (_this_modelMap = _this.modelMap) === null || _this_modelMap === void 0 ? void 0 : _this_modelMap[req.model]) !== null && _this_modelMap_req_model !== void 0 ? _this_modelMap_req_model : req.model : _this.models.model;
                                 if (!_this.tracer) return [
                                     3,
                                     2
@@ -28789,7 +28791,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                     4,
                                     (_this_tracer = _this.tracer) === null || _this_tracer === void 0 ? void 0 : _this_tracer.startActiveSpan("Chat Request", {
                                         kind: AxSpanKind.SERVER,
-                                        attributes: (_obj = {}, _define_property$p(_obj, axSpanAttributes.LLM_SYSTEM, _this.name), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MODEL, model), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MAX_TOKENS, mc.maxTokens), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TEMPERATURE, mc.temperature), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TOP_P, mc.topP), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TOP_K, mc.topK), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_FREQUENCY_PENALTY, mc.frequencyPenalty), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_PRESENCE_PENALTY, mc.presencePenalty), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_STOP_SEQUENCES, (_mc_stopSequences = mc.stopSequences) === null || _mc_stopSequences === void 0 ? void 0 : _mc_stopSequences.join(", ")), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_LLM_IS_STREAMING, mc.stream), _obj)
+                                        attributes: (_obj = {}, _define_property$p(_obj, axSpanAttributes.LLM_SYSTEM, _this.name), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MODEL, _this.modelInfo.name), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MAX_TOKENS, mc.maxTokens), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TEMPERATURE, mc.temperature), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TOP_P, mc.topP), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_TOP_K, mc.topK), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_FREQUENCY_PENALTY, mc.frequencyPenalty), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_PRESENCE_PENALTY, mc.presencePenalty), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_STOP_SEQUENCES, (_mc_stopSequences = mc.stopSequences) === null || _mc_stopSequences === void 0 ? void 0 : _mc_stopSequences.join(", ")), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_LLM_IS_STREAMING, mc.stream), _obj)
                                     }, function() {
                                         var _ref = _async_to_generator$7(function(span) {
                                             var res;
@@ -28798,7 +28800,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                                     case 0:
                                                         return [
                                                             4,
-                                                            _this._chat(model, req, options, span)
+                                                            _this._chat(_req, options, span)
                                                         ];
                                                     case 1:
                                                         res = _state.sent();
@@ -28823,7 +28825,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                             case 2:
                                 return [
                                     4,
-                                    _this._chat(model, req, options)
+                                    _this._chat(_req, options)
                                 ];
                             case 3:
                                 return [
@@ -28837,10 +28839,10 @@ var AxBaseAI = /*#__PURE__*/ function() {
         },
         {
             key: "_chat",
-            value: function _chat(model, chatReq, options, span) {
+            value: function _chat(_req, options, span) {
                 var _this = this;
                 return _async_to_generator$7(function() {
-                    var _chatReq_modelConfig, reqFn, _options_stream, stream, functions, req, fn, rv, _tmp, respFn, wrappedRespFn, doneCb, st, res;
+                    var _req_modelConfig, reqFn, _options_stream, stream, functions, req, fn, rv, _tmp, respFn, wrappedRespFn, doneCb, st, res;
                     return _ts_generator$8(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -28848,14 +28850,11 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                     throw new Error("generateChatReq not implemented");
                                 }
                                 reqFn = _this.generateChatReq;
-                                stream = (_options_stream = options === null || options === void 0 ? void 0 : options.stream) !== null && _options_stream !== void 0 ? _options_stream : (_chatReq_modelConfig = chatReq.modelConfig) === null || _chatReq_modelConfig === void 0 ? void 0 : _chatReq_modelConfig.stream;
-                                if (chatReq.functions && chatReq.functions.length > 0) {
-                                    functions = chatReq.functions;
-                                }
-                                req = _object_spread_props$8(_object_spread$h({}, chatReq), {
-                                    model: model,
+                                stream = (_options_stream = options === null || options === void 0 ? void 0 : options.stream) !== null && _options_stream !== void 0 ? _options_stream : (_req_modelConfig = _req.modelConfig) === null || _req_modelConfig === void 0 ? void 0 : _req_modelConfig.stream;
+                                functions = _req.functions && _req.functions.length > 0 ? _req.functions : undefined;
+                                req = _object_spread_props$8(_object_spread$h({}, _req), {
                                     functions: functions,
-                                    modelConfig: _object_spread_props$8(_object_spread$h({}, chatReq.modelConfig), {
+                                    modelConfig: _object_spread_props$8(_object_spread$h({}, _req.modelConfig), {
                                         stream: stream
                                     })
                                 });
@@ -28992,14 +28991,10 @@ var AxBaseAI = /*#__PURE__*/ function() {
             value: function embed(req, options) {
                 var _this = this;
                 return _async_to_generator$7(function() {
-                    var _this_modelMap, _this_modelMap_req_embedModel, embedModel, _this_tracer, _req_embedModel, _obj;
+                    var _this_tracer, _obj;
                     return _ts_generator$8(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                embedModel = req.embedModel ? (_this_modelMap_req_embedModel = (_this_modelMap = _this.modelMap) === null || _this_modelMap === void 0 ? void 0 : _this_modelMap[req.embedModel]) !== null && _this_modelMap_req_embedModel !== void 0 ? _this_modelMap_req_embedModel : req.embedModel : _this.models.embedModel;
-                                if (!embedModel) {
-                                    throw new Error("No embed model defined");
-                                }
                                 if (!_this.tracer) return [
                                     3,
                                     2
@@ -29008,7 +29003,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                     4,
                                     (_this_tracer = _this.tracer) === null || _this_tracer === void 0 ? void 0 : _this_tracer.startActiveSpan("Embed Request", {
                                         kind: AxSpanKind.SERVER,
-                                        attributes: (_obj = {}, _define_property$p(_obj, axSpanAttributes.LLM_SYSTEM, _this.name), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MODEL, (_req_embedModel = req.embedModel) !== null && _req_embedModel !== void 0 ? _req_embedModel : _this.models.embedModel), _obj)
+                                        attributes: (_obj = {}, _define_property$p(_obj, axSpanAttributes.LLM_SYSTEM, _this.name), _define_property$p(_obj, axSpanAttributes.LLM_REQUEST_MODEL, _this.modelInfo.name), _obj)
                                     }, function() {
                                         var _ref = _async_to_generator$7(function(span) {
                                             var res;
@@ -29017,7 +29012,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                                     case 0:
                                                         return [
                                                             4,
-                                                            _this._embed(embedModel, req, options, span)
+                                                            _this._embed(req, options, span)
                                                         ];
                                                     case 1:
                                                         res = _state.sent();
@@ -29042,7 +29037,7 @@ var AxBaseAI = /*#__PURE__*/ function() {
                             case 2:
                                 return [
                                     2,
-                                    _this._embed(embedModel, req, options)
+                                    _this._embed(req, options)
                                 ];
                         }
                     });
@@ -29051,10 +29046,10 @@ var AxBaseAI = /*#__PURE__*/ function() {
         },
         {
             key: "_embed",
-            value: function _embed(embedModel, embedReq, options, span) {
+            value: function _embed(req, options, span) {
                 var _this = this;
                 return _async_to_generator$7(function() {
-                    var req, fn, resValue, _tmp, res, _res_modelUsage_completionTokens, _obj;
+                    var fn, resValue, _tmp, res, _res_modelUsage_completionTokens, _obj;
                     return _ts_generator$8(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -29064,9 +29059,6 @@ var AxBaseAI = /*#__PURE__*/ function() {
                                 if (!_this.generateEmbedResp) {
                                     throw new Error("generateEmbedResp not implemented");
                                 }
-                                req = _object_spread_props$8(_object_spread$h({}, embedReq), {
-                                    embedModel: embedModel
-                                });
                                 fn = function() {
                                     var _ref = _async_to_generator$7(function() {
                                         var _this_generateEmbedReq, apiConfig, reqValue, res;
@@ -29148,6 +29140,22 @@ var AxBaseAI = /*#__PURE__*/ function() {
                 var headers = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
                 return _object_spread$h({}, headers, this.headers);
             }
+        },
+        {
+            key: "getEmbedModel",
+            value: function getEmbedModel(name) {
+                var _this_embedModelMap;
+                var _this_embedModelMap_name;
+                return name ? (_this_embedModelMap_name = (_this_embedModelMap = this.embedModelMap) === null || _this_embedModelMap === void 0 ? void 0 : _this_embedModelMap[name]) !== null && _this_embedModelMap_name !== void 0 ? _this_embedModelMap_name : name : undefined;
+            }
+        },
+        {
+            key: "getModel",
+            value: function getModel(name) {
+                var _this_modelMap;
+                var _this_modelMap_name;
+                return (_this_modelMap_name = (_this_modelMap = this.modelMap) === null || _this_modelMap === void 0 ? void 0 : _this_modelMap[name]) !== null && _this_modelMap_name !== void 0 ? _this_modelMap_name : name;
+            }
         }
     ]);
     return AxBaseAI;
@@ -29311,7 +29319,6 @@ var AxAIOpenAIModel;
 (function(AxAIOpenAIModel) {
     AxAIOpenAIModel["GPT4"] = "gpt-4";
     AxAIOpenAIModel["GPT4O"] = "gpt-4o";
-    AxAIOpenAIModel["GPT4OMini"] = "gpt-4o-mini";
     AxAIOpenAIModel["GPT4Turbo"] = "gpt-4-turbo";
     AxAIOpenAIModel["GPT35Turbo"] = "gpt-3.5-turbo";
     AxAIOpenAIModel["GPT35TurboInstruct"] = "gpt-3.5-turbo-instruct";
@@ -29342,12 +29349,6 @@ var AxAIOpenAIEmbedModel;
         promptTokenCostPer1M: 5,
         completionTokenCostPer1M: 15
     },
-    {
-        name: AxAIOpenAIModel.GPT4OMini,
-        currency: "usd",
-        promptTokenCostPer1M: 0.15,
-        completionTokenCostPer1M: 0.6
-    },
     {
         name: AxAIOpenAIModel.GPT4Turbo,
         currency: "usd",
@@ -29503,7 +29504,7 @@ var AxAIOpenAI = /*#__PURE__*/ function(AxBaseAI) {
     _inherits$f(AxAIOpenAI, AxBaseAI);
     var _super = _create_super$f(AxAIOpenAI);
     function AxAIOpenAI(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, apiURL = param.apiURL, _param_modelInfo = param.modelInfo, modelInfo = _param_modelInfo === void 0 ? axModelInfoOpenAI : _param_modelInfo, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options, apiURL = param.apiURL, _param_modelInfo = param.modelInfo, modelInfo = _param_modelInfo === void 0 ? axModelInfoOpenAI : _param_modelInfo;
         _class_call_check$o(this, AxAIOpenAI);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -29525,16 +29526,14 @@ var AxAIOpenAI = /*#__PURE__*/ function(AxBaseAI) {
             supportFor: {
                 functions: true,
                 streaming: true
-            },
-            modelMap: modelMap
+            }
         });
         _define_property$o(_assert_this_initialized$f(_this), "config", void 0);
         _define_property$o(_assert_this_initialized$f(_this), "streamingUsage", void 0);
-        _define_property$o(_assert_this_initialized$f(_this), "dimensions", void 0);
         _define_property$o(_assert_this_initialized$f(_this), "generateChatReq", function(req, // eslint-disable-next-line @typescript-eslint/no-unused-vars
         _config) {
             var _req_functions, _req_modelConfig, _req_modelConfig1, _this_config, _this_config1, _req_modelConfig2, _req_modelConfig3, _req_modelConfig4, _req_modelConfig5, _req_modelConfig6, _req_modelConfig7;
-            var model = req.model;
+            var model = _this.config.model;
             if (!req.chatPrompt || req.chatPrompt.length === 0) {
                 throw new Error("Chat prompt is empty");
             }
@@ -29587,7 +29586,7 @@ var AxAIOpenAI = /*#__PURE__*/ function(AxBaseAI) {
             ];
         });
         _define_property$o(_assert_this_initialized$f(_this), "generateEmbedReq", function(req) {
-            var model = req.embedModel;
+            var model = _this.config.embedModel;
             if (!model) {
                 throw new Error("Embed model not set");
             }
@@ -29599,8 +29598,7 @@ var AxAIOpenAI = /*#__PURE__*/ function(AxBaseAI) {
             };
             var reqValue = {
                 model: model,
-                input: req.texts,
-                dimensions: _this.dimensions
+                input: req.texts
             };
             return [
                 apiConfig,
@@ -29709,7 +29707,6 @@ var AxAIOpenAI = /*#__PURE__*/ function(AxBaseAI) {
         _this.config = _config;
         var _options_streamingUsage;
         _this.streamingUsage = (_options_streamingUsage = options === null || options === void 0 ? void 0 : options.streamingUsage) !== null && _options_streamingUsage !== void 0 ? _options_streamingUsage : true;
-        _this.dimensions = config === null || config === void 0 ? void 0 : config.dimensions;
         return _this;
     }
     _create_class$b(AxAIOpenAI, [
@@ -29943,7 +29940,7 @@ var AxAIAzureOpenAI = /*#__PURE__*/ function(AxAIOpenAI) {
     _inherits$e(AxAIAzureOpenAI, AxAIOpenAI);
     var _super = _create_super$e(AxAIAzureOpenAI);
     function AxAIAzureOpenAI(param) {
-        var apiKey = param.apiKey, resourceName = param.resourceName, deploymentName = param.deploymentName, _param_version = param.version, version = _param_version === void 0 ? "api-version=2024-02-15-preview" : _param_version, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, resourceName = param.resourceName, deploymentName = param.deploymentName, _param_version = param.version, version = _param_version === void 0 ? "api-version=2024-02-15-preview" : _param_version, config = param.config, options = param.options;
         _class_call_check$n(this, AxAIAzureOpenAI);
         if (!apiKey || apiKey === "") {
             throw new Error("Azure OpenAPI API key not set");
@@ -29958,8 +29955,7 @@ var AxAIAzureOpenAI = /*#__PURE__*/ function(AxAIOpenAI) {
         var _this = _super.call(this, {
             apiKey: apiKey,
             config: _config,
-            options: options,
-            modelMap: modelMap
+            options: options
         });
         var host = resourceName.includes("://") ? resourceName : "https://".concat(resourceName, ".openai.azure.com/");
         _get$5((_assert_this_initialized$e(_this), _get_prototype_of$e(AxAIAzureOpenAI.prototype)), "setName", _this).call(_this, "Azure OpenAI");
@@ -30105,7 +30101,7 @@ var AxAIHuggingFace = /*#__PURE__*/ function(AxBaseAI) {
     _inherits$d(AxAIHuggingFace, AxBaseAI);
     var _super = _create_super$d(AxAIHuggingFace);
     function AxAIHuggingFace(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$m(this, AxAIHuggingFace);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -30126,14 +30122,13 @@ var AxAIHuggingFace = /*#__PURE__*/ function(AxBaseAI) {
             supportFor: {
                 functions: false,
                 streaming: false
-            },
-            modelMap: modelMap
+            }
         });
         _define_property$m(_assert_this_initialized$d(_this), "config", void 0);
         _define_property$m(_assert_this_initialized$d(_this), "generateChatReq", function(req, // eslint-disable-next-line @typescript-eslint/no-unused-vars
         _config) {
             var _req_chatPrompt, _req_modelConfig, _req_modelConfig1, _req_modelConfig2, _req_modelConfig3, _req_modelConfig4;
-            var model = req.model;
+            var model = _this.config.model;
             var functionsList = req.functions ? "Functions:\n".concat(JSON.stringify(req.functions, null, 2), "\n") : "";
             var prompt = (_req_chatPrompt = req.chatPrompt) === null || _req_chatPrompt === void 0 ? void 0 : _req_chatPrompt.map(function(msg) {
                 switch(msg.role){
@@ -30355,7 +30350,7 @@ var AxAITogether = /*#__PURE__*/ function(AxAIOpenAI) {
     _inherits$c(AxAITogether, AxAIOpenAI);
     var _super = _create_super$c(AxAITogether);
     function AxAITogether(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$l(this, AxAITogether);
         if (!apiKey || apiKey === "") {
             throw new Error("Together API key not set");
@@ -30366,8 +30361,7 @@ var AxAITogether = /*#__PURE__*/ function(AxAIOpenAI) {
             config: _config,
             options: options,
             apiURL: "https://api.together.xyz/v1",
-            modelInfo: axModelInfoTogether,
-            modelMap: modelMap
+            modelInfo: axModelInfoTogether
         });
         _get$4((_assert_this_initialized$c(_this), _get_prototype_of$c(AxAITogether.prototype)), "setName", _this).call(_this, "Together");
         return _this;
@@ -30641,7 +30635,7 @@ var AxAICohere = /*#__PURE__*/ function(AxBaseAI) {
     _inherits$b(AxAICohere, AxBaseAI);
     var _super = _create_super$b(AxAICohere);
     function AxAICohere(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$k(this, AxAICohere);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -30662,14 +30656,13 @@ var AxAICohere = /*#__PURE__*/ function(AxBaseAI) {
                 functions: true,
                 streaming: true
             },
-            options: options,
-            modelMap: modelMap
+            options: options
         });
         _define_property$k(_assert_this_initialized$b(_this), "config", void 0);
         _define_property$k(_assert_this_initialized$b(_this), "generateChatReq", function(req, // eslint-disable-next-line @typescript-eslint/no-unused-vars
         _config) {
             var _req_functions, _req_modelConfig, _req_modelConfig1, _req_modelConfig2, _req_modelConfig3, _req_modelConfig4, _req_modelConfig5, _req_modelConfig6;
-            var model = req.model;
+            var model = _this.config.model;
             var lastChatMsg = req.chatPrompt.at(-1);
             var restOfChat = req.chatPrompt.slice(0, -1);
             var message;
@@ -30764,7 +30757,7 @@ var AxAICohere = /*#__PURE__*/ function(AxBaseAI) {
             ];
         });
         _define_property$k(_assert_this_initialized$b(_this), "generateEmbedReq", function(req) {
-            var model = req.embedModel;
+            var model = _this.config.embedModel;
             if (!model) {
                 throw new Error("Embed model not set");
             }
@@ -31163,7 +31156,7 @@ var safetySettings = [
     _inherits$a(AxAIGoogleGemini, AxBaseAI);
     var _super = _create_super$a(AxAIGoogleGemini);
     function AxAIGoogleGemini(param) {
-        var apiKey = param.apiKey, projectId = param.projectId, region = param.region, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, projectId = param.projectId, region = param.region, config = param.config, options = param.options;
         _class_call_check$j(this, AxAIGoogleGemini);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -31187,15 +31180,14 @@ var safetySettings = [
             supportFor: {
                 functions: true,
                 streaming: true
-            },
-            modelMap: modelMap
+            }
         });
         _define_property$j(_assert_this_initialized$a(_this), "options", void 0);
         _define_property$j(_assert_this_initialized$a(_this), "config", void 0);
         _define_property$j(_assert_this_initialized$a(_this), "apiKey", void 0);
         _define_property$j(_assert_this_initialized$a(_this), "generateChatReq", function(req) {
             var _req_modelConfig, _this_options, _req_modelConfig1, _req_modelConfig2, _req_modelConfig3, _req_modelConfig4, _req_modelConfig5;
-            var model = req.model;
+            var model = _this.config.model;
             var _req_modelConfig_stream;
             var stream = (_req_modelConfig_stream = (_req_modelConfig = req.modelConfig) === null || _req_modelConfig === void 0 ? void 0 : _req_modelConfig.stream) !== null && _req_modelConfig_stream !== void 0 ? _req_modelConfig_stream : _this.config.stream;
             if (!req.chatPrompt || req.chatPrompt.length === 0) {
@@ -31375,7 +31367,7 @@ var safetySettings = [
             ];
         });
         _define_property$j(_assert_this_initialized$a(_this), "generateEmbedReq", function(req) {
-            var model = req.embedModel;
+            var model = _this.config.embedModel;
             if (!model) {
                 throw new Error("Embed model not set");
             }
@@ -31739,7 +31731,7 @@ var AxAIAnthropic = /*#__PURE__*/ function(AxBaseAI) {
     _inherits$9(AxAIAnthropic, AxBaseAI);
     var _super = _create_super$9(AxAIAnthropic);
     function AxAIAnthropic(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$i(this, AxAIAnthropic);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -31761,13 +31753,12 @@ var AxAIAnthropic = /*#__PURE__*/ function(AxBaseAI) {
             supportFor: {
                 functions: true,
                 streaming: true
-            },
-            modelMap: modelMap
+            }
         });
         _define_property$i(_assert_this_initialized$9(_this), "config", void 0);
         _define_property$i(_assert_this_initialized$9(_this), "generateChatReq", function(req) {
             var _req_functions, _req_modelConfig, _req_modelConfig1, _req_modelConfig2, _req_modelConfig3, _req_modelConfig4, _req_modelConfig5;
-            var model = req.model;
+            var model = _this.config.model;
             var apiConfig = {
                 name: "/messages"
             };
@@ -32664,7 +32655,7 @@ var AxAIGroq = /*#__PURE__*/ function(AxAIOpenAI) {
     _inherits$8(AxAIGroq, AxAIOpenAI);
     var _super = _create_super$8(AxAIGroq);
     function AxAIGroq(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$g(this, AxAIGroq);
         var _this;
         if (!apiKey || apiKey === "") {
@@ -32679,8 +32670,7 @@ var AxAIGroq = /*#__PURE__*/ function(AxAIOpenAI) {
             config: _config,
             options: _options,
             apiURL: "https://api.groq.com/openai/v1",
-            modelInfo: [],
-            modelMap: modelMap
+            modelInfo: []
         });
         _define_property$g(_assert_this_initialized$8(_this), "setOptions", function(options) {
             var rateLimiter = _this.newRateLimiter(options);
@@ -32736,23 +32726,19 @@ var AxAIGroq = /*#__PURE__*/ function(AxAIOpenAI) {
 } 
 (AxAIOpenAI);
 
-// cspell:ignore mistral, mixtral, codestral, nemo
 var AxAIMistralModel;
 (function(AxAIMistralModel) {
     AxAIMistralModel["Mistral7B"] = "open-mistral-7b";
     AxAIMistralModel["Mistral8x7B"] = "open-mixtral-8x7b";
     AxAIMistralModel["MistralSmall"] = "mistral-small-latest";
+    AxAIMistralModel["MistralMedium"] = "mistral-medium-latest";
     AxAIMistralModel["MistralLarge"] = "mistral-large-latest";
-    AxAIMistralModel["Codestral"] = "codestral-latest";
-    AxAIMistralModel["OpenCodestralMamba"] = "open-codestral-mamba";
-    AxAIMistralModel["OpenMistralNemo"] = "open-mistral-nemo-latest";
 })(AxAIMistralModel || (AxAIMistralModel = {}));
 var AxAIMistralEmbedModels;
 (function(AxAIMistralEmbedModels) {
     AxAIMistralEmbedModels["MistralEmbed"] = "mistral-embed";
 })(AxAIMistralEmbedModels || (AxAIMistralEmbedModels = {}));
 
-// cspell:ignore mistral, mixtral, codestral, nemo
 var axModelInfoMistral = [
     {
         name: AxAIMistralModel.Mistral7B,
@@ -32773,28 +32759,16 @@ var axModelInfoMistral = [
         completionTokenCostPer1M: 6
     },
     {
-        name: AxAIMistralModel.MistralLarge,
-        currency: "USD",
-        promptTokenCostPer1M: 8,
-        completionTokenCostPer1M: 24
-    },
-    {
-        name: AxAIMistralModel.Codestral,
+        name: AxAIMistralModel.MistralMedium,
         currency: "USD",
-        promptTokenCostPer1M: 1,
-        completionTokenCostPer1M: 3
+        promptTokenCostPer1M: 2.7,
+        completionTokenCostPer1M: 8.1
     },
     {
-        name: AxAIMistralModel.OpenCodestralMamba,
-        currency: "USD",
-        promptTokenCostPer1M: 0.25,
-        completionTokenCostPer1M: 0.25
-    },
-    {
-        name: AxAIMistralModel.OpenMistralNemo,
+        name: AxAIMistralModel.MistralLarge,
         currency: "USD",
-        promptTokenCostPer1M: 0.3,
-        completionTokenCostPer1M: 0.3
+        promptTokenCostPer1M: 8,
+        completionTokenCostPer1M: 24
     }
 ];
 
@@ -32929,7 +32903,7 @@ var AxAIMistral = /*#__PURE__*/ function(AxAIOpenAI) {
     _inherits$7(AxAIMistral, AxAIOpenAI);
     var _super = _create_super$7(AxAIMistral);
     function AxAIMistral(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$f(this, AxAIMistral);
         if (!apiKey || apiKey === "") {
             throw new Error("Mistral API key not set");
@@ -32940,8 +32914,7 @@ var AxAIMistral = /*#__PURE__*/ function(AxAIOpenAI) {
             config: _config,
             options: options,
             apiURL: "https://api.mistral.ai/v1",
-            modelInfo: axModelInfoMistral,
-            modelMap: modelMap
+            modelInfo: axModelInfoMistral
         });
         _get$2((_assert_this_initialized$7(_this), _get_prototype_of$7(AxAIMistral.prototype)), "setName", _this).call(_this, "Mistral");
         return _this;
@@ -33105,7 +33078,7 @@ var AxAIDeepSeek = /*#__PURE__*/ function(AxAIOpenAI) {
     _inherits$6(AxAIDeepSeek, AxAIOpenAI);
     var _super = _create_super$6(AxAIDeepSeek);
     function AxAIDeepSeek(param) {
-        var apiKey = param.apiKey, config = param.config, options = param.options, modelMap = param.modelMap;
+        var apiKey = param.apiKey, config = param.config, options = param.options;
         _class_call_check$e(this, AxAIDeepSeek);
         if (!apiKey || apiKey === "") {
             throw new Error("DeepSeek API key not set");
@@ -33116,8 +33089,7 @@ var AxAIDeepSeek = /*#__PURE__*/ function(AxAIOpenAI) {
             config: _config,
             options: options,
             apiURL: "https://api.deepseek.com",
-            modelInfo: axModelInfoDeepSeek,
-            modelMap: modelMap
+            modelInfo: axModelInfoDeepSeek
         });
         _get$1((_assert_this_initialized$6(_this), _get_prototype_of$6(AxAIDeepSeek.prototype)), "setName", _this).call(_this, "DeepSeek");
         return _this;
@@ -33285,15 +33257,14 @@ var axAIOllamaDefaultConfig = function() {
     _inherits$5(AxAIOllama, AxAIOpenAI);
     var _super = _create_super$5(AxAIOllama);
     function AxAIOllama(param) {
-        var _param_apiKey = param.apiKey, apiKey = _param_apiKey === void 0 ? "not-set" : _param_apiKey, _param_url = param.url, url = _param_url === void 0 ? "http://localhost:11434" : _param_url, config = param.config, options = param.options, modelMap = param.modelMap;
+        var _param_apiKey = param.apiKey, apiKey = _param_apiKey === void 0 ? "not-set" : _param_apiKey, _param_url = param.url, url = _param_url === void 0 ? "http://localhost:11434" : _param_url, config = param.config, options = param.options;
         _class_call_check$d(this, AxAIOllama);
         var _config = _object_spread$6({}, axAIOllamaDefaultConfig(), config);
         var _this = _super.call(this, {
             apiKey: apiKey,
             options: options,
             config: _config,
-            apiURL: new URL("/api", url).href,
-            modelMap: modelMap
+            apiURL: new URL("/v1", url).href
         });
         _get((_assert_this_initialized$5(_this), _get_prototype_of$5(AxAIOllama.prototype)), "setName", _this).call(_this, "Ollama");
         return _this;
@@ -33501,6 +33472,18 @@ var AxAI = /*#__PURE__*/ function() {
         }
     }
     _create_class$5(AxAI, [
+        {
+            key: "setModelMap",
+            value: function setModelMap(modelMap) {
+                this.ai.setModelMap(modelMap);
+            }
+        },
+        {
+            key: "setEmbedModelMap",
+            value: function setEmbedModelMap(modelMap) {
+                this.ai.setEmbedModelMap(modelMap);
+            }
+        },
         {
             key: "getName",
             value: function getName() {
@@ -33531,12 +33514,6 @@ var AxAI = /*#__PURE__*/ function() {
                 return this.ai.getFeatures();
             }
         },
-        {
-            key: "getModelMap",
-            value: function getModelMap() {
-                return this.ai.getModelMap();
-            }
-        },
         {
             key: "chat",
             value: function chat(req, options) {
@@ -34095,8 +34072,8 @@ var assertRequiredFields = function(sig, values) {
     });
     if (missingFields.length > 0) {
         throw new AxAssertionError({
-            message: "Output must include: t: ".concat(missingFields.map(function(f) {
-                return "`".concat(f.title, ":`");
+            message: "Missing required fields: ".concat(missingFields.map(function(f) {
+                return f.name;
             }).join(", ")),
             values: values
         });
@@ -38902,7 +38879,7 @@ var AxPromptTemplate = function AxPromptTemplate(sig, fieldTemplates) {
     this.outputFormat = {
         type: "text",
         text: [
-            "Use the following output format."
+            "Follow the following format."
         ].concat(_to_consumable_array$2(this.renderOutFields(this.sig.getOutputFields())), [
             "---\n\n"
         ]).join("\n\n")
@@ -40718,7 +40695,9 @@ let DspService = class DspService {
     }
     async modelOpenAI(params, _pinsSettingsList, context) {
         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 { 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 = {
+            model: 'gpt-4o-mini'
+        }, options } = params;
         const modelInstance = new AxAIOpenAI({
             apiKey,
             apiURL,