190proof 1.0.114 → 1.0.116

package/dist/index.mjs

@@ -311,6 +311,7 @@ async function prepareOpenAIPayload(identifier, payload) {
   const preparedPayload = {
     model: payload.model,
     messages: [],
+    reasoning_effort: payload.reasoningEffort,
     tools: (_a = payload.functions) == null ? void 0 : _a.map((fn) => ({
       type: "function",
       function: fn
@@ -381,7 +382,7 @@ async function prepareOpenAIPayload(identifier, payload) {
   return preparedPayload;
 }
 async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs, requestTimeoutMs = 12e4, signal) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const functionNames = openAiPayload.tools ? new Set(openAiPayload.tools.map((fn) => fn.function.name)) : null;
   const { endpoint, headers } = buildOpenAIRequestConfig(
     id,
@@ -399,7 +400,15 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
   const response = await fetch(endpoint, {
     method: "POST",
     headers,
-    body: JSON.stringify({ ...openAiPayload, stream: true }),
+    // include_usage: OpenAI only reports token usage on streams when asked,
+    // via a final choices-less chunk — without it every streamed call is
+    // invisible to usage accounting. Skipped for Azure, where older
+    // api-versions reject stream_options.
+    body: JSON.stringify({
+      ...openAiPayload,
+      stream: true,
+      ...(openAiConfig == null ? void 0 : openAiConfig.service) !== "azure" ? { stream_options: { include_usage: true } } : {}
+    }),
     // Merge (don't overwrite) the internal timeout controller with the caller's
     // cancellation signal so both an internal timeout and an external abort stop
     // the stream.
@@ -410,6 +419,7 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
   }
   let paragraph = "";
   let reasoning = "";
+  let streamUsage = null;
   const toolCallAccumulators = [];
   const reader = response.body.getReader();
   let partialChunk = "";
@@ -440,13 +450,15 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
       if (!jsonString) continue;
       if (jsonString.includes("[DONE]")) {
         clearTimeout(overallTimeout);
-        return parseStreamedResponse(
+        const parsed = parseStreamedResponse(
           id,
           paragraph,
           toolCallAccumulators,
           functionNames,
           reasoning
         );
+        parsed.usage = streamUsage;
+        return parsed;
       }
       let json;
       try {
@@ -456,6 +468,15 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
         continue;
       }
       if (!((_a = json.choices) == null ? void 0 : _a.length)) {
+        if (json.usage) {
+          streamUsage = {
+            prompt_tokens: json.usage.prompt_tokens,
+            completion_tokens: json.usage.completion_tokens,
+            total_tokens: json.usage.total_tokens,
+            cached_tokens: (_c = (_b = json.usage.prompt_tokens_details) == null ? void 0 : _b.cached_tokens) != null ? _c : 0
+          };
+          continue;
+        }
         if (json.error) {
           logger_default.error(id, "Stream error from OpenAI:", json.error);
           const error2 = new Error("Stream error: OpenAI error");
@@ -468,23 +489,23 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
         }
         continue;
       }
-      const toolCalls = (_c = (_b = json.choices[0]) == null ? void 0 : _b.delta) == null ? void 0 : _c.tool_calls;
+      const toolCalls = (_e = (_d = json.choices[0]) == null ? void 0 : _d.delta) == null ? void 0 : _e.tool_calls;
       if (toolCalls) {
         for (const toolCall of toolCalls) {
-          const idx = (_d = toolCall.index) != null ? _d : 0;
+          const idx = (_f = toolCall.index) != null ? _f : 0;
           while (toolCallAccumulators.length <= idx) {
             toolCallAccumulators.push({ name: "", arguments: "" });
           }
           if (toolCall.id) toolCallAccumulators[idx].id = toolCall.id;
-          if ((_e = toolCall.function) == null ? void 0 : _e.name)
+          if ((_g = toolCall.function) == null ? void 0 : _g.name)
             toolCallAccumulators[idx].name += toolCall.function.name;
-          if ((_f = toolCall.function) == null ? void 0 : _f.arguments)
+          if ((_h = toolCall.function) == null ? void 0 : _h.arguments)
             toolCallAccumulators[idx].arguments += toolCall.function.arguments;
         }
       }
-      const text = (_h = (_g = json.choices[0]) == null ? void 0 : _g.delta) == null ? void 0 : _h.content;
+      const text = (_j = (_i = json.choices[0]) == null ? void 0 : _i.delta) == null ? void 0 : _j.content;
       if (text) paragraph += text;
-      const reasoningDelta = (_j = (_i = json.choices[0]) == null ? void 0 : _i.delta) == null ? void 0 : _j.reasoning;
+      const reasoningDelta = (_l = (_k = json.choices[0]) == null ? void 0 : _k.delta) == null ? void 0 : _l.reasoning;
       if (reasoningDelta) reasoning += reasoningDelta;
     }
   }
@@ -1197,7 +1218,7 @@ async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutM
 function normalizeMessageContent(content) {
   return Array.isArray(content) ? content.map((c) => c.type === "text" ? c.text : `[${c.type}]`).join("\n") : content;
 }
-function prepareOpenAICompatMessages(messages) {
+function prepareOpenAICompatMessages(messages, opts = {}) {
   var _a;
   const out = [];
   for (const message of messages) {
@@ -1219,6 +1240,22 @@ function prepareOpenAICompatMessages(messages) {
       role: message.role,
       content
     };
+    if (opts.imageParts) {
+      const imageBlocks = (message.files || []).filter(
+        (file) => ALLOWED_IMAGE_MIME_TYPES.includes(file.mimeType) && (file.url || file.data)
+      ).map((file) => ({
+        type: "image_url",
+        image_url: {
+          url: file.url || `data:${file.mimeType};base64,${file.data}`
+        }
+      }));
+      if (imageBlocks.length) {
+        outMessage.content = [
+          ...content ? [{ type: "text", text: content }] : [],
+          ...imageBlocks
+        ];
+      }
+    }
     if ((_a = message.functionCalls) == null ? void 0 : _a.length) {
       outMessage.tool_calls = message.functionCalls.map((fc, i) => {
         var _a2;
@@ -1231,7 +1268,8 @@ function prepareOpenAICompatMessages(messages) {
           }
         };
       });
-      if (!content) outMessage.content = null;
+      if (!content && !Array.isArray(outMessage.content))
+        outMessage.content = null;
     }
     if (message.reasoning) outMessage.reasoning = message.reasoning;
     const reasoningDetails = filterOpenAICompatReasoningDetails(
@@ -1325,11 +1363,14 @@ async function callGroqWithRetries(id, payload, retries = 5, requestTimeoutMs =
     signal
   });
 }
+var openRouterImageRejectedModels = /* @__PURE__ */ new Set();
 function prepareOpenRouterPayload(payload) {
   var _a;
   return {
     model: payload.model,
-    messages: prepareOpenAICompatMessages(payload.messages),
+    messages: prepareOpenAICompatMessages(payload.messages, {
+      imageParts: !openRouterImageRejectedModels.has(String(payload.model))
+    }),
     tools: (_a = payload.functions) == null ? void 0 : _a.map((fn) => ({
       type: "function",
       function: fn
@@ -1719,6 +1760,11 @@ function moderationEvictionSlug(error2, payload) {
 }
 var MIN_STREAM_ATTEMPT_MS = 1e4;
 var estimateTokens = (text) => Math.round(text.length / 4);
+function isImageInputRejection(error2) {
+  var _a, _b, _c, _d;
+  const body = (_c = error2 == null ? void 0 : error2.data) != null ? _c : (_b = (_a = error2 == null ? void 0 : error2.response) == null ? void 0 : _a.data) == null ? void 0 : _b.error;
+  return /no endpoints found.*image input/i.test(String((_d = body == null ? void 0 : body.message) != null ? _d : ""));
+}
 function streamAttemptBudgetMs(options) {
   if (options.streamDeadlineAt === void 0) return options.streamTimeoutMs;
   const remaining = options.streamDeadlineAt - Date.now();
@@ -1769,6 +1815,16 @@ async function callOpenRouterWithRetries(id, payload, retries = 5, options, sign
           `OpenRouter moderation eviction: ignoring provider "${slug}" for remaining attempts`
         );
       }
+      if (isImageInputRejection(error2) && options.genericMessages) {
+        openRouterImageRejectedModels.add(String(payload.model));
+        payload.messages = prepareOpenAICompatMessages(
+          options.genericMessages
+        );
+        logger_default.log(
+          id,
+          `OpenRouter: ${payload.model} has no image-capable endpoints; retrying with images as text refs`
+        );
+      }
       throw error2;
     }),
     { retries, signal }
@@ -1869,7 +1925,8 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
             streamTimeoutMs: (_c = aiPayload.streamTimeoutMs) != null ? _c : OPENROUTER_STREAM_TIMEOUT_MS,
             streamDeadlineAt: aiPayload.streamDeadlineAt,
             requestTimeoutMs: (_d = aiPayload.requestTimeoutMs) != null ? _d : OPENROUTER_NONSTREAM_TIMEOUT_MS,
-            chunkTimeoutMs
+            chunkTimeoutMs,
+            genericMessages: routingPayload.messages
           },
           signal
         );
@@ -1913,6 +1970,7 @@ export {
   OPENROUTER_STREAM_TIMEOUT_MS,
   OpenRouterModel,
   callWithRetries,
+  openRouterImageRejectedModels,
   parseModelString
 };
 //# sourceMappingURL=index.mjs.map