@ax-llm/ax 11.0.45 → 11.0.47

package/index.d.cts

@@ -65,6 +65,8 @@ interface AxAIFeatures {
     functions: boolean;
     streaming: boolean;
     functionCot?: boolean;
+    hasThinkingBudget?: boolean;
+    hasShowThoughts?: boolean;
 }
 interface AxBaseAIArgs<TModel, TEmbedModel> {
     name: string;
@@ -156,6 +158,8 @@ type AxModelInfo = {
     promptTokenCostPer1M?: number;
     completionTokenCostPer1M?: number;
     aliases?: string[];
+    hasThinkingBudget?: boolean;
+    hasShowThoughts?: boolean;
 };
 type AxTokenUsage = {
     promptTokens: number;
@@ -346,6 +350,7 @@ type AxAIServiceActionOptions<TModel = unknown, TEmbedModel = unknown> = {
     rateLimiter?: AxRateLimiterFunction;
     debug?: boolean;
     debugHideSystemPrompt?: boolean;
+    hideThought?: boolean;
 };
 interface AxAIService<TModel = unknown, TEmbedModel = unknown> {
     getId(): string;
@@ -615,6 +620,18 @@ type AxAIOpenAIConfig<TModel, TEmbedModel> = Omit<AxModelConfig, 'topK'> & {
     dimensions?: number;
     reasoningEffort?: 'low' | 'medium' | 'high';
     store?: boolean;
+    webSearchOptions?: {
+        searchContextSize?: 'low' | 'medium' | 'high';
+        userLocation?: {
+            approximate: {
+                type: 'approximate';
+                city?: string;
+                country?: string;
+                region?: string;
+                timezone?: string;
+            };
+        } | null;
+    };
 };
 type AxAIOpenAILogprob = {
     tokens: string[];
@@ -710,6 +727,18 @@ type AxAIOpenAIChatRequest<TModel> = {
     logit_bias?: Map<string, number>;
     user?: string;
     organization?: string;
+    web_search_options?: {
+        search_context_size?: 'low' | 'medium' | 'high';
+        user_location?: {
+            approximate: {
+                type: 'approximate';
+                city?: string;
+                country?: string;
+                region?: string;
+                timezone?: string;
+            };
+        } | null;
+    };
 };
 type AxAIOpenAIChatResponse = {
     id: string;
@@ -721,6 +750,7 @@ type AxAIOpenAIChatResponse = {
         message: {
             role: string;
             content: string;
+            reasoning_content?: string;
             tool_calls?: {
                 id: string;
                 type: 'function';
@@ -743,6 +773,7 @@ type AxAIOpenAIChatResponse = {
 };
 type AxAIOpenAIChatResponseDelta = AxAIOpenAIResponseDelta<{
     content: string;
+    reasoning_content?: string;
     role?: string;
     tool_calls?: (NonNullable<AxAIOpenAIChatResponse['choices'][0]['message']['tool_calls']>[0] & {
         index: number;
@@ -782,9 +813,10 @@ interface AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq extends AxAIOpenAICha
     modelInfo: Readonly<AxModelInfo[]>;
     models?: AxAIInputModelList<TModel, TEmbedModel>;
     chatReqUpdater?: ChatReqUpdater<TModel, TChatReq>;
+    supportFor?: AxAIFeatures | ((model: TModel) => AxAIFeatures);
 }
 declare class AxAIOpenAIBase<TModel, TEmbedModel, TChatReq extends AxAIOpenAIChatRequest<TModel> = AxAIOpenAIChatRequest<TModel>> extends AxBaseAI<TModel, TEmbedModel, AxAIOpenAIChatRequest<TModel>, AxAIOpenAIEmbedRequest<TEmbedModel>, AxAIOpenAIChatResponse, AxAIOpenAIChatResponseDelta, AxAIOpenAIEmbedResponse> {
-    constructor({ apiKey, config, options, apiURL, modelInfo, models, chatReqUpdater, }: Readonly<Omit<AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq>, 'name'>>);
+    constructor({ apiKey, config, options, apiURL, modelInfo, models, chatReqUpdater, supportFor, }: Readonly<Omit<AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq>, 'name'>>);
 }
 declare class AxAIOpenAI extends AxAIOpenAIBase<AxAIOpenAIModel, AxAIOpenAIEmbedModel> {
     constructor({ apiKey, config, options, models, }: Readonly<Omit<AxAIOpenAIArgs, 'name' | 'modelInfo'>>);

package/index.d.ts

@@ -65,6 +65,8 @@ interface AxAIFeatures {
     functions: boolean;
     streaming: boolean;
     functionCot?: boolean;
+    hasThinkingBudget?: boolean;
+    hasShowThoughts?: boolean;
 }
 interface AxBaseAIArgs<TModel, TEmbedModel> {
     name: string;
@@ -156,6 +158,8 @@ type AxModelInfo = {
     promptTokenCostPer1M?: number;
     completionTokenCostPer1M?: number;
     aliases?: string[];
+    hasThinkingBudget?: boolean;
+    hasShowThoughts?: boolean;
 };
 type AxTokenUsage = {
     promptTokens: number;
@@ -346,6 +350,7 @@ type AxAIServiceActionOptions<TModel = unknown, TEmbedModel = unknown> = {
     rateLimiter?: AxRateLimiterFunction;
     debug?: boolean;
     debugHideSystemPrompt?: boolean;
+    hideThought?: boolean;
 };
 interface AxAIService<TModel = unknown, TEmbedModel = unknown> {
     getId(): string;
@@ -615,6 +620,18 @@ type AxAIOpenAIConfig<TModel, TEmbedModel> = Omit<AxModelConfig, 'topK'> & {
     dimensions?: number;
     reasoningEffort?: 'low' | 'medium' | 'high';
     store?: boolean;
+    webSearchOptions?: {
+        searchContextSize?: 'low' | 'medium' | 'high';
+        userLocation?: {
+            approximate: {
+                type: 'approximate';
+                city?: string;
+                country?: string;
+                region?: string;
+                timezone?: string;
+            };
+        } | null;
+    };
 };
 type AxAIOpenAILogprob = {
     tokens: string[];
@@ -710,6 +727,18 @@ type AxAIOpenAIChatRequest<TModel> = {
     logit_bias?: Map<string, number>;
     user?: string;
     organization?: string;
+    web_search_options?: {
+        search_context_size?: 'low' | 'medium' | 'high';
+        user_location?: {
+            approximate: {
+                type: 'approximate';
+                city?: string;
+                country?: string;
+                region?: string;
+                timezone?: string;
+            };
+        } | null;
+    };
 };
 type AxAIOpenAIChatResponse = {
     id: string;
@@ -721,6 +750,7 @@ type AxAIOpenAIChatResponse = {
         message: {
             role: string;
             content: string;
+            reasoning_content?: string;
             tool_calls?: {
                 id: string;
                 type: 'function';
@@ -743,6 +773,7 @@ type AxAIOpenAIChatResponse = {
 };
 type AxAIOpenAIChatResponseDelta = AxAIOpenAIResponseDelta<{
     content: string;
+    reasoning_content?: string;
     role?: string;
     tool_calls?: (NonNullable<AxAIOpenAIChatResponse['choices'][0]['message']['tool_calls']>[0] & {
         index: number;
@@ -782,9 +813,10 @@ interface AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq extends AxAIOpenAICha
     modelInfo: Readonly<AxModelInfo[]>;
     models?: AxAIInputModelList<TModel, TEmbedModel>;
     chatReqUpdater?: ChatReqUpdater<TModel, TChatReq>;
+    supportFor?: AxAIFeatures | ((model: TModel) => AxAIFeatures);
 }
 declare class AxAIOpenAIBase<TModel, TEmbedModel, TChatReq extends AxAIOpenAIChatRequest<TModel> = AxAIOpenAIChatRequest<TModel>> extends AxBaseAI<TModel, TEmbedModel, AxAIOpenAIChatRequest<TModel>, AxAIOpenAIEmbedRequest<TEmbedModel>, AxAIOpenAIChatResponse, AxAIOpenAIChatResponseDelta, AxAIOpenAIEmbedResponse> {
-    constructor({ apiKey, config, options, apiURL, modelInfo, models, chatReqUpdater, }: Readonly<Omit<AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq>, 'name'>>);
+    constructor({ apiKey, config, options, apiURL, modelInfo, models, chatReqUpdater, supportFor, }: Readonly<Omit<AxAIOpenAIBaseArgs<TModel, TEmbedModel, TChatReq>, 'name'>>);
 }
 declare class AxAIOpenAI extends AxAIOpenAIBase<AxAIOpenAIModel, AxAIOpenAIEmbedModel> {
     constructor({ apiKey, config, options, models, }: Readonly<Omit<AxAIOpenAIArgs, 'name' | 'modelInfo'>>);

package/index.js

@@ -916,6 +916,11 @@ var AxBaseAI = class {
       ...this.aiImpl.getModelConfig(),
       ...req.modelConfig
     };
+    if (options?.thinkingTokenBudget && !this.getFeatures(model).hasThinkingBudget) {
+      throw new Error(
+        `Model ${model} does not support thinkingTokenBudget.`
+      );
+    }
     modelConfig.stream = (options?.stream !== void 0 ? options.stream : modelConfig.stream) ?? true;
     const canStream = this.getFeatures(model).streaming;
     if (!canStream) {
@@ -1018,6 +1023,13 @@ var AxBaseAI = class {
       const wrappedRespFn = (state) => (resp) => {
         const res2 = respFn(resp, state);
         res2.sessionId = options?.sessionId;
+        if (options?.hideThought) {
+          res2.results.forEach((result) => {
+            if (result.thought) {
+              result.thought = void 0;
+            }
+          });
+        }
         if (!res2.modelUsage) {
           res2.modelUsage = {
             ai: this.name,
@@ -1055,6 +1067,13 @@ var AxBaseAI = class {
     }
     const res = this.aiImpl.createChatResp(rv);
     res.sessionId = options?.sessionId;
+    if (options?.hideThought) {
+      res.results.forEach((result) => {
+        if (result.thought) {
+          result.thought = void 0;
+        }
+      });
+    }
     if (!res.modelUsage) {
       const tokenUsage = this.aiImpl.getTokenUsage();
       if (tokenUsage) {
@@ -1842,25 +1861,29 @@ var axModelInfoOpenAI = [
     name: "o1" /* O1 */,
     currency: "usd",
     promptTokenCostPer1M: 15,
-    completionTokenCostPer1M: 60
+    completionTokenCostPer1M: 60,
+    hasThinkingBudget: true
   },
   {
     name: "o1-mini" /* O1Mini */,
     currency: "usd",
     promptTokenCostPer1M: 1.1,
-    completionTokenCostPer1M: 14.4
+    completionTokenCostPer1M: 14.4,
+    hasThinkingBudget: true
   },
   {
     name: "o3-mini" /* O3Mini */,
     currency: "usd",
     promptTokenCostPer1M: 1.1,
-    completionTokenCostPer1M: 4.4
+    completionTokenCostPer1M: 4.4,
+    hasThinkingBudget: true
   },
   {
     name: "o4-mini" /* O4Mini */,
     currency: "usd",
     promptTokenCostPer1M: 1.1,
-    completionTokenCostPer1M: 4.4
+    completionTokenCostPer1M: 4.4,
+    hasThinkingBudget: true
   },
   {
     name: "gpt-4" /* GPT4 */,
@@ -2014,6 +2037,32 @@ var AxAIOpenAIImpl = class {
     if (this.config.reasoningEffort) {
       reqValue.reasoning_effort = this.config.reasoningEffort;
     }
+    if (this.config.webSearchOptions) {
+      reqValue.web_search_options = {
+        ...this.config.webSearchOptions.searchContextSize && {
+          search_context_size: this.config.webSearchOptions.searchContextSize
+        },
+        ...this.config.webSearchOptions.userLocation && {
+          user_location: {
+            approximate: {
+              type: "approximate",
+              ...this.config.webSearchOptions.userLocation.approximate.city && {
+                city: this.config.webSearchOptions.userLocation.approximate.city
+              },
+              ...this.config.webSearchOptions.userLocation.approximate.country && {
+                country: this.config.webSearchOptions.userLocation.approximate.country
+              },
+              ...this.config.webSearchOptions.userLocation.approximate.region && {
+                region: this.config.webSearchOptions.userLocation.approximate.region
+              },
+              ...this.config.webSearchOptions.userLocation.approximate.timezone && {
+                timezone: this.config.webSearchOptions.userLocation.approximate.timezone
+              }
+            }
+          }
+        }
+      };
+    }
     if (config.thinkingTokenBudget) {
       switch (config.thinkingTokenBudget) {
         case "minimal":
@@ -2074,6 +2123,7 @@ var AxAIOpenAIImpl = class {
       return {
         id: `${choice.index}`,
         content: choice.message.content,
+        thought: choice.message.reasoning_content,
         functionCalls,
         finishReason
       };
@@ -2096,7 +2146,12 @@ var AxAIOpenAIImpl = class {
     }
     const results = choices.map(
       ({
-        delta: { content, role, tool_calls: toolCalls },
+        delta: {
+          content,
+          role,
+          tool_calls: toolCalls,
+          reasoning_content: thought
+        },
         finish_reason: oaiFinishReason
       }) => {
         const finishReason = mapFinishReason2(oaiFinishReason);
@@ -2117,6 +2172,7 @@ var AxAIOpenAIImpl = class {
         return {
           content,
           role,
+          thought,
           functionCalls,
           finishReason,
           id
@@ -2215,7 +2271,8 @@ var AxAIOpenAIBase = class extends AxBaseAI {
     apiURL,
     modelInfo,
     models,
-    chatReqUpdater
+    chatReqUpdater,
+    supportFor
   }) {
     if (!apiKey || apiKey === "") {
       throw new Error("OpenAI API key not set");
@@ -2235,9 +2292,15 @@ var AxAIOpenAIBase = class extends AxBaseAI {
         embedModel: config.embedModel
       },
       options,
-      supportFor: () => {
-        return { functions: true, streaming: true };
-      },
+      supportFor: supportFor ?? ((model) => {
+        const modelInf = modelInfo.find((m) => m.name === model);
+        return {
+          functions: true,
+          streaming: true,
+          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
+          hasShowThoughts: modelInf?.hasShowThoughts ?? false
+        };
+      }),
       models
     });
   }
@@ -2252,6 +2315,15 @@ var AxAIOpenAI = class extends AxAIOpenAIBase {
     if (!apiKey || apiKey === "") {
       throw new Error("OpenAI API key not set");
     }
+    const supportForFn = (model) => {
+      const modelInf = axModelInfoOpenAI.find((m) => m.name === model);
+      return {
+        functions: true,
+        streaming: true,
+        hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
+        hasShowThoughts: modelInf?.hasShowThoughts ?? false
+      };
+    };
     super({
       apiKey,
       config: {
@@ -2260,7 +2332,8 @@ var AxAIOpenAI = class extends AxAIOpenAIBase {
       },
       options,
       modelInfo: axModelInfoOpenAI,
-      models
+      models,
+      supportFor: supportForFn
     });
     super.setName("OpenAI");
   }
@@ -2299,7 +2372,16 @@ var AxAIAzureOpenAI = class extends AxAIOpenAIBase {
       config: _config,
       options,
       models,
-      modelInfo: axModelInfoOpenAI
+      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
+        };
+      }
     });
     const host = resourceName.includes("://") ? resourceName : `https://${resourceName}.openai.azure.com/`;
     super.setName("Azure OpenAI");
@@ -2758,14 +2840,18 @@ var axModelInfoGoogleGemini = [
     currency: "usd",
     characterIsToken: false,
     promptTokenCostPer1M: 2.5,
-    completionTokenCostPer1M: 15
+    completionTokenCostPer1M: 15,
+    hasThinkingBudget: true,
+    hasShowThoughts: true
   },
   {
     name: "gemini-2.5-flash-preview-04-17" /* Gemini25Flash */,
     currency: "usd",
     characterIsToken: false,
     promptTokenCostPer1M: 15,
-    completionTokenCostPer1M: 3.5
+    completionTokenCostPer1M: 3.5,
+    hasThinkingBudget: true,
+    hasShowThoughts: true
   },
   {
     name: "gemini-2.0-flash" /* Gemini20Flash */,
@@ -3240,7 +3326,16 @@ var AxAIGoogleGemini = class extends AxBaseAI {
         embedModel: _config.embedModel
       },
       options,
-      supportFor: { functions: true, streaming: true },
+      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
+        };
+      },
       models
     });
   }
@@ -4030,7 +4125,8 @@ var axModelInfoGrok = [
     name: "grok-3-mini" /* Grok3Mini */,
     currency: "USD",
     promptTokenCostPer1M: 0.3,
-    completionTokenCostPer1M: 0.5
+    completionTokenCostPer1M: 0.5,
+    hasThinkingBudget: true
   },
   {
     name: "grok-3-fast" /* Grok3Fast */,
@@ -4042,7 +4138,8 @@ var axModelInfoGrok = [
     name: "grok-3-mini-fast" /* Grok3MiniFast */,
     currency: "USD",
     promptTokenCostPer1M: 0.6,
-    completionTokenCostPer1M: 4
+    completionTokenCostPer1M: 4,
+    hasThinkingBudget: true
   }
 ];
 
@@ -4075,7 +4172,16 @@ var AxAIGrok = class extends AxAIOpenAIBase {
       options,
       apiURL: "https://api.x.ai/v1",
       modelInfo: axModelInfoGrok,
-      models
+      models,
+      supportFor: (model) => {
+        const modelInf = axModelInfoGrok.find((m) => m.name === model);
+        return {
+          functions: true,
+          streaming: true,
+          hasThinkingBudget: modelInf?.hasThinkingBudget ?? false,
+          hasShowThoughts: modelInf?.hasShowThoughts ?? false
+        };
+      }
     });
     super.setName("Grok");
   }
@@ -6912,7 +7018,7 @@ Content: ${result.content}`
     return false;
   }
   async *_forward1(ai, values, options) {
-    const tracer = options?.tracer ?? this.options?.tracer;
+    const tracer = options?.tracer ?? this.options?.tracer ?? ai.getOptions().tracer;
     let functions = this.functions;
     if (options?.functions) {
       functions = parseFunctions(options.functions, this.functions);