190proof 1.0.69 → 1.0.71

package/dist/index.js

@@ -86,6 +86,31 @@ var GeminiModel = /* @__PURE__ */ ((GeminiModel2) => {
   return GeminiModel2;
 })(GeminiModel || {});
 
+// logger.ts
+function formatIdentifier(identifier) {
+  if (Array.isArray(identifier)) {
+    return identifier.map((id) => `[${id}]`).join(" ");
+  }
+  return `[${identifier}]`;
+}
+function formatMessage(level, identifier, message) {
+  return `[${level}] ${formatIdentifier(identifier)} ${message}`;
+}
+function log(identifier, message, ...args) {
+  console.log(formatMessage("LOG", identifier, message), ...args);
+}
+function warn(identifier, message, ...args) {
+  console.warn(formatMessage("WARN", identifier, message), ...args);
+}
+function error(identifier, message, ...args) {
+  console.error(formatMessage("ERROR", identifier, message), ...args);
+}
+var logger_default = {
+  log,
+  warn,
+  error
+};
+
 // index.ts
 var import_client_bedrock_runtime = require("@aws-sdk/client-bedrock-runtime");
 var import_axios = __toESM(require("axios"));
@@ -118,13 +143,13 @@ function parseStreamedResponse(identifier, paragraph, functionCallName, function
         name: functionCallName,
         arguments: JSON.parse(functionCallArgs)
       };
-    } catch (error) {
-      console.error("Error parsing functionCallArgs:", functionCallArgs);
-      throw error;
+    } catch (error2) {
+      logger_default.error(identifier, "Error parsing functionCallArgs:", functionCallArgs);
+      throw error2;
     }
   }
   if (!paragraph && !functionCall) {
-    console.error(
+    logger_default.error(
       identifier,
       "Stream error: received message without content or function_call, raw:",
       JSON.stringify({ paragraph, functionCallName, functionCallArgs })
@@ -142,7 +167,7 @@ function parseStreamedResponse(identifier, paragraph, functionCallName, function
 }
 async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, retries = 5, chunkTimeoutMs = 15e3) {
   var _a, _b;
-  console.log(
+  logger_default.log(
     identifier,
     "Calling OpenAI API with retries:",
     openAiConfig == null ? void 0 : openAiConfig.service,
@@ -162,27 +187,15 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
           chunkTimeoutMs
         );
       }
-    } catch (error) {
-      console.error(error);
-      console.error(
+    } catch (error2) {
+      logger_default.error(
         identifier,
-        `Retrying due to error: received bad response from OpenAI API [${openAiConfig == null ? void 0 : openAiConfig.service}-${openAiPayload.model}-${openAiConfig == null ? void 0 : openAiConfig.orgId}]: ${error.message} - ${JSON.stringify((_a = error.response) == null ? void 0 : _a.data)}`
+        `Retry #${i} error: ${error2.message}`,
+        ((_a = error2.response) == null ? void 0 : _a.data) || error2.data || error2
       );
-      const errorCode = (_b = error.data) == null ? void 0 : _b.code;
-      if (errorCode) {
-        console.error(
-          identifier,
-          `Retry #${i} failed with API error: ${errorCode}`,
-          JSON.stringify({
-            data: error.data
-          })
-        );
-      }
+      const errorCode = (_b = error2.data) == null ? void 0 : _b.code;
       if (errorCode === "content_policy_violation") {
-        console.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(
@@ -192,34 +205,25 @@ async function callOpenAiWithRetries(identifier, openAiPayload, openAiConfig, re
         });
       }
       if (i >= 2 && (openAiConfig == null ? void 0 : openAiConfig.service) === "azure" && errorCode === "content_filter") {
-        console.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") {
-          console.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) {
-          console.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";
         }
       }
       await timeout(250);
     }
   }
-  console.error(
+  logger_default.error(
     identifier,
     `Failed to call OpenAI API after ${retries} attempts. Please lookup OpenAI status for active issues.`,
     errorObj
@@ -241,7 +245,7 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
   let response;
   const controller = new AbortController();
   if (openAiConfig.service === "azure") {
-    console.log(identifier, "Using Azure OpenAI service", openAiPayload.model);
+    logger_default.log(identifier, "Using Azure OpenAI service", openAiPayload.model);
     const model = openAiPayload.model;
     if (!openAiConfig.modelConfigMap) {
       throw new Error(
@@ -255,19 +259,15 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
     } else {
       throw new Error("Azure OpenAI endpoint is required in modelConfigMap.");
     }
-    console.log(identifier, "Using endpoint", endpoint);
+    logger_default.log(identifier, "Using endpoint", endpoint);
     try {
       const stringifiedPayload = JSON.stringify({
         ...openAiPayload,
         stream: true
       });
       const parsedPayload = JSON.parse(stringifiedPayload);
-    } catch (error) {
-      console.error(
-        identifier,
-        "Stream error: Azure OpenAI JSON parsing error:",
-        JSON.stringify(error)
-      );
+    } catch (error2) {
+      logger_default.error(identifier, "Stream error: Azure OpenAI JSON parsing error:", error2);
     }
     response = await fetch(endpoint, {
       method: "POST",
@@ -282,10 +282,10 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
       signal: controller.signal
     });
   } else {
-    console.log(identifier, "Using OpenAI service", openAiPayload.model);
+    logger_default.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);
+      logger_default.log(identifier, "Using orgId", openAiConfig.orgId);
     }
     response = await fetch(endpoint, {
       method: "POST",
@@ -312,11 +312,7 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
     const startAbortTimeout = () => {
       abortTimeout && clearTimeout(abortTimeout);
       return setTimeout(() => {
-        console.log(
-          identifier,
-          `Stream error: aborted due to timeout after ${chunkTimeoutMs} ms.`,
-          JSON.stringify({ paragraph })
-        );
+        logger_default.error(identifier, `Stream timeout after ${chunkTimeoutMs}ms`);
         controller.abort();
       }, chunkTimeoutMs);
     };
@@ -327,11 +323,7 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
       const { done, value } = await reader.read();
       clearTimeout(abortTimeout2);
       if (done) {
-        console.log(
-          identifier,
-          `Stream error: ended after ${chunkIndex + 1} chunks via reader done flag.`,
-          rawStreamedBody
-        );
+        logger_default.error(identifier, `Stream ended prematurely after ${chunkIndex + 1} chunks`);
         throw new Error("Stream error: ended prematurely");
       }
       let chunk = new TextDecoder().decode(value);
@@ -346,10 +338,6 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
           continue;
         }
         if (jsonString.includes("[DONE]")) {
-          console.log(
-            identifier,
-            `Stream explicitly marked as done after ${chunkIndex + 1} chunks.`
-          );
           try {
             return parseStreamedResponse(
               identifier,
@@ -358,40 +346,29 @@ async function callOpenAIStream(identifier, openAiPayload, openAiConfig, chunkTi
               functionCallArgs,
               functionNames
             );
-          } catch (error) {
-            console.error(
-              identifier,
-              "Stream error: parsing response:",
-              rawStreamedBody
-            );
-            throw error;
+          } catch (error2) {
+            logger_default.error(identifier, "Stream error: parsing response");
+            throw error2;
           }
         }
         let json;
         try {
           json = JSON.parse(jsonString.trim());
-        } catch (error) {
+        } catch (error2) {
           partialChunk = jsonString;
           continue;
         }
         if (!json.choices || !json.choices.length) {
           if (json.error) {
-            console.error(
-              identifier,
-              "Stream error: OpenAI error:",
-              json.error && JSON.stringify(json.error)
-            );
-            const error = new Error("Stream error: OpenAI error");
-            error.data = json.error;
-            error.requestBody = truncatePayload(openAiPayload);
-            throw error;
+            logger_default.error(identifier, "Stream error: OpenAI error:", json.error);
+            const error2 = new Error("Stream error: OpenAI error");
+            error2.data = json.error;
+            error2.requestBody = truncatePayload(openAiPayload);
+            throw error2;
+          }
+          if (chunkIndex !== 0) {
+            logger_default.error(identifier, "Stream error: no choices in JSON:", json);
           }
-          if (chunkIndex !== 0)
-            console.error(
-              identifier,
-              "Stream error: no choices in JSON:",
-              json
-            );
           continue;
         }
         const dToolCall = (_d = (_c = (_b = (_a = json.choices) == null ? void 0 : _a[0]) == null ? void 0 : _b.delta) == null ? void 0 : _c.tool_calls) == null ? void 0 : _d[0];
@@ -426,7 +403,7 @@ async function callOpenAI(identifier, openAiPayload, openAiConfig) {
   }
   let response;
   if (openAiConfig.service === "azure") {
-    console.log(identifier, "Using Azure OpenAI service", openAiPayload.model);
+    logger_default.log(identifier, "Using Azure OpenAI service", openAiPayload.model);
     const model = openAiPayload.model;
     if (!openAiConfig.modelConfigMap) {
       throw new Error(
@@ -440,20 +417,16 @@ async function callOpenAI(identifier, openAiPayload, openAiConfig) {
     } else {
       throw new Error("Azure OpenAI endpoint is required in modelConfigMap.");
     }
-    console.log(identifier, "Using endpoint", endpoint);
+    logger_default.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;
+    } catch (error2) {
+      logger_default.error(identifier, "OpenAI JSON parsing error:", error2);
+      throw error2;
     }
     response = await fetch(endpoint, {
       method: "POST",
@@ -467,10 +440,10 @@ async function callOpenAI(identifier, openAiPayload, openAiConfig) {
       })
     });
   } else {
-    console.log(identifier, "Using OpenAI service", openAiPayload.model);
+    logger_default.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);
+      logger_default.log(identifier, "Using orgId", openAiConfig.orgId);
     }
     response = await fetch(endpoint, {
       method: "POST",
@@ -487,13 +460,13 @@ async function callOpenAI(identifier, openAiPayload, openAiConfig) {
   }
   if (!response.ok) {
     const errorData = await response.json();
-    console.error(identifier, "OpenAI API error:", JSON.stringify(errorData));
+    logger_default.error(identifier, "OpenAI API error:", 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));
+      logger_default.error(identifier, "OpenAI error:", data.error);
       throw new Error("OpenAI error: " + data.error.message);
     }
     throw new Error("OpenAI error: No choices returned.");
@@ -534,29 +507,28 @@ function truncatePayload(payload) {
 }
 async function callAnthropicWithRetries(identifier, AiPayload, AiConfig, attempts = 5) {
   var _a, _b, _c, _d;
-  console.log(identifier, "Calling Anthropic API with retries");
+  logger_default.log(identifier, "Calling Anthropic API with retries");
   let lastResponse;
   for (let i = 0; i < attempts; i++) {
     try {
       lastResponse = await callAnthropic(identifier, AiPayload, AiConfig);
       return lastResponse;
     } catch (e) {
-      console.error(e);
-      console.error(
+      logger_default.error(
         identifier,
-        `Retrying due to error: received bad response from Anthropic API: ${e.message}`,
-        JSON.stringify((_a = e.response) == null ? void 0 : _a.data)
+        `Retry #${i} error: ${e.message}`,
+        ((_a = e.response) == null ? void 0 : _a.data) || e
       );
       if (((_d = (_c = (_b = e.response) == null ? void 0 : _b.data) == null ? void 0 : _c.error) == null ? void 0 : _d.type) === "rate_limit_error") {
       }
       await timeout(125 * i);
     }
   }
-  const error = new Error(
+  const error2 = new Error(
     `Failed to call Anthropic API after ${attempts} attempts`
   );
-  error.response = lastResponse;
-  throw error;
+  error2.response = lastResponse;
+  throw error2;
 }
 async function callAnthropic(identifier, AiPayload, AiConfig) {
   var _a, _b;
@@ -615,14 +587,14 @@ async function callAnthropic(identifier, AiPayload, AiConfig) {
   }
   const answers = data.content;
   if (!answers[0]) {
-    console.error(identifier, "Missing answer in Anthropic API:", data);
+    logger_default.error(identifier, "Missing answer in Anthropic API:", data);
     throw new Error("Missing answer in Anthropic API");
   }
   let textResponse = "";
   let functionCalls = [];
   for (const answer of answers) {
     if (!answer.type) {
-      console.error(identifier, "Missing answer type in Anthropic API:", data);
+      logger_default.error(identifier, "Missing answer type in Anthropic API:", data);
       throw new Error("Missing answer type in Anthropic API");
     }
     let text = "";
@@ -633,7 +605,7 @@ async function callAnthropic(identifier, AiPayload, AiConfig) {
           /<thinking>|<\/thinking>|<answer>|<\/answer>/gs,
           ""
         );
-        console.log("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 += `
@@ -651,11 +623,7 @@ ${text}`;
     }
   }
   if (!textResponse && !functionCalls.length) {
-    console.error(
-      identifier,
-      "Missing text & fns in Anthropic API response:",
-      JSON.stringify(data)
-    );
+    logger_default.error(identifier, "Missing text & fns in Anthropic API response:", data);
     throw new Error("Missing text & fns in Anthropic API response");
   }
   return {
@@ -765,9 +733,7 @@ async function prepareGoogleAIPayload(payload) {
     }
     for (const file of message.files || []) {
       if (!((_a = file.mimeType) == null ? void 0 : _a.startsWith("image"))) {
-        console.warn(
-          "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) {
@@ -805,9 +771,8 @@ async function prepareGoogleAIPayload(payload) {
 }
 async function callGoogleAI(identifier, payload) {
   var _a, _b, _c;
-  console.log(identifier, "Calling Google AI API");
+  logger_default.log(identifier, "Calling Google AI API");
   const googleMessages = jigGoogleMessages(payload.messages);
-  console.log(identifier, "Google AI API messages:", googleMessages);
   const history = googleMessages.slice(0, -1);
   const lastMessage = googleMessages.slice(-1)[0];
   const genAI = new import_genai.GoogleGenAI({
@@ -850,11 +815,7 @@ async function callGoogleAI(identifier, payload) {
     };
   });
   if (!text && !(parsedFunctionCalls == null ? void 0 : parsedFunctionCalls.length) && !files.length) {
-    console.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 {
@@ -865,32 +826,26 @@ async function callGoogleAI(identifier, payload) {
   };
 }
 async function callGoogleAIWithRetries(identifier, payload, retries = 5) {
-  console.log(identifier, "Calling Google AI API with retries");
+  logger_default.log(identifier, "Calling Google AI API with retries");
   let lastError;
   for (let i = 0; i < retries; i++) {
     try {
       return await callGoogleAI(identifier, payload);
     } catch (e) {
       lastError = e;
-      console.error(e);
-      console.error(
-        identifier,
-        `Retrying due to error: received bad response from Google AI API: ${e.message}`,
-        JSON.stringify(e)
-        // Google AI errors might not have a response.data structure like others
-      );
+      logger_default.error(identifier, `Retry #${i} error: ${e.message}`, e);
       await timeout(125 * i);
     }
   }
-  const error = new Error(
+  const error2 = new Error(
     `Failed to call Google AI API after ${retries} attempts`
   );
-  error.cause = lastError;
-  throw error;
+  error2.cause = lastError;
+  throw error2;
 }
 async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chunkTimeoutMs = 15e3) {
   if (isAnthropicPayload(aiPayload)) {
-    console.log(identifier, "Delegating call to Anthropic API");
+    logger_default.log(identifier, "Delegating call to Anthropic API");
     return await callAnthropicWithRetries(
       identifier,
       await prepareAnthropicPayload(aiPayload),
@@ -898,7 +853,7 @@ async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chu
       retries
     );
   } else if (isOpenAiPayload(aiPayload)) {
-    console.log(identifier, "Delegating call to OpenAI API");
+    logger_default.log(identifier, "Delegating call to OpenAI API");
     return await callOpenAiWithRetries(
       identifier,
       await prepareOpenAIPayload(aiPayload),
@@ -907,13 +862,13 @@ async function callWithRetries(identifier, aiPayload, aiConfig, retries = 5, chu
       chunkTimeoutMs
     );
   } else if (isGroqPayload(aiPayload)) {
-    console.log(identifier, "Delegating call to Groq API");
+    logger_default.log(identifier, "Delegating call to Groq API");
     return await callGroqWithRetries(
       identifier,
       await prepareGroqPayload(aiPayload)
     );
   } else if (isGoogleAIPayload(aiPayload)) {
-    console.log(identifier, "Delegating call to Google AI API");
+    logger_default.log(identifier, "Delegating call to Google AI API");
     return await callGoogleAIWithRetries(
       identifier,
       await prepareGoogleAIPayload(aiPayload),
@@ -948,9 +903,7 @@ async function prepareAnthropicPayload(payload) {
     }
     for (const file of message.files || []) {
       if (!((_a = file.mimeType) == null ? void 0 : _a.startsWith("image"))) {
-        console.warn(
-          "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) {
@@ -1040,10 +993,7 @@ async function prepareOpenAIPayload(payload) {
           });
         }
       } else {
-        console.warn(
-          "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({
@@ -1095,7 +1045,7 @@ async function callGroq(identifier, payload) {
   const data = response.data;
   const answer = data.choices[0].message;
   if (!answer) {
-    console.error(identifier, "Missing answer in Groq API:", data);
+    logger_default.error(identifier, "Missing answer in Groq API:", data);
     throw new Error("Missing answer in Groq API");
   }
   const textResponse = answer.content || null;
@@ -1116,30 +1066,24 @@ async function callGroq(identifier, payload) {
 }
 async function callGroqWithRetries(identifier, payload, retries = 5) {
   var _a;
-  console.log(identifier, "Calling Groq API with retries");
+  logger_default.log(identifier, "Calling Groq API with retries");
   let lastResponse;
   for (let i = 0; i < retries; i++) {
     try {
       lastResponse = await callGroq(identifier, payload);
       return lastResponse;
     } catch (e) {
-      console.error(e);
-      console.error(
-        identifier,
-        `Retrying due to error: received bad response from Groq API: ${e.message}`,
-        JSON.stringify((_a = e.response) == null ? void 0 : _a.data)
-      );
+      logger_default.error(identifier, `Retry #${i} error: ${e.message}`, ((_a = e.response) == null ? void 0 : _a.data) || e);
       await timeout(125 * i);
     }
   }
-  const error = new Error(
+  const error2 = new Error(
     `Failed to call Groq API after ${retries} attempts`
   );
-  error.response = lastResponse;
-  throw error;
+  error2.response = lastResponse;
+  throw error2;
 }
 async function getNormalizedBase64PNG(url, mime) {
-  console.log("Normalizing image", url);
   const response = await import_axios.default.get(url, { responseType: "arraybuffer" });
   let imageBuffer = Buffer.from(response.data);
   let sharpOptions = {};