190proof 1.0.72 → 1.0.74

package/README.md

@@ -1,16 +1,17 @@
 # 190proof
 
-A unified interface for interacting with multiple AI providers including **OpenAI**, **Anthropic**, **Google**, and **Groq**. This package provides a consistent API for making requests to different LLM providers while handling retries, streaming, and multimodal inputs.
+A unified interface for interacting with multiple AI providers including **OpenAI**, **Anthropic**, **Google**, **Groq**, and **AWS Bedrock**. This package provides a consistent API for making requests to different LLM providers while handling retries, streaming, and multimodal inputs.
 
 ## Features
 
 Fully-local unified interface across multiple AI providers that includes:
 
-- 🖼️ Image format & size normalization
-- 🛠️ Consistent function calling
+- 🛠️ Consistent function/tool calling across all providers
 - 💬 Consistent message alternation & system instructions
+- 🖼️ Image format & size normalization
 - 🔄 Automatic retries with configurable attempts
 - 📡 Streaming by default
+- ☁️ Cloud service providers supported (Azure, AWS Bedrock)
 
 ## Installation
 
@@ -27,7 +28,7 @@ import { callWithRetries } from "190proof";
 import { GPTModel, GenericPayload } from "190proof/interfaces";
 
 const payload: GenericPayload = {
-  model: GPTModel.O1_MINI,
+  model: GPTModel.GPT4O_MINI,
   messages: [
     {
       role: "user",
@@ -40,11 +41,43 @@ const response = await callWithRetries("my-request-id", payload);
 console.log(response.content);
 ```
 
+### Using Different Providers
+
+```typescript
+import { callWithRetries } from "190proof";
+import {
+  ClaudeModel,
+  GeminiModel,
+  GroqModel,
+  GenericPayload,
+} from "190proof/interfaces";
+
+// Anthropic
+const claudePayload: GenericPayload = {
+  model: ClaudeModel.SONNET_4,
+  messages: [{ role: "user", content: "Hello!" }],
+};
+
+// Google
+const geminiPayload: GenericPayload = {
+  model: GeminiModel.GEMINI_2_0_FLASH,
+  messages: [{ role: "user", content: "Hello!" }],
+};
+
+// Groq
+const groqPayload: GenericPayload = {
+  model: GroqModel.LLAMA_3_70B_8192,
+  messages: [{ role: "user", content: "Hello!" }],
+};
+
+const response = await callWithRetries("request-id", claudePayload);
+```
+
 ### With Function Calling
 
 ```typescript
 const payload: GenericPayload = {
-  model: GPTModel.O1_MINI,
+  model: GPTModel.GPT4O,
   messages: [
     {
       role: "user",
@@ -70,13 +103,14 @@ const payload: GenericPayload = {
 };
 
 const response = await callWithRetries("function-call-example", payload);
+// response.function_call contains { name: string, arguments: Record<string, any> }
 ```
 
 ### With Images
 
 ```typescript
 const payload: GenericPayload = {
-  model: GPTModel.O1_MINI,
+  model: ClaudeModel.SONNET_4,
   messages: [
     {
       role: "user",
@@ -98,7 +132,7 @@ const response = await callWithRetries("image-example", payload);
 
 ```typescript
 const payload: GenericPayload = {
-  model: GPTModel.O1_MINI,
+  model: GeminiModel.GEMINI_2_0_FLASH,
   messages: [
     {
       role: "system",
@@ -128,35 +162,122 @@ const response = await callWithRetries("system-message-example", payload);
 - `gpt-4o-mini`
 - `o1-preview`
 - `o1-mini`
+- `o3-mini`
+- `gpt-4.1`
+- `gpt-4.1-mini`
+- `gpt-4.1-nano`
+- `gpt-5`
+- `gpt-5-mini`
 
 ### Anthropic Models
 
 - `claude-3-haiku-20240307`
 - `claude-3-sonnet-20240229`
 - `claude-3-opus-20240229`
+- `claude-3-5-haiku-20241022`
 - `claude-3-5-sonnet-20241022`
+- `claude-sonnet-4-20250514`
+- `claude-opus-4-20250514`
+- `claude-opus-4-1`
+- `claude-haiku-4-5`
+- `claude-sonnet-4-5`
+- `claude-opus-4-5`
 
 ### Google Models
 
 - `gemini-1.5-pro-latest`
+- `gemini-exp-1206`
+- `gemini-2.0-flash`
+- `gemini-2.0-flash-exp-image-generation`
+- `gemini-2.0-flash-thinking-exp`
+- `gemini-2.0-flash-thinking-exp-01-21`
+- `gemini-2.5-flash-preview-04-17`
+- `gemini-3-flash-preview`
 
 ### Groq Models
 
 - `llama3-70b-8192`
+- `deepseek-r1-distill-llama-70b`
+
+## Environment Variables
+
+Set the following environment variables for the providers you want to use:
+
+```bash
+# OpenAI
+OPENAI_API_KEY=your-openai-api-key
+
+# Anthropic
+ANTHROPIC_API_KEY=your-anthropic-api-key
+
+# Google
+GEMINI_API_KEY=your-gemini-api-key
+
+# Groq
+GROQ_API_KEY=your-groq-api-key
+
+# AWS Bedrock (for Anthropic via Bedrock)
+AWS_ACCESS_KEY_ID=your-aws-access-key
+AWS_SECRET_ACCESS_KEY=your-aws-secret-key
+```
 
 ## API Reference
 
-### `callWithRetries(identifier: string, payload: GenericPayload, config?: Config, retries?: number, chunkTimeoutMs?: number)`
+### `callWithRetries(identifier, payload, config?, retries?, chunkTimeoutMs?)`
 
 Main function to make requests to any supported AI provider.
 
 #### Parameters
 
-- `identifier`: Unique identifier for the request
-- `payload`: Request payload containing model, messages, and optional functions
-- `config`: Optional configuration for the specific provider
-- `retries`: Number of retry attempts (default: 5)
-- `chunkTimeoutMs`: Timeout for streaming chunks (default: 15000)
+- `identifier`: `string | string[]` - Unique identifier for the request (used for logging)
+- `payload`: `GenericPayload` - Request payload containing model, messages, and optional functions
+- `config`: `OpenAIConfig | AnthropicAIConfig` - Optional configuration for the specific provider
+- `retries`: `number` - Number of retry attempts (default: 5)
+- `chunkTimeoutMs`: `number` - Timeout for streaming chunks in ms (default: 15000)
+
+#### Returns
+
+`Promise<ParsedResponseMessage>`:
+
+```typescript
+interface ParsedResponseMessage {
+  role: "assistant";
+  content: string | null;
+  function_call: FunctionCall | null;
+  files: File[]; // For models that return files (e.g., image generation)
+}
+```
+
+### Configuration Options
+
+#### OpenAI Config
+
+```typescript
+interface OpenAIConfig {
+  service: "azure" | "openai";
+  apiKey: string;
+  baseUrl: string;
+  orgId?: string;
+  modelConfigMap?: Record<
+    GPTModel,
+    {
+      resource: string;
+      deployment: string;
+      apiVersion: string;
+      apiKey: string;
+      endpoint?: string;
+    }
+  >;
+}
+```
+
+#### Anthropic Config
+
+```typescript
+interface AnthropicAIConfig {
+  service: "anthropic" | "bedrock";
+}
+```
 
 ## License
 

package/dist/index.d.mts

@@ -2,9 +2,12 @@ declare enum ClaudeModel {
     HAIKU_3 = "claude-3-haiku-20240307",
     SONNET_3 = "claude-3-sonnet-20240229",
     OPUS_3 = "claude-3-opus-20240229",
+    HAIKU_3_5 = "claude-3-5-haiku-20241022",
     SONNET_3_5 = "claude-3-5-sonnet-20241022",
     SONNET_4 = "claude-sonnet-4-20250514",
     OPUS_4 = "claude-opus-4-20250514",
+    OPUS_4_1 = "claude-opus-4-1",
+    HAIKU_4_5 = "claude-haiku-4-5",
     SONNET_4_5 = "claude-sonnet-4-5",
     OPUS_4_5 = "claude-opus-4-5"
 }

package/dist/index.d.ts

@@ -2,9 +2,12 @@ declare enum ClaudeModel {
     HAIKU_3 = "claude-3-haiku-20240307",
     SONNET_3 = "claude-3-sonnet-20240229",
     OPUS_3 = "claude-3-opus-20240229",
+    HAIKU_3_5 = "claude-3-5-haiku-20241022",
     SONNET_3_5 = "claude-3-5-sonnet-20241022",
     SONNET_4 = "claude-sonnet-4-20250514",
     OPUS_4 = "claude-opus-4-20250514",
+    OPUS_4_1 = "claude-opus-4-1",
+    HAIKU_4_5 = "claude-haiku-4-5",
     SONNET_4_5 = "claude-sonnet-4-5",
     OPUS_4_5 = "claude-opus-4-5"
 }

package/dist/index.js

@@ -43,9 +43,12 @@ var ClaudeModel = /* @__PURE__ */ ((ClaudeModel2) => {
   ClaudeModel2["HAIKU_3"] = "claude-3-haiku-20240307";
   ClaudeModel2["SONNET_3"] = "claude-3-sonnet-20240229";
   ClaudeModel2["OPUS_3"] = "claude-3-opus-20240229";
+  ClaudeModel2["HAIKU_3_5"] = "claude-3-5-haiku-20241022";
   ClaudeModel2["SONNET_3_5"] = "claude-3-5-sonnet-20241022";
   ClaudeModel2["SONNET_4"] = "claude-sonnet-4-20250514";
   ClaudeModel2["OPUS_4"] = "claude-opus-4-20250514";
+  ClaudeModel2["OPUS_4_1"] = "claude-opus-4-1";
+  ClaudeModel2["HAIKU_4_5"] = "claude-haiku-4-5";
   ClaudeModel2["SONNET_4_5"] = "claude-sonnet-4-5";
   ClaudeModel2["OPUS_4_5"] = "claude-opus-4-5";
   return ClaudeModel2;
@@ -144,7 +147,11 @@ function parseStreamedResponse(identifier, paragraph, functionCallName, function
         arguments: JSON.parse(functionCallArgs)
       };
     } catch (error2) {
-      logger_default.error(identifier, "Error parsing functionCallArgs:", functionCallArgs);
+      logger_default.error(
+        identifier,
+        "Error parsing functionCallArgs:",
+        functionCallArgs
+      );
       throw error2;
     }
   }
@@ -195,7 +202,10 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
       );
       const errorCode = (_b = error2.data) == null ? void 0 : _b.code;
       if (errorCode === "content_policy_violation") {
-        logger_default.log(identifier, "Removing images due to content policy violation error");
+        logger_default.log(
+          identifier,
+          "Removing images due to content policy violation error"
+        );
         openAiPayload.messages.forEach((message) => {
           if (Array.isArray(message.content)) {
             message.content = message.content.filter(
@@ -205,18 +215,27 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
         });
       }
       if (i >= 2 && (openAiConfig == null ? void 0 : openAiConfig.service) === "azure" && errorCode === "content_filter") {
-        logger_default.log(identifier, "Switching to OpenAI service due to content filter error");
+        logger_default.log(
+          identifier,
+          "Switching to OpenAI service due to content filter error"
+        );
         openAiConfig.service = "openai";
       }
       if (i === 3) {
         if ((openAiConfig == null ? void 0 : openAiConfig.service) === "azure") {
-          logger_default.log(identifier, "Switching to OpenAI service due to Azure service error");
+          logger_default.log(
+            identifier,
+            "Switching to OpenAI service due to Azure service error"
+          );
           openAiConfig.service = "openai";
         }
       }
       if (i === 4) {
         if (openAiPayload.tools) {
-          logger_default.log(identifier, "Switching to no tool choice due to persistent error");
+          logger_default.log(
+            identifier,
+            "Switching to no tool choice due to persistent error"
+          );
           openAiPayload.tool_choice = "none";
         }
       }
@@ -267,7 +286,11 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
       });
       const parsedPayload = JSON.parse(stringifiedPayload);
     } catch (error2) {
-      logger_default.error(identifier, "Stream error: Azure OpenAI JSON parsing error:", error2);
+      logger_default.error(
+        identifier,
+        "Stream error: Azure OpenAI JSON parsing error:",
+        error2
+      );
     }
     response = await fetch(endpoint, {
       method: "POST",
@@ -323,7 +346,10 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
       const { done, value } = await reader.read();
       clearTimeout(abortTimeout2);
       if (done) {
-        logger_default.error(identifier, `Stream ended prematurely after ${chunkIndex + 1} chunks`);
+        logger_default.error(
+          identifier,
+          `Stream ended prematurely after ${chunkIndex + 1} chunks`
+        );
         throw new Error("Stream error: ended prematurely");
       }
       let chunk = new TextDecoder().decode(value);
@@ -605,7 +631,11 @@ async function callAnthropic(identifier, AiPayload, AiConfig) {
           /<thinking>|<\/thinking>|<answer>|<\/answer>/gs,
           ""
         );
-        logger_default.log(identifier, "No text in answer, returning text within tags:", text);
+        logger_default.log(
+          identifier,
+          "No text in answer, returning text within tags:",
+          text
+        );
       }
       if (textResponse) {
         textResponse += `
@@ -623,7 +653,11 @@ ${text}`;
     }
   }
   if (!textResponse && !functionCalls.length) {
-    logger_default.error(identifier, "Missing text & fns in Anthropic API response:", data);
+    logger_default.error(
+      identifier,
+      "Missing text & fns in Anthropic API response:",
+      data
+    );
     throw new Error("Missing text & fns in Anthropic API response");
   }
   return {
@@ -733,7 +767,10 @@ async function prepareGoogleAIPayload(payload) {
     }
     for (const file of message.files || []) {
       if (!((_a = file.mimeType) == null ? void 0 : _a.startsWith("image"))) {
-        logger_default.warn("payload", "Google AI API does not support non-image file types. Skipping file.");
+        logger_default.warn(
+          "payload",
+          "Google AI API does not support non-image file types. Skipping file."
+        );
         continue;
       }
       if (file.url) {
@@ -771,7 +808,6 @@ async function prepareGoogleAIPayload(payload) {
 }
 async function callGoogleAI(identifier, payload) {
   var _a, _b, _c;
-  logger_default.log(identifier, "Calling Google AI API");
   const googleMessages = jigGoogleMessages(payload.messages);
   const history = googleMessages.slice(0, -1);
   const lastMessage = googleMessages.slice(-1)[0];
@@ -815,7 +851,11 @@ async function callGoogleAI(identifier, payload) {
     };
   });
   if (!text && !(parsedFunctionCalls == null ? void 0 : parsedFunctionCalls.length) && !files.length) {
-    logger_default.error(identifier, "Missing text & fns in Google AI API response:", response);
+    logger_default.error(
+      identifier,
+      "Missing text & fns in Google AI API response:",
+      response
+    );
     throw new Error("Missing text & fns in Google AI API response");
   }
   return {
@@ -846,7 +886,6 @@ async function callGoogleAIWithRetries(identifier, payload, retries = 5) {
 async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chunkTimeoutMs = 15e3) {
   const id = identifier;
   if (isAnthropicPayload(aiPayload)) {
-    logger_default.log(id, "Delegating call to Anthropic API");
     return await callAnthropicWithRetries(
       id,
       await prepareAnthropicPayload(aiPayload),
@@ -854,7 +893,6 @@ async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chu
       retries
     );
   } else if (isOpenAiPayload(aiPayload)) {
-    logger_default.log(id, "Delegating call to OpenAI API");
     return await callOpenAiWithRetries(
       id,
       await prepareOpenAIPayload(aiPayload),
@@ -863,13 +901,8 @@ async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chu
       chunkTimeoutMs
     );
   } else if (isGroqPayload(aiPayload)) {
-    logger_default.log(id, "Delegating call to Groq API");
-    return await callGroqWithRetries(
-      id,
-      await prepareGroqPayload(aiPayload)
-    );
+    return await callGroqWithRetries(id, await prepareGroqPayload(aiPayload));
   } else if (isGoogleAIPayload(aiPayload)) {
-    logger_default.log(id, "Delegating call to Google AI API");
     return await callGoogleAIWithRetries(
       id,
       await prepareGoogleAIPayload(aiPayload),
@@ -904,7 +937,10 @@ async function prepareAnthropicPayload(payload) {
     }
     for (const file of message.files || []) {
       if (!((_a = file.mimeType) == null ? void 0 : _a.startsWith("image"))) {
-        logger_default.warn("payload", "Anthropic API does not support non-image file types. Skipping file.");
+        logger_default.warn(
+          "payload",
+          "Anthropic API does not support non-image file types. Skipping file."
+        );
         continue;
       }
       if (file.url) {
@@ -994,7 +1030,11 @@ async function prepareOpenAIPayload(payload) {
           });
         }
       } else {
-        logger_default.warn("payload", "Skipping file in message. File or image type not supported by OpenAI API:", file.mimeType);
+        logger_default.warn(
+          "payload",
+          "Skipping file in message. File or image type not supported by OpenAI API:",
+          file.mimeType
+        );
       }
     }
     preparedPayload.messages.push({
@@ -1074,7 +1114,11 @@ async function callGroqWithRetries(identifier, payload, retries = 5) {
       lastResponse = await callGroq(identifier, payload);
       return lastResponse;
     } catch (e) {
-      logger_default.error(identifier, `Retry #${i} error: ${e.message}`, ((_a = e.response) == null ? void 0 : _a.data) || e);
+      logger_default.error(
+        identifier,
+        `Retry #${i} error: ${e.message}`,
+        ((_a = e.response) == null ? void 0 : _a.data) || e
+      );
       await timeout(125 * i);
     }
   }