llm-exe 2.1.1 → 2.1.3

package/dist/index.d.mts

@@ -954,6 +954,12 @@ type AllLlm = {
     "amazon:meta.chat.v1": {
         input: AmazonBedrockRequest;
     };
+    "xai.chat.v1": {
+        input: GenericLLm;
+    };
+    "ollama.chat.v1": {
+        input: GenericLLm;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -977,6 +983,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 +1003,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" | "ollama.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1143,6 +1152,10 @@ declare function filterObjectOnSchema(schema: any, doc: any, detach?: any, prope
 
 declare const asyncCallWithTimeout: <T = any>(asyncPromise: Promise<T>, timeLimit?: number) => Promise<T>;
 
+declare function guessProviderFromModel(payload: {
+    model: string;
+}): "openai" | "xai" | "bedrock:anthropic" | "anthropic";
+
 declare const maybeStringifyJSON: (objOrMaybeString: any) => string;
 declare const maybeParseJSON: <Expected = any>(objOrMaybeJSON: any) => Expected;
 declare function isObjectStringified(maybeObject: string): boolean;
@@ -1154,6 +1167,7 @@ declare const index_assert: typeof assert;
 declare const index_asyncCallWithTimeout: typeof asyncCallWithTimeout;
 declare const index_defineSchema: typeof defineSchema;
 declare const index_filterObjectOnSchema: typeof filterObjectOnSchema;
+declare const index_guessProviderFromModel: typeof guessProviderFromModel;
 declare const index_importHelpers: typeof importHelpers;
 declare const index_importPartials: typeof importPartials;
 declare const index_isObjectStringified: typeof isObjectStringified;
@@ -1164,10 +1178,13 @@ declare const index_registerPartials: typeof registerPartials;
 declare const index_replaceTemplateString: typeof replaceTemplateString;
 declare const index_replaceTemplateStringAsync: typeof replaceTemplateStringAsync;
 declare namespace index {
-  export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
+  export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_guessProviderFromModel as guessProviderFromModel, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
 }
 
 declare const configs: {
+    "ollama.chat.v1": 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>;

package/dist/index.d.ts

@@ -954,6 +954,12 @@ type AllLlm = {
     "amazon:meta.chat.v1": {
         input: AmazonBedrockRequest;
     };
+    "xai.chat.v1": {
+        input: GenericLLm;
+    };
+    "ollama.chat.v1": {
+        input: GenericLLm;
+    };
 };
 type AllUseLlmOptions = AllLlm & {
     "openai.gpt-4": {
@@ -977,6 +983,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 +1003,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" | "ollama.chat";
 interface Config<Pk = LlmProviderKey> {
     key: Pk;
     provider: LlmProvider;
@@ -1143,6 +1152,10 @@ declare function filterObjectOnSchema(schema: any, doc: any, detach?: any, prope
 
 declare const asyncCallWithTimeout: <T = any>(asyncPromise: Promise<T>, timeLimit?: number) => Promise<T>;
 
+declare function guessProviderFromModel(payload: {
+    model: string;
+}): "openai" | "xai" | "bedrock:anthropic" | "anthropic";
+
 declare const maybeStringifyJSON: (objOrMaybeString: any) => string;
 declare const maybeParseJSON: <Expected = any>(objOrMaybeJSON: any) => Expected;
 declare function isObjectStringified(maybeObject: string): boolean;
@@ -1154,6 +1167,7 @@ declare const index_assert: typeof assert;
 declare const index_asyncCallWithTimeout: typeof asyncCallWithTimeout;
 declare const index_defineSchema: typeof defineSchema;
 declare const index_filterObjectOnSchema: typeof filterObjectOnSchema;
+declare const index_guessProviderFromModel: typeof guessProviderFromModel;
 declare const index_importHelpers: typeof importHelpers;
 declare const index_importPartials: typeof importPartials;
 declare const index_isObjectStringified: typeof isObjectStringified;
@@ -1164,10 +1178,13 @@ declare const index_registerPartials: typeof registerPartials;
 declare const index_replaceTemplateString: typeof replaceTemplateString;
 declare const index_replaceTemplateStringAsync: typeof replaceTemplateStringAsync;
 declare namespace index {
-  export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
+  export { index_assert as assert, index_asyncCallWithTimeout as asyncCallWithTimeout, index_defineSchema as defineSchema, index_filterObjectOnSchema as filterObjectOnSchema, index_guessProviderFromModel as guessProviderFromModel, index_importHelpers as importHelpers, index_importPartials as importPartials, index_isObjectStringified as isObjectStringified, index_maybeParseJSON as maybeParseJSON, index_maybeStringifyJSON as maybeStringifyJSON, index_registerHelpers as registerHelpers, index_registerPartials as registerPartials, index_replaceTemplateString as replaceTemplateString, index_replaceTemplateStringAsync as replaceTemplateStringAsync };
 }
 
 declare const configs: {
+    "ollama.chat.v1": 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>;

package/dist/index.js

@@ -429,6 +429,7 @@ __export(utils_exports, {
   asyncCallWithTimeout: () => asyncCallWithTimeout,
   defineSchema: () => defineSchema,
   filterObjectOnSchema: () => filterObjectOnSchema,
+  guessProviderFromModel: () => guessProviderFromModel,
   importHelpers: () => importHelpers,
   importPartials: () => importPartials,
   isObjectStringified: () => isObjectStringified,
@@ -1403,6 +1404,61 @@ var asyncCallWithTimeout = /* @__PURE__ */ __name(async (asyncPromise, timeLimit
   });
 }, "asyncCallWithTimeout");
 
+// src/utils/modules/guessProviderFromModel.ts
+function isModelKnownOpenAi(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("gpt-") || model.startsWith("chatgpt-")) {
+    return true;
+  }
+  if (model === "o1" || model.startsWith("o1-")) {
+    return true;
+  }
+  if (model === "o3-mini") {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownOpenAi, "isModelKnownOpenAi");
+function isModelKnownAnthropic(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("claude-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownAnthropic, "isModelKnownAnthropic");
+function isModelKnownXai(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("grok-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownXai, "isModelKnownXai");
+function isModelKnownBedrockAnthropic(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("anthropic.claude-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownBedrockAnthropic, "isModelKnownBedrockAnthropic");
+function guessProviderFromModel(payload) {
+  switch (true) {
+    case isModelKnownOpenAi(payload):
+      return "openai";
+    case isModelKnownXai(payload):
+      return "xai";
+    case isModelKnownBedrockAnthropic(payload):
+      return "bedrock:anthropic";
+    case isModelKnownAnthropic(payload):
+      return "anthropic";
+    default:
+      throw new Error("Unsupported model");
+  }
+}
+__name(guessProviderFromModel, "guessProviderFromModel");
+
 // src/utils/modules/index.ts
 function registerHelpers(helpers) {
   hbs.registerHelpers(helpers);
@@ -2295,11 +2351,94 @@ 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/ollama/index.ts
+var ollamaChatV1 = {
+  key: "ollama.chat.v1",
+  provider: "ollama.chat",
+  endpoint: `${getEnvironmentVariable("OLLAMA_ENDPOINT") || `http://localhost:11434`}/api/chat`,
+  options: {
+    prompt: {}
+  },
+  method: "POST",
+  headers: `{"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"
+    }
+  }
+};
+var ollama = {
+  "ollama.chat.v1": ollamaChatV1
+};
+
 // src/llm/config.ts
 var configs = {
   ...openai,
   ...anthropic,
-  ...bedrock
+  ...bedrock,
+  ...xai,
+  ...ollama
 };
 function getLlmConfig(provider) {
   const pick2 = configs[provider];
@@ -2530,6 +2669,128 @@ 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/_utils/combineJsonl.ts
+function combineJsonl(jsonl) {
+  const lines = jsonl.trim().split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => {
+    try {
+      return JSON.parse(line);
+    } catch (e) {
+      throw new Error(`Invalid JSON: ${line}`);
+    }
+  });
+  if (lines.length === 0) {
+    throw new Error("No JSON lines provided.");
+  }
+  lines.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+  let combinedContent = lines.map((line) => line?.message?.content ?? "").join("");
+  combinedContent = combinedContent.replace(/\\u003c/g, "<").replace(/\\u003e/g, ">");
+  const finalLine = lines.find((line) => line.done === true);
+  if (!finalLine) {
+    throw new Error("No line found where done = true.");
+  }
+  const result = {
+    model: finalLine.model,
+    created_at: finalLine.created_at,
+    message: {
+      role: finalLine?.message?.role || "assistant",
+      content: combinedContent
+    },
+    done_reason: finalLine.done_reason,
+    done: finalLine.done,
+    total_duration: finalLine.total_duration,
+    load_duration: finalLine.load_duration,
+    prompt_eval_count: finalLine.prompt_eval_count,
+    prompt_eval_duration: finalLine.prompt_eval_duration,
+    eval_count: finalLine.eval_count,
+    eval_duration: finalLine.eval_duration
+  };
+  const content = {
+    type: "text",
+    text: combinedContent
+  };
+  return {
+    lines,
+    result,
+    content
+  };
+}
+__name(combineJsonl, "combineJsonl");
+
+// src/llm/output/ollama.ts
+function OutputOllamaChat(result, _config) {
+  const combined = combineJsonl(result);
+  const id = `${combined.result.model}.${combined.result.created_at}`;
+  const name = combined.result.model || _config?.model || "ollama.unknown";
+  const created = (/* @__PURE__ */ new Date(`${combined.result.created_at}`)).getTime();
+  const stopReason = `${combined?.result?.done_reason || "stop"}`;
+  const content = [
+    combined.content
+  ];
+  const usage = {
+    output_tokens: 0,
+    input_tokens: 0,
+    total_tokens: 0
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options: []
+  });
+}
+__name(OutputOllamaChat, "OutputOllamaChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2543,6 +2804,10 @@ 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);
+    case "ollama.chat.v1":
+      return OutputOllamaChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);
@@ -2553,12 +2818,26 @@ function getOutputParser(config, response) {
 }
 __name(getOutputParser, "getOutputParser");
 
+// src/utils/modules/isValidUrl.ts
+function isValidUrl(input) {
+  try {
+    new URL(input);
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(isValidUrl, "isValidUrl");
+
 // src/utils/modules/request.ts
 async function apiRequest(url, options) {
   const finalOptions = {
     ...options
   };
   try {
+    if (!url || !isValidUrl(url)) {
+      throw new Error("Invalid URL");
+    }
     const response = await fetch(url, finalOptions);
     if (!response.ok) {
       let message = `HTTP error. Status: ${response.status}. Error Message: ${response?.statusText || "Unknown error."}`;
@@ -2571,8 +2850,13 @@ async function apiRequest(url, options) {
       }
       throw new Error(message);
     }
-    const responseData = await response.json();
-    return responseData;
+    if (response.headers.get("content-type")?.includes("application/json")) {
+      const responseData = await response.json();
+      return responseData;
+    } else {
+      const responseData = await response.text();
+      return responseData;
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Error";
     throw new Error(`Request to ${url} failed: ${message}`);

package/dist/index.mjs

@@ -381,6 +381,7 @@ __export(utils_exports, {
   asyncCallWithTimeout: () => asyncCallWithTimeout,
   defineSchema: () => defineSchema,
   filterObjectOnSchema: () => filterObjectOnSchema,
+  guessProviderFromModel: () => guessProviderFromModel,
   importHelpers: () => importHelpers,
   importPartials: () => importPartials,
   isObjectStringified: () => isObjectStringified,
@@ -1355,6 +1356,61 @@ var asyncCallWithTimeout = /* @__PURE__ */ __name(async (asyncPromise, timeLimit
   });
 }, "asyncCallWithTimeout");
 
+// src/utils/modules/guessProviderFromModel.ts
+function isModelKnownOpenAi(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("gpt-") || model.startsWith("chatgpt-")) {
+    return true;
+  }
+  if (model === "o1" || model.startsWith("o1-")) {
+    return true;
+  }
+  if (model === "o3-mini") {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownOpenAi, "isModelKnownOpenAi");
+function isModelKnownAnthropic(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("claude-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownAnthropic, "isModelKnownAnthropic");
+function isModelKnownXai(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("grok-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownXai, "isModelKnownXai");
+function isModelKnownBedrockAnthropic(payload) {
+  const model = payload.model.toLowerCase();
+  if (model.startsWith("anthropic.claude-")) {
+    return true;
+  }
+  return false;
+}
+__name(isModelKnownBedrockAnthropic, "isModelKnownBedrockAnthropic");
+function guessProviderFromModel(payload) {
+  switch (true) {
+    case isModelKnownOpenAi(payload):
+      return "openai";
+    case isModelKnownXai(payload):
+      return "xai";
+    case isModelKnownBedrockAnthropic(payload):
+      return "bedrock:anthropic";
+    case isModelKnownAnthropic(payload):
+      return "anthropic";
+    default:
+      throw new Error("Unsupported model");
+  }
+}
+__name(guessProviderFromModel, "guessProviderFromModel");
+
 // src/utils/modules/index.ts
 function registerHelpers(helpers) {
   hbs.registerHelpers(helpers);
@@ -2247,11 +2303,94 @@ 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/ollama/index.ts
+var ollamaChatV1 = {
+  key: "ollama.chat.v1",
+  provider: "ollama.chat",
+  endpoint: `${getEnvironmentVariable("OLLAMA_ENDPOINT") || `http://localhost:11434`}/api/chat`,
+  options: {
+    prompt: {}
+  },
+  method: "POST",
+  headers: `{"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"
+    }
+  }
+};
+var ollama = {
+  "ollama.chat.v1": ollamaChatV1
+};
+
 // src/llm/config.ts
 var configs = {
   ...openai,
   ...anthropic,
-  ...bedrock
+  ...bedrock,
+  ...xai,
+  ...ollama
 };
 function getLlmConfig(provider) {
   const pick2 = configs[provider];
@@ -2482,6 +2621,128 @@ 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/_utils/combineJsonl.ts
+function combineJsonl(jsonl) {
+  const lines = jsonl.trim().split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => {
+    try {
+      return JSON.parse(line);
+    } catch (e) {
+      throw new Error(`Invalid JSON: ${line}`);
+    }
+  });
+  if (lines.length === 0) {
+    throw new Error("No JSON lines provided.");
+  }
+  lines.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+  let combinedContent = lines.map((line) => line?.message?.content ?? "").join("");
+  combinedContent = combinedContent.replace(/\\u003c/g, "<").replace(/\\u003e/g, ">");
+  const finalLine = lines.find((line) => line.done === true);
+  if (!finalLine) {
+    throw new Error("No line found where done = true.");
+  }
+  const result = {
+    model: finalLine.model,
+    created_at: finalLine.created_at,
+    message: {
+      role: finalLine?.message?.role || "assistant",
+      content: combinedContent
+    },
+    done_reason: finalLine.done_reason,
+    done: finalLine.done,
+    total_duration: finalLine.total_duration,
+    load_duration: finalLine.load_duration,
+    prompt_eval_count: finalLine.prompt_eval_count,
+    prompt_eval_duration: finalLine.prompt_eval_duration,
+    eval_count: finalLine.eval_count,
+    eval_duration: finalLine.eval_duration
+  };
+  const content = {
+    type: "text",
+    text: combinedContent
+  };
+  return {
+    lines,
+    result,
+    content
+  };
+}
+__name(combineJsonl, "combineJsonl");
+
+// src/llm/output/ollama.ts
+function OutputOllamaChat(result, _config) {
+  const combined = combineJsonl(result);
+  const id = `${combined.result.model}.${combined.result.created_at}`;
+  const name = combined.result.model || _config?.model || "ollama.unknown";
+  const created = (/* @__PURE__ */ new Date(`${combined.result.created_at}`)).getTime();
+  const stopReason = `${combined?.result?.done_reason || "stop"}`;
+  const content = [
+    combined.content
+  ];
+  const usage = {
+    output_tokens: 0,
+    input_tokens: 0,
+    total_tokens: 0
+  };
+  return BaseLlmOutput2({
+    id,
+    name,
+    created,
+    usage,
+    stopReason,
+    content,
+    options: []
+  });
+}
+__name(OutputOllamaChat, "OutputOllamaChat");
+
 // src/llm/output/index.ts
 function getOutputParser(config, response) {
   switch (config?.key) {
@@ -2495,6 +2756,10 @@ 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);
+    case "ollama.chat.v1":
+      return OutputOllamaChat(response, config);
     default: {
       if (config?.key?.startsWith("custom:")) {
         return OutputDefault(response, config);
@@ -2505,12 +2770,26 @@ function getOutputParser(config, response) {
 }
 __name(getOutputParser, "getOutputParser");
 
+// src/utils/modules/isValidUrl.ts
+function isValidUrl(input) {
+  try {
+    new URL(input);
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(isValidUrl, "isValidUrl");
+
 // src/utils/modules/request.ts
 async function apiRequest(url, options) {
   const finalOptions = {
     ...options
   };
   try {
+    if (!url || !isValidUrl(url)) {
+      throw new Error("Invalid URL");
+    }
     const response = await fetch(url, finalOptions);
     if (!response.ok) {
       let message = `HTTP error. Status: ${response.status}. Error Message: ${response?.statusText || "Unknown error."}`;
@@ -2523,8 +2802,13 @@ async function apiRequest(url, options) {
       }
       throw new Error(message);
     }
-    const responseData = await response.json();
-    return responseData;
+    if (response.headers.get("content-type")?.includes("application/json")) {
+      const responseData = await response.json();
+      return responseData;
+    } else {
+      const responseData = await response.text();
+      return responseData;
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : "Error";
     throw new Error(`Request to ${url} failed: ${message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-exe",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "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",
@@ -12,6 +12,7 @@
     "gpt-3.5-turbo",
     "gpt-4",
     "claude",
+    "grok",
     "chain",
     "prompt",
     "agent"
@@ -23,8 +24,7 @@
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs"
     }
   },
   "files": [
@@ -45,7 +45,9 @@
     "docs:build": "vitepress build docs",
     "lint": "eslint",
     "format:check": "prettier --check \"src\"",
-    "format:write": "prettier --write \"src\""
+    "format:write": "prettier --write \"src\"",
+    "publish-main": "npm publish",
+    "publish-beta": "npm publish --tag beta"
   },
   "author": "Greg Reindel",
   "license": "MIT",

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)
 
 
 ---