@ax-llm/ax 11.0.33 → 11.0.35

package/index.js

@@ -734,8 +734,8 @@ var AxBaseAI = class {
     this.modelInfo = modelInfo;
     this.models = models;
     this.id = crypto.randomUUID();
-    const model = this.models?.find((v) => v.key === defaults.model)?.model ?? defaults.model;
-    const embedModel = defaults.embedModel;
+    const model = this.getModel(defaults.model) ?? defaults.model;
+    const embedModel = this.getEmbedModel(defaults.embedModel);
     this.defaults = { model, embedModel };
     if (!defaults.model || typeof defaults.model !== "string" || defaults.model === "") {
       throw new Error("No model defined");
@@ -801,18 +801,10 @@ var AxBaseAI = class {
     this.headers = headers;
   }
   setOptions(options) {
-    if (options.debug) {
-      this.debug = options.debug;
-    }
-    if (options.rateLimiter) {
-      this.rt = options.rateLimiter;
-    }
-    if (options.fetch) {
-      this.fetch = options.fetch;
-    }
-    if (options.tracer) {
-      this.tracer = options.tracer;
-    }
+    this.debug = options.debug ?? false;
+    this.rt = options.rateLimiter;
+    this.fetch = options.fetch;
+    this.tracer = options.tracer;
   }
   getOptions() {
     return {
@@ -823,11 +815,27 @@ var AxBaseAI = class {
     };
   }
   getModelList() {
-    return this.models?.filter((model) => !model.isInternal)?.map((model) => ({
-      key: model.key,
-      description: model.description,
-      model: model.model
-    }));
+    const models = [];
+    for (const model of this.models ?? []) {
+      if (model.isInternal) {
+        continue;
+      }
+      if ("model" in model && model.model) {
+        models.push({
+          key: model.key,
+          description: model.description,
+          model: model.model
+        });
+      }
+      if ("embedModel" in model && model.embedModel) {
+        models.push({
+          key: model.key,
+          description: model.description,
+          embedModel: model.embedModel
+        });
+      }
+    }
+    return models;
   }
   getDefaultModels() {
     return {
@@ -888,7 +896,7 @@ var AxBaseAI = class {
     }
   }
   async _chat1(req, options) {
-    const model = req.model ? this.models?.find((v) => v.key === req.model)?.model ?? req.model : this.defaults.model;
+    const model = this.getModel(req.model) ?? req.model ?? this.defaults.model;
     const modelConfig = {
       ...this.aiImpl.getModelConfig(),
       ...req.modelConfig
@@ -952,6 +960,7 @@ var AxBaseAI = class {
     if (!this.aiImpl.createChatReq) {
       throw new Error("generateChatReq not implemented");
     }
+    const debug = options?.debug ?? this.debug;
     let functions;
     if (chatReq.functions && chatReq.functions.length > 0) {
       functions = chatReq.functions.map((fn2) => this.cleanupFunctionSchema(fn2));
@@ -973,7 +982,7 @@ var AxBaseAI = class {
           url: this.apiURL,
           headers: await this.buildHeaders(apiConfig.headers),
           stream: modelConfig.stream,
-          debug: this.debug,
+          debug,
           fetch: this.fetch,
           span
         },
@@ -981,7 +990,7 @@ var AxBaseAI = class {
       );
       return res2;
     };
-    if (options?.debug ?? this.debug) {
+    if (debug) {
       logChatRequest(req.chatPrompt, options?.debugHideSystemPrompt);
     }
     const rt = options?.rateLimiter ?? this.rt;
@@ -1000,13 +1009,13 @@ var AxBaseAI = class {
         if (span?.isRecording()) {
           setResponseAttr(res2, span);
         }
-        if (options?.debug ?? this.debug) {
+        if (debug) {
           logResponse(res2);
         }
         return res2;
       };
       const doneCb = async (_values) => {
-        if (options?.debug ?? this.debug) {
+        if (debug) {
           process.stdout.write("\n");
         }
       };
@@ -1029,7 +1038,7 @@ var AxBaseAI = class {
     if (span?.isRecording()) {
       setResponseAttr(res, span);
     }
-    if (options?.debug ?? this.debug) {
+    if (debug) {
       logResponse(res);
     }
     span?.end();
@@ -1050,7 +1059,7 @@ var AxBaseAI = class {
     }
   }
   async _embed1(req, options) {
-    const embedModel = req.embedModel ?? this.defaults.embedModel;
+    const embedModel = this.getEmbedModel(req.embedModel) ?? req.embedModel ?? this.defaults.embedModel;
     if (!embedModel) {
       throw new Error("No embed model defined");
     }
@@ -1082,6 +1091,7 @@ var AxBaseAI = class {
     if (!this.aiImpl.createEmbedResp) {
       throw new Error("generateEmbedResp not implemented");
     }
+    const debug = options?.debug ?? this.debug;
     const req = {
       ...embedReq,
       embedModel
@@ -1093,7 +1103,7 @@ var AxBaseAI = class {
           name: apiConfig.name,
           url: this.apiURL,
           headers: await this.buildHeaders(apiConfig.headers),
-          debug: this.debug,
+          debug,
           fetch: this.fetch,
           span
         },
@@ -1119,6 +1129,21 @@ var AxBaseAI = class {
   async buildHeaders(headers = {}) {
     return { ...headers, ...await this.headers() };
   }
+  getModelByKey(modelName) {
+    if (!modelName) {
+      return void 0;
+    }
+    const item = this.models?.find((v) => v.key === modelName);
+    return item;
+  }
+  getModel(modelName) {
+    const item = this.getModelByKey(modelName);
+    return item && "model" in item ? item.model : void 0;
+  }
+  getEmbedModel(modelName) {
+    const item = this.getModelByKey(modelName);
+    return item && "embedModel" in item ? item.embedModel : void 0;
+  }
 };
 function setResponseAttr(res, span) {
   if (res.modelUsage) {
@@ -1645,10 +1670,12 @@ function mapFinishReason(stopReason) {
 // ai/openai/types.ts
 var AxAIOpenAIModel = /* @__PURE__ */ ((AxAIOpenAIModel2) => {
   AxAIOpenAIModel2["O1"] = "o1";
+  AxAIOpenAIModel2["O3"] = "o3";
   AxAIOpenAIModel2["O1Mini"] = "o1-mini";
   AxAIOpenAIModel2["O3Mini"] = "o3-mini";
+  AxAIOpenAIModel2["O4Mini"] = "o4-mini";
   AxAIOpenAIModel2["GPT4"] = "gpt-4";
-  AxAIOpenAIModel2["GPT45"] = "gpt-4.5-preview";
+  AxAIOpenAIModel2["GPT41"] = "gpt-4.1";
   AxAIOpenAIModel2["GPT4O"] = "gpt-4o";
   AxAIOpenAIModel2["GPT4OMini"] = "gpt-4o-mini";
   AxAIOpenAIModel2["GPT4ChatGPT4O"] = "chatgpt-4o-latest";
@@ -1669,12 +1696,6 @@ var AxAIOpenAIEmbedModel = /* @__PURE__ */ ((AxAIOpenAIEmbedModel2) => {
 
 // ai/openai/info.ts
 var axModelInfoOpenAI = [
-  {
-    name: "gpt-4.5-preview" /* GPT45 */,
-    currency: "usd",
-    promptTokenCostPer1M: 75,
-    completionTokenCostPer1M: 150
-  },
   {
     name: "o1" /* O1 */,
     currency: "usd",
@@ -1693,12 +1714,24 @@ var axModelInfoOpenAI = [
     promptTokenCostPer1M: 1.1,
     completionTokenCostPer1M: 4.4
   },
+  {
+    name: "o4-mini" /* O4Mini */,
+    currency: "usd",
+    promptTokenCostPer1M: 1.1,
+    completionTokenCostPer1M: 4.4
+  },
   {
     name: "gpt-4" /* GPT4 */,
     currency: "usd",
     promptTokenCostPer1M: 30,
     completionTokenCostPer1M: 60
   },
+  {
+    name: "gpt-4.1" /* GPT41 */,
+    currency: "usd",
+    promptTokenCostPer1M: 2,
+    completionTokenCostPer1M: 8
+  },
   {
     name: "gpt-4o" /* GPT4O */,
     currency: "usd",
@@ -2503,8 +2536,8 @@ var AxAIDeepSeek = class extends AxAIOpenAIBase {
 
 // ai/google-gemini/types.ts
 var AxAIGoogleGeminiModel = /* @__PURE__ */ ((AxAIGoogleGeminiModel2) => {
-  AxAIGoogleGeminiModel2["Gemini25Pro"] = "gemini-2.5-pro-exp-03-25";
-  AxAIGoogleGeminiModel2["Gemini20Pro"] = "gemini-2.0-pro-exp-02-05";
+  AxAIGoogleGeminiModel2["Gemini25Pro"] = "gemini-2.5-pro-preview-03-25";
+  AxAIGoogleGeminiModel2["Gemini25Flash"] = "gemini-2.5-flash-preview-04-17";
   AxAIGoogleGeminiModel2["Gemini20Flash"] = "gemini-2.0-flash";
   AxAIGoogleGeminiModel2["Gemini20FlashLite"] = "gemini-2.0-flash-lite-preview-02-05";
   AxAIGoogleGeminiModel2["Gemini20FlashThinking"] = "gemini-2.0-flash-thinking-exp-01-21";
@@ -2552,11 +2585,18 @@ var AxAIGoogleGeminiEmbedTypes = /* @__PURE__ */ ((AxAIGoogleGeminiEmbedTypes2)
 // ai/google-gemini/info.ts
 var axModelInfoGoogleGemini = [
   {
-    name: "gemini-2.0-pro-exp-02-05" /* Gemini20Pro */,
+    name: "gemini-2.5-pro-preview-03-25" /* Gemini25Pro */,
     currency: "usd",
     characterIsToken: false,
-    promptTokenCostPer1M: 0,
-    completionTokenCostPer1M: 0
+    promptTokenCostPer1M: 2.5,
+    completionTokenCostPer1M: 15
+  },
+  {
+    name: "gemini-2.5-flash-preview-04-17" /* Gemini25Flash */,
+    currency: "usd",
+    characterIsToken: false,
+    promptTokenCostPer1M: 15,
+    completionTokenCostPer1M: 3.5
   },
   {
     name: "gemini-2.0-flash" /* Gemini20Flash */,
@@ -2810,7 +2850,10 @@ var AxAIGoogleGeminiImpl = class {
       frequencyPenalty: req.modelConfig?.frequencyPenalty ?? this.config.frequencyPenalty,
       candidateCount: 1,
       stopSequences: req.modelConfig?.stopSequences ?? this.config.stopSequences,
-      responseMimeType: "text/plain"
+      responseMimeType: "text/plain",
+      ...this.config.thinkingConfig && {
+        thinkingConfig: this.config.thinkingConfig
+      }
     };
     const safetySettings2 = this.config.safetySettings;
     const reqValue = {
@@ -4773,6 +4816,9 @@ function matchesContent(content, prefix, startIndex = 0, prefixCache = globalPre
   );
   for (let i = 0; i < prefixes.length - 1; i++) {
     const partialPrefix = prefixes[i];
+    if (partialPrefix === "\n" || partialPrefix === ":") {
+      continue;
+    }
     if (partialPrefix && contentEnd.endsWith(partialPrefix)) {
       return -2;
     }
@@ -5555,7 +5601,7 @@ var streamingExtractValues = (sig, values, xstate, content, streamingValidation
     }
     const isFirst = xstate.extractedFields.length === 0;
     const prefix = (isFirst ? "" : "\n") + field.title + ":";
-    let e = matchesContent(content, prefix, xstate.s === 0 ? 0 : xstate.s + 1);
+    let e = matchesContent(content, prefix, xstate.s);
     switch (e) {
       case -1:
         if (streamingValidation && values.length == 0 && !field.isOptional) {
@@ -6421,10 +6467,8 @@ var AxGen = class extends AxProgramWithSignature {
     const maxRetries = options.maxRetries ?? this.options?.maxRetries ?? 10;
     const maxSteps = options.maxSteps ?? this.options?.maxSteps ?? 10;
     const debug = options.debug ?? ai.getOptions().debug;
-    const memOptions = {
-      debug: options.debug,
-      debugHideSystemPrompt: options.debugHideSystemPrompt
-    };
+    const debugHideSystemPrompt = options.debugHideSystemPrompt;
+    const memOptions = { debug, debugHideSystemPrompt };
     const mem = options.mem ?? this.options?.mem ?? new AxMemory(1e4, memOptions);
     let err;
     if (options?.functions && options.functions.length > 0) {
@@ -6485,7 +6529,7 @@ var AxGen = class extends AxProgramWithSignature {
           }
         }
       }
-      throw new Error(`Unable to fix validation error: ${err}`);
+      throw new Error(`Unable to fix validation error: ${err?.toString()}`);
     }
     throw new Error(`Max steps reached: ${maxSteps}`);
   }
@@ -6502,7 +6546,7 @@ var AxGen = class extends AxProgramWithSignature {
     return false;
   }
   async *_forward1(ai, values, options) {
-    const tracer = this.options?.tracer ?? options?.tracer;
+    const tracer = options?.tracer ?? this.options?.tracer;
     let functions = this.functions;
     if (options?.functions) {
       functions = parseFunctions(options.functions, this.functions);
@@ -6538,9 +6582,7 @@ var AxGen = class extends AxProgramWithSignature {
     }
   }
   async forward(ai, values, options) {
-    const generator = this._forward1(ai, values, {
-      ...options
-    });
+    const generator = this._forward1(ai, values, options ?? {});
     let buffer = {};
     let currentVersion = 0;
     for await (const item of generator) {
@@ -9204,7 +9246,7 @@ var AxMockAIService = class {
   }
 };
 
-// dsp/router.ts
+// dsp/classifier.ts
 var colorLog6 = new ColorLog();
 var AxSimpleClassifierClass = class {
   name;
@@ -11013,6 +11055,7 @@ var AxMCPStdioTransport = class {
 
 // ai/multiservice.ts
 var AxMultiServiceRouter = class {
+  options;
   services = /* @__PURE__ */ new Map();
   /**
    * Constructs a new multi-service router.
@@ -11033,9 +11076,7 @@ var AxMultiServiceRouter = class {
         this.services.set(item.key, {
           service,
           description,
-          isInternal,
-          model: item.service.getDefaultModels().model,
-          useDefaultModel: true
+          isInternal
         });
       } else {
         const modelList = item.getModelList();
@@ -11044,18 +11085,31 @@ var AxMultiServiceRouter = class {
             `Service ${index} \`${item.getName()}\` has no model list.`
           );
         }
-        for (const { key, description, model } of modelList ?? []) {
-          if (this.services.has(key)) {
-            const otherService = this.services.get(key)?.service;
+        for (const v of modelList) {
+          if (this.services.has(v.key)) {
+            const otherService = this.services.get(v.key)?.service;
             throw new Error(
-              `Service ${index} \`${item.getName()}\` has duplicate model key: ${key} as service ${otherService?.getName()}`
+              `Service ${index} \`${item.getName()}\` has duplicate model key: ${v.key} as service ${otherService?.getName()}`
             );
+          } else {
+            if ("model" in v && typeof v.model) {
+              this.services.set(v.key, {
+                description: v.description,
+                service: item,
+                model: v.model
+              });
+            } else if ("embedModel" in v && v.embedModel) {
+              this.services.set(v.key, {
+                description: v.description,
+                service: item,
+                embedModel: v.embedModel
+              });
+            } else {
+              throw new Error(
+                `Key ${v.key} in model list for service ${index} \`${item.getName()}\` is missing a model or embedModel property.`
+              );
+            }
           }
-          this.services.set(key, {
-            description,
-            service: item,
-            model
-          });
         }
       }
     }
@@ -11072,25 +11126,32 @@ var AxMultiServiceRouter = class {
     if (!item) {
       throw new Error(`No service found for model key: ${modelKey}`);
     }
-    const service = item.service;
-    const model = item.useDefaultModel ? req.model : modelKey;
-    return await service.chat({ model, ...req }, options);
+    if (!item.model) {
+      const { model, ...reqWithoutModel } = req;
+      return await item.service.chat(reqWithoutModel, options);
+    }
+    return await item.service.chat({ model: modelKey, ...req }, options);
   }
   /**
    * Delegates the embed call to the service matching the provided embed model key.
    */
   async embed(req, options) {
-    const modelKey = req.embedModel;
-    if (!modelKey) {
+    const embedModelKey = req.embedModel;
+    if (!embedModelKey) {
       throw new Error("Embed model key must be specified for multi-service");
     }
-    const item = this.services.get(modelKey);
+    const item = this.services.get(embedModelKey);
     if (!item) {
-      throw new Error(`No service found for embed model key: ${modelKey}`);
+      throw new Error(`No service found for embed model key: ${embedModelKey}`);
+    }
+    if (!item.model) {
+      const { embedModel, ...reqWithoutEmbedModel } = req;
+      return await item.service.embed(reqWithoutEmbedModel, options);
     }
-    const service = item.service;
-    const embedModel = item.useDefaultModel ? req.embedModel : modelKey;
-    return await service.embed({ embedModel, ...req }, options);
+    return await item.service.embed(
+      { embedModel: embedModelKey, ...req },
+      options
+    );
   }
   /**
    * Returns a composite ID built from the IDs of the underlying services.
@@ -11108,11 +11169,15 @@ var AxMultiServiceRouter = class {
    * Aggregates all available models across the underlying services.
    */
   getModelList() {
-    return Array.from(this.services).filter(([, value]) => !value.isInternal).map(([key, { description, model }]) => ({
-      key,
-      description,
-      model
-    }));
+    return Array.from(this.services).filter(([, value]) => !value.isInternal).map(([key, v]) => {
+      if (v.model) {
+        return { key, description: v.description, model: v.model };
+      } else if (v.embedModel) {
+        return { key, description: v.description, embedModel: v.embedModel };
+      } else {
+        throw new Error(`Service ${key} has no model or embedModel`);
+      }
+    });
   }
   getDefaultModels() {
     throw new Error(
@@ -11151,17 +11216,14 @@ var AxMultiServiceRouter = class {
     for (const service of this.services.values()) {
       service.service.setOptions(options);
     }
+    this.options = options;
   }
   /**
    * Returns the options from the last used service,
    * or falls back to the first service if none has been used.
    */
   getOptions() {
-    const service = this.services.values().next().value;
-    if (!service) {
-      throw new Error("No service available to get options.");
-    }
-    return service.service.getOptions();
+    return this.options ?? {};
   }
 };