190proof 1.0.47 → 1.0.49

package/dist/index.d.mts

@@ -12,7 +12,9 @@ declare enum GPTModel {
     GPT4_0125_PREVIEW = "gpt-4-0125-preview",
     GPT4_0409 = "gpt-4-turbo-2024-04-09",
     GPT4O = "gpt-4o",
-    GPT4O_MINI = "gpt-4o-mini"
+    GPT4O_MINI = "gpt-4o-mini",
+    O1_PREVIEW = "o1-preview",
+    O1_MINI = "o1-mini"
 }
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192"

package/dist/index.d.ts

@@ -12,7 +12,9 @@ declare enum GPTModel {
     GPT4_0125_PREVIEW = "gpt-4-0125-preview",
     GPT4_0409 = "gpt-4-turbo-2024-04-09",
     GPT4O = "gpt-4o",
-    GPT4O_MINI = "gpt-4o-mini"
+    GPT4O_MINI = "gpt-4o-mini",
+    O1_PREVIEW = "o1-preview",
+    O1_MINI = "o1-mini"
 }
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192"

package/dist/index.js

@@ -27038,6 +27038,8 @@ var GPTModel = /* @__PURE__ */ ((GPTModel2) => {
   GPTModel2["GPT4_0409"] = "gpt-4-turbo-2024-04-09";
   GPTModel2["GPT4O"] = "gpt-4o";
   GPTModel2["GPT4O_MINI"] = "gpt-4o-mini";
+  GPTModel2["O1_PREVIEW"] = "o1-preview";
+  GPTModel2["O1_MINI"] = "o1-mini";
   return GPTModel2;
 })(GPTModel || {});
 var GroqModel = /* @__PURE__ */ ((GroqModel2) => {
@@ -31487,13 +31489,16 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
   for (let i5 = 0; i5 <= retries; i5++) {
     try {
       const timerId = `timer:${identifier}:${Date.now()}:callOpenAi:${openAiConfig == null ? void 0 : openAiConfig.service}-${openAiPayload.model}-${openAiConfig == null ? void 0 : openAiConfig.orgId}`;
-      const res = await callOpenAIStream(
-        identifier,
-        openAiPayload,
-        openAiConfig,
-        chunkTimeoutMs
-      );
-      return res;
+      if (openAiPayload.model === "o1-mini" /* O1_MINI */ || openAiPayload.model === "o1-preview" /* O1_PREVIEW */) {
+        return await callOpenAI(identifier, openAiPayload, openAiConfig);
+      } else {
+        return await callOpenAIStream(
+          identifier,
+          openAiPayload,
+          openAiConfig,
+          chunkTimeoutMs
+        );
+      }
     } catch (error) {
       console.error(error);
       console.error(
@@ -31515,7 +31520,7 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
       if (errorCode === "content_policy_violation") {
         console.log(
           identifier,
-          `Switching to OpenAI service due to content policy violation error`
+          `Removing images due to content policy violation error`
         );
         openAiPayload.messages.forEach((message) => {
           if (Array.isArray(message.content)) {
@@ -31642,9 +31647,9 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
     let functionCallArgs = "";
     const reader = response.body.getReader();
     let partialChunk = "";
-    let abortTimeout;
+    let abortTimeout = null;
     const startAbortTimeout = () => {
-      clearTimeout(abortTimeout);
+      abortTimeout && clearTimeout(abortTimeout);
       return setTimeout(() => {
         console.log(
           identifier,
@@ -31717,7 +31722,7 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
             );
             const error = new Error("Stream error: OpenAI error");
             error.data = json.error;
-            error.requestBody = openAiPayload;
+            error.requestBody = truncatePayload(openAiPayload);
             throw error;
           }
           if (chunkIndex !== 0)
@@ -31749,6 +31754,122 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
     throw new Error("Stream error: no response body");
   }
 }
+async function callOpenAI(identifier, openAiPayload, openAiConfig) {
+  const functionNames = openAiPayload.tools ? new Set(openAiPayload.tools.map((fn) => fn.function.name)) : null;
+  if (!openAiConfig) {
+    openAiConfig = {
+      service: "openai",
+      apiKey: process.env.OPENAI_API_KEY,
+      baseUrl: ""
+    };
+  }
+  let response;
+  if (openAiConfig.service === "azure") {
+    console.log(identifier, "Using Azure OpenAI service", openAiPayload.model);
+    const model = openAiPayload.model;
+    if (!openAiConfig.modelConfigMap) {
+      throw new Error(
+        "OpenAI config modelConfigMap is required when using Azure OpenAI service."
+      );
+    }
+    const azureConfig = openAiConfig.modelConfigMap[model];
+    let endpoint;
+    if (azureConfig.endpoint) {
+      endpoint = `${azureConfig.endpoint}/openai/deployments/${azureConfig.deployment}/chat/completions?api-version=${azureConfig.apiVersion}`;
+    } else {
+      throw new Error("Azure OpenAI endpoint is required in modelConfigMap.");
+    }
+    console.log(identifier, "Using endpoint", endpoint);
+    try {
+      const stringifiedPayload = JSON.stringify({
+        ...openAiPayload,
+        stream: false
+      });
+      const parsedPayload = JSON.parse(stringifiedPayload);
+    } catch (error) {
+      console.error(
+        identifier,
+        "OpenAI JSON parsing error:",
+        JSON.stringify(error)
+      );
+      throw error;
+    }
+    response = await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "api-key": azureConfig.apiKey
+      },
+      body: JSON.stringify({
+        ...openAiPayload,
+        stream: false
+      })
+    });
+  } else {
+    console.log(identifier, "Using OpenAI service", openAiPayload.model);
+    const endpoint = `https://api.openai.com/v1/chat/completions`;
+    if (openAiConfig.orgId) {
+      console.log(identifier, "Using orgId", openAiConfig.orgId);
+    }
+    response = await fetch(endpoint, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${openAiConfig.apiKey}`,
+        ...openAiConfig.orgId ? { "OpenAI-Organization": openAiConfig.orgId } : {}
+      },
+      body: JSON.stringify({
+        ...openAiPayload,
+        stream: false
+      })
+    });
+  }
+  if (!response.ok) {
+    const errorData = await response.json();
+    console.error(identifier, "OpenAI API error:", JSON.stringify(errorData));
+    throw new Error(`OpenAI API Error: ${errorData.error.message}`);
+  }
+  const data = await response.json();
+  if (!data.choices || !data.choices.length) {
+    if (data.error) {
+      console.error(identifier, "OpenAI error:", JSON.stringify(data.error));
+      throw new Error("OpenAI error: " + data.error.message);
+    }
+    throw new Error("OpenAI error: No choices returned.");
+  }
+  const choice = data.choices[0];
+  const functionCall = choice.function_call ? {
+    name: choice.function_call.name,
+    arguments: JSON.parse(choice.function_call.arguments)
+  } : null;
+  return {
+    role: "assistant",
+    content: choice.message.content || null,
+    function_call: functionCall
+  };
+}
+function truncatePayload(payload) {
+  return JSON.stringify(
+    {
+      ...payload,
+      messages: payload.messages.map((message) => {
+        if (typeof message.content === "string") {
+          message.content = message.content.slice(0, 100);
+        } else if (Array.isArray(message.content)) {
+          message.content = message.content.map((block) => {
+            if (block.type === "image_url") {
+              block.image_url.url = block.image_url.url.slice(0, 100);
+            }
+            return block;
+          });
+        }
+        return message;
+      })
+    },
+    null,
+    2
+  );
+}
 async function callAnthropicWithRetries(identifier, AiPayload, AiConfig, attempts = 5) {
   var _a3, _b, _c, _d;
   console.log(identifier, "Calling Anthropic API with retries");