@eminent337/aery-ai 0.67.74 → 0.67.76

package/dist/providers/openai-completions.js

@@ -5,6 +5,7 @@ import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
 import { parseStreamingJson } from "../utils/json-parse.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
+import { isCloudflareProvider, resolveCloudflareBaseUrl } from "./cloudflare.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { buildBaseOptions, clampReasoning } from "./simple-options.js";
 import { transformMessages } from "./transform-messages.js";
@@ -78,20 +79,30 @@ export const streamOpenAICompletions = (model, context, options) => {
             if (nextParams !== undefined) {
                 params = nextParams;
             }
+            const requestOptions = {
+                ...(options?.signal ? { signal: options.signal } : {}),
+                ...(options?.timeoutMs !== undefined ? { timeout: options.timeoutMs } : {}),
+                ...(options?.maxRetries !== undefined ? { maxRetries: options.maxRetries } : {}),
+            };
             const { data: openaiStream, response } = await client.chat.completions
-                .create(params, { signal: options?.signal })
+                .create(params, requestOptions)
                 .withResponse();
             await options?.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
             stream.push({ type: "start", partial: output });
             let currentBlock = null;
             const blocks = output.content;
-            const blockIndex = () => blocks.length - 1;
+            const getContentIndex = (block) => (block ? blocks.indexOf(block) : -1);
+            const currentContentIndex = () => getContentIndex(currentBlock);
             const finishCurrentBlock = (block) => {
                 if (block) {
+                    const contentIndex = getContentIndex(block);
+                    if (contentIndex === -1) {
+                        return;
+                    }
                     if (block.type === "text") {
                         stream.push({
                             type: "text_end",
-                            contentIndex: blockIndex(),
+                            contentIndex,
                             content: block.text,
                             partial: output,
                         });
@@ -99,19 +110,20 @@ export const streamOpenAICompletions = (model, context, options) => {
                     else if (block.type === "thinking") {
                         stream.push({
                             type: "thinking_end",
-                            contentIndex: blockIndex(),
+                            contentIndex,
                             content: block.thinking,
                             partial: output,
                         });
                     }
                     else if (block.type === "toolCall") {
                         block.arguments = parseStreamingJson(block.partialArgs);
-                        // Finalize in-place and strip the scratch buffer so replay only
+                        // Finalize in-place and strip the scratch buffers so replay only
                         // carries parsed arguments.
                         delete block.partialArgs;
+                        delete block.streamIndex;
                         stream.push({
                             type: "toolcall_end",
-                            contentIndex: blockIndex(),
+                            contentIndex,
                             toolCall: block,
                             partial: output,
                         });
@@ -150,13 +162,13 @@ export const streamOpenAICompletions = (model, context, options) => {
                             finishCurrentBlock(currentBlock);
                             currentBlock = { type: "text", text: "" };
                             output.content.push(currentBlock);
-                            stream.push({ type: "text_start", contentIndex: blockIndex(), partial: output });
+                            stream.push({ type: "text_start", contentIndex: currentContentIndex(), partial: output });
                         }
                         if (currentBlock.type === "text") {
                             currentBlock.text += choice.delta.content;
                             stream.push({
                                 type: "text_delta",
-                                contentIndex: blockIndex(),
+                                contentIndex: currentContentIndex(),
                                 delta: choice.delta.content,
                                 partial: output,
                             });
@@ -187,14 +199,14 @@ export const streamOpenAICompletions = (model, context, options) => {
                                 thinkingSignature: foundReasoningField,
                             };
                             output.content.push(currentBlock);
-                            stream.push({ type: "thinking_start", contentIndex: blockIndex(), partial: output });
+                            stream.push({ type: "thinking_start", contentIndex: currentContentIndex(), partial: output });
                         }
                         if (currentBlock.type === "thinking") {
                             const delta = choice.delta[foundReasoningField];
                             currentBlock.thinking += delta;
                             stream.push({
                                 type: "thinking_delta",
-                                contentIndex: blockIndex(),
+                                contentIndex: currentContentIndex(),
                                 delta,
                                 partial: output,
                             });
@@ -202,9 +214,11 @@ export const streamOpenAICompletions = (model, context, options) => {
                     }
                     if (choice?.delta?.tool_calls) {
                         for (const toolCall of choice.delta.tool_calls) {
-                            if (!currentBlock ||
-                                currentBlock.type !== "toolCall" ||
-                                (toolCall.id && currentBlock.id !== toolCall.id)) {
+                            const streamIndex = typeof toolCall.index === "number" ? toolCall.index : undefined;
+                            const sameToolCall = currentBlock?.type === "toolCall" &&
+                                ((streamIndex !== undefined && currentBlock.streamIndex === streamIndex) ||
+                                    (streamIndex === undefined && toolCall.id && currentBlock.id === toolCall.id));
+                            if (!sameToolCall) {
                                 finishCurrentBlock(currentBlock);
                                 currentBlock = {
                                     type: "toolCall",
@@ -212,24 +226,34 @@ export const streamOpenAICompletions = (model, context, options) => {
                                     name: toolCall.function?.name || "",
                                     arguments: {},
                                     partialArgs: "",
+                                    streamIndex,
                                 };
                                 output.content.push(currentBlock);
-                                stream.push({ type: "toolcall_start", contentIndex: blockIndex(), partial: output });
+                                stream.push({
+                                    type: "toolcall_start",
+                                    contentIndex: getContentIndex(currentBlock),
+                                    partial: output,
+                                });
                             }
-                            if (currentBlock.type === "toolCall") {
-                                if (toolCall.id)
-                                    currentBlock.id = toolCall.id;
-                                if (toolCall.function?.name)
-                                    currentBlock.name = toolCall.function.name;
+                            const currentToolCallBlock = currentBlock?.type === "toolCall" ? currentBlock : null;
+                            if (currentToolCallBlock) {
+                                if (!currentToolCallBlock.id && toolCall.id)
+                                    currentToolCallBlock.id = toolCall.id;
+                                if (!currentToolCallBlock.name && toolCall.function?.name) {
+                                    currentToolCallBlock.name = toolCall.function.name;
+                                }
+                                if (currentToolCallBlock.streamIndex === undefined && streamIndex !== undefined) {
+                                    currentToolCallBlock.streamIndex = streamIndex;
+                                }
                                 let delta = "";
                                 if (toolCall.function?.arguments) {
                                     delta = toolCall.function.arguments;
-                                    currentBlock.partialArgs += toolCall.function.arguments;
-                                    currentBlock.arguments = parseStreamingJson(currentBlock.partialArgs);
+                                    currentToolCallBlock.partialArgs += toolCall.function.arguments;
+                                    currentToolCallBlock.arguments = parseStreamingJson(currentToolCallBlock.partialArgs);
                                 }
                                 stream.push({
                                     type: "toolcall_delta",
-                                    contentIndex: blockIndex(),
+                                    contentIndex: getContentIndex(currentToolCallBlock),
                                     delta,
                                     partial: output,
                                 });
@@ -265,8 +289,9 @@ export const streamOpenAICompletions = (model, context, options) => {
         catch (error) {
             for (const block of output.content) {
                 delete block.index;
-                // partialArgs is only a streaming scratch buffer; never persist it.
+                // Streaming scratch buffers are only used during parsing; never persist them.
                 delete block.partialArgs;
+                delete block.streamIndex;
             }
             output.stopReason = options?.signal?.aborted ? "aborted" : "error";
             output.errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
@@ -321,20 +346,23 @@ function createClient(model, context, apiKey, optionsHeaders, sessionId, compat
     }
     return new OpenAI({
         apiKey,
-        baseURL: model.baseUrl,
+        baseURL: isCloudflareProvider(model.provider) ? resolveCloudflareBaseUrl(model) : model.baseUrl,
         dangerouslyAllowBrowser: true,
         defaultHeaders: headers,
     });
 }
 function buildParams(model, context, options, compat = getCompat(model), cacheRetention = resolveCacheRetention(options?.cacheRetention)) {
     const messages = convertMessages(model, context, compat);
-    const cacheControl = getCompatCacheControl(model, compat, cacheRetention);
+    const cacheControl = getCompatCacheControl(compat, cacheRetention);
     const params = {
         model: model.id,
         messages,
         stream: true,
-        prompt_cache_key: model.baseUrl.includes("api.openai.com") && cacheRetention !== "none" ? options?.sessionId : undefined,
-        prompt_cache_retention: model.baseUrl.includes("api.openai.com") && cacheRetention === "long" ? "24h" : undefined,
+        prompt_cache_key: (model.baseUrl.includes("api.openai.com") && cacheRetention !== "none") ||
+            (cacheRetention === "long" && compat.supportsLongCacheRetention)
+            ? options?.sessionId
+            : undefined,
+        prompt_cache_retention: cacheRetention === "long" && compat.supportsLongCacheRetention ? "24h" : undefined,
     };
     if (compat.supportsUsageInStreaming !== false) {
         params.stream_options = { include_usage: true };
@@ -353,7 +381,7 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
     if (options?.temperature !== undefined) {
         params.temperature = options.temperature;
     }
-    if (context.tools) {
+    if (context.tools && context.tools.length > 0) {
         params.tools = convertTools(context.tools, compat);
         if (compat.zaiToolStream) {
             params.tool_stream = true;
@@ -381,6 +409,12 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
             preserve_thinking: true,
         };
     }
+    else if (compat.thinkingFormat === "deepseek" && model.reasoning) {
+        params.thinking = { type: options?.reasoningEffort ? "enabled" : "disabled" };
+        if (options?.reasoningEffort) {
+            params.reasoning_effort = mapReasoningEffort(options.reasoningEffort, compat.reasoningEffortMap);
+        }
+    }
     else if (compat.thinkingFormat === "openrouter" && model.reasoning) {
         // OpenRouter normalizes reasoning across providers via a nested reasoning object.
         const openRouterParams = params;
@@ -418,11 +452,11 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
 function mapReasoningEffort(effort, reasoningEffortMap) {
     return reasoningEffortMap[effort] ?? effort;
 }
-function getCompatCacheControl(model, compat, cacheRetention) {
+function getCompatCacheControl(compat, cacheRetention) {
     if (compat.cacheControlFormat !== "anthropic" || cacheRetention === "none") {
         return undefined;
     }
-    const ttl = cacheRetention === "long" && model.baseUrl.includes("api.anthropic.com") ? "1h" : undefined;
+    const ttl = cacheRetention === "long" && compat.supportsLongCacheRetention ? "1h" : undefined;
     return { type: "ephemeral", ...(ttl ? { ttl } : {}) };
 }
 function applyAnthropicCacheControl(messages, tools, cacheControl) {
@@ -631,6 +665,11 @@ export function convertMessages(model, context, compat) {
                     assistantMsg.reasoning_details = reasoningDetails;
                 }
             }
+            if (compat.requiresReasoningContentOnAssistantMessages &&
+                model.reasoning &&
+                assistantMsg.reasoning_content === undefined) {
+                assistantMsg.reasoning_content = "";
+            }
             // Skip assistant messages that have no content and no tool calls.
             // Some providers require "either content or tool_calls, but not none".
             // Other providers also don't accept empty assistant messages.
@@ -725,7 +764,6 @@ function parseChunkUsage(rawUsage, model) {
     const promptTokens = rawUsage.prompt_tokens || 0;
     const reportedCachedTokens = rawUsage.prompt_tokens_details?.cached_tokens || 0;
     const cacheWriteTokens = rawUsage.prompt_tokens_details?.cache_write_tokens || 0;
-    const reasoningTokens = rawUsage.completion_tokens_details?.reasoning_tokens || 0;
     // Normalize to pi-ai semantics:
     // - cacheRead: hits from cache created by previous requests only
     // - cacheWrite: tokens written to cache in this request
@@ -733,9 +771,8 @@ function parseChunkUsage(rawUsage, model) {
     // as (previous hits + current writes). In that case, remove cacheWrite from cacheRead.
     const cacheReadTokens = cacheWriteTokens > 0 ? Math.max(0, reportedCachedTokens - cacheWriteTokens) : reportedCachedTokens;
     const input = Math.max(0, promptTokens - cacheReadTokens - cacheWriteTokens);
-    // Compute totalTokens ourselves since we add reasoning_tokens to output
-    // and some providers (e.g., Groq) don't include them in total_tokens
-    const outputTokens = (rawUsage.completion_tokens || 0) + reasoningTokens;
+    // OpenAI completion_tokens already includes reasoning_tokens.
+    const outputTokens = rawUsage.completion_tokens || 0;
     const usage = {
         input,
         output: outputTokens,
@@ -779,6 +816,7 @@ function detectCompat(model) {
     const provider = model.provider;
     const baseUrl = model.baseUrl;
     const isZai = provider === "zai" || baseUrl.includes("api.z.ai");
+    const isCloudflareWorkersAI = provider === "cloudflare-workers-ai" || baseUrl.includes("api.cloudflare.com");
     const isNonStandard = provider === "cerebras" ||
         baseUrl.includes("cerebras.ai") ||
         provider === "xai" ||
@@ -787,20 +825,30 @@ function detectCompat(model) {
         baseUrl.includes("deepseek.com") ||
         isZai ||
         provider === "opencode" ||
-        baseUrl.includes("opencode.ai");
+        baseUrl.includes("opencode.ai") ||
+        isCloudflareWorkersAI;
     const useMaxTokens = baseUrl.includes("chutes.ai");
     const isGrok = provider === "xai" || baseUrl.includes("api.x.ai");
     const isGroq = provider === "groq" || baseUrl.includes("groq.com");
+    const isDeepSeek = provider === "deepseek" || baseUrl.includes("deepseek.com");
     const cacheControlFormat = provider === "openrouter" && model.id.startsWith("anthropic/") ? "anthropic" : undefined;
-    const reasoningEffortMap = isGroq && model.id === "qwen/qwen3-32b"
+    const reasoningEffortMap = isDeepSeek
         ? {
-            minimal: "default",
-            low: "default",
-            medium: "default",
-            high: "default",
-            xhigh: "default",
+            minimal: "high",
+            low: "high",
+            medium: "high",
+            high: "high",
+            xhigh: "max",
         }
-        : {};
+        : isGroq && model.id === "qwen/qwen3-32b"
+            ? {
+                minimal: "default",
+                low: "default",
+                medium: "default",
+                high: "default",
+                xhigh: "default",
+            }
+            : {};
     return {
         supportsStore: !isNonStandard,
         supportsDeveloperRole: !isNonStandard,
@@ -811,17 +859,21 @@ function detectCompat(model) {
         requiresToolResultName: false,
         requiresAssistantAfterToolResult: false,
         requiresThinkingAsText: false,
-        thinkingFormat: isZai
-            ? "zai"
-            : provider === "openrouter" || baseUrl.includes("openrouter.ai")
-                ? "openrouter"
-                : "openai",
+        requiresReasoningContentOnAssistantMessages: isDeepSeek,
+        thinkingFormat: isDeepSeek
+            ? "deepseek"
+            : isZai
+                ? "zai"
+                : provider === "openrouter" || baseUrl.includes("openrouter.ai")
+                    ? "openrouter"
+                    : "openai",
         openRouterRouting: {},
         vercelGatewayRouting: {},
         zaiToolStream: false,
         supportsStrictMode: true,
         cacheControlFormat,
         sendSessionAffinityHeaders: false,
+        supportsLongCacheRetention: true,
     };
 }
 /**
@@ -842,6 +894,8 @@ function getCompat(model) {
         requiresToolResultName: model.compat.requiresToolResultName ?? detected.requiresToolResultName,
         requiresAssistantAfterToolResult: model.compat.requiresAssistantAfterToolResult ?? detected.requiresAssistantAfterToolResult,
         requiresThinkingAsText: model.compat.requiresThinkingAsText ?? detected.requiresThinkingAsText,
+        requiresReasoningContentOnAssistantMessages: model.compat.requiresReasoningContentOnAssistantMessages ??
+            detected.requiresReasoningContentOnAssistantMessages,
         thinkingFormat: model.compat.thinkingFormat ?? detected.thinkingFormat,
         openRouterRouting: model.compat.openRouterRouting ?? {},
         vercelGatewayRouting: model.compat.vercelGatewayRouting ?? detected.vercelGatewayRouting,
@@ -849,6 +903,7 @@ function getCompat(model) {
         supportsStrictMode: model.compat.supportsStrictMode ?? detected.supportsStrictMode,
         cacheControlFormat: model.compat.cacheControlFormat ?? detected.cacheControlFormat,
         sendSessionAffinityHeaders: model.compat.sendSessionAffinityHeaders ?? detected.sendSessionAffinityHeaders,
+        supportsLongCacheRetention: model.compat.supportsLongCacheRetention ?? detected.supportsLongCacheRetention,
     };
 }
 //# sourceMappingURL=openai-completions.js.map