@ax-llm/ax 11.0.35 → 11.0.37

package/index.js

@@ -735,7 +735,7 @@ var AxBaseAI = class {
     this.models = models;
     this.id = crypto.randomUUID();
     const model = this.getModel(defaults.model) ?? defaults.model;
-    const embedModel = this.getEmbedModel(defaults.embedModel);
+    const embedModel = this.getEmbedModel(defaults.embedModel) ?? defaults.embedModel;
     this.defaults = { model, embedModel };
     if (!defaults.model || typeof defaults.model !== "string" || defaults.model === "") {
       throw new Error("No model defined");
@@ -837,12 +837,6 @@ var AxBaseAI = class {
     }
     return models;
   }
-  getDefaultModels() {
-    return {
-      model: this.defaults.model,
-      embedModel: this.defaults.embedModel
-    };
-  }
   getName() {
     return this.name;
   }
@@ -999,13 +993,18 @@ var AxBaseAI = class {
       if (!this.aiImpl.createChatStreamResp) {
         throw new Error("generateChatResp not implemented");
       }
-      const respFn = this.aiImpl.createChatStreamResp;
+      const respFn = this.aiImpl.createChatStreamResp.bind(this);
       const wrappedRespFn = (state) => (resp) => {
         const res2 = respFn(resp, state);
         res2.sessionId = options?.sessionId;
-        if (res2.modelUsage) {
-          this.modelUsage = res2.modelUsage;
+        if (!res2.modelUsage) {
+          res2.modelUsage = {
+            ai: this.name,
+            model,
+            tokens: this.aiImpl.getTokenUsage()
+          };
         }
+        this.modelUsage = res2.modelUsage;
         if (span?.isRecording()) {
           setResponseAttr(res2, span);
         }
@@ -1111,17 +1110,19 @@ var AxBaseAI = class {
       );
       return res2;
     };
-    const resValue = this.rt ? await this.rt(fn, { embedModelUsage: this.embedModelUsage }) : await fn();
+    const resValue = this.rt ? await this.rt(fn, { modelUsage: this.embedModelUsage }) : await fn();
     const res = this.aiImpl.createEmbedResp(resValue);
     res.sessionId = options?.sessionId;
+    if (!res.modelUsage) {
+      res.modelUsage = {
+        ai: this.name,
+        model: embedModel,
+        tokens: this.aiImpl.getTokenUsage()
+      };
+    }
+    this.embedModelUsage = res.modelUsage;
     if (span?.isRecording()) {
-      if (res.modelUsage) {
-        this.embedModelUsage = res.modelUsage;
-        span.setAttributes({
-          [axSpanAttributes.LLM_USAGE_COMPLETION_TOKENS]: res.modelUsage.completionTokens ?? 0,
-          [axSpanAttributes.LLM_USAGE_PROMPT_TOKENS]: res.modelUsage.promptTokens
-        });
-      }
+      setResponseAttr(res, span);
     }
     span?.end();
     return res;
@@ -1148,8 +1149,8 @@ var AxBaseAI = class {
 function setResponseAttr(res, span) {
   if (res.modelUsage) {
     span.setAttributes({
-      [axSpanAttributes.LLM_USAGE_COMPLETION_TOKENS]: res.modelUsage.completionTokens ?? 0,
-      [axSpanAttributes.LLM_USAGE_PROMPT_TOKENS]: res.modelUsage.promptTokens
+      [axSpanAttributes.LLM_USAGE_COMPLETION_TOKENS]: res.modelUsage.tokens?.completionTokens ?? 0,
+      [axSpanAttributes.LLM_USAGE_PROMPT_TOKENS]: res.modelUsage.tokens?.promptTokens
     });
   }
 }
@@ -1204,14 +1205,14 @@ var AxAIAnthropicModel = /* @__PURE__ */ ((AxAIAnthropicModel2) => {
   AxAIAnthropicModel2["ClaudeInstant12"] = "claude-instant-1.2";
   return AxAIAnthropicModel2;
 })(AxAIAnthropicModel || {});
-var AxAIAnthropicVertexModel = /* @__PURE__ */ ((AxAIAnthropicVertexModel3) => {
-  AxAIAnthropicVertexModel3["Claude37Sonnet"] = "claude-3-7-sonnet";
-  AxAIAnthropicVertexModel3["Claude35Haiku"] = "claude-3-5-haiku";
-  AxAIAnthropicVertexModel3["Claude35Sonnet"] = "claude-3-5-sonnet";
-  AxAIAnthropicVertexModel3["Claude35SonnetV2"] = "claude-3-5-sonnet-v2";
-  AxAIAnthropicVertexModel3["Claude3Haiku"] = "claude-3-haiku";
-  AxAIAnthropicVertexModel3["Claude3Opus"] = "claude-3-opus";
-  return AxAIAnthropicVertexModel3;
+var AxAIAnthropicVertexModel = /* @__PURE__ */ ((AxAIAnthropicVertexModel2) => {
+  AxAIAnthropicVertexModel2["Claude37Sonnet"] = "claude-3-7-sonnet";
+  AxAIAnthropicVertexModel2["Claude35Haiku"] = "claude-3-5-haiku";
+  AxAIAnthropicVertexModel2["Claude35Sonnet"] = "claude-3-5-sonnet";
+  AxAIAnthropicVertexModel2["Claude35SonnetV2"] = "claude-3-5-sonnet-v2";
+  AxAIAnthropicVertexModel2["Claude3Haiku"] = "claude-3-haiku";
+  AxAIAnthropicVertexModel2["Claude3Opus"] = "claude-3-opus";
+  return AxAIAnthropicVertexModel2;
 })(AxAIAnthropicVertexModel || {});
 
 // ai/anthropic/info.ts
@@ -1265,7 +1266,11 @@ var axModelInfoAnthropic = [
 
 // ai/anthropic/api.ts
 var axAIAnthropicDefaultConfig = () => structuredClone({
-  model: "claude-3-5-sonnet-latest" /* Claude35Sonnet */,
+  model: "claude-3-7-sonnet-latest" /* Claude37Sonnet */,
+  ...axBaseAIDefaultConfig()
+});
+var axAIAnthropicVertexDefaultConfig = () => structuredClone({
+  model: "claude-3-7-sonnet" /* Claude37Sonnet */,
   ...axBaseAIDefaultConfig()
 });
 var AxAIAnthropicImpl = class {
@@ -1273,6 +1278,10 @@ var AxAIAnthropicImpl = class {
     this.config = config;
     this.isVertex = isVertex;
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -1382,16 +1391,12 @@ var AxAIAnthropicImpl = class {
         finishReason
       };
     });
-    const modelUsage = {
+    this.tokensUsed = {
       promptTokens: resp.usage.input_tokens,
       completionTokens: resp.usage.output_tokens,
       totalTokens: resp.usage.input_tokens + resp.usage.output_tokens
     };
-    return {
-      results,
-      modelUsage,
-      remoteId: resp.id
-    };
+    return { results, remoteId: resp.id };
   };
   createChatStreamResp = (resp, state) => {
     if (!("type" in resp)) {
@@ -1408,15 +1413,12 @@ var AxAIAnthropicImpl = class {
     if (resp.type === "message_start") {
       const { message } = resp;
       const results = [{ content: "", id: message.id }];
-      const modelUsage = {
+      this.tokensUsed = {
         promptTokens: message.usage?.input_tokens ?? 0,
         completionTokens: message.usage?.output_tokens ?? 0,
         totalTokens: (message.usage?.input_tokens ?? 0) + (message.usage?.output_tokens ?? 0)
       };
-      return {
-        results,
-        modelUsage
-      };
+      return { results };
     }
     if (resp.type === "content_block_start") {
       const { content_block: contentBlock } = resp;
@@ -1473,19 +1475,15 @@ var AxAIAnthropicImpl = class {
     }
     if (resp.type === "message_delta") {
       const { delta, usage } = resp;
-      return {
-        results: [
-          {
-            content: "",
-            finishReason: mapFinishReason(delta.stop_reason)
-          }
-        ],
-        modelUsage: {
-          promptTokens: 0,
-          completionTokens: usage.output_tokens,
-          totalTokens: usage.output_tokens
-        }
+      this.tokensUsed = {
+        promptTokens: 0,
+        completionTokens: usage.output_tokens,
+        totalTokens: usage.output_tokens
       };
+      const results = [
+        { content: "", finishReason: mapFinishReason(delta.stop_reason) }
+      ];
+      return { results };
     }
     return {
       results: [{ content: "" }]
@@ -1676,6 +1674,7 @@ var AxAIOpenAIModel = /* @__PURE__ */ ((AxAIOpenAIModel2) => {
   AxAIOpenAIModel2["O4Mini"] = "o4-mini";
   AxAIOpenAIModel2["GPT4"] = "gpt-4";
   AxAIOpenAIModel2["GPT41"] = "gpt-4.1";
+  AxAIOpenAIModel2["GPT41Mini"] = "gpt-4.1-mini";
   AxAIOpenAIModel2["GPT4O"] = "gpt-4o";
   AxAIOpenAIModel2["GPT4OMini"] = "gpt-4o-mini";
   AxAIOpenAIModel2["GPT4ChatGPT4O"] = "chatgpt-4o-latest";
@@ -1732,6 +1731,12 @@ var axModelInfoOpenAI = [
     promptTokenCostPer1M: 2,
     completionTokenCostPer1M: 8
   },
+  {
+    name: "gpt-4.1-mini" /* GPT41Mini */,
+    currency: "usd",
+    promptTokenCostPer1M: 0.4,
+    completionTokenCostPer1M: 1.6
+  },
   {
     name: "gpt-4o" /* GPT4O */,
     currency: "usd",
@@ -1784,28 +1789,32 @@ var axModelInfoOpenAI = [
 
 // ai/openai/api.ts
 var axAIOpenAIDefaultConfig = () => structuredClone({
-  model: "gpt-4o" /* GPT4O */,
+  model: "gpt-4.1" /* GPT41 */,
   embedModel: "text-embedding-3-small" /* TextEmbedding3Small */,
   ...axBaseAIDefaultConfig()
 });
 var axAIOpenAIBestConfig = () => structuredClone({
   ...axAIOpenAIDefaultConfig(),
-  model: "gpt-4o" /* GPT4O */
+  model: "gpt-4.1" /* GPT41 */
 });
 var axAIOpenAICreativeConfig = () => structuredClone({
-  model: "gpt-4o" /* GPT4O */,
+  model: "gpt-4.1" /* GPT41 */,
   embedModel: "text-embedding-3-small" /* TextEmbedding3Small */,
   ...axBaseAIDefaultCreativeConfig()
 });
 var axAIOpenAIFastConfig = () => ({
   ...axAIOpenAIDefaultConfig(),
-  model: "gpt-4o-mini" /* GPT4OMini */
+  model: "gpt-4.1-mini" /* GPT41Mini */
 });
 var AxAIOpenAIImpl = class {
   constructor(config, streamingUsage) {
     this.config = config;
     this.streamingUsage = streamingUsage;
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -1885,7 +1894,7 @@ var AxAIOpenAIImpl = class {
     if (error) {
       throw error;
     }
-    const modelUsage = usage ? {
+    this.tokensUsed = usage ? {
       promptTokens: usage.prompt_tokens,
       completionTokens: usage.completion_tokens,
       totalTokens: usage.total_tokens
@@ -1907,14 +1916,13 @@ var AxAIOpenAIImpl = class {
       };
     });
     return {
-      modelUsage,
       results,
       remoteId: id
     };
   }
   createChatStreamResp(resp, state) {
     const { id, usage, choices } = resp;
-    const modelUsage = usage ? {
+    this.tokensUsed = usage ? {
       promptTokens: usage.prompt_tokens,
       completionTokens: usage.completion_tokens,
       totalTokens: usage.total_tokens
@@ -1952,22 +1960,16 @@ var AxAIOpenAIImpl = class {
         };
       }
     );
-    return {
-      results,
-      modelUsage
-    };
+    return { results };
   }
   createEmbedResp(resp) {
     const { data, usage } = resp;
-    const modelUsage = usage ? {
+    this.tokensUsed = usage ? {
       promptTokens: usage.prompt_tokens,
       completionTokens: usage.completion_tokens,
       totalTokens: usage.total_tokens
     } : void 0;
-    return {
-      embeddings: data.map((v) => v.embedding),
-      modelUsage
-    };
+    return { embeddings: data.map((v) => v.embedding) };
   }
 };
 var mapFinishReason2 = (finishReason) => {
@@ -2232,6 +2234,10 @@ var AxAICohereImpl = class {
   constructor(config) {
     this.config = config;
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -2323,7 +2329,7 @@ var AxAICohereImpl = class {
     return [apiConfig, reqValue];
   };
   createChatResp = (resp) => {
-    const modelUsage = resp.meta.billed_units ? {
+    this.tokensUsed = resp.meta.billed_units ? {
       promptTokens: resp.meta.billed_units.input_tokens,
       completionTokens: resp.meta.billed_units.output_tokens,
       totalTokens: resp.meta.billed_units.input_tokens + resp.meta.billed_units.output_tokens
@@ -2366,17 +2372,18 @@ var AxAICohereImpl = class {
         finishReason
       }
     ];
-    return {
-      results,
-      modelUsage,
-      remoteId: resp.response_id
-    };
+    return { results, remoteId: resp.response_id };
   };
   createChatStreamResp = (resp, state) => {
     const ss = state;
     if (resp.event_type === "stream-start") {
       ss.generation_id = resp.generation_id;
     }
+    this.tokensUsed = {
+      promptTokens: 0,
+      completionTokens: resp.meta.billed_units?.output_tokens ?? 0,
+      totalTokens: resp.meta.billed_units?.output_tokens ?? 0
+    };
     const { results } = this.createChatResp(resp);
     const result = results[0];
     if (!result) {
@@ -2670,13 +2677,13 @@ var safetySettings = [
 ];
 var axAIGoogleGeminiDefaultConfig = () => structuredClone({
   model: "gemini-2.0-flash" /* Gemini20Flash */,
-  embedModel: "text-embedding-004" /* TextEmbedding004 */,
+  embedModel: "text-embedding-005" /* TextEmbedding005 */,
   safetySettings,
   ...axBaseAIDefaultConfig()
 });
 var axAIGoogleGeminiDefaultCreativeConfig = () => structuredClone({
   model: "gemini-2.0-flash" /* Gemini20Flash */,
-  embedModel: "text-embedding-004" /* TextEmbedding004 */,
+  embedModel: "text-embedding-005" /* TextEmbedding005 */,
   safetySettings,
   ...axBaseAIDefaultCreativeConfig()
 });
@@ -2691,6 +2698,10 @@ var AxAIGoogleGeminiImpl = class {
       throw new Error("Auto truncate is not supported for GoogleGemini");
     }
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -2953,18 +2964,14 @@ var AxAIGoogleGeminiImpl = class {
         return result;
       }
     );
-    let modelUsage;
     if (resp.usageMetadata) {
-      modelUsage = {
+      this.tokensUsed = {
         totalTokens: resp.usageMetadata.totalTokenCount,
         promptTokens: resp.usageMetadata.promptTokenCount,
         completionTokens: resp.usageMetadata.candidatesTokenCount
       };
     }
-    return {
-      results,
-      modelUsage
-    };
+    return { results };
   };
   createChatStreamResp = (resp) => {
     return this.createChatResp(resp);
@@ -3182,7 +3189,7 @@ var AxAIGroq = class extends AxAIOpenAIBase {
       debug: options?.debug
     });
     const rtFunc = async (func, info) => {
-      const totalTokens = info.modelUsage?.totalTokens || 0;
+      const totalTokens = info.modelUsage?.tokens?.totalTokens || 0;
       await rt.acquire(totalTokens);
       return await func();
     };
@@ -3212,6 +3219,10 @@ var AxAIHuggingFaceImpl = class {
   constructor(config) {
     this.config = config;
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -3505,6 +3516,10 @@ var AxAIRekaImpl = class {
   constructor(config) {
     this.config = config;
   }
+  tokensUsed;
+  getTokenUsage() {
+    return this.tokensUsed;
+  }
   getModelConfig() {
     const { config } = this;
     return {
@@ -3545,7 +3560,7 @@ var AxAIRekaImpl = class {
   };
   createChatResp = (resp) => {
     const { id, usage, responses } = resp;
-    const modelUsage = usage ? {
+    this.tokensUsed = usage ? {
       promptTokens: usage.input_tokens,
       completionTokens: usage.output_tokens,
       totalTokens: usage.input_tokens + usage.output_tokens
@@ -3564,15 +3579,11 @@ var AxAIRekaImpl = class {
         finishReason
       };
     });
-    return {
-      modelUsage,
-      results,
-      remoteId: id
-    };
+    return { results, remoteId: id };
   };
   createChatStreamResp = (resp) => {
     const { id, usage, responses } = resp;
-    const modelUsage = usage ? {
+    this.tokensUsed = usage ? {
       promptTokens: usage.input_tokens,
       completionTokens: usage.output_tokens,
       totalTokens: usage.input_tokens + usage.output_tokens
@@ -3591,10 +3602,7 @@ var AxAIRekaImpl = class {
         finishReason
       };
     });
-    return {
-      results,
-      modelUsage
-    };
+    return { results };
   };
 };
 var mapFinishReason3 = (finishReason) => {
@@ -3780,9 +3788,6 @@ var AxAI = class {
   getModelList() {
     return this.ai.getModelList();
   }
-  getDefaultModels() {
-    return this.ai.getDefaultModels();
-  }
   getMetrics() {
     return this.ai.getMetrics();
   }
@@ -4719,9 +4724,15 @@ function mergeProgramUsage(usages) {
     }
     const currentUsage = usageMap[key];
     if (currentUsage) {
-      currentUsage.promptTokens += usage.promptTokens;
-      currentUsage.completionTokens += usage.completionTokens;
-      currentUsage.totalTokens += usage.totalTokens;
+      const tokens = currentUsage.tokens ?? {
+        promptTokens: 0,
+        completionTokens: 0,
+        totalTokens: 0
+      };
+      tokens.promptTokens += usage?.tokens?.promptTokens ?? 0;
+      tokens.completionTokens += usage?.tokens?.completionTokens ?? 0;
+      tokens.totalTokens += usage?.tokens?.totalTokens ?? 0;
+      currentUsage.tokens = tokens;
     }
   }
   return Object.values(usageMap);
@@ -6241,13 +6252,9 @@ var AxGen = class extends AxProgramWithSignature {
     mem,
     options
   }) {
-    const { sessionId, traceId, model, functions: _functions } = options ?? {};
+    const { sessionId, traceId, functions: _functions } = options ?? {};
     const fastFail = options?.fastFail ?? this.options?.fastFail;
-    const modelName = model ?? ai.getDefaultModels().model;
-    const usageInfo = {
-      ai: ai.getName(),
-      model: modelName
-    };
+    const model = options.model;
     const functions = _functions?.map((f) => "toFunction" in f ? f.toFunction() : f)?.flat();
     const res = await this.forwardSendRequest({
       ai,
@@ -6259,7 +6266,6 @@ var AxGen = class extends AxProgramWithSignature {
         ai,
         model,
         res,
-        usageInfo,
         mem,
         traceId,
         sessionId,
@@ -6271,7 +6277,6 @@ var AxGen = class extends AxProgramWithSignature {
         ai,
         model,
         res,
-        usageInfo,
         mem,
         traceId,
         sessionId,
@@ -6283,14 +6288,13 @@ var AxGen = class extends AxProgramWithSignature {
     ai,
     model,
     res,
-    usageInfo,
     mem,
     sessionId,
     traceId,
     functions,
     fastFail
   }) {
-    const streamingValidation = fastFail ?? ai.getFeatures().functionCot !== true;
+    const streamingValidation = fastFail ?? ai.getFeatures(model).functionCot !== true;
     const functionCalls = [];
     const values = {};
     const xstate = {
@@ -6305,7 +6309,7 @@ var AxGen = class extends AxProgramWithSignature {
         continue;
       }
       if (v.modelUsage) {
-        this.usage.push({ ...usageInfo, ...v.modelUsage });
+        this.usage.push(v.modelUsage);
       }
       if (result.functionCalls) {
         mergeFunctionCalls(functionCalls, result.functionCalls);
@@ -6406,7 +6410,6 @@ var AxGen = class extends AxProgramWithSignature {
   async processResponse({
     ai,
     res,
-    usageInfo,
     mem,
     sessionId,
     traceId,
@@ -6419,7 +6422,7 @@ var AxGen = class extends AxProgramWithSignature {
     }
     for (const result of results) {
       if (res.modelUsage) {
-        this.usage.push({ ...usageInfo, ...res.modelUsage });
+        this.usage.push(res.modelUsage);
       }
       mem.addResult(result, sessionId);
       if (result.functionCalls?.length) {
@@ -7011,9 +7014,6 @@ var AxBalancer = class _AxBalancer {
   getModelList() {
     return this.currentService.getModelList();
   }
-  getDefaultModels() {
-    return this.currentService.getDefaultModels();
-  }
   getNextService() {
     const cs = this.services[++this.currentServiceIndex];
     if (cs === void 0) {
@@ -9165,12 +9165,6 @@ var AxMockAIService = class {
   getModelList() {
     return this.config.models;
   }
-  getDefaultModels() {
-    return {
-      model: this.config.modelInfo?.name ?? "mock-model",
-      embedModel: this.config.embedModelInfo?.name
-    };
-  }
   getMetrics() {
     return this.metrics;
   }
@@ -9193,9 +9187,13 @@ var AxMockAIService = class {
         }
       ],
       modelUsage: {
-        promptTokens: 10,
-        completionTokens: 5,
-        totalTokens: 15
+        ai: this.getName(),
+        model: "mock-model",
+        tokens: {
+          promptTokens: 10,
+          completionTokens: 5,
+          totalTokens: 15
+        }
       }
     };
   }
@@ -9213,9 +9211,13 @@ var AxMockAIService = class {
     return this.config.embedResponse ?? {
       embeddings: [[0.1, 0.2, 0.3]],
       modelUsage: {
-        promptTokens: 5,
-        completionTokens: 0,
-        totalTokens: 5
+        ai: this.getName(),
+        model: "mock-model",
+        tokens: {
+          promptTokens: 5,
+          completionTokens: 0,
+          totalTokens: 5
+        }
       }
     };
   }
@@ -11179,11 +11181,6 @@ var AxMultiServiceRouter = class {
       }
     });
   }
-  getDefaultModels() {
-    throw new Error(
-      "getDefaultModels is not supported for multi-service router."
-    );
-  }
   /**
    * If a model key is provided, delegate to the corresponding service's features.
    * Otherwise, returns a default feature set.
@@ -11345,6 +11342,7 @@ export {
   AxStringUtil,
   AxTestPrompt,
   axAIAnthropicDefaultConfig,
+  axAIAnthropicVertexDefaultConfig,
   axAIAzureOpenAIBestConfig,
   axAIAzureOpenAICreativeConfig,
   axAIAzureOpenAIDefaultConfig,