@ax-llm/ax 11.0.48 → 11.0.49

package/index.js

@@ -1817,6 +1817,22 @@ function mapFinishReason(stopReason) {
   }
 }
 
+// dsp/modelinfo.ts
+function getModelInfo({
+  model,
+  modelInfo,
+  models
+}) {
+  const modelEntry = models?.find((v) => v.key === model);
+  const mappedModel = modelEntry && "model" in modelEntry ? modelEntry.model : model;
+  const exactMatch = modelInfo.find((v) => v.name === model);
+  if (exactMatch) return exactMatch;
+  const normalizedName = mappedModel.replace(/^(anthropic\.|openai\.)/, "").replace(/-latest$/, "").replace(/-\d{8}$/, "").replace(/-v\d+:\d+$/, "").replace(/@\d{8}$/, "").replace(/-\d{2,}(-[a-zA-Z0-9-]+)?$/, "").replace(/-v\d+@\d{8}$/, "").replace(/-v\d+$/, "");
+  const normalizedMatch = modelInfo.find((v) => v.name === normalizedName);
+  if (normalizedMatch) return normalizedMatch;
+  return null;
+}
+
 // ai/openai/types.ts
 var AxAIOpenAIModel = /* @__PURE__ */ ((AxAIOpenAIModel2) => {
   AxAIOpenAIModel2["O1"] = "o1";
@@ -2286,15 +2302,7 @@ var AxAIOpenAIBase = class extends AxBaseAI {
         embedModel: config.embedModel
       },
       options,
-      supportFor: supportFor ?? ((model) => {
-        const modelInf = modelInfo.find((m) => m.name === model);
-        return {
-          functions: true,
-          streaming: true,
-          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
-          hasShowThoughts: modelInf?.hasShowThoughts ?? false
-        };
-      }),
+      supportFor,
       models
     });
   }
@@ -2304,18 +2312,24 @@ var AxAIOpenAI = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("OpenAI API key not set");
     }
-    const supportForFn = (model) => {
-      const modelInf = axModelInfoOpenAI.find((m) => m.name === model);
+    modelInfo = [...axModelInfoOpenAI, ...modelInfo ?? []];
+    const supportFor = (model) => {
+      const mi = getModelInfo({
+        model,
+        modelInfo,
+        models
+      });
       return {
         functions: true,
         streaming: true,
-        hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
-        hasShowThoughts: modelInf?.hasShowThoughts ?? false
+        hasThinkingBudget: mi?.hasThinkingBudget ?? false,
+        hasShowThoughts: mi?.hasShowThoughts ?? false
       };
     };
     super({
@@ -2325,9 +2339,9 @@ var AxAIOpenAI = class extends AxAIOpenAIBase {
         ...config
       },
       options,
-      modelInfo: axModelInfoOpenAI,
+      modelInfo,
       models,
-      supportFor: supportForFn
+      supportFor
     });
     super.setName("OpenAI");
   }
@@ -2346,7 +2360,8 @@ var AxAIAzureOpenAI = class extends AxAIOpenAIBase {
     version = "api-version=2024-02-15-preview",
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("Azure OpenAPI API key not set");
@@ -2361,21 +2376,27 @@ var AxAIAzureOpenAI = class extends AxAIOpenAIBase {
       ...axAIAzureOpenAIDefaultConfig(),
       ...config
     };
+    modelInfo = [...axModelInfoOpenAI, ...modelInfo ?? []];
+    const supportFor = (model) => {
+      const mi = getModelInfo({
+        model,
+        modelInfo,
+        models
+      });
+      return {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: mi?.hasThinkingBudget ?? false,
+        hasShowThoughts: mi?.hasShowThoughts ?? false
+      };
+    };
     super({
       apiKey,
       config: _config,
       options,
       models,
-      modelInfo: axModelInfoOpenAI,
-      supportFor: (model) => {
-        const modelInf = axModelInfoOpenAI.find((m) => m.name === model);
-        return {
-          functions: true,
-          streaming: true,
-          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
-          hasShowThoughts: modelInf?.hasShowThoughts ?? false
-        };
-      }
+      modelInfo,
+      supportFor
     });
     const host = resourceName.includes("://") ? resourceName : `https://${resourceName}.openai.azure.com/`;
     super.setName("Azure OpenAI");
@@ -2725,6 +2746,7 @@ function createToolCall(functionCalls) {
 var AxAIDeepSeekModel = /* @__PURE__ */ ((AxAIDeepSeekModel2) => {
   AxAIDeepSeekModel2["DeepSeekChat"] = "deepseek-chat";
   AxAIDeepSeekModel2["DeepSeekCoder"] = "deepseek-coder";
+  AxAIDeepSeekModel2["DeepSeekReasoner"] = "deepseek-reasoner";
   return AxAIDeepSeekModel2;
 })(AxAIDeepSeekModel || {});
 
@@ -2733,14 +2755,14 @@ var axModelInfoDeepSeek = [
   {
     name: "deepseek-chat" /* DeepSeekChat */,
     currency: "USD",
-    promptTokenCostPer1M: 0.14,
-    completionTokenCostPer1M: 0.28
+    promptTokenCostPer1M: 0.27,
+    completionTokenCostPer1M: 1.1
   },
   {
-    name: "deepseek-coder" /* DeepSeekCoder */,
+    name: "deepseek-reasoner" /* DeepSeekReasoner */,
     currency: "USD",
-    promptTokenCostPer1M: 0.14,
-    completionTokenCostPer1M: 0.28
+    promptTokenCostPer1M: 0.55,
+    completionTokenCostPer1M: 2.19
   }
 ];
 
@@ -2758,7 +2780,8 @@ var AxAIDeepSeek = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("DeepSeek API key not set");
@@ -2767,12 +2790,19 @@ var AxAIDeepSeek = class extends AxAIOpenAIBase {
       ...axAIDeepSeekDefaultConfig(),
       ...config
     };
+    modelInfo = [...axModelInfoDeepSeek, ...modelInfo ?? []];
     super({
       apiKey,
       config: _config,
       options,
       apiURL: "https://api.deepseek.com",
-      modelInfo: axModelInfoDeepSeek,
+      modelInfo,
+      supportFor: {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: false,
+        hasShowThoughts: false
+      },
       models
     });
     super.setName("DeepSeek");
@@ -2785,7 +2815,6 @@ var AxAIGoogleGeminiModel = /* @__PURE__ */ ((AxAIGoogleGeminiModel2) => {
   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";
   AxAIGoogleGeminiModel2["Gemini1Pro"] = "gemini-1.0-pro";
   AxAIGoogleGeminiModel2["Gemini15Flash"] = "gemini-1.5-flash";
   AxAIGoogleGeminiModel2["Gemini15Flash002"] = "gemini-1.5-flash-002";
@@ -2861,13 +2890,6 @@ var axModelInfoGoogleGemini = [
     promptTokenCostPer1M: 0,
     completionTokenCostPer1M: 0
   },
-  {
-    name: "gemini-2.0-flash-thinking-exp-01-21" /* Gemini20FlashThinking */,
-    currency: "usd",
-    characterIsToken: false,
-    promptTokenCostPer1M: 0,
-    completionTokenCostPer1M: 0
-  },
   {
     name: "gemini-1.5-flash" /* Gemini15Flash */,
     currency: "usd",
@@ -3070,6 +3092,9 @@ var AxAIGoogleGeminiImpl = class {
         }
       });
     }
+    if (this.options?.googleSearch) {
+      tools.push({ google_search: {} });
+    }
     if (this.options?.urlContext) {
       tools.push({ url_context: {} });
     }
@@ -3274,7 +3299,8 @@ var AxAIGoogleGemini = class extends AxBaseAI {
     endpointId,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     const isVertex = projectId !== void 0 && region !== void 0;
     let apiURL;
@@ -3313,26 +3339,32 @@ var AxAIGoogleGemini = class extends AxBaseAI {
       apiKey,
       options
     );
+    modelInfo = [...axModelInfoGoogleGemini, ...modelInfo ?? []];
+    const supportFor = (model) => {
+      const mi = getModelInfo({
+        model,
+        modelInfo,
+        models
+      });
+      return {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: mi?.hasThinkingBudget ?? false,
+        hasShowThoughts: mi?.hasShowThoughts ?? false,
+        functionCot: false
+      };
+    };
     super(aiImpl, {
       name: "GoogleGeminiAI",
       apiURL,
       headers,
-      modelInfo: axModelInfoGoogleGemini,
+      modelInfo,
       defaults: {
         model: _config.model,
         embedModel: _config.embedModel
       },
       options,
-      supportFor: (model) => {
-        const modelInf = axModelInfoGoogleGemini.find((m) => m.name === model);
-        return {
-          functions: true,
-          streaming: true,
-          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
-          hasShowThoughts: modelInf?.hasShowThoughts ?? false,
-          functionCot: false
-        };
-      },
+      supportFor,
       models
     });
   }
@@ -3435,7 +3467,8 @@ var AxAIGroq = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("Groq API key not set");
@@ -3448,13 +3481,21 @@ var AxAIGroq = class extends AxAIOpenAIBase {
       ...options,
       streamingUsage: false
     };
+    modelInfo = [...axModelInfoGroq, ...modelInfo ?? []];
+    const supportFor = {
+      functions: true,
+      streaming: true,
+      hasThinkingBudget: false,
+      hasShowThoughts: false
+    };
     super({
       apiKey,
       config: _config,
       options: _options,
-      modelInfo: axModelInfoGroq,
+      modelInfo,
       apiURL: "https://api.groq.com/openai/v1",
-      models
+      models,
+      supportFor
     });
     super.setName("Groq");
     this.setOptions(_options);
@@ -3692,7 +3733,8 @@ var AxAIMistral = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("Mistral API key not set");
@@ -3701,13 +3743,21 @@ var AxAIMistral = class extends AxAIOpenAIBase {
       ...axAIMistralDefaultConfig(),
       ...config
     };
+    modelInfo = [...axModelInfoMistral, ...modelInfo ?? []];
+    const supportFor = {
+      functions: true,
+      streaming: true,
+      hasThinkingBudget: false,
+      hasShowThoughts: false
+    };
     super({
       apiKey,
       config: _config,
       options,
       apiURL: "https://api.mistral.ai/v1",
-      modelInfo: axModelInfoMistral,
-      models
+      modelInfo,
+      models,
+      supportFor
     });
     super.setName("Mistral");
   }
@@ -3742,7 +3792,13 @@ var AxAIOllama = class extends AxAIOpenAIBase {
       config: _config,
       apiURL: url,
       models,
-      modelInfo: []
+      modelInfo: [],
+      supportFor: {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: false,
+        hasShowThoughts: false
+      }
     });
     super.setName("Ollama");
   }
@@ -3993,7 +4049,8 @@ var AxAITogether = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("Together API key not set");
@@ -4002,13 +4059,21 @@ var AxAITogether = class extends AxAIOpenAIBase {
       ...axAITogetherDefaultConfig(),
       ...config
     };
+    modelInfo = [...axModelInfoTogether, ...modelInfo ?? []];
+    const supportFor = {
+      functions: true,
+      streaming: true,
+      hasThinkingBudget: false,
+      hasShowThoughts: false
+    };
     super({
       apiKey,
       config: _config,
       options,
       apiURL: "https://api.together.xyz/v1",
-      modelInfo: axModelInfoTogether,
-      models
+      modelInfo,
+      models,
+      supportFor
     });
     super.setName("Together");
   }
@@ -4154,7 +4219,8 @@ var AxAIGrok = class extends AxAIOpenAIBase {
     apiKey,
     config,
     options,
-    models
+    models,
+    modelInfo
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("Grok API key not set");
@@ -4163,22 +4229,28 @@ var AxAIGrok = class extends AxAIOpenAIBase {
       ...axAIGrokDefaultConfig(),
       ...config
     };
+    modelInfo = [...axModelInfoGrok, ...modelInfo ?? []];
+    const supportFor = (model) => {
+      const mi = getModelInfo({
+        model,
+        modelInfo,
+        models
+      });
+      return {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: mi?.hasThinkingBudget ?? false,
+        hasShowThoughts: mi?.hasShowThoughts ?? false
+      };
+    };
     super({
       apiKey,
       config: _config,
       options,
       apiURL: "https://api.x.ai/v1",
-      modelInfo: axModelInfoGrok,
+      modelInfo,
       models,
-      supportFor: (model) => {
-        const modelInf = axModelInfoGrok.find((m) => m.name === model);
-        return {
-          functions: true,
-          streaming: true,
-          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
-          hasShowThoughts: modelInf?.hasShowThoughts ?? false
-        };
-      }
+      supportFor
     });
     super.setName("Grok");
   }
@@ -6627,7 +6699,8 @@ var AxGen = class extends AxProgramWithSignature {
     ai,
     mem,
     options,
-    traceContext
+    traceContext,
+    firstStep
   }) {
     const {
       sessionId,
@@ -6645,7 +6718,10 @@ var AxGen = class extends AxProgramWithSignature {
       throw new Error("No chat prompt found");
     }
     const functions = _functions?.map((f) => "toFunction" in f ? f.toFunction() : f)?.flat();
-    const functionCall = _functionCall ?? this.options?.functionCall;
+    let functionCall = _functionCall ?? this.options?.functionCall;
+    if (!firstStep && (functionCall === "required" || typeof functionCall === "function")) {
+      functionCall = void 0;
+    }
     const res = await ai.chat(
       {
         chatPrompt,
@@ -6670,6 +6746,7 @@ var AxGen = class extends AxProgramWithSignature {
     ai,
     mem,
     options,
+    firstStep,
     span,
     traceContext
   }) {
@@ -6681,7 +6758,8 @@ var AxGen = class extends AxProgramWithSignature {
       ai,
       mem,
       options,
-      traceContext
+      traceContext,
+      firstStep
     });
     if (res instanceof ReadableStream3) {
       yield* this.processStreamingResponse({
@@ -6941,12 +7019,14 @@ Content: ${result.content}`
     });
     mem.add(prompt, options?.sessionId);
     multiStepLoop: for (let n = 0; n < maxSteps; n++) {
+      const firstStep = n === 0;
       for (let errCount = 0; errCount < maxRetries; errCount++) {
         try {
           const generator = this.forwardCore({
             options,
             ai,
             mem,
+            firstStep,
             span,
             traceContext
           });