190proof 1.0.0 → 1.0.2

package/dist/index.d.mts

@@ -13,14 +13,9 @@ declare enum GPTModel {
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192"
 }
-declare enum Role {
-    User = "user",
-    Assistant = "assistant",
-    System = "system"
-}
 interface GenericMessage {
-    role: Role;
-    content: string;
+    role: "user" | "assistant" | "system";
+    content: string | AnthropicContentBlock[];
     timestamp?: string;
     files?: File[];
     functionCalls?: FunctionCall[];
@@ -31,14 +26,6 @@ interface File {
     url?: string;
     data?: string;
 }
-interface OpenAIMessage {
-    role: "user" | "assistant" | "system";
-    content: string;
-}
-interface AnthropicAIMessage {
-    role: "user" | "assistant" | "system";
-    content: string | AnthropicContentBlock[];
-}
 type AnthropicContentBlock = AnthropicTextContentBlock | AnthropicImageContentBlock;
 interface AnthropicTextContentBlock {
     type: "text";
@@ -80,20 +67,6 @@ interface OpenAIConfig {
 interface AnthropicAIConfig {
     service: "anthropic" | "bedrock";
 }
-interface OpenAIPayload {
-    model: GPTModel;
-    messages: OpenAIMessage[];
-    functions?: any[];
-    function_call?: "none" | "auto" | {
-        name: string;
-    };
-    temperature?: number;
-}
-interface AnthropicAIPayload {
-    model: ClaudeModel;
-    messages: AnthropicAIMessage[];
-    functions?: any[];
-}
 interface GenericPayload {
     model: GPTModel | ClaudeModel | GroqModel;
     messages: GenericMessage[];
@@ -104,8 +77,6 @@ interface GenericPayload {
     temperature?: number;
 }
 
-declare function callOpenAiWithRetries(identifier: string, openAiPayload: OpenAIPayload, openAiConfig?: OpenAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
-declare function callAnthropicWithRetries(identifier: string, AiPayload: AnthropicAIPayload, AiConfig?: AnthropicAIConfig, attempts?: number): Promise<ParsedResponseMessage>;
 declare function callWithRetries(identifier: string, aiPayload: GenericPayload, aiConfig?: OpenAIConfig | AnthropicAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
 
-export { ClaudeModel, GPTModel, GroqModel, Role, callAnthropicWithRetries, callOpenAiWithRetries, callWithRetries };
+export { ClaudeModel, GPTModel, GroqModel, callWithRetries };

package/dist/index.d.ts

@@ -13,14 +13,9 @@ declare enum GPTModel {
 declare enum GroqModel {
     LLAMA_3_70B_8192 = "llama3-70b-8192"
 }
-declare enum Role {
-    User = "user",
-    Assistant = "assistant",
-    System = "system"
-}
 interface GenericMessage {
-    role: Role;
-    content: string;
+    role: "user" | "assistant" | "system";
+    content: string | AnthropicContentBlock[];
     timestamp?: string;
     files?: File[];
     functionCalls?: FunctionCall[];
@@ -31,14 +26,6 @@ interface File {
     url?: string;
     data?: string;
 }
-interface OpenAIMessage {
-    role: "user" | "assistant" | "system";
-    content: string;
-}
-interface AnthropicAIMessage {
-    role: "user" | "assistant" | "system";
-    content: string | AnthropicContentBlock[];
-}
 type AnthropicContentBlock = AnthropicTextContentBlock | AnthropicImageContentBlock;
 interface AnthropicTextContentBlock {
     type: "text";
@@ -80,20 +67,6 @@ interface OpenAIConfig {
 interface AnthropicAIConfig {
     service: "anthropic" | "bedrock";
 }
-interface OpenAIPayload {
-    model: GPTModel;
-    messages: OpenAIMessage[];
-    functions?: any[];
-    function_call?: "none" | "auto" | {
-        name: string;
-    };
-    temperature?: number;
-}
-interface AnthropicAIPayload {
-    model: ClaudeModel;
-    messages: AnthropicAIMessage[];
-    functions?: any[];
-}
 interface GenericPayload {
     model: GPTModel | ClaudeModel | GroqModel;
     messages: GenericMessage[];
@@ -104,8 +77,6 @@ interface GenericPayload {
     temperature?: number;
 }
 
-declare function callOpenAiWithRetries(identifier: string, openAiPayload: OpenAIPayload, openAiConfig?: OpenAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
-declare function callAnthropicWithRetries(identifier: string, AiPayload: AnthropicAIPayload, AiConfig?: AnthropicAIConfig, attempts?: number): Promise<ParsedResponseMessage>;
 declare function callWithRetries(identifier: string, aiPayload: GenericPayload, aiConfig?: OpenAIConfig | AnthropicAIConfig, retries?: number, chunkTimeoutMs?: number): Promise<ParsedResponseMessage>;
 
-export { ClaudeModel, GPTModel, GroqModel, Role, callAnthropicWithRetries, callOpenAiWithRetries, callWithRetries };
+export { ClaudeModel, GPTModel, GroqModel, callWithRetries };

package/dist/index.js

@@ -27016,9 +27016,6 @@ __export(proof_exports, {
   ClaudeModel: () => ClaudeModel,
   GPTModel: () => GPTModel,
   GroqModel: () => GroqModel,
-  Role: () => Role,
-  callAnthropicWithRetries: () => callAnthropicWithRetries,
-  callOpenAiWithRetries: () => callOpenAiWithRetries,
   callWithRetries: () => callWithRetries
 });
 module.exports = __toCommonJS(proof_exports);
@@ -27042,12 +27039,6 @@ var GroqModel = /* @__PURE__ */ ((GroqModel2) => {
   GroqModel2["LLAMA_3_70B_8192"] = "llama3-70b-8192";
   return GroqModel2;
 })(GroqModel || {});
-var Role = /* @__PURE__ */ ((Role2) => {
-  Role2["User"] = "user";
-  Role2["Assistant"] = "assistant";
-  Role2["System"] = "system";
-  return Role2;
-})(Role || {});
 
 // ../node_modules/@aws-sdk/client-bedrock-runtime/dist-es/BedrockRuntimeClient.js
 init_dist_es3();
@@ -31532,10 +31523,14 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
 async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTimeoutMs) {
   const functionNames = openAiPayload.functions ? new Set(openAiPayload.functions.map((fn) => fn.name)) : null;
   if (!openAiConfig) {
+    const defaultOpenAIBaseUrl = (
+      // TODO: Remove this one we have per-provider configs
+      "https://gateway.ai.cloudflare.com/v1/932636fc124abb5171fd630afe668905/igpt"
+    );
     openAiConfig = {
       service: "openai",
       apiKey: process.env.OPENAI_API_KEY,
-      baseUrl: "https://api.openai.com/v1"
+      baseUrl: defaultOpenAIBaseUrl
     };
   }
   let response;
@@ -31564,7 +31559,7 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
     });
   } else {
     console.log(identifier, "Using OpenAI service", openAiPayload.model);
-    const endpoint = `${openAiConfig == null ? void 0 : openAiConfig.baseUrl}/chat/completions`;
+    const endpoint = `${openAiConfig.baseUrl}/openai/chat/completions`;
     if (openAiConfig.orgId) {
       console.log(identifier, "Using orgId", openAiConfig.orgId);
     }
@@ -31719,10 +31714,6 @@ async function callAnthropic(identifier, AiPayload, AiConfig) {
   if ((AiConfig == null ? void 0 : AiConfig.service) === "bedrock") {
     const AWS_REGION = "us-east-1";
     const MODEL_ID = "anthropic.claude-3-haiku-20240307-v1:0";
-    const AWS_ACCESS_KEY_ID = "AKIAZI2LICXWZC3QQ4O2";
-    const AWS_SECRET_ACCESS_KEY = "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";
-    process.env.AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID;
-    process.env.AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY;
     const client = new BedrockRuntimeClient({ region: AWS_REGION });
     const payload = {
       anthropic_version: "bedrock-2023-05-31",
@@ -31769,7 +31760,6 @@ async function callAnthropic(identifier, AiPayload, AiConfig) {
     data = response2.data;
   }
   const answers = data.content;
-  console.log("Anthropic API answers:", JSON.stringify({ answers }));
   if (!answers[0]) {
     console.error(identifier, "Missing answer in Anthropic API:", data);
     throw new Error("Missing answer in Anthropic API");
@@ -31915,7 +31905,7 @@ function prepareOpenAIPayload(payload) {
     model: payload.model,
     messages: payload.messages.map((message) => ({
       role: message.role,
-      content: message.content
+      content: normalizeMessageContent(message.content)
       // TODO: Handle files
     })),
     functions: payload.functions
@@ -31930,7 +31920,7 @@ function prepareGroqPayload(payload) {
     model: payload.model,
     messages: payload.messages.map((message) => ({
       role: message.role,
-      content: message.content
+      content: normalizeMessageContent(message.content)
     })),
     functions: (_a3 = payload.functions) == null ? void 0 : _a3.map((fn) => ({
       type: "function",
@@ -31938,6 +31928,9 @@ function prepareGroqPayload(payload) {
     }))
   };
 }
+function normalizeMessageContent(content) {
+  return Array.isArray(content) ? content.map((c5) => c5.type === "text" ? c5.text : `[${c5.type}]`).join("\n") : content;
+}
 async function callGroq(identifier, payload) {
   const response = await axios_default.post(
     "https://api.groq.com/openai/v1/chat/completions",
@@ -32002,9 +31995,6 @@ async function callGroqWithRetries(identifier, payload, retries = 5) {
   ClaudeModel,
   GPTModel,
   GroqModel,
-  Role,
-  callAnthropicWithRetries,
-  callOpenAiWithRetries,
   callWithRetries
 });
 /*! Bundled license information: