@ai-sdk/openai-compatible 2.0.44 → 2.0.46

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/openai-compatible
 
+## 2.0.46
+
+### Patch Changes
+
+- 38966ab: fix(openai, openai-compatible): only send null content for assistant messages with tool calls
+
+## 2.0.45
+
+### Patch Changes
+
+- 6043d24: feat(vertex): add grok models to vertex provider
+
 ## 2.0.44
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { SharedV3ProviderMetadata, LanguageModelV3, LanguageModelV3CallOptions, LanguageModelV3GenerateResult, LanguageModelV3StreamResult, EmbeddingModelV3, ImageModelV3, ProviderV3 } from '@ai-sdk/provider';
+import { SharedV3ProviderMetadata, LanguageModelV3, LanguageModelV3Usage, LanguageModelV3CallOptions, LanguageModelV3GenerateResult, LanguageModelV3StreamResult, EmbeddingModelV3, ImageModelV3, ProviderV3 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { ZodType, z } from 'zod/v4';
 
@@ -94,6 +94,11 @@ type OpenAICompatibleChatConfig = {
      * than the official OpenAI API.
      */
     transformRequestBody?: (args: Record<string, any>) => Record<string, any>;
+    /**
+     * Optional usage converter for OpenAI-compatible providers with different
+     * token accounting semantics.
+     */
+    convertUsage?: (usage: z.infer<typeof openaiCompatibleTokenUsageSchema>) => LanguageModelV3Usage;
 };
 declare class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
     readonly specificationVersion = "v3";
@@ -107,10 +112,24 @@ declare class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
     private get providerOptionsName();
     get supportedUrls(): Record<string, RegExp[]> | PromiseLike<Record<string, RegExp[]>>;
     private transformRequestBody;
+    private convertUsage;
     private getArgs;
     doGenerate(options: LanguageModelV3CallOptions): Promise<LanguageModelV3GenerateResult>;
     doStream(options: LanguageModelV3CallOptions): Promise<LanguageModelV3StreamResult>;
 }
+declare const openaiCompatibleTokenUsageSchema: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    prompt_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    completion_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    total_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    prompt_tokens_details: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        cached_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, z.core.$strip>>>;
+    completion_tokens_details: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        reasoning_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        accepted_prediction_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        rejected_prediction_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, z.core.$strip>>>;
+}, z.core.$loose>>>;
 
 type OpenAICompatibleCompletionModelId = string;
 declare const openaiCompatibleLanguageModelCompletionOptions: z.ZodObject<{
@@ -279,6 +298,15 @@ interface OpenAICompatibleProviderSettings {
      * or provider-specific metrics from both streaming and non-streaming responses.
      */
     metadataExtractor?: MetadataExtractor;
+    /**
+     * The supported URLs for chat models.
+     */
+    supportedUrls?: OpenAICompatibleChatConfig['supportedUrls'];
+    /**
+     * Optional usage converter for providers with token accounting semantics that
+     * differ from the default OpenAI-compatible shape.
+     */
+    convertUsage?: OpenAICompatibleChatConfig['convertUsage'];
 }
 /**
  * Create an OpenAICompatible provider instance.

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SharedV3ProviderMetadata, LanguageModelV3, LanguageModelV3CallOptions, LanguageModelV3GenerateResult, LanguageModelV3StreamResult, EmbeddingModelV3, ImageModelV3, ProviderV3 } from '@ai-sdk/provider';
+import { SharedV3ProviderMetadata, LanguageModelV3, LanguageModelV3Usage, LanguageModelV3CallOptions, LanguageModelV3GenerateResult, LanguageModelV3StreamResult, EmbeddingModelV3, ImageModelV3, ProviderV3 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { ZodType, z } from 'zod/v4';
 
@@ -94,6 +94,11 @@ type OpenAICompatibleChatConfig = {
      * than the official OpenAI API.
      */
     transformRequestBody?: (args: Record<string, any>) => Record<string, any>;
+    /**
+     * Optional usage converter for OpenAI-compatible providers with different
+     * token accounting semantics.
+     */
+    convertUsage?: (usage: z.infer<typeof openaiCompatibleTokenUsageSchema>) => LanguageModelV3Usage;
 };
 declare class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
     readonly specificationVersion = "v3";
@@ -107,10 +112,24 @@ declare class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
     private get providerOptionsName();
     get supportedUrls(): Record<string, RegExp[]> | PromiseLike<Record<string, RegExp[]>>;
     private transformRequestBody;
+    private convertUsage;
     private getArgs;
     doGenerate(options: LanguageModelV3CallOptions): Promise<LanguageModelV3GenerateResult>;
     doStream(options: LanguageModelV3CallOptions): Promise<LanguageModelV3StreamResult>;
 }
+declare const openaiCompatibleTokenUsageSchema: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+    prompt_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    completion_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    total_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    prompt_tokens_details: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        cached_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, z.core.$strip>>>;
+    completion_tokens_details: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        reasoning_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        accepted_prediction_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        rejected_prediction_tokens: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, z.core.$strip>>>;
+}, z.core.$loose>>>;
 
 type OpenAICompatibleCompletionModelId = string;
 declare const openaiCompatibleLanguageModelCompletionOptions: z.ZodObject<{
@@ -279,6 +298,15 @@ interface OpenAICompatibleProviderSettings {
      * or provider-specific metrics from both streaming and non-streaming responses.
      */
     metadataExtractor?: MetadataExtractor;
+    /**
+     * The supported URLs for chat models.
+     */
+    supportedUrls?: OpenAICompatibleChatConfig['supportedUrls'];
+    /**
+     * Optional usage converter for providers with token accounting semantics that
+     * differ from the default OpenAI-compatible shape.
+     */
+    convertUsage?: OpenAICompatibleChatConfig['convertUsage'];
 }
 /**
  * Create an OpenAICompatible provider instance.

package/dist/index.js

@@ -256,7 +256,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
         }
         messages.push({
           role: "assistant",
-          content: text || null,
+          content: toolCalls.length > 0 ? text || null : text,
           ...reasoning.length > 0 ? { reasoning_content: reasoning } : {},
           tool_calls: toolCalls.length > 0 ? toolCalls : void 0,
           ...metadata
@@ -445,6 +445,10 @@ var OpenAICompatibleChatLanguageModel = class {
     var _a, _b, _c;
     return (_c = (_b = (_a = this.config).transformRequestBody) == null ? void 0 : _b.call(_a, args)) != null ? _c : args;
   }
+  convertUsage(usage) {
+    var _a, _b, _c;
+    return (_c = (_b = (_a = this.config).convertUsage) == null ? void 0 : _b.call(_a, usage)) != null ? _c : convertOpenAICompatibleChatUsage(usage);
+  }
   async getArgs({
     prompt,
     maxOutputTokens,
@@ -630,7 +634,7 @@ var OpenAICompatibleChatLanguageModel = class {
         unified: mapOpenAICompatibleFinishReason(choice.finish_reason),
         raw: (_h = choice.finish_reason) != null ? _h : void 0
       },
-      usage: convertOpenAICompatibleChatUsage(responseBody.usage),
+      usage: this.convertUsage(responseBody.usage),
       providerMetadata,
       request: { body },
       response: {
@@ -675,6 +679,7 @@ var OpenAICompatibleChatLanguageModel = class {
     const providerOptionsName = metadataKey;
     let isActiveReasoning = false;
     let isActiveText = false;
+    const convertUsage = (usage2) => this.convertUsage(usage2);
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -902,7 +907,7 @@ var OpenAICompatibleChatLanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage: convertOpenAICompatibleChatUsage(usage),
+              usage: convertUsage(usage),
               providerMetadata
             });
           }
@@ -1693,7 +1698,7 @@ async function fileToBlob(file) {
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.44" : "0.0.0-test";
+var VERSION = true ? "2.0.46" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {
@@ -1721,8 +1726,10 @@ function createOpenAICompatible(options) {
     ...getCommonModelConfig("chat"),
     includeUsage: options.includeUsage,
     supportsStructuredOutputs: options.supportsStructuredOutputs,
+    supportedUrls: options.supportedUrls,
     transformRequestBody: options.transformRequestBody,
-    metadataExtractor: options.metadataExtractor
+    metadataExtractor: options.metadataExtractor,
+    convertUsage: options.convertUsage
   });
   const createCompletionModel = (modelId) => new OpenAICompatibleCompletionLanguageModel(modelId, {
     ...getCommonModelConfig("completion"),