@absolutejs/ai 0.1.1 → 0.1.3

package/dist/ai/providers/openaiCompatible.js

@@ -877,11 +877,12 @@ var extractUsage = (response) => {
   const outputDetails = isRecord(usage.output_tokens_details) ? usage.output_tokens_details : undefined;
   const inputDetails = isRecord(usage.input_tokens_details) ? usage.input_tokens_details : undefined;
   const costDetails = isRecord(usage.cost_details) ? usage.cost_details : undefined;
+  const written = inputDetails && typeof inputDetails.cache_write_tokens === "number" ? inputDetails.cache_write_tokens : 0;
   const normalized = {
     cacheReadInputTokens: cached,
-    cacheWriteInputTokens: inputDetails && typeof inputDetails.cache_write_tokens === "number" ? inputDetails.cache_write_tokens : undefined,
+    cacheWriteInputTokens: written || undefined,
     costCredits: typeof usage.cost === "number" ? usage.cost : undefined,
-    inputTokens: Math.max(0, input - cached),
+    inputTokens: Math.max(0, input - cached - written),
     outputTokens: typeof usage.output_tokens === "number" ? usage.output_tokens : 0,
     reasoningTokens: outputDetails && typeof outputDetails.reasoning_tokens === "number" ? outputDetails.reasoning_tokens : undefined,
     upstreamInferenceCostCredits: costDetails && typeof costDetails.upstream_inference_cost === "number" ? costDetails.upstream_inference_cost : undefined
@@ -1262,30 +1263,6 @@ var buildToolMessages = (blocks) => {
   }
   return messages;
 };
-var processMessageAtIndex = (result, msg, idx) => {
-  if (!hasArrayContent(msg)) {
-    return;
-  }
-  const hasToolBlocks2 = msg.content.some((block) => block.type === "tool_use" || block.type === "tool_result");
-  if (!hasToolBlocks2) {
-    return;
-  }
-  const toolMessages = buildToolMessages(msg.content);
-  result.splice(idx, 1, ...toolMessages);
-};
-var convertSingleMessage = (result, msg, idx) => {
-  if (!msg) {
-    return;
-  }
-  processMessageAtIndex(result, msg, idx);
-};
-var convertToolResultMessages = (messages, params) => {
-  const result = [...messages];
-  for (let idx = 0;idx < params.messages.length; idx++) {
-    convertSingleMessage(result, params.messages[idx], idx);
-  }
-  return result;
-};
 var mapToolDefinitions = (tools) => tools.map((tool) => ({
   function: {
     description: tool.description,
@@ -1342,10 +1319,11 @@ var mapOpenAIContent = (msg) => {
   return msg.content.map(mapContentBlockToOpenAI).filter((mapped) => mapped !== null);
 };
 var buildRequestBody = (params, capabilityModel = params.model) => {
-  const messages = convertToolResultMessages(params.messages.map((msg) => ({
-    content: mapOpenAIContent(msg),
-    role: msg.role
-  })), params);
+  const messages = params.messages.flatMap((msg) => {
+    if (hasArrayContent(msg) && msg.content.some((block) => block.type === "tool_use" || block.type === "tool_result"))
+      return buildToolMessages(msg.content);
+    return [{ content: mapOpenAIContent(msg), role: msg.role }];
+  });
   if (params.systemPrompt) {
     messages.unshift({ content: params.systemPrompt, role: "system" });
   }
@@ -1433,11 +1411,12 @@ var flushPendingToolCalls = function* (pendingToolCalls) {
 var extractUsage2 = (parsedUsage) => {
   const prompt = parsedUsage.prompt_tokens ?? 0;
   const cached = parsedUsage.cached_tokens ?? 0;
+  const written = parsedUsage.cache_write_tokens ?? 0;
   return {
     cacheReadInputTokens: cached,
-    cacheWriteInputTokens: parsedUsage.cache_write_tokens || undefined,
+    cacheWriteInputTokens: written || undefined,
     costCredits: parsedUsage.cost,
-    inputTokens: Math.max(0, prompt - cached),
+    inputTokens: Math.max(0, prompt - cached - written),
     outputTokens: parsedUsage.completion_tokens ?? 0,
     reasoningTokens: parsedUsage.reasoning_tokens || undefined,
     upstreamInferenceCostCredits: parsedUsage.upstream_inference_cost || undefined
@@ -1809,5 +1788,5 @@ export {
   xai
 };
 
-//# debugId=4F4027EEB930CE6D64756E2164756E21
+//# debugId=E875F1C4139B39C064756E2164756E21
 //# sourceMappingURL=openaiCompatible.js.map