@ai-sdk/openai-compatible 1.0.0-canary.7 → 1.0.0-canary.9

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.0-canary.9
+
+### Patch Changes
+
+- Updated dependencies [95857aa]
+- Updated dependencies [7ea4132]
+  - @ai-sdk/provider@2.0.0-canary.8
+  - @ai-sdk/provider-utils@3.0.0-canary.9
+
+## 1.0.0-canary.8
+
+### Patch Changes
+
+- b9a6121: fix (provider/openai-compatible): change tool_call type schema to nullish
+- Updated dependencies [5d142ab]
+- Updated dependencies [b6b43c7]
+- Updated dependencies [8aa9e20]
+- Updated dependencies [3795467]
+  - @ai-sdk/provider-utils@3.0.0-canary.8
+  - @ai-sdk/provider@2.0.0-canary.7
+
 ## 1.0.0-canary.7
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { SharedV2ProviderMetadata, LanguageModelV2, LanguageModelV2ObjectGenerationMode, EmbeddingModelV2, ImageModelV1, ProviderV2 } from '@ai-sdk/provider';
+import { SharedV2ProviderMetadata, LanguageModelV2, EmbeddingModelV2, ImageModelV1, ProviderV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { z, ZodSchema } from 'zod';
 
@@ -109,15 +109,13 @@ type OpenAICompatibleChatConfig = {
     errorStructure?: ProviderErrorStructure<any>;
     metadataExtractor?: MetadataExtractor;
     /**
-  Default object generation mode that should be used with this model when
-  no mode is specified. Should be the mode with the best results for this
-  model. `undefined` can be specified if object generation is not supported.
-    */
-    defaultObjectGenerationMode?: LanguageModelV2ObjectGenerationMode;
-    /**
      * Whether the model supports structured outputs.
      */
     supportsStructuredOutputs?: boolean;
+    /**
+     * The supported URLs for the model.
+     */
+    getSupportedUrls?: () => Promise<Record<string, RegExp[]>>;
 };
 declare class OpenAICompatibleChatLanguageModel implements LanguageModelV2 {
     readonly specificationVersion = "v2";
@@ -127,9 +125,9 @@ declare class OpenAICompatibleChatLanguageModel implements LanguageModelV2 {
     private readonly failedResponseHandler;
     private readonly chunkSchema;
     constructor(modelId: OpenAICompatibleChatModelId, config: OpenAICompatibleChatConfig);
-    get defaultObjectGenerationMode(): 'json' | 'tool' | undefined;
     get provider(): string;
     private get providerOptionsName();
+    getSupportedUrls(): Promise<Record<string, RegExp[]>>;
     private getArgs;
     doGenerate(options: Parameters<LanguageModelV2['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>>;
     doStream(options: Parameters<LanguageModelV2['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>>;
@@ -179,10 +177,13 @@ type OpenAICompatibleCompletionConfig = {
     }) => string;
     fetch?: FetchFunction;
     errorStructure?: ProviderErrorStructure<any>;
+    /**
+     * The supported URLs for the model.
+     */
+    getSupportedUrls?: () => Promise<Record<string, RegExp[]>>;
 };
 declare class OpenAICompatibleCompletionLanguageModel implements LanguageModelV2 {
     readonly specificationVersion = "v2";
-    readonly defaultObjectGenerationMode: undefined;
     readonly modelId: OpenAICompatibleCompletionModelId;
     private readonly config;
     private readonly failedResponseHandler;
@@ -190,6 +191,7 @@ declare class OpenAICompatibleCompletionLanguageModel implements LanguageModelV2
     constructor(modelId: OpenAICompatibleCompletionModelId, config: OpenAICompatibleCompletionConfig);
     get provider(): string;
     private get providerOptionsName();
+    getSupportedUrls(): Promise<Record<string, RegExp[]>>;
     private getArgs;
     doGenerate(options: Parameters<LanguageModelV2['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>>;
     doStream(options: Parameters<LanguageModelV2['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SharedV2ProviderMetadata, LanguageModelV2, LanguageModelV2ObjectGenerationMode, EmbeddingModelV2, ImageModelV1, ProviderV2 } from '@ai-sdk/provider';
+import { SharedV2ProviderMetadata, LanguageModelV2, EmbeddingModelV2, ImageModelV1, ProviderV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 import { z, ZodSchema } from 'zod';
 
@@ -109,15 +109,13 @@ type OpenAICompatibleChatConfig = {
     errorStructure?: ProviderErrorStructure<any>;
     metadataExtractor?: MetadataExtractor;
     /**
-  Default object generation mode that should be used with this model when
-  no mode is specified. Should be the mode with the best results for this
-  model. `undefined` can be specified if object generation is not supported.
-    */
-    defaultObjectGenerationMode?: LanguageModelV2ObjectGenerationMode;
-    /**
      * Whether the model supports structured outputs.
      */
     supportsStructuredOutputs?: boolean;
+    /**
+     * The supported URLs for the model.
+     */
+    getSupportedUrls?: () => Promise<Record<string, RegExp[]>>;
 };
 declare class OpenAICompatibleChatLanguageModel implements LanguageModelV2 {
     readonly specificationVersion = "v2";
@@ -127,9 +125,9 @@ declare class OpenAICompatibleChatLanguageModel implements LanguageModelV2 {
     private readonly failedResponseHandler;
     private readonly chunkSchema;
     constructor(modelId: OpenAICompatibleChatModelId, config: OpenAICompatibleChatConfig);
-    get defaultObjectGenerationMode(): 'json' | 'tool' | undefined;
     get provider(): string;
     private get providerOptionsName();
+    getSupportedUrls(): Promise<Record<string, RegExp[]>>;
     private getArgs;
     doGenerate(options: Parameters<LanguageModelV2['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>>;
     doStream(options: Parameters<LanguageModelV2['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>>;
@@ -179,10 +177,13 @@ type OpenAICompatibleCompletionConfig = {
     }) => string;
     fetch?: FetchFunction;
     errorStructure?: ProviderErrorStructure<any>;
+    /**
+     * The supported URLs for the model.
+     */
+    getSupportedUrls?: () => Promise<Record<string, RegExp[]>>;
 };
 declare class OpenAICompatibleCompletionLanguageModel implements LanguageModelV2 {
     readonly specificationVersion = "v2";
-    readonly defaultObjectGenerationMode: undefined;
     readonly modelId: OpenAICompatibleCompletionModelId;
     private readonly config;
     private readonly failedResponseHandler;
@@ -190,6 +191,7 @@ declare class OpenAICompatibleCompletionLanguageModel implements LanguageModelV2
     constructor(modelId: OpenAICompatibleCompletionModelId, config: OpenAICompatibleCompletionConfig);
     get provider(): string;
     private get providerOptionsName();
+    getSupportedUrls(): Promise<Record<string, RegExp[]>>;
     private getArgs;
     doGenerate(options: Parameters<LanguageModelV2['doGenerate']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doGenerate']>>>;
     doStream(options: Parameters<LanguageModelV2['doStream']>[0]): Promise<Awaited<ReturnType<LanguageModelV2['doStream']>>>;

package/dist/index.js

@@ -266,15 +266,16 @@ var OpenAICompatibleChatLanguageModel = class {
     this.failedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)(errorStructure);
     this.supportsStructuredOutputs = (_b = config.supportsStructuredOutputs) != null ? _b : false;
   }
-  get defaultObjectGenerationMode() {
-    return this.config.defaultObjectGenerationMode;
-  }
   get provider() {
     return this.config.provider;
   }
   get providerOptionsName() {
     return this.config.provider.split(".")[0].trim();
   }
+  async getSupportedUrls() {
+    var _a, _b, _c;
+    return (_c = (_b = (_a = this.config).getSupportedUrls) == null ? void 0 : _b.call(_a)) != null ? _c : {};
+  }
   getArgs({
     prompt,
     maxOutputTokens,
@@ -376,16 +377,39 @@ var OpenAICompatibleChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const { messages: rawPrompt, ...rawSettings } = args;
     const choice = responseBody.choices[0];
+    const content = [];
+    const text = choice.message.content;
+    if (text != null && text.length > 0) {
+      content.push({ type: "text", text });
+    }
+    const reasoning = choice.message.reasoning_content;
+    if (reasoning != null && reasoning.length > 0) {
+      content.push({
+        type: "reasoning",
+        reasoningType: "text",
+        text: reasoning
+      });
+    }
+    if (choice.message.tool_calls != null) {
+      for (const toolCall of choice.message.tool_calls) {
+        content.push({
+          type: "tool-call",
+          toolCallType: "function",
+          toolCallId: (_a = toolCall.id) != null ? _a : (0, import_provider_utils.generateId)(),
+          toolName: toolCall.function.name,
+          args: toolCall.function.arguments
+        });
+      }
+    }
     const providerMetadata = {
       [this.providerOptionsName]: {},
-      ...(_b = (_a = this.config.metadataExtractor) == null ? void 0 : _a.extractMetadata) == null ? void 0 : _b.call(_a, {
+      ...(_c = (_b = this.config.metadataExtractor) == null ? void 0 : _b.extractMetadata) == null ? void 0 : _c.call(_b, {
         parsedBody: rawResponse
       })
     };
-    const completionTokenDetails = (_c = responseBody.usage) == null ? void 0 : _c.completion_tokens_details;
-    const promptTokenDetails = (_d = responseBody.usage) == null ? void 0 : _d.prompt_tokens_details;
+    const completionTokenDetails = (_d = responseBody.usage) == null ? void 0 : _d.completion_tokens_details;
+    const promptTokenDetails = (_e = responseBody.usage) == null ? void 0 : _e.prompt_tokens_details;
     if ((completionTokenDetails == null ? void 0 : completionTokenDetails.reasoning_tokens) != null) {
       providerMetadata[this.providerOptionsName].reasoningTokens = completionTokenDetails == null ? void 0 : completionTokenDetails.reasoning_tokens;
     }
@@ -399,24 +423,7 @@ var OpenAICompatibleChatLanguageModel = class {
       providerMetadata[this.providerOptionsName].cachedPromptTokens = promptTokenDetails == null ? void 0 : promptTokenDetails.cached_tokens;
     }
     return {
-      text: choice.message.content != null ? { type: "text", text: choice.message.content } : void 0,
-      reasoning: choice.message.reasoning_content ? [
-        {
-          type: "reasoning",
-          reasoningType: "text",
-          text: choice.message.reasoning_content
-        }
-      ] : void 0,
-      toolCalls: (_e = choice.message.tool_calls) == null ? void 0 : _e.map((toolCall) => {
-        var _a2;
-        return {
-          type: "tool-call",
-          toolCallType: "function",
-          toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils.generateId)(),
-          toolName: toolCall.function.name,
-          args: toolCall.function.arguments
-        };
-      }),
+      content,
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       usage: {
         inputTokens: (_g = (_f = responseBody.usage) == null ? void 0 : _f.prompt_tokens) != null ? _g : void 0,
@@ -473,6 +480,9 @@ var OpenAICompatibleChatLanguageModel = class {
     return {
       stream: response.pipeThrough(
         new TransformStream({
+          start(controller) {
+            controller.enqueue({ type: "stream-start", warnings });
+          },
           // TODO we lost type safety on Chunk, most likely due to the error schema. MUST FIX
           transform(chunk, controller) {
             var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
@@ -653,8 +663,7 @@ var OpenAICompatibleChatLanguageModel = class {
         })
       ),
       request: { body },
-      response: { headers: responseHeaders },
-      warnings
+      response: { headers: responseHeaders }
     };
   }
 };
@@ -711,7 +720,7 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod3.z.union
             import_zod3.z.object({
               index: import_zod3.z.number(),
               id: import_zod3.z.string().nullish(),
-              type: import_zod3.z.literal("function").optional(),
+              type: import_zod3.z.literal("function").nullish(),
               function: import_zod3.z.object({
                 name: import_zod3.z.string().nullish(),
                 arguments: import_zod3.z.string().nullish()
@@ -840,7 +849,6 @@ var OpenAICompatibleCompletionLanguageModel = class {
   // type inferred via constructor
   constructor(modelId, config) {
     this.specificationVersion = "v2";
-    this.defaultObjectGenerationMode = void 0;
     var _a;
     this.modelId = modelId;
     this.config = config;
@@ -856,6 +864,10 @@ var OpenAICompatibleCompletionLanguageModel = class {
   get providerOptionsName() {
     return this.config.provider.split(".")[0].trim();
   }
+  async getSupportedUrls() {
+    var _a, _b, _c;
+    return (_c = (_b = (_a = this.config).getSupportedUrls) == null ? void 0 : _b.call(_a)) != null ? _c : {};
+  }
   getArgs({
     inputFormat,
     prompt,
@@ -944,8 +956,12 @@ var OpenAICompatibleCompletionLanguageModel = class {
       fetch: this.config.fetch
     });
     const choice = response.choices[0];
+    const content = [];
+    if (choice.text != null && choice.text.length > 0) {
+      content.push({ type: "text", text: choice.text });
+    }
     return {
-      text: { type: "text", text: choice.text },
+      content,
       usage: {
         inputTokens: (_b = (_a = response.usage) == null ? void 0 : _a.prompt_tokens) != null ? _b : void 0,
         outputTokens: (_d = (_c = response.usage) == null ? void 0 : _c.completion_tokens) != null ? _d : void 0
@@ -989,6 +1005,9 @@ var OpenAICompatibleCompletionLanguageModel = class {
     return {
       stream: response.pipeThrough(
         new TransformStream({
+          start(controller) {
+            controller.enqueue({ type: "stream-start", warnings });
+          },
           transform(chunk, controller) {
             var _a, _b;
             if (!chunk.success) {
@@ -1036,8 +1055,7 @@ var OpenAICompatibleCompletionLanguageModel = class {
         })
       ),
       request: { body },
-      response: { headers: responseHeaders },
-      warnings
+      response: { headers: responseHeaders }
     };
   }
 };
@@ -1283,10 +1301,10 @@ function createOpenAICompatible(options) {
     fetch: options.fetch
   });
   const createLanguageModel = (modelId) => createChatModel(modelId);
-  const createChatModel = (modelId) => new OpenAICompatibleChatLanguageModel(modelId, {
-    ...getCommonModelConfig("chat"),
-    defaultObjectGenerationMode: "tool"
-  });
+  const createChatModel = (modelId) => new OpenAICompatibleChatLanguageModel(
+    modelId,
+    getCommonModelConfig("chat")
+  );
   const createCompletionModel = (modelId) => new OpenAICompatibleCompletionLanguageModel(
     modelId,
     getCommonModelConfig("completion")