llm-exe 2.1.0 → 2.1.2

package/dist/index.d.mts

@@ -954,6 +954,9 @@ type AllLlm = {
     "amazon:meta.chat.v1": {
         input: AmazonBedrockRequest;
     };
+    "xai.chat.v1": {
+        input: OpenAiRequest;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -977,6 +980,9 @@ type AllUseLlmOptions = AllLlm & {
     "anthropic.claude-3-haiku": {
         input: Omit<AnthropicRequest, "model">;
     };
+    "xai.grok-2": {
+        input: OpenAiRequest;
+    };
 };
 type LlmProviderKey = keyof AllLlm;
 type EmbeddingProviderKey = keyof AllEmbedding;
@@ -994,7 +1000,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";
+type LlmProvider = "openai.chat" | "openai.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1168,6 +1174,8 @@ declare namespace index {
 }
 
 declare const configs: {
+    "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>;

package/dist/index.d.ts

@@ -954,6 +954,9 @@ type AllLlm = {
     "amazon:meta.chat.v1": {
         input: AmazonBedrockRequest;
     };
+    "xai.chat.v1": {
+        input: OpenAiRequest;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -977,6 +980,9 @@ type AllUseLlmOptions = AllLlm & {
     "anthropic.claude-3-haiku": {
         input: Omit<AnthropicRequest, "model">;
     };
+    "xai.grok-2": {
+        input: OpenAiRequest;
+    };
 };
 type LlmProviderKey = keyof AllLlm;
 type EmbeddingProviderKey = keyof AllEmbedding;
@@ -994,7 +1000,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";
+type LlmProvider = "openai.chat" | "openai.embedding" | "openai.chat-mock" | "anthropic.chat" | "amazon:anthropic.chat" | "amazon:meta.chat" | "amazon:nova.chat" | "amazon.embedding" | "xai.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1168,6 +1174,8 @@ declare namespace index {
 }
 
 declare const configs: {
+    "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>;

package/dist/index.js

@@ -2145,7 +2145,16 @@ function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
       ...a
     }))
   ];
-  if (first.role === "system") {
+  if (first.role === "system" && messages.length === 0) {
+    return [
+      {
+        role: "user",
+        content: first.content
+      },
+      ...messages
+    ];
+  }
+  if (first.role === "system" && messages.length > 0) {
     _outputObj.system = first.content;
     return messages;
   }
@@ -2286,11 +2295,59 @@ var bedrock = {
   "amazon:meta.chat.v1": amazonMetaChatV1
 };
 
+// src/llm/config/x/index.ts
+var xaiChatV1 = {
+  key: "xai.chat.v1",
+  provider: "xai.chat",
+  endpoint: `https://api.x.ai/v1/chat/completions`,
+  options: {
+    prompt: {},
+    topP: {},
+    useJson: {},
+    xAiApiKey: {
+      default: getEnvironmentVariable("XAI_API_KEY")
+    }
+  },
+  method: "POST",
+  headers: `{"Authorization":"Bearer {{xAiApiKey}}", "Content-Type": "application/json" }`,
+  mapBody: {
+    prompt: {
+      key: "messages",
+      sanitize: /* @__PURE__ */ __name((v) => {
+        if (typeof v === "string") {
+          return [
+            {
+              role: "user",
+              content: v
+            }
+          ];
+        }
+        return v;
+      }, "sanitize")
+    },
+    model: {
+      key: "model"
+    },
+    topP: {
+      key: "top_p"
+    },
+    useJson: {
+      key: "response_format.type",
+      sanitize: /* @__PURE__ */ __name((v) => v ? "json_object" : "text", "sanitize")
+    }
+  }
+};
+var xai = {
+  "xai.chat.v1": xaiChatV1,
+  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest")
+};
+
 // src/llm/config.ts
 var configs = {
   ...openai,
   ...anthropic,
-  ...bedrock
+  ...bedrock,
+  ...xai
 };
 function getLlmConfig(provider) {
   const pick2 = configs[provider];
@@ -2521,6 +2578,54 @@ function OutputDefault(result, _config) {
 }
 __name(OutputDefault, "OutputDefault");
 
+// src/llm/output/xai.ts
+function formatResult3(result) {
+  if (typeof result?.message?.content === "string") {
+    return {
+      type: "text",
+      text: result.message.content
+    };
+  } else if (result?.message && "tool_calls" in result.message) {
+    const tool_calls = result.message.tool_calls;
+    for (const call of tool_calls) {
+      return {
+        type: "function_use",
+        name: call.function.name,
+        input: JSON.parse(call.function.arguments)
+      };
+    }
+  }
+  return {
+    type: "text",
+    text: ""
+  };
+}
+__name(formatResult3, "formatResult");
+function OutputXAIChat(result, _config) {
+  const id = result.id;
+  const name = result?.model;
+  const created = result.created;
+  const [_content, ..._options] = result?.choices || [];
+  const stopReason = _content?.finish_reason;
+  const content = formatContent(_content, formatResult3);
+  const options = formatOptions(_options, formatResult3);
+  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
+  });
+}
+__name(OutputXAIChat, "OutputXAIChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2534,6 +2639,8 @@ function getOutputParser(config, response) {
       return OutputMetaLlama3Chat(response, config);
     // case "amazon:nova.chat.v1":
     // return OutputDefault(response, config);
+    case "xai.chat.v1":
+      return OutputXAIChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);

package/dist/index.mjs

@@ -2097,7 +2097,16 @@ function anthropicPromptSanitize(_messages, _inputBodyObj, _outputObj) {
       ...a
     }))
   ];
-  if (first.role === "system") {
+  if (first.role === "system" && messages.length === 0) {
+    return [
+      {
+        role: "user",
+        content: first.content
+      },
+      ...messages
+    ];
+  }
+  if (first.role === "system" && messages.length > 0) {
     _outputObj.system = first.content;
     return messages;
   }
@@ -2238,11 +2247,59 @@ var bedrock = {
   "amazon:meta.chat.v1": amazonMetaChatV1
 };
 
+// src/llm/config/x/index.ts
+var xaiChatV1 = {
+  key: "xai.chat.v1",
+  provider: "xai.chat",
+  endpoint: `https://api.x.ai/v1/chat/completions`,
+  options: {
+    prompt: {},
+    topP: {},
+    useJson: {},
+    xAiApiKey: {
+      default: getEnvironmentVariable("XAI_API_KEY")
+    }
+  },
+  method: "POST",
+  headers: `{"Authorization":"Bearer {{xAiApiKey}}", "Content-Type": "application/json" }`,
+  mapBody: {
+    prompt: {
+      key: "messages",
+      sanitize: /* @__PURE__ */ __name((v) => {
+        if (typeof v === "string") {
+          return [
+            {
+              role: "user",
+              content: v
+            }
+          ];
+        }
+        return v;
+      }, "sanitize")
+    },
+    model: {
+      key: "model"
+    },
+    topP: {
+      key: "top_p"
+    },
+    useJson: {
+      key: "response_format.type",
+      sanitize: /* @__PURE__ */ __name((v) => v ? "json_object" : "text", "sanitize")
+    }
+  }
+};
+var xai = {
+  "xai.chat.v1": xaiChatV1,
+  "xai.grok-2": withDefaultModel(xaiChatV1, "grok-2-latest")
+};
+
 // src/llm/config.ts
 var configs = {
   ...openai,
   ...anthropic,
-  ...bedrock
+  ...bedrock,
+  ...xai
 };
 function getLlmConfig(provider) {
   const pick2 = configs[provider];
@@ -2473,6 +2530,54 @@ function OutputDefault(result, _config) {
 }
 __name(OutputDefault, "OutputDefault");
 
+// src/llm/output/xai.ts
+function formatResult3(result) {
+  if (typeof result?.message?.content === "string") {
+    return {
+      type: "text",
+      text: result.message.content
+    };
+  } else if (result?.message && "tool_calls" in result.message) {
+    const tool_calls = result.message.tool_calls;
+    for (const call of tool_calls) {
+      return {
+        type: "function_use",
+        name: call.function.name,
+        input: JSON.parse(call.function.arguments)
+      };
+    }
+  }
+  return {
+    type: "text",
+    text: ""
+  };
+}
+__name(formatResult3, "formatResult");
+function OutputXAIChat(result, _config) {
+  const id = result.id;
+  const name = result?.model;
+  const created = result.created;
+  const [_content, ..._options] = result?.choices || [];
+  const stopReason = _content?.finish_reason;
+  const content = formatContent(_content, formatResult3);
+  const options = formatOptions(_options, formatResult3);
+  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
+  });
+}
+__name(OutputXAIChat, "OutputXAIChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2486,6 +2591,8 @@ function getOutputParser(config, response) {
       return OutputMetaLlama3Chat(response, config);
     // case "amazon:nova.chat.v1":
     // return OutputDefault(response, config);
+    case "xai.chat.v1":
+      return OutputXAIChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-exe",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "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",
@@ -9,11 +9,13 @@
     "anthropic",
     "bedrock",
     "llama",
+    "gpt-3.5-turbo",
     "gpt-4",
     "claude",
+    "grok",
     "chain",
     "prompt",
-    "agents"
+    "agent"
   ],
   "source": "./src/index.ts",
   "main": "./dist/index.js",
@@ -22,8 +24,7 @@
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     }
   },
   "files": [

package/readme.md

@@ -6,7 +6,8 @@ A package that provides simplified base components to make building and maintain
 
 - 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).
+- 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)
 - 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.
@@ -14,7 +15,7 @@ A package that provides simplified base components to make building and maintain
 ![llm-exe](https://assets.llm-exe.com/llm-exe-featured.jpg)
 
 
-See full docs [here](https://llm-exe.com)
+See full docs here: [https://llm-exe.com](https://llm-exe.com)
 
 
 ---