@absolutejs/ai 0.4.0 → 0.5.0

package/dist/ai/providers/openrouter.js

@@ -567,7 +567,7 @@ async function* tapStream(source, params, providerName) {
   let lastUsage;
   try {
     for await (const chunk of source) {
-      if (chunk.type === "done" && chunk.usage) {
+      if ((chunk.type === "done" || chunk.type === "usage_update" && chunk.final) && chunk.usage) {
         lastUsage = chunk.usage;
       }
       yield chunk;
@@ -870,7 +870,10 @@ var convertToolBlock = (block) => {
   if (block.type === "tool_result") {
     return {
       call_id: block.tool_use_id,
-      output: typeof block.content === "string" ? block.content : "",
+      output: block.images?.length ? [
+        { text: block.content, type: "input_text" },
+        ...block.images.map((source) => mapBlockToResponsesFormat({ source, type: "image" }))
+      ] : block.content,
       type: "function_call_output"
     };
   }
@@ -1180,6 +1183,8 @@ var processCompleted = function* (parsed) {
   const { response } = parsed;
   const usage = extractUsage(response);
   const metadata = extractResponseMetadata(response);
+  if (usage)
+    yield { type: "usage_update", usage, metadata, final: true };
   if (isRecordArray(response.output)) {
     yield* extractCitationsFromOutput(response.output);
     yield* extractImageFromOutput(response.output);
@@ -1218,6 +1223,15 @@ var processSSEEvent = function* (eventType, parsed, pendingCalls, providerName)
       break;
     case "response.output_item.added":
       processOutputItemAdded(parsed, pendingCalls);
+      if (isRecord(parsed.item) && parsed.item.type === "function_call" && typeof parsed.item.name === "string") {
+        const id = typeof parsed.item.call_id === "string" ? parsed.item.call_id : parsed.item.id;
+        if (typeof id === "string")
+          yield {
+            type: "tool_input_start",
+            id,
+            name: parsed.item.name
+          };
+      }
       break;
     case "response.output_item.done":
       yield* processOutputItemDone(parsed);
@@ -1234,8 +1248,19 @@ var processSSEEvent = function* (eventType, parsed, pendingCalls, providerName)
     case "response.failed":
     case "response.incomplete":
     case "response.error":
-    case "error":
+    case "error": {
+      if (isRecord(parsed.response)) {
+        const usage = extractUsage(parsed.response);
+        if (usage)
+          yield {
+            type: "usage_update",
+            usage,
+            metadata: extractResponseMetadata(parsed.response),
+            final: false
+          };
+      }
       throw responseFailure(eventType, parsed, providerName);
+    }
   }
 };
 var flushSSEBuffer = function* (state) {
@@ -1378,6 +1403,7 @@ var NOT_FOUND = -1;
 var isRecord2 = (value) => typeof value === "object" && value !== null;
 var isRecordArray2 = (value) => Array.isArray(value) && value.length > 0 && isRecord2(value[0]);
 var hasArrayContent = (msg) => typeof msg.content !== "string" && Array.isArray(msg.content);
+var imageUrl = (source) => source.type === "url" ? source.url : `data:${source.media_type};base64,${source.data}`;
 var buildToolMessages = (blocks) => {
   const toolUseBlocks = blocks.filter((block) => block.type === "tool_use");
   const toolResultBlocks = blocks.filter((block) => block.type === "tool_result");
@@ -1403,6 +1429,18 @@ var buildToolMessages = (blocks) => {
       tool_call_id: result.tool_use_id
     });
   }
+  const images = toolResultBlocks.flatMap((result) => result.images ?? []);
+  if (images.length > 0)
+    messages.push({
+      content: [
+        { text: "Images returned by the tool calls above:", type: "text" },
+        ...images.map((source) => ({
+          image_url: { url: imageUrl(source) },
+          type: "image_url"
+        }))
+      ],
+      role: "user"
+    });
   return messages;
 };
 var mapToolDefinitions = (tools) => tools.map((tool) => ({
@@ -1416,9 +1454,7 @@ var mapToolDefinitions = (tools) => tools.map((tool) => ({
 var mapContentBlockToOpenAI = (block) => {
   if (block.type === "image") {
     return {
-      image_url: {
-        url: block.source.type === "url" ? block.source.url : `data:${block.source.media_type};base64,${block.source.data}`
-      },
+      image_url: { url: imageUrl(block.source) },
       type: "image_url"
     };
   }
@@ -1657,6 +1693,14 @@ var processDelta = function* (delta, pendingToolCalls) {
   }
   if (isRecordArray2(delta.tool_calls)) {
     processToolCallDeltas(delta.tool_calls, pendingToolCalls);
+    for (const call of delta.tool_calls) {
+      if (isRecord2(call.function) && typeof call.function.name === "string" && call.function.name)
+        yield {
+          type: "tool_input_start",
+          id: typeof call.id === "string" ? call.id : String(call.index),
+          name: call.function.name
+        };
+    }
   }
   if (Array.isArray(delta.annotations)) {
     for (const annotation of delta.annotations) {
@@ -1755,7 +1799,12 @@ var processSSELine2 = function* (line, pendingToolCalls, providerName) {
   }
   const usageUpdate = narrowUsageRecord(parsed);
   if (usageUpdate) {
-    yield { type: "usage_update", usage: usageUpdate };
+    yield {
+      type: "usage_update",
+      usage: usageUpdate,
+      final: Array.isArray(parsed.choices) && parsed.choices.length === 0,
+      metadata: narrowResponseMetadata(parsed)
+    };
   }
   const metadata = narrowResponseMetadata(parsed);
   if (metadata) {
@@ -1784,10 +1833,9 @@ var processSSELine2 = function* (line, pendingToolCalls, providerName) {
   }
   yield* processChoice(firstChoice, pendingToolCalls);
 };
-var isUsageUpdate = (chunk) => chunk.type === "usage_update";
 var collectYieldableChunks = (line, pendingToolCalls, usageRef, metadataRef, providerName) => {
   const allChunks = Array.from(processSSELine2(line, pendingToolCalls, providerName));
-  const usageChunks = allChunks.filter(isUsageUpdate);
+  const usageChunks = allChunks.filter((chunk) => chunk.type === "usage_update");
   const lastUsage = usageChunks.at(NOT_FOUND);
   if (lastUsage) {
     usageRef.current = lastUsage.usage;
@@ -1804,7 +1852,7 @@ var collectYieldableChunks = (line, pendingToolCalls, usageRef, metadataRef, pro
       }
     };
   }
-  return allChunks.filter((chunk) => !isUsageUpdate(chunk) && chunk.type !== "response_metadata");
+  return allChunks.filter((chunk) => chunk.type !== "response_metadata").map((chunk) => chunk.type === "usage_update" ? { ...chunk, metadata: metadataRef.current } : chunk);
 };
 var processSSELines2 = function* (lines, pendingToolCalls, usageRef, metadataRef, providerName) {
   for (const line of lines) {
@@ -1922,7 +1970,6 @@ var API_VERSION = "2023-06-01";
 var DEFAULT_MAX_TOKENS = 32000;
 var EVENT_PREFIX_LENGTH2 = 7;
 var DATA_PREFIX_LENGTH2 = 6;
-var EMPTY_CHUNKS = [];
 var isRecord3 = (val) => typeof val === "object" && val !== null;
 var mapContentBlock = (block) => {
   if (block.type === "thinking") {
@@ -1946,7 +1993,10 @@ var mapContentBlock = (block) => {
   }
   if (block.type === "tool_result") {
     return {
-      content: block.content,
+      content: block.images?.length ? [
+        { text: block.content, type: "text" },
+        ...block.images.map((source) => ({ source, type: "image" }))
+      ] : block.content,
       tool_use_id: block.tool_use_id,
       type: "tool_result"
     };
@@ -2450,11 +2500,21 @@ var processEvent = (eventType, parsed, state) => {
     case "message_delta": {
       handleMessageDelta(parsed, state);
       mergeMetadata(parsed, state);
-      return;
+      return state.usage ? {
+        type: "usage_update",
+        usage: state.usage,
+        metadata: state.metadata,
+        final: false
+      } : undefined;
     }
     case "message_start": {
       handleMessageStart(parsed, state);
-      return;
+      return state.usage ? {
+        type: "usage_update",
+        usage: state.usage,
+        metadata: state.metadata,
+        final: false
+      } : undefined;
     }
     case "message_stop": {
       mergeMetadata(parsed, state);
@@ -2488,49 +2548,6 @@ var processSingleEvent = (event, state) => {
   }
   return processEvent(eventType, parsed, state);
 };
-var collectChunk = (event, state) => {
-  const chunk = processSingleEvent(event, state);
-  return chunk ? [chunk] : [];
-};
-var processBufferedEvents = (eventsText, state) => {
-  const events = eventsText.split(`
-
-`);
-  state.buffer = events.pop() ?? "";
-  return events.flatMap((event) => collectChunk(event, state));
-};
-var readNextChunks = async (reader, decoder, state, signal) => {
-  if (signal?.aborted) {
-    return { chunks: EMPTY_CHUNKS, done: true };
-  }
-  const { done, value } = await reader.read();
-  if (done) {
-    return { chunks: EMPTY_CHUNKS, done: true };
-  }
-  const rawText = state.buffer + decoder.decode(value, { stream: true });
-  const chunks = processBufferedEvents(rawText, state);
-  return { chunks, done: false };
-};
-var findDoneChunk = (chunks) => chunks.findIndex((c) => c.type === "done");
-var sseStreamLoop = async (reader, decoder, state, signal) => {
-  const result = await readNextChunks(reader, decoder, state, signal);
-  if (result.done) {
-    return { chunks: result.chunks, finished: true };
-  }
-  const doneIdx = findDoneChunk(result.chunks);
-  if (doneIdx >= 0) {
-    return { chunks: result.chunks.slice(0, doneIdx + 1), finished: true };
-  }
-  return { chunks: result.chunks, finished: false };
-};
-async function* streamChunks(reader, decoder, state, signal) {
-  let finished = false;
-  while (!finished) {
-    const result = await sseStreamLoop(reader, decoder, state, signal);
-    ({ finished } = result);
-    yield* result.chunks;
-  }
-}
 async function* parseSSEStream3(body, providerName, signal) {
   const reader = body.getReader();
   const decoder = new TextDecoder;
@@ -2548,8 +2565,34 @@ async function* parseSSEStream3(body, providerName, signal) {
     providerBlockInputJson: ""
   };
   try {
-    yield* streamChunks(reader, decoder, state, signal);
+    while (true) {
+      signal?.throwIfAborted();
+      const { done, value } = await reader.read();
+      if (done)
+        return;
+      const events = (state.buffer + decoder.decode(value, { stream: true })).split(`
+
+`);
+      state.buffer = events.pop() ?? "";
+      for (const event of events) {
+        const chunk = processSingleEvent(event, state);
+        if (!chunk)
+          continue;
+        if (chunk.type === "tool_input" && chunk.receivedChars === 0)
+          yield {
+            type: "tool_input_start",
+            id: chunk.id,
+            name: chunk.name
+          };
+        yield chunk;
+        if (chunk.type === "done")
+          return;
+      }
+    }
   } finally {
+    await reader.cancel().catch(() => {
+      return;
+    });
     reader.releaseLock();
   }
 }
@@ -3586,5 +3629,5 @@ export {
   verifyOpenRouterWebhookSignature
 };
 
-//# debugId=28EECE403772185564756E2164756E21
+//# debugId=C9DE38070AD183BF64756E2164756E21
 //# sourceMappingURL=openrouter.js.map