llm-exe 2.3.0 → 2.3.1

package/dist/index.d.mts

@@ -1042,6 +1042,12 @@ type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4o-mini": {
         input: Omit<OpenAiRequest, "model">;
     };
+    "anthropic.claude-sonnet-4-0": {
+        input: Omit<AnthropicRequest, "model">;
+    };
+    "anthropic.claude-opus-4-0": {
+        input: Omit<AnthropicRequest, "model">;
+    };
     "anthropic.claude-3-7-sonnet": {
         input: Omit<AnthropicRequest, "model">;
     };
@@ -1066,12 +1072,27 @@ type AllUseLlmOptions = AllLlm & {
     "google.gemini-2.0-flash-lite": {
         input: Omit<GeminiRequest, "model">;
     };
+    "google.gemini-2.5-flash": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.5-flash-lite": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "google.gemini-1.5-pro": {
         input: Omit<GeminiRequest, "model">;
     };
+    "google.gemini-2.5-pro": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "xai.grok-2": {
         input: OpenAiRequest;
     };
+    "xai.grok-3": {
+        input: OpenAiRequest;
+    };
+    "xai.grok-4": {
+        input: OpenAiRequest;
+    };
     "ollama.deepseek-r1": {
         input: GenericLLm;
     };
@@ -1321,7 +1342,10 @@ declare const configs: {
     "google.chat.v1": Config<keyof AllLlm>;
     "google.gemini-2.0-flash": Config<keyof AllLlm>;
     "google.gemini-2.0-flash-lite": Config<keyof AllLlm>;
+    "google.gemini-2.5-flash": Config<keyof AllLlm>;
+    "google.gemini-2.5-flash-lite": Config<keyof AllLlm>;
     "google.gemini-1.5-pro": Config<keyof AllLlm>;
+    "google.gemini-2.5-pro": Config<keyof AllLlm>;
     "ollama.chat.v1": Config<keyof AllLlm>;
     "ollama.deepseek-r1": Config<keyof AllLlm>;
     "ollama.llama3.3": Config<keyof AllLlm>;
@@ -1330,9 +1354,13 @@ declare const configs: {
     "ollama.qwq": Config<keyof AllLlm>;
     "xai.chat.v1": Config<keyof AllLlm>;
     "xai.grok-2": Config<keyof AllLlm>;
+    "xai.grok-3": Config<keyof AllLlm>;
+    "xai.grok-4": Config<keyof AllLlm>;
     "amazon:anthropic.chat.v1": Config<keyof AllLlm>;
     "amazon:meta.chat.v1": Config<keyof AllLlm>;
     "anthropic.chat.v1": Config<keyof AllLlm>;
+    "anthropic.claude-sonnet-4-0": Config<keyof AllLlm>;
+    "anthropic.claude-opus-4-0": Config<keyof AllLlm>;
     "anthropic.claude-3-7-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-haiku": Config<keyof AllLlm>;

package/dist/index.d.ts

@@ -1042,6 +1042,12 @@ type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4o-mini": {
         input: Omit<OpenAiRequest, "model">;
     };
+    "anthropic.claude-sonnet-4-0": {
+        input: Omit<AnthropicRequest, "model">;
+    };
+    "anthropic.claude-opus-4-0": {
+        input: Omit<AnthropicRequest, "model">;
+    };
     "anthropic.claude-3-7-sonnet": {
         input: Omit<AnthropicRequest, "model">;
     };
@@ -1066,12 +1072,27 @@ type AllUseLlmOptions = AllLlm & {
     "google.gemini-2.0-flash-lite": {
         input: Omit<GeminiRequest, "model">;
     };
+    "google.gemini-2.5-flash": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.5-flash-lite": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "google.gemini-1.5-pro": {
         input: Omit<GeminiRequest, "model">;
     };
+    "google.gemini-2.5-pro": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "xai.grok-2": {
         input: OpenAiRequest;
     };
+    "xai.grok-3": {
+        input: OpenAiRequest;
+    };
+    "xai.grok-4": {
+        input: OpenAiRequest;
+    };
     "ollama.deepseek-r1": {
         input: GenericLLm;
     };
@@ -1321,7 +1342,10 @@ declare const configs: {
     "google.chat.v1": Config<keyof AllLlm>;
     "google.gemini-2.0-flash": Config<keyof AllLlm>;
     "google.gemini-2.0-flash-lite": Config<keyof AllLlm>;
+    "google.gemini-2.5-flash": Config<keyof AllLlm>;
+    "google.gemini-2.5-flash-lite": Config<keyof AllLlm>;
     "google.gemini-1.5-pro": Config<keyof AllLlm>;
+    "google.gemini-2.5-pro": Config<keyof AllLlm>;
     "ollama.chat.v1": Config<keyof AllLlm>;
     "ollama.deepseek-r1": Config<keyof AllLlm>;
     "ollama.llama3.3": Config<keyof AllLlm>;
@@ -1330,9 +1354,13 @@ declare const configs: {
     "ollama.qwq": Config<keyof AllLlm>;
     "xai.chat.v1": Config<keyof AllLlm>;
     "xai.grok-2": Config<keyof AllLlm>;
+    "xai.grok-3": Config<keyof AllLlm>;
+    "xai.grok-4": Config<keyof AllLlm>;
     "amazon:anthropic.chat.v1": Config<keyof AllLlm>;
     "amazon:meta.chat.v1": Config<keyof AllLlm>;
     "anthropic.chat.v1": Config<keyof AllLlm>;
+    "anthropic.claude-sonnet-4-0": Config<keyof AllLlm>;
+    "anthropic.claude-opus-4-0": Config<keyof AllLlm>;
     "anthropic.claude-3-7-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-haiku": Config<keyof AllLlm>;

package/dist/index.js

@@ -2411,6 +2411,14 @@ var anthropicChatV1 = {
 };
 var anthropic = {
   "anthropic.chat.v1": anthropicChatV1,
+  "anthropic.claude-sonnet-4-0": withDefaultModel(
+    anthropicChatV1,
+    "claude-sonnet-4-0"
+  ),
+  "anthropic.claude-opus-4-0": withDefaultModel(
+    anthropicChatV1,
+    "claude-sonnet-4-0"
+  ),
   "anthropic.claude-3-7-sonnet": withDefaultModel(
     anthropicChatV1,
     "claude-3-7-sonnet-latest"
@@ -2423,6 +2431,7 @@ var anthropic = {
     anthropicChatV1,
     "claude-3-5-haiku-latest"
   ),
+  // Deprecated
   "anthropic.claude-3-opus": withDefaultModel(
     anthropicChatV1,
     "claude-3-opus-latest"
@@ -2447,12 +2456,7 @@ var xaiChatV1 = {
   mapBody: {
     prompt: {
       key: "messages",
-      sanitize: (v) => {
-        if (typeof v === "string") {
-          return [{ role: "user", content: v }];
-        }
-        return v;
-      }
+      sanitize: openaiPromptSanitize
     },
     model: {
       key: "model"
@@ -2468,7 +2472,9 @@ var xaiChatV1 = {
 };
 var xai = {
   "xai.chat.v1": xaiChatV1,
-  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest")
+  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest"),
+  "xai.grok-3": withDefaultModel(xaiChatV1, "grok-3"),
+  "xai.grok-4": withDefaultModel(xaiChatV1, "grok-4")
 };
 
 // src/llm/config/ollama/index.ts
@@ -2622,9 +2628,21 @@ var google = {
     googleGeminiChatV1,
     "gemini-2.0-flash-lite"
   ),
+  "google.gemini-2.5-flash": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-flash"
+  ),
+  "google.gemini-2.5-flash-lite": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-flash-lite"
+  ),
   "google.gemini-1.5-pro": withDefaultModel(
     googleGeminiChatV1,
     "gemini-1.5-pro"
+  ),
+  "google.gemini-2.5-pro": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-pro"
   )
 };
 
@@ -2646,12 +2664,7 @@ var deepseekChatV1 = {
   mapBody: {
     prompt: {
       key: "messages",
-      sanitize: (v) => {
-        if (typeof v === "string") {
-          return [{ role: "user", content: v }];
-        }
-        return v;
-      }
+      sanitize: openaiPromptSanitize
     },
     model: {
       key: "model"
@@ -2766,14 +2779,6 @@ function formatOptions(response, handler) {
   }
   return out;
 }
-function formatContent(response, handler) {
-  const out = [];
-  const result = handler(response);
-  if (result) {
-    out.push(result);
-  }
-  return out;
-}
 
 // src/llm/output/openai.ts
 function formatResult(result) {
@@ -2904,36 +2909,32 @@ function OutputDefault(result, _config) {
 
 // src/llm/output/xai.ts
 function formatResult3(result) {
+  const out = [];
   if (typeof result?.message?.content === "string") {
-    return {
+    out.push({
       type: "text",
       text: result.message.content
-    };
-  } else if (result?.message && "tool_calls" in result.message) {
-    const tool_calls = result.message.tool_calls;
-    if (tool_calls) {
-      for (const call of tool_calls) {
-        return {
-          functionId: call.id,
-          type: "function_use",
-          name: call.function.name,
-          input: JSON.parse(call.function.arguments)
-        };
-      }
+    });
+  }
+  if (result?.message?.tool_calls) {
+    for (const call of result.message.tool_calls) {
+      out.push({
+        functionId: call.id,
+        type: "function_use",
+        name: call.function.name,
+        input: maybeParseJSON(call.function.arguments)
+      });
     }
   }
-  return {
-    type: "text",
-    text: ""
-  };
+  return out;
 }
 function OutputXAIChat(result, _config) {
   const id = result.id;
-  const name = result?.model;
+  const name = result.model || _config?.model || "openai.unknown";
   const created = result.created;
   const [_content, ..._options] = result?.choices || [];
   const stopReason = _content?.finish_reason;
-  const content = formatContent(_content, formatResult3);
+  const content = formatResult3(_content);
   const options = formatOptions(_options, formatResult3);
   const usage = {
     output_tokens: result?.usage?.completion_tokens,
@@ -3071,6 +3072,51 @@ function OutputGoogleGeminiChat(result, _config) {
   });
 }
 
+// src/llm/output/deepseek.ts
+function formatResult5(result) {
+  const out = [];
+  if (typeof result?.message?.content === "string" && result?.message?.content) {
+    out.push({
+      type: "text",
+      text: result.message.content
+    });
+  }
+  if (result?.message?.tool_calls) {
+    for (const call of result.message.tool_calls) {
+      out.push({
+        functionId: call.id,
+        type: "function_use",
+        name: call.function.name,
+        input: maybeParseJSON(call.function.arguments)
+      });
+    }
+  }
+  return out;
+}
+function OutputDeepSeekChat(result, _config) {
+  const id = result.id;
+  const name = result.model || _config?.model || "deepseek.unknown";
+  const created = result.created;
+  const [_content, ..._options] = result?.choices || [];
+  const stopReason = _content?.finish_reason;
+  const content = formatResult5(_content);
+  const options = formatOptions(_options, formatResult5);
+  const usage = {
+    output_tokens: result?.usage?.completion_tokens,
+    input_tokens: result?.usage?.prompt_tokens,
+    total_tokens: result?.usage?.total_tokens
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options
+  });
+}
+
 // src/llm/output/index.ts
 function normalizeLlmOutputToInternalFormat(config, response) {
   switch (config?.key) {
@@ -3091,7 +3137,7 @@ function normalizeLlmOutputToInternalFormat(config, response) {
     case "google.chat.v1":
       return OutputGoogleGeminiChat(response, config);
     case "deepseek.chat.v1":
-      return OutputOpenAIChat(response, config);
+      return OutputDeepSeekChat(response, config);
     // use oai for now
     default: {
       if (config?.key?.startsWith("custom:")) {
@@ -3321,9 +3367,9 @@ async function parseHeaders(config, replacements, payload) {
 // src/llm/output/_utils/cleanJsonSchemaFor.ts
 var providerFieldExclusions = {
   "openai.chat": ["default"],
-  // fields to exclude for openai.chat
-  "anthropic.chat": []
-  // fields to exclude for openai.chat
+  // fields to exclude for openai.chat, xai, deepseek
+  "anthropic.chat": [],
+  "google.chat": ["additionalProperties"]
 };
 function cleanJsonSchemaFor(schema = {}, provider) {
   const clone = deepClone(schema);
@@ -3362,7 +3408,7 @@ async function useLlm_call(state, messages, _options) {
     })
   );
   if (_options && _options?.jsonSchema) {
-    if (state.provider.startsWith("openai")) {
+    if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       const curr = input["response_format"] || {};
       input["response_format"] = Object.assign(curr, {
         type: "json_schema",
@@ -3383,7 +3429,7 @@ async function useLlm_call(state, messages, _options) {
       } else {
         input["tool_choice"] = _options?.functionCall;
       }
-    } else if (state.provider.startsWith("openai")) {
+    } else if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       input["tool_choice"] = normalizeFunctionCall(
         _options?.functionCall,
         "openai"
@@ -3403,7 +3449,7 @@ async function useLlm_call(state, messages, _options) {
         description: f.description,
         input_schema: cleanJsonSchemaFor(f.parameters, "anthropic.chat")
       }));
-    } else if (state.provider.startsWith("openai")) {
+    } else if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       input["tools"] = _options.functions.map((f) => {
         const props = {
           name: f?.name,

package/dist/index.mjs

@@ -2350,6 +2350,14 @@ var anthropicChatV1 = {
 };
 var anthropic = {
   "anthropic.chat.v1": anthropicChatV1,
+  "anthropic.claude-sonnet-4-0": withDefaultModel(
+    anthropicChatV1,
+    "claude-sonnet-4-0"
+  ),
+  "anthropic.claude-opus-4-0": withDefaultModel(
+    anthropicChatV1,
+    "claude-sonnet-4-0"
+  ),
   "anthropic.claude-3-7-sonnet": withDefaultModel(
     anthropicChatV1,
     "claude-3-7-sonnet-latest"
@@ -2362,6 +2370,7 @@ var anthropic = {
     anthropicChatV1,
     "claude-3-5-haiku-latest"
   ),
+  // Deprecated
   "anthropic.claude-3-opus": withDefaultModel(
     anthropicChatV1,
     "claude-3-opus-latest"
@@ -2386,12 +2395,7 @@ var xaiChatV1 = {
   mapBody: {
     prompt: {
       key: "messages",
-      sanitize: (v) => {
-        if (typeof v === "string") {
-          return [{ role: "user", content: v }];
-        }
-        return v;
-      }
+      sanitize: openaiPromptSanitize
     },
     model: {
       key: "model"
@@ -2407,7 +2411,9 @@ var xaiChatV1 = {
 };
 var xai = {
   "xai.chat.v1": xaiChatV1,
-  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest")
+  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest"),
+  "xai.grok-3": withDefaultModel(xaiChatV1, "grok-3"),
+  "xai.grok-4": withDefaultModel(xaiChatV1, "grok-4")
 };
 
 // src/llm/config/ollama/index.ts
@@ -2561,9 +2567,21 @@ var google = {
     googleGeminiChatV1,
     "gemini-2.0-flash-lite"
   ),
+  "google.gemini-2.5-flash": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-flash"
+  ),
+  "google.gemini-2.5-flash-lite": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-flash-lite"
+  ),
   "google.gemini-1.5-pro": withDefaultModel(
     googleGeminiChatV1,
     "gemini-1.5-pro"
+  ),
+  "google.gemini-2.5-pro": withDefaultModel(
+    googleGeminiChatV1,
+    "gemini-2.5-pro"
   )
 };
 
@@ -2585,12 +2603,7 @@ var deepseekChatV1 = {
   mapBody: {
     prompt: {
       key: "messages",
-      sanitize: (v) => {
-        if (typeof v === "string") {
-          return [{ role: "user", content: v }];
-        }
-        return v;
-      }
+      sanitize: openaiPromptSanitize
     },
     model: {
       key: "model"
@@ -2705,14 +2718,6 @@ function formatOptions(response, handler) {
   }
   return out;
 }
-function formatContent(response, handler) {
-  const out = [];
-  const result = handler(response);
-  if (result) {
-    out.push(result);
-  }
-  return out;
-}
 
 // src/llm/output/openai.ts
 function formatResult(result) {
@@ -2843,36 +2848,32 @@ function OutputDefault(result, _config) {
 
 // src/llm/output/xai.ts
 function formatResult3(result) {
+  const out = [];
   if (typeof result?.message?.content === "string") {
-    return {
+    out.push({
       type: "text",
       text: result.message.content
-    };
-  } else if (result?.message && "tool_calls" in result.message) {
-    const tool_calls = result.message.tool_calls;
-    if (tool_calls) {
-      for (const call of tool_calls) {
-        return {
-          functionId: call.id,
-          type: "function_use",
-          name: call.function.name,
-          input: JSON.parse(call.function.arguments)
-        };
-      }
+    });
+  }
+  if (result?.message?.tool_calls) {
+    for (const call of result.message.tool_calls) {
+      out.push({
+        functionId: call.id,
+        type: "function_use",
+        name: call.function.name,
+        input: maybeParseJSON(call.function.arguments)
+      });
     }
   }
-  return {
-    type: "text",
-    text: ""
-  };
+  return out;
 }
 function OutputXAIChat(result, _config) {
   const id = result.id;
-  const name = result?.model;
+  const name = result.model || _config?.model || "openai.unknown";
   const created = result.created;
   const [_content, ..._options] = result?.choices || [];
   const stopReason = _content?.finish_reason;
-  const content = formatContent(_content, formatResult3);
+  const content = formatResult3(_content);
   const options = formatOptions(_options, formatResult3);
   const usage = {
     output_tokens: result?.usage?.completion_tokens,
@@ -3010,6 +3011,51 @@ function OutputGoogleGeminiChat(result, _config) {
   });
 }
 
+// src/llm/output/deepseek.ts
+function formatResult5(result) {
+  const out = [];
+  if (typeof result?.message?.content === "string" && result?.message?.content) {
+    out.push({
+      type: "text",
+      text: result.message.content
+    });
+  }
+  if (result?.message?.tool_calls) {
+    for (const call of result.message.tool_calls) {
+      out.push({
+        functionId: call.id,
+        type: "function_use",
+        name: call.function.name,
+        input: maybeParseJSON(call.function.arguments)
+      });
+    }
+  }
+  return out;
+}
+function OutputDeepSeekChat(result, _config) {
+  const id = result.id;
+  const name = result.model || _config?.model || "deepseek.unknown";
+  const created = result.created;
+  const [_content, ..._options] = result?.choices || [];
+  const stopReason = _content?.finish_reason;
+  const content = formatResult5(_content);
+  const options = formatOptions(_options, formatResult5);
+  const usage = {
+    output_tokens: result?.usage?.completion_tokens,
+    input_tokens: result?.usage?.prompt_tokens,
+    total_tokens: result?.usage?.total_tokens
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options
+  });
+}
+
 // src/llm/output/index.ts
 function normalizeLlmOutputToInternalFormat(config, response) {
   switch (config?.key) {
@@ -3030,7 +3076,7 @@ function normalizeLlmOutputToInternalFormat(config, response) {
     case "google.chat.v1":
       return OutputGoogleGeminiChat(response, config);
     case "deepseek.chat.v1":
-      return OutputOpenAIChat(response, config);
+      return OutputDeepSeekChat(response, config);
     // use oai for now
     default: {
       if (config?.key?.startsWith("custom:")) {
@@ -3260,9 +3306,9 @@ async function parseHeaders(config, replacements, payload) {
 // src/llm/output/_utils/cleanJsonSchemaFor.ts
 var providerFieldExclusions = {
   "openai.chat": ["default"],
-  // fields to exclude for openai.chat
-  "anthropic.chat": []
-  // fields to exclude for openai.chat
+  // fields to exclude for openai.chat, xai, deepseek
+  "anthropic.chat": [],
+  "google.chat": ["additionalProperties"]
 };
 function cleanJsonSchemaFor(schema = {}, provider) {
   const clone = deepClone(schema);
@@ -3301,7 +3347,7 @@ async function useLlm_call(state, messages, _options) {
     })
   );
   if (_options && _options?.jsonSchema) {
-    if (state.provider.startsWith("openai")) {
+    if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       const curr = input["response_format"] || {};
       input["response_format"] = Object.assign(curr, {
         type: "json_schema",
@@ -3322,7 +3368,7 @@ async function useLlm_call(state, messages, _options) {
       } else {
         input["tool_choice"] = _options?.functionCall;
       }
-    } else if (state.provider.startsWith("openai")) {
+    } else if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       input["tool_choice"] = normalizeFunctionCall(
         _options?.functionCall,
         "openai"
@@ -3342,7 +3388,7 @@ async function useLlm_call(state, messages, _options) {
         description: f.description,
         input_schema: cleanJsonSchemaFor(f.parameters, "anthropic.chat")
       }));
-    } else if (state.provider.startsWith("openai")) {
+    } else if (state.provider.startsWith("openai") || state.provider.startsWith("deepseek") || state.provider.startsWith("xai")) {
       input["tools"] = _options.functions.map((f) => {
         const props = {
           name: f?.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-exe",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Simplify building LLM-powered apps with easy-to-use base components, supporting text and chat-based prompts with handlebars template engine, output parsers, and flexible function calling capabilities.",
   "keywords": [
     "ai",