190proof 1.0.118 → 1.0.120

package/dist/index.mjs

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// interfaces.ts
+// src/interfaces.ts
 var ClaudeModel = /* @__PURE__ */ ((ClaudeModel2) => {
   ClaudeModel2["HAIKU_3"] = "claude-3-haiku-20240307";
   ClaudeModel2["SONNET_3"] = "claude-3-sonnet-20240229";
@@ -64,7 +64,7 @@ var GeminiModel = /* @__PURE__ */ ((GeminiModel2) => {
   return GeminiModel2;
 })(GeminiModel || {});
 
-// logger.ts
+// src/logger.ts
 function formatIdentifier(identifier) {
   if (Array.isArray(identifier)) {
     return identifier.map((id) => `[${id}]`).join(" ");
@@ -74,14 +74,34 @@ function formatIdentifier(identifier) {
 function formatMessage(level, identifier, message) {
   return `[${level}] ${formatIdentifier(identifier)} ${message}`;
 }
+var sink = console;
+function setLogger(next) {
+  sink = next;
+}
 function log(identifier, message, ...args) {
-  console.log(formatMessage("LOG", identifier, message), ...args);
+  sink == null ? void 0 : sink.log(formatMessage("LOG", identifier, message), ...args);
 }
 function warn(identifier, message, ...args) {
-  console.warn(formatMessage("WARN", identifier, message), ...args);
+  sink == null ? void 0 : sink.warn(formatMessage("WARN", identifier, message), ...args);
 }
 function error(identifier, message, ...args) {
-  console.error(formatMessage("ERROR", identifier, message), ...args);
+  sink == null ? void 0 : sink.error(formatMessage("ERROR", identifier, message), ...args);
+}
+function redactError(err) {
+  const e = err;
+  if (!e || typeof e !== "object" || !(e.config || e.request || e.isAxiosError)) {
+    return err;
+  }
+  const clean = new Error(e.message);
+  clean.name = e.name;
+  if (e.code !== void 0) clean.code = e.code;
+  if (e.status !== void 0) clean.status = e.status;
+  if (e.response) {
+    clean.response = { status: e.response.status, statusText: e.response.statusText, data: e.response.data };
+  }
+  if (e.data !== void 0) clean.data = e.data;
+  if (e.cause) clean.cause = redactError(e.cause);
+  return clean;
 }
 var logger_default = {
   log,
@@ -89,14 +109,14 @@ var logger_default = {
   error
 };
 
-// index.ts
+// src/index.ts
 import {
   BedrockRuntimeClient,
   InvokeModelCommand
 } from "@aws-sdk/client-bedrock-runtime";
 import axios from "axios";
 
-// utils.ts
+// src/utils.ts
 function timeout(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -106,7 +126,7 @@ function isHeicImage(name, mime) {
   return ["heic", "heif", "heics"].includes(extension) || !!(mime && ["image/heic", "image/heif", "image/heic-sequence"].includes(mime));
 }
 
-// index.ts
+// src/index.ts
 var sharp = __require("sharp");
 var decode = __require("heic-decode");
 function anySignal(signals) {
@@ -144,7 +164,7 @@ async function withRetries(identifier, apiName, fn, options = {}) {
         logger_default.error(
           identifier,
           `Retry #${attempt} error: ${error3.message}`,
-          ((_b = error3.response) == null ? void 0 : _b.data) || error3
+          ((_b = error3.response) == null ? void 0 : _b.data) || redactError(error3)
         );
       }
       await timeout(baseDelayMs * attempt);
@@ -154,7 +174,7 @@ async function withRetries(identifier, apiName, fn, options = {}) {
   const error2 = new Error(
     `Failed to call ${apiName} API after ${retries} attempts: ${detail}`
   );
-  error2.cause = lastError;
+  error2.cause = redactError(lastError);
   throw error2;
 }
 function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allowedFunctionNames, reasoning) {
@@ -624,7 +644,7 @@ async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries =
         logger_default.error(
           id,
           `Retry #${attempt} error: ${error2.message}`,
-          ((_a = error2.response) == null ? void 0 : _a.data) || error2.data || error2
+          ((_a = error2.response) == null ? void 0 : _a.data) || error2.data || redactError(error2)
         );
         if (((_b = error2.data) == null ? void 0 : _b.code) === "content_policy_violation") {
           logger_default.log(id, "Removing images due to content policy violation");
@@ -1182,7 +1202,7 @@ async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutM
         const fetchError = new Error(
           "Google AI could not fetch the provided image URL(s)."
         );
-        fetchError.cause = error2;
+        fetchError.cause = redactError(error2);
         fetchError.googleFetchFailure = true;
         throw fetchError;
       }
@@ -1529,6 +1549,14 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
   let finishReason = null;
   let sawDone = false;
   let dataChunks = 0;
+  const RAW_HEAD_MAX = 3e3;
+  const RAW_TAIL_MAX = 1500;
+  let rawHead = "";
+  let rawTail = "";
+  let generationId;
+  const unreadKeys = /* @__PURE__ */ new Set();
+  const KNOWN_DELTA_KEYS = /* @__PURE__ */ new Set(["role", "content", "reasoning", "reasoning_details", "tool_calls"]);
+  const KNOWN_CHOICE_KEYS = /* @__PURE__ */ new Set(["index", "delta", "finish_reason", "native_finish_reason", "logprobs"]);
   try {
     armStallTimer();
     const response = await fetch(openRouterEndpoint(), {
@@ -1580,6 +1608,11 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
           sawDone = true;
           break outer;
         }
+        if (rawHead.length < RAW_HEAD_MAX) {
+          rawHead += dataStr.slice(0, RAW_HEAD_MAX - rawHead.length) + "\n";
+        } else {
+          rawTail = (rawTail + dataStr + "\n").slice(-RAW_TAIL_MAX);
+        }
         let json;
         try {
           json = JSON.parse(dataStr);
@@ -1601,6 +1634,7 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
           throw error2;
         }
         if (json.provider) provider = json.provider;
+        if (json.id && !generationId) generationId = json.id;
         let useful = false;
         if (json.usage) {
           usage = json.usage;
@@ -1609,6 +1643,12 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
         const choice = (_c = json.choices) == null ? void 0 : _c[0];
         if (choice) {
           const delta = (_d = choice.delta) != null ? _d : {};
+          for (const k of Object.keys(choice)) {
+            if (!KNOWN_CHOICE_KEYS.has(k) && choice[k] != null) unreadKeys.add(`choice.${k}`);
+          }
+          for (const k of Object.keys(delta)) {
+            if (!KNOWN_DELTA_KEYS.has(k) && delta[k] != null && delta[k] !== "") unreadKeys.add(`delta.${k}`);
+          }
           if (delta.content) {
             paragraph += delta.content;
             useful = true;
@@ -1665,7 +1705,12 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
         usage,
         paragraph: paragraph.slice(0, 500),
         reasoningChars: reasoning.length,
-        toolCalls
+        toolCalls,
+        generationId,
+        dataChunks,
+        unreadKeys: [...unreadKeys],
+        rawHead,
+        rawTail: rawTail || void 0
       })
     });
   } catch (error2) {
@@ -1940,7 +1985,7 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
     (_e = result.provider) != null ? _e : result.provider = provider;
     return result;
   } catch (error2) {
-    if ((_f = aiPayload.signal) == null ? void 0 : _f.aborted) throw error2;
+    if ((_f = aiPayload.signal) == null ? void 0 : _f.aborted) throw redactError(error2);
     if (aiPayload.fallbackModel) {
       logger_default.error(
         id,
@@ -1962,7 +2007,7 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
         chunkTimeoutMs
       );
     }
-    throw error2;
+    throw redactError(error2);
   }
 }
 export {
@@ -1976,6 +2021,8 @@ export {
   OpenRouterModel,
   callWithRetries,
   openRouterImageRejectedModels,
-  parseModelString
+  parseModelString,
+  redactError,
+  setLogger
 };
 //# sourceMappingURL=index.mjs.map