llm-exe 2.1.3 → 2.1.5

package/dist/index.d.mts

@@ -13,7 +13,7 @@ interface Serializable {
     deserialize?(): void;
 }
 
-type IChatMessageRole = "system" | "assistant" | "user" | "function" | "function_call";
+type IChatMessageRole = "system" | "model" | "assistant" | "user" | "function" | "function_call";
 interface IChatMessageContentDetailed {
     type: string;
     text?: string;
@@ -930,6 +930,10 @@ interface AnthropicRequest extends GenericLLm {
     model: string;
     anthropicApiKey?: string;
 }
+interface GeminiRequest extends GenericLLm {
+    model: string;
+    geminiApiKey?: string;
+}
 type AllEmbedding = {
     "openai.embedding.v1": {
         input: OpenAiEmbeddingOptions;
@@ -960,6 +964,9 @@ type AllLlm = {
     "ollama.chat.v1": {
         input: GenericLLm;
     };
+    "google.chat.v1": {
+        input: GeminiRequest;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -971,6 +978,9 @@ type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4o-mini": {
         input: Omit<OpenAiRequest, "model">;
     };
+    "anthropic.claude-3-7-sonnet": {
+        input: Omit<AnthropicRequest, "model">;
+    };
     "anthropic.claude-3-5-sonnet": {
         input: Omit<AnthropicRequest, "model">;
     };
@@ -983,9 +993,36 @@ type AllUseLlmOptions = AllLlm & {
     "anthropic.claude-3-haiku": {
         input: Omit<AnthropicRequest, "model">;
     };
+    "google.gemini-2.5-pro-exp-03-25": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.0-flash": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.0-flash-lite": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-1.5-pro": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "xai.grok-2": {
         input: OpenAiRequest;
     };
+    "ollama.deepseek-r1": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.3": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.2": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.1": {
+        input: GenericLLm;
+    };
+    "ollama.qwq": {
+        input: GenericLLm;
+    };
 };
 type LlmProviderKey = keyof AllLlm;
 type EmbeddingProviderKey = keyof AllEmbedding;
@@ -1003,7 +1040,7 @@ interface BaseRequest<_T extends Record<string, any>> {
 interface BaseLlm<_T extends BaseLlCall = BaseLlCall> extends BaseRequest<_T> {
 }
 
-type LlmProvider = "openai.chat" | "openai.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat" | "ollama.chat";
+type LlmProvider = "openai.chat" | "openai.embedding" | "google.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat" | "google.chat" | "ollama.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1182,12 +1219,22 @@ declare namespace index {
 }
 
 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-1.5-pro": Config<keyof AllLlm>;
     "ollama.chat.v1": Config<keyof AllLlm>;
+    "ollama.deepseek-r1": Config<keyof AllLlm>;
+    "ollama.llama3.3": Config<keyof AllLlm>;
+    "ollama.llama3.2": Config<keyof AllLlm>;
+    "ollama.llama3.1": Config<keyof AllLlm>;
+    "ollama.qwq": Config<keyof AllLlm>;
     "xai.chat.v1": Config<keyof AllLlm>;
     "xai.grok-2": 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-3-7-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-opus": Config<keyof AllLlm>;
     "anthropic.claude-3-sonnet": Config<keyof AllLlm>;
@@ -1237,4 +1284,4 @@ declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, op
     };
 };
 
-export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, useExecutors, useLlm, index as utils };
+export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, useExecutors, useLlm, index as utils };

package/dist/index.d.ts

@@ -13,7 +13,7 @@ interface Serializable {
     deserialize?(): void;
 }
 
-type IChatMessageRole = "system" | "assistant" | "user" | "function" | "function_call";
+type IChatMessageRole = "system" | "model" | "assistant" | "user" | "function" | "function_call";
 interface IChatMessageContentDetailed {
     type: string;
     text?: string;
@@ -930,6 +930,10 @@ interface AnthropicRequest extends GenericLLm {
     model: string;
     anthropicApiKey?: string;
 }
+interface GeminiRequest extends GenericLLm {
+    model: string;
+    geminiApiKey?: string;
+}
 type AllEmbedding = {
     "openai.embedding.v1": {
         input: OpenAiEmbeddingOptions;
@@ -960,6 +964,9 @@ type AllLlm = {
     "ollama.chat.v1": {
         input: GenericLLm;
     };
+    "google.chat.v1": {
+        input: GeminiRequest;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -971,6 +978,9 @@ type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4o-mini": {
         input: Omit<OpenAiRequest, "model">;
     };
+    "anthropic.claude-3-7-sonnet": {
+        input: Omit<AnthropicRequest, "model">;
+    };
     "anthropic.claude-3-5-sonnet": {
         input: Omit<AnthropicRequest, "model">;
     };
@@ -983,9 +993,36 @@ type AllUseLlmOptions = AllLlm & {
     "anthropic.claude-3-haiku": {
         input: Omit<AnthropicRequest, "model">;
     };
+    "google.gemini-2.5-pro-exp-03-25": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.0-flash": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-2.0-flash-lite": {
+        input: Omit<GeminiRequest, "model">;
+    };
+    "google.gemini-1.5-pro": {
+        input: Omit<GeminiRequest, "model">;
+    };
     "xai.grok-2": {
         input: OpenAiRequest;
     };
+    "ollama.deepseek-r1": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.3": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.2": {
+        input: GenericLLm;
+    };
+    "ollama.llama3.1": {
+        input: GenericLLm;
+    };
+    "ollama.qwq": {
+        input: GenericLLm;
+    };
 };
 type LlmProviderKey = keyof AllLlm;
 type EmbeddingProviderKey = keyof AllEmbedding;
@@ -1003,7 +1040,7 @@ interface BaseRequest<_T extends Record<string, any>> {
 interface BaseLlm<_T extends BaseLlCall = BaseLlCall> extends BaseRequest<_T> {
 }
 
-type LlmProvider = "openai.chat" | "openai.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat" | "ollama.chat";
+type LlmProvider = "openai.chat" | "openai.embedding" | "google.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat" | "google.chat" | "ollama.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1182,12 +1219,22 @@ declare namespace index {
 }
 
 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-1.5-pro": Config<keyof AllLlm>;
     "ollama.chat.v1": Config<keyof AllLlm>;
+    "ollama.deepseek-r1": Config<keyof AllLlm>;
+    "ollama.llama3.3": Config<keyof AllLlm>;
+    "ollama.llama3.2": Config<keyof AllLlm>;
+    "ollama.llama3.1": Config<keyof AllLlm>;
+    "ollama.qwq": Config<keyof AllLlm>;
     "xai.chat.v1": Config<keyof AllLlm>;
     "xai.grok-2": 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-3-7-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-5-sonnet": Config<keyof AllLlm>;
     "anthropic.claude-3-opus": Config<keyof AllLlm>;
     "anthropic.claude-3-sonnet": Config<keyof AllLlm>;
@@ -1237,4 +1284,4 @@ declare function createEmbedding<T extends EmbeddingProviderKey>(provider: T, op
     };
 };
 
-export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, useExecutors, useLlm, index as utils };
+export { BaseExecutor, type BaseLlm, BaseParser, BasePrompt, BaseStateItem, ChatPrompt, CustomParser, DefaultState, DefaultStateItem, type ExecutorContext, type IChatMessages, LlmExecutorOpenAiFunctions, type LlmProvider, type OpenAIModelName, OpenAiFunctionParser, TextPrompt, createCallableExecutor, createChatPrompt, createCoreExecutor, createCustomParser, createDialogue, createEmbedding, createLlmExecutor, createParser, createPrompt, createState, createStateItem, useExecutors, useLlm, index as utils };

package/dist/index.js

@@ -2185,8 +2185,7 @@ var openai = {
   "openai.gpt-4o-mini": withDefaultModel(openAiChatV1, "gpt-4o-mini")
 };
 
-// src/llm/config/anthropic/index.ts
-var ANTORPIC_VERSION = "2023-06-01";
+// src/llm/config/anthropic/promptSanitize.ts
 function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
   if (typeof _messages === "string") {
     return [
@@ -2220,49 +2219,6 @@ function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
   ];
 }
 __name(anthropicPromptSanitize, "anthropicPromptSanitize");
-var anthropicChatV1 = {
-  key: "anthropic.chat.v1",
-  provider: "anthropic.chat",
-  endpoint: `https://api.anthropic.com/v1/messages`,
-  headers: `{"x-api-key":"{{anthropicApiKey}}", "Content-Type": "application/json", "anthropic-version": "${ANTORPIC_VERSION}" }`,
-  method: "POST",
-  options: {
-    prompt: {},
-    system: {},
-    maxTokens: {
-      required: [
-        true,
-        "maxTokens required"
-      ],
-      default: 4096
-    },
-    anthropicApiKey: {
-      default: getEnvironmentVariable("ANTHROPIC_API_KEY")
-    }
-  },
-  mapBody: {
-    model: {
-      key: "model"
-    },
-    maxTokens: {
-      key: "max_tokens"
-    },
-    system: {
-      key: "system"
-    },
-    prompt: {
-      key: "messages",
-      sanitize: anthropicPromptSanitize
-    }
-  }
-};
-var anthropic = {
-  "anthropic.chat.v1": anthropicChatV1,
-  "anthropic.claude-3-5-sonnet": withDefaultModel(anthropicChatV1, "claude-3-5-sonnet-20240620"),
-  "anthropic.claude-3-opus": withDefaultModel(anthropicChatV1, "claude-3-opus-20240229"),
-  "anthropic.claude-3-sonnet": withDefaultModel(anthropicChatV1, "claude-3-sonnet-20240229"),
-  "anthropic.claude-3-haiku": withDefaultModel(anthropicChatV1, "claude-3-haiku-20240307")
-};
 
 // src/llm/config/bedrock/index.ts
 var ANTORPIC_BEDROCK_VERSION = "bedrock-2023-05-31";
@@ -2351,6 +2307,53 @@ var bedrock = {
   "amazon:meta.chat.v1": amazonMetaChatV1
 };
 
+// src/llm/config/anthropic/index.ts
+var ANTHROPIC_VERSION = "2023-06-01";
+var anthropicChatV1 = {
+  key: "anthropic.chat.v1",
+  provider: "anthropic.chat",
+  endpoint: `https://api.anthropic.com/v1/messages`,
+  headers: `{"x-api-key":"{{anthropicApiKey}}", "Content-Type": "application/json", "anthropic-version": "${ANTHROPIC_VERSION}" }`,
+  method: "POST",
+  options: {
+    prompt: {},
+    system: {},
+    maxTokens: {
+      required: [
+        true,
+        "maxTokens required"
+      ],
+      default: 4096
+    },
+    anthropicApiKey: {
+      default: getEnvironmentVariable("ANTHROPIC_API_KEY")
+    }
+  },
+  mapBody: {
+    model: {
+      key: "model"
+    },
+    maxTokens: {
+      key: "max_tokens"
+    },
+    system: {
+      key: "system"
+    },
+    prompt: {
+      key: "messages",
+      sanitize: anthropicPromptSanitize
+    }
+  }
+};
+var anthropic = {
+  "anthropic.chat.v1": anthropicChatV1,
+  "anthropic.claude-3-7-sonnet": withDefaultModel(anthropicChatV1, "claude-3-7-sonnet-latest"),
+  "anthropic.claude-3-5-sonnet": withDefaultModel(anthropicChatV1, "claude-3-5-sonnet-latest"),
+  "anthropic.claude-3-opus": withDefaultModel(anthropicChatV1, "claude-3-opus-latest"),
+  "anthropic.claude-3-sonnet": withDefaultModel(anthropicChatV1, "claude-3-sonnet-latest"),
+  "anthropic.claude-3-haiku": withDefaultModel(anthropicChatV1, "claude-3-haiku-latest")
+};
+
 // src/llm/config/x/index.ts
 var xaiChatV1 = {
   key: "xai.chat.v1",
@@ -2429,7 +2432,106 @@ var ollamaChatV1 = {
   }
 };
 var ollama = {
-  "ollama.chat.v1": ollamaChatV1
+  "ollama.chat.v1": ollamaChatV1,
+  "ollama.deepseek-r1": withDefaultModel(ollamaChatV1, "deepseek-r1"),
+  "ollama.llama3.3": withDefaultModel(ollamaChatV1, "llama3.3"),
+  "ollama.llama3.2": withDefaultModel(ollamaChatV1, "llama3.2"),
+  "ollama.llama3.1": withDefaultModel(ollamaChatV1, "llama3.1"),
+  "ollama.qwq": withDefaultModel(ollamaChatV1, "qwq")
+};
+
+// src/utils/modules/modifyPromptRoleChange.ts
+function modifyPromptRoleChange(messages, roleChanges) {
+  const roleChangeMap = new Map(roleChanges.map(({ from, to }) => [
+    from,
+    to
+  ]));
+  if (Array.isArray(messages)) {
+    return messages.map((message) => {
+      const newRole2 = roleChangeMap.get(message.role);
+      return newRole2 ? {
+        ...message,
+        role: newRole2
+      } : message;
+    });
+  }
+  const newRole = roleChangeMap.get(messages.role);
+  return newRole ? {
+    ...messages,
+    role: newRole
+  } : messages;
+}
+__name(modifyPromptRoleChange, "modifyPromptRoleChange");
+
+// src/llm/config/google/promptSanitizeMessageCallback.ts
+function googleGeminiPromptMessageCallback(_message) {
+  let message = {
+    ..._message
+  };
+  message = modifyPromptRoleChange(_message, [
+    {
+      from: "assistant",
+      to: "model"
+    },
+    {
+      from: "system",
+      to: "model"
+    }
+  ]);
+  const { role, ...payload } = message;
+  const parts = [];
+  if (typeof payload.content === "string") {
+    parts.push({
+      text: message.content
+    });
+  }
+  return {
+    role,
+    parts
+  };
+}
+__name(googleGeminiPromptMessageCallback, "googleGeminiPromptMessageCallback");
+
+// src/llm/config/google/promptSanitize.ts
+function googleGeminiPromptSanitize(_messages, _inputBodyObj, _outputObj) {
+  if (typeof _messages === "string") {
+    return _messages;
+  }
+  if (Array.isArray(_messages)) {
+    if (_messages.length === 0) {
+      throw new Error("Empty messages array");
+    }
+  }
+  return _messages.map(googleGeminiPromptMessageCallback);
+}
+__name(googleGeminiPromptSanitize, "googleGeminiPromptSanitize");
+
+// src/llm/config/google/index.ts
+var googleGeminiChatV1 = {
+  key: "google.chat.v1",
+  provider: "google.chat",
+  endpoint: `https://generativelanguage.googleapis.com/v1beta/models/{{model}}:generateContent?key={{geminiApiKey}}`,
+  options: {
+    prompt: {},
+    // topP: {},
+    geminiApiKey: {
+      default: getEnvironmentVariable("GEMINI_API_KEY")
+    }
+  },
+  method: "POST",
+  headers: `{"Content-Type": "application/json" }`,
+  mapBody: {
+    prompt: {
+      key: "contents",
+      sanitize: googleGeminiPromptSanitize
+    }
+  }
+};
+var google = {
+  "google.chat.v1": googleGeminiChatV1,
+  "google.gemini-2.0-flash": withDefaultModel(googleGeminiChatV1, "gemini-2.0-flash"),
+  "google.gemini-2.0-flash-lite": withDefaultModel(googleGeminiChatV1, "gemini-2.0-flash-lite"),
+  "google.gemini-1.5-pro": withDefaultModel(googleGeminiChatV1, "gemini-1.5-pro")
 };
 
 // src/llm/config.ts
@@ -2438,14 +2540,18 @@ var configs = {
   ...anthropic,
   ...bedrock,
   ...xai,
-  ...ollama
+  ...ollama,
+  ...google
 };
 function getLlmConfig(provider) {
+  if (!provider) {
+    throw new Error(`Missing provider`);
+  }
   const pick2 = configs[provider];
   if (pick2) {
     return pick2;
   }
-  throw new Error("Invalid provider");
+  throw new Error(`Invalid provider: ${provider}`);
 }
 __name(getLlmConfig, "getLlmConfig");
 
@@ -2791,6 +2897,57 @@ function OutputOllamaChat(result, _config) {
 }
 __name(OutputOllamaChat, "OutputOllamaChat");
 
+// src/llm/output/google.gemini/formatResult.ts
+function formatResult4(result) {
+  const { parts = [] } = result?.content || {};
+  if (parts.length === 1) {
+    const answer = parts[0];
+    if (!!answer?.functionCall && typeof answer?.functionCall === "object") {
+      return {
+        type: "function_use",
+        name: answer.functionCall.name,
+        input: JSON.parse(answer.functionCall.args)
+      };
+    } else {
+      return {
+        type: "text",
+        text: answer.text || ""
+      };
+    }
+  }
+  return {
+    type: "text",
+    text: ""
+  };
+}
+__name(formatResult4, "formatResult");
+
+// src/llm/output/google.gemini/index.ts
+function OutputGoogleGeminiChat(result, _config) {
+  const id = "result.id";
+  const name = result.modelVersion;
+  const created = (/* @__PURE__ */ new Date()).getTime();
+  const [_content, ..._options] = result?.candidates || [];
+  const stopReason = _content?.finishReason?.toLowerCase();
+  const content = formatContent(_content, formatResult4);
+  const options = formatOptions(_options, formatResult4);
+  const usage = {
+    output_tokens: result?.usageMetadata?.candidatesTokenCount,
+    input_tokens: result?.usageMetadata?.promptTokenCount,
+    total_tokens: result?.usageMetadata?.totalTokenCount
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options
+  });
+}
+__name(OutputGoogleGeminiChat, "OutputGoogleGeminiChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2808,6 +2965,8 @@ function getOutputParser(config, response) {
       return OutputXAIChat(response, config);
     case "ollama.chat.v1":
       return OutputOllamaChat(response, config);
+    case "google.chat.v1":
+      return OutputGoogleGeminiChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);
@@ -3421,11 +3580,14 @@ var embeddingConfigs = {
   }
 };
 function getEmbeddingConfig(provider) {
+  if (!provider) {
+    throw new Error(`Missing provider`);
+  }
   const pick2 = embeddingConfigs[provider];
   if (pick2) {
     return pick2;
   }
-  throw new Error("Invalid provider");
+  throw new Error(`Invalid provider: ${provider}`);
 }
 __name(getEmbeddingConfig, "getEmbeddingConfig");
 

package/dist/index.mjs

@@ -2137,8 +2137,7 @@ var openai = {
   "openai.gpt-4o-mini": withDefaultModel(openAiChatV1, "gpt-4o-mini")
 };
 
-// src/llm/config/anthropic/index.ts
-var ANTORPIC_VERSION = "2023-06-01";
+// src/llm/config/anthropic/promptSanitize.ts
 function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
   if (typeof _messages === "string") {
     return [
@@ -2172,49 +2171,6 @@ function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
   ];
 }
 __name(anthropicPromptSanitize, "anthropicPromptSanitize");
-var anthropicChatV1 = {
-  key: "anthropic.chat.v1",
-  provider: "anthropic.chat",
-  endpoint: `https://api.anthropic.com/v1/messages`,
-  headers: `{"x-api-key":"{{anthropicApiKey}}", "Content-Type": "application/json", "anthropic-version": "${ANTORPIC_VERSION}" }`,
-  method: "POST",
-  options: {
-    prompt: {},
-    system: {},
-    maxTokens: {
-      required: [
-        true,
-        "maxTokens required"
-      ],
-      default: 4096
-    },
-    anthropicApiKey: {
-      default: getEnvironmentVariable("ANTHROPIC_API_KEY")
-    }
-  },
-  mapBody: {
-    model: {
-      key: "model"
-    },
-    maxTokens: {
-      key: "max_tokens"
-    },
-    system: {
-      key: "system"
-    },
-    prompt: {
-      key: "messages",
-      sanitize: anthropicPromptSanitize
-    }
-  }
-};
-var anthropic = {
-  "anthropic.chat.v1": anthropicChatV1,
-  "anthropic.claude-3-5-sonnet": withDefaultModel(anthropicChatV1, "claude-3-5-sonnet-20240620"),
-  "anthropic.claude-3-opus": withDefaultModel(anthropicChatV1, "claude-3-opus-20240229"),
-  "anthropic.claude-3-sonnet": withDefaultModel(anthropicChatV1, "claude-3-sonnet-20240229"),
-  "anthropic.claude-3-haiku": withDefaultModel(anthropicChatV1, "claude-3-haiku-20240307")
-};
 
 // src/llm/config/bedrock/index.ts
 var ANTORPIC_BEDROCK_VERSION = "bedrock-2023-05-31";
@@ -2303,6 +2259,53 @@ var bedrock = {
   "amazon:meta.chat.v1": amazonMetaChatV1
 };
 
+// src/llm/config/anthropic/index.ts
+var ANTHROPIC_VERSION = "2023-06-01";
+var anthropicChatV1 = {
+  key: "anthropic.chat.v1",
+  provider: "anthropic.chat",
+  endpoint: `https://api.anthropic.com/v1/messages`,
+  headers: `{"x-api-key":"{{anthropicApiKey}}", "Content-Type": "application/json", "anthropic-version": "${ANTHROPIC_VERSION}" }`,
+  method: "POST",
+  options: {
+    prompt: {},
+    system: {},
+    maxTokens: {
+      required: [
+        true,
+        "maxTokens required"
+      ],
+      default: 4096
+    },
+    anthropicApiKey: {
+      default: getEnvironmentVariable("ANTHROPIC_API_KEY")
+    }
+  },
+  mapBody: {
+    model: {
+      key: "model"
+    },
+    maxTokens: {
+      key: "max_tokens"
+    },
+    system: {
+      key: "system"
+    },
+    prompt: {
+      key: "messages",
+      sanitize: anthropicPromptSanitize
+    }
+  }
+};
+var anthropic = {
+  "anthropic.chat.v1": anthropicChatV1,
+  "anthropic.claude-3-7-sonnet": withDefaultModel(anthropicChatV1, "claude-3-7-sonnet-latest"),
+  "anthropic.claude-3-5-sonnet": withDefaultModel(anthropicChatV1, "claude-3-5-sonnet-latest"),
+  "anthropic.claude-3-opus": withDefaultModel(anthropicChatV1, "claude-3-opus-latest"),
+  "anthropic.claude-3-sonnet": withDefaultModel(anthropicChatV1, "claude-3-sonnet-latest"),
+  "anthropic.claude-3-haiku": withDefaultModel(anthropicChatV1, "claude-3-haiku-latest")
+};
+
 // src/llm/config/x/index.ts
 var xaiChatV1 = {
   key: "xai.chat.v1",
@@ -2381,7 +2384,106 @@ var ollamaChatV1 = {
   }
 };
 var ollama = {
-  "ollama.chat.v1": ollamaChatV1
+  "ollama.chat.v1": ollamaChatV1,
+  "ollama.deepseek-r1": withDefaultModel(ollamaChatV1, "deepseek-r1"),
+  "ollama.llama3.3": withDefaultModel(ollamaChatV1, "llama3.3"),
+  "ollama.llama3.2": withDefaultModel(ollamaChatV1, "llama3.2"),
+  "ollama.llama3.1": withDefaultModel(ollamaChatV1, "llama3.1"),
+  "ollama.qwq": withDefaultModel(ollamaChatV1, "qwq")
+};
+
+// src/utils/modules/modifyPromptRoleChange.ts
+function modifyPromptRoleChange(messages, roleChanges) {
+  const roleChangeMap = new Map(roleChanges.map(({ from, to }) => [
+    from,
+    to
+  ]));
+  if (Array.isArray(messages)) {
+    return messages.map((message) => {
+      const newRole2 = roleChangeMap.get(message.role);
+      return newRole2 ? {
+        ...message,
+        role: newRole2
+      } : message;
+    });
+  }
+  const newRole = roleChangeMap.get(messages.role);
+  return newRole ? {
+    ...messages,
+    role: newRole
+  } : messages;
+}
+__name(modifyPromptRoleChange, "modifyPromptRoleChange");
+
+// src/llm/config/google/promptSanitizeMessageCallback.ts
+function googleGeminiPromptMessageCallback(_message) {
+  let message = {
+    ..._message
+  };
+  message = modifyPromptRoleChange(_message, [
+    {
+      from: "assistant",
+      to: "model"
+    },
+    {
+      from: "system",
+      to: "model"
+    }
+  ]);
+  const { role, ...payload } = message;
+  const parts = [];
+  if (typeof payload.content === "string") {
+    parts.push({
+      text: message.content
+    });
+  }
+  return {
+    role,
+    parts
+  };
+}
+__name(googleGeminiPromptMessageCallback, "googleGeminiPromptMessageCallback");
+
+// src/llm/config/google/promptSanitize.ts
+function googleGeminiPromptSanitize(_messages, _inputBodyObj, _outputObj) {
+  if (typeof _messages === "string") {
+    return _messages;
+  }
+  if (Array.isArray(_messages)) {
+    if (_messages.length === 0) {
+      throw new Error("Empty messages array");
+    }
+  }
+  return _messages.map(googleGeminiPromptMessageCallback);
+}
+__name(googleGeminiPromptSanitize, "googleGeminiPromptSanitize");
+
+// src/llm/config/google/index.ts
+var googleGeminiChatV1 = {
+  key: "google.chat.v1",
+  provider: "google.chat",
+  endpoint: `https://generativelanguage.googleapis.com/v1beta/models/{{model}}:generateContent?key={{geminiApiKey}}`,
+  options: {
+    prompt: {},
+    // topP: {},
+    geminiApiKey: {
+      default: getEnvironmentVariable("GEMINI_API_KEY")
+    }
+  },
+  method: "POST",
+  headers: `{"Content-Type": "application/json" }`,
+  mapBody: {
+    prompt: {
+      key: "contents",
+      sanitize: googleGeminiPromptSanitize
+    }
+  }
+};
+var google = {
+  "google.chat.v1": googleGeminiChatV1,
+  "google.gemini-2.0-flash": withDefaultModel(googleGeminiChatV1, "gemini-2.0-flash"),
+  "google.gemini-2.0-flash-lite": withDefaultModel(googleGeminiChatV1, "gemini-2.0-flash-lite"),
+  "google.gemini-1.5-pro": withDefaultModel(googleGeminiChatV1, "gemini-1.5-pro")
 };
 
 // src/llm/config.ts
@@ -2390,14 +2492,18 @@ var configs = {
   ...anthropic,
   ...bedrock,
   ...xai,
-  ...ollama
+  ...ollama,
+  ...google
 };
 function getLlmConfig(provider) {
+  if (!provider) {
+    throw new Error(`Missing provider`);
+  }
   const pick2 = configs[provider];
   if (pick2) {
     return pick2;
   }
-  throw new Error("Invalid provider");
+  throw new Error(`Invalid provider: ${provider}`);
 }
 __name(getLlmConfig, "getLlmConfig");
 
@@ -2743,6 +2849,57 @@ function OutputOllamaChat(result, _config) {
 }
 __name(OutputOllamaChat, "OutputOllamaChat");
 
+// src/llm/output/google.gemini/formatResult.ts
+function formatResult4(result) {
+  const { parts = [] } = result?.content || {};
+  if (parts.length === 1) {
+    const answer = parts[0];
+    if (!!answer?.functionCall && typeof answer?.functionCall === "object") {
+      return {
+        type: "function_use",
+        name: answer.functionCall.name,
+        input: JSON.parse(answer.functionCall.args)
+      };
+    } else {
+      return {
+        type: "text",
+        text: answer.text || ""
+      };
+    }
+  }
+  return {
+    type: "text",
+    text: ""
+  };
+}
+__name(formatResult4, "formatResult");
+
+// src/llm/output/google.gemini/index.ts
+function OutputGoogleGeminiChat(result, _config) {
+  const id = "result.id";
+  const name = result.modelVersion;
+  const created = (/* @__PURE__ */ new Date()).getTime();
+  const [_content, ..._options] = result?.candidates || [];
+  const stopReason = _content?.finishReason?.toLowerCase();
+  const content = formatContent(_content, formatResult4);
+  const options = formatOptions(_options, formatResult4);
+  const usage = {
+    output_tokens: result?.usageMetadata?.candidatesTokenCount,
+    input_tokens: result?.usageMetadata?.promptTokenCount,
+    total_tokens: result?.usageMetadata?.totalTokenCount
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options
+  });
+}
+__name(OutputGoogleGeminiChat, "OutputGoogleGeminiChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2760,6 +2917,8 @@ function getOutputParser(config, response) {
       return OutputXAIChat(response, config);
     case "ollama.chat.v1":
       return OutputOllamaChat(response, config);
+    case "google.chat.v1":
+      return OutputGoogleGeminiChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);
@@ -3373,11 +3532,14 @@ var embeddingConfigs = {
   }
 };
 function getEmbeddingConfig(provider) {
+  if (!provider) {
+    throw new Error(`Missing provider`);
+  }
   const pick2 = embeddingConfigs[provider];
   if (pick2) {
     return pick2;
   }
-  throw new Error("Invalid provider");
+  throw new Error(`Invalid provider: ${provider}`);
 }
 __name(getEmbeddingConfig, "getEmbeddingConfig");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-exe",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "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",
@@ -13,6 +13,7 @@
     "gpt-4",
     "claude",
     "grok",
+    "gemini",
     "chain",
     "prompt",
     "agent"
@@ -34,7 +35,9 @@
     "node": ">=18"
   },
   "scripts": {
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --coverage --forceExit",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.ts --detectOpenHandles --coverage --forceExit",
+    "test-examples": "eval $(cat .env) NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.examples.ts --detectOpenHandles --coverage --forceExit",
+    "test-one": "eval $(cat .env) NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --coverage --forceExit --config jest.config.examples.ts examples/helloWorldReasoning.test.ts",
     "build": "(concurrently \"tsc --p ./tsconfig.json -w\" \"tsc-alias -p tsconfig.json -w\")",
     "build:ci": "tsup src/index.ts --format cjs,esm --dts --clean",
     "build:package": "tsup src/index.ts --format cjs,esm --dts --clean",

package/readme.md

@@ -1,13 +1,13 @@
 # llm-exe
 
-[![node.js](https://github.com/gregreindel/llm-exe/actions/workflows/node.js.yml/badge.svg)](https://github.com/gregreindel/llm-exe/actions/workflows/node.js.yml) [![Coverage Status](https://coveralls.io/repos/github/gregreindel/llm-exe/badge.svg?branch=main)](https://coveralls.io/github/gregreindel/llm-exe?branch=main) [![npm version](https://badge.fury.io/js/llm-exe.svg)](https://badge.fury.io/js/llm-exe)
+[![tests](https://github.com/gregreindel/llm-exe/actions/workflows/tests.yml/badge.svg)](https://github.com/gregreindel/llm-exe/actions/workflows/tests.yml) [![Coverage Status](https://coveralls.io/repos/github/gregreindel/llm-exe/badge.svg?branch=main)](https://coveralls.io/github/gregreindel/llm-exe?branch=main) [![npm version](https://badge.fury.io/js/llm-exe.svg)](https://badge.fury.io/js/llm-exe)
 
 A package that provides simplified base components to make building and maintaining LLM-powered applications easier.
 
 - Write functions powered by LLM's with easy to use building blocks.
 - Pure Javascript and Typescript. Allows you to pass and infer types.
-- Support for text-based (llama-3) and chat-based prompts (gpt-4o, claude-3.5, grok-3).
-- Call LLM's from different providers without changing your code. (OpenAi/Anthropic/xAI/AWS Bedrock)
+- Support for text-based (llama-3) and chat-based prompts. (gpt-4o, claude-3.5, grok-3, Gemini, Bedrock, Ollama, etc)
+- Call LLM's from different providers without changing your code. (OpenAi/Anthropic/xAI/Google/AWS Bedrock/Ollama)
 - Supercharge your prompts by using handlebars within prompt template.
 - Allow LLM's to call functions (or call other LLM executors).
 - Not very opinionated. You have control on how you use it.