@ai-sdk/openai-compatible 1.0.0-canary.2 → 1.0.0-canary.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.0-canary.4
+
+### Patch Changes
+
+- Updated dependencies [d1a1aa1]
+  - @ai-sdk/provider@2.0.0-canary.3
+  - @ai-sdk/provider-utils@3.0.0-canary.4
+
+## 1.0.0-canary.3
+
+### Patch Changes
+
+- Updated dependencies [a166433]
+- Updated dependencies [abf9a79]
+- Updated dependencies [9f95b35]
+- Updated dependencies [0a87932]
+- Updated dependencies [6dc848c]
+  - @ai-sdk/provider-utils@3.0.0-canary.3
+  - @ai-sdk/provider@2.0.0-canary.2
+
 ## 1.0.0-canary.2
 
 ### Patch Changes

package/dist/index.js

@@ -30,12 +30,11 @@ module.exports = __toCommonJS(src_exports);
 
 // src/openai-compatible-chat-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
-var import_provider_utils2 = require("@ai-sdk/provider-utils");
+var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_zod2 = require("zod");
 
 // src/convert-to-openai-compatible-chat-messages.ts
 var import_provider = require("@ai-sdk/provider");
-var import_provider_utils = require("@ai-sdk/provider-utils");
 function getOpenAIMetadata(message) {
   var _a, _b;
   return (_b = (_a = message == null ? void 0 : message.providerOptions) == null ? void 0 : _a.openaiCompatible) != null ? _b : {};
@@ -61,25 +60,26 @@ function convertToOpenAICompatibleChatMessages(prompt) {
         messages.push({
           role: "user",
           content: content.map((part) => {
-            var _a;
             const partMetadata = getOpenAIMetadata(part);
             switch (part.type) {
               case "text": {
                 return { type: "text", text: part.text, ...partMetadata };
               }
-              case "image": {
-                return {
-                  type: "image_url",
-                  image_url: {
-                    url: part.image instanceof URL ? part.image.toString() : `data:${(_a = part.mimeType) != null ? _a : "image/jpeg"};base64,${(0, import_provider_utils.convertUint8ArrayToBase64)(part.image)}`
-                  },
-                  ...partMetadata
-                };
-              }
               case "file": {
-                throw new import_provider.UnsupportedFunctionalityError({
-                  functionality: "File content parts in user messages"
-                });
+                if (part.mediaType.startsWith("image/")) {
+                  const mediaType = part.mediaType === "image/*" ? "image/jpeg" : part.mediaType;
+                  return {
+                    type: "image_url",
+                    image_url: {
+                      url: part.data instanceof URL ? part.data.toString() : `data:${mediaType};base64,${part.data}`
+                    },
+                    ...partMetadata
+                  };
+                } else {
+                  throw new import_provider.UnsupportedFunctionalityError({
+                    functionality: `file part media type ${part.mediaType}`
+                  });
+                }
               }
             }
           }),
@@ -235,7 +235,7 @@ function prepareTools({
     default: {
       const _exhaustiveCheck = type;
       throw new import_provider2.UnsupportedFunctionalityError({
-        functionality: `Unsupported tool choice type: ${_exhaustiveCheck}`
+        functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
   }
@@ -254,7 +254,7 @@ var OpenAICompatibleChatLanguageModel = class {
     this.chunkSchema = createOpenAICompatibleChatChunkSchema(
       errorStructure.errorSchema
     );
-    this.failedResponseHandler = (0, import_provider_utils2.createJsonErrorResponseHandler)(errorStructure);
+    this.failedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)(errorStructure);
     this.supportsStructuredOutputs = (_b = config.supportsStructuredOutputs) != null ? _b : false;
   }
   get defaultObjectGenerationMode() {
@@ -341,15 +341,15 @@ var OpenAICompatibleChatLanguageModel = class {
       responseHeaders,
       value: responseBody,
       rawValue: rawResponse
-    } = await (0, import_provider_utils2.postJsonToApi)({
+    } = await (0, import_provider_utils.postJsonToApi)({
       url: this.config.url({
         path: "/chat/completions",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils.combineHeaders)(this.config.headers(), options.headers),
       body: args,
       failedResponseHandler: this.failedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils.createJsonResponseHandler)(
         OpenAICompatibleChatResponseSchema
       ),
       abortSignal: options.abortSignal,
@@ -384,7 +384,7 @@ var OpenAICompatibleChatLanguageModel = class {
         var _a2;
         return {
           toolCallType: "function",
-          toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils2.generateId)(),
+          toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils.generateId)(),
           toolName: toolCall.function.name,
           args: toolCall.function.arguments
         };
@@ -396,10 +396,13 @@ var OpenAICompatibleChatLanguageModel = class {
       },
       providerMetadata,
       rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders, body: rawResponse },
-      response: getResponseMetadata(responseBody),
-      warnings,
-      request: { body }
+      request: { body },
+      response: {
+        ...getResponseMetadata(responseBody),
+        headers: responseHeaders,
+        body: rawResponse
+      },
+      warnings
     };
   }
   async doStream(options) {
@@ -453,25 +456,25 @@ var OpenAICompatibleChatLanguageModel = class {
       return {
         stream: simulatedStream,
         rawCall: result.rawCall,
-        rawResponse: result.rawResponse,
+        response: result.response,
         warnings: result.warnings
       };
     }
     const { args, warnings } = this.getArgs({ ...options });
     const body = JSON.stringify({ ...args, stream: true });
     const metadataExtractor = (_a = this.config.metadataExtractor) == null ? void 0 : _a.createStreamExtractor();
-    const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils.postJsonToApi)({
       url: this.config.url({
         path: "/chat/completions",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils.combineHeaders)(this.config.headers(), options.headers),
       body: {
         ...args,
         stream: true
       },
       failedResponseHandler: this.failedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils2.createEventSourceResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils.createEventSourceResponseHandler)(
         this.chunkSchema
       ),
       abortSignal: options.abortSignal,
@@ -605,11 +608,11 @@ var OpenAICompatibleChatLanguageModel = class {
                         argsTextDelta: toolCall2.function.arguments
                       });
                     }
-                    if ((0, import_provider_utils2.isParsableJson)(toolCall2.function.arguments)) {
+                    if ((0, import_provider_utils.isParsableJson)(toolCall2.function.arguments)) {
                       controller.enqueue({
                         type: "tool-call",
                         toolCallType: "function",
-                        toolCallId: (_e = toolCall2.id) != null ? _e : (0, import_provider_utils2.generateId)(),
+                        toolCallId: (_e = toolCall2.id) != null ? _e : (0, import_provider_utils.generateId)(),
                         toolName: toolCall2.function.name,
                         args: toolCall2.function.arguments
                       });
@@ -632,11 +635,11 @@ var OpenAICompatibleChatLanguageModel = class {
                   toolName: toolCall.function.name,
                   argsTextDelta: (_i = toolCallDelta.function.arguments) != null ? _i : ""
                 });
-                if (((_j = toolCall.function) == null ? void 0 : _j.name) != null && ((_k = toolCall.function) == null ? void 0 : _k.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                if (((_j = toolCall.function) == null ? void 0 : _j.name) != null && ((_k = toolCall.function) == null ? void 0 : _k.arguments) != null && (0, import_provider_utils.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-call",
                     toolCallType: "function",
-                    toolCallId: (_l = toolCall.id) != null ? _l : (0, import_provider_utils2.generateId)(),
+                    toolCallId: (_l = toolCall.id) != null ? _l : (0, import_provider_utils.generateId)(),
                     toolName: toolCall.function.name,
                     args: toolCall.function.arguments
                   });
@@ -676,9 +679,9 @@ var OpenAICompatibleChatLanguageModel = class {
         })
       ),
       rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders },
-      warnings,
-      request: { body }
+      request: { body },
+      response: { headers: responseHeaders },
+      warnings
     };
   }
 };
@@ -752,7 +755,7 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod2.z.union
 ]);
 
 // src/openai-compatible-completion-language-model.ts
-var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var import_provider_utils2 = require("@ai-sdk/provider-utils");
 var import_zod3 = require("zod");
 
 // src/convert-to-openai-compatible-completion-prompt.ts
@@ -787,13 +790,8 @@ function convertToOpenAICompatibleCompletionPrompt({
             case "text": {
               return part.text;
             }
-            case "image": {
-              throw new import_provider4.UnsupportedFunctionalityError({
-                functionality: "images"
-              });
-            }
           }
-        }).join("");
+        }).filter(Boolean).join("");
         text += `${user}:
 ${userMessage}
 
@@ -853,7 +851,7 @@ var OpenAICompatibleCompletionLanguageModel = class {
     this.chunkSchema = createOpenAICompatibleCompletionChunkSchema(
       errorStructure.errorSchema
     );
-    this.failedResponseHandler = (0, import_provider_utils3.createJsonErrorResponseHandler)(errorStructure);
+    this.failedResponseHandler = (0, import_provider_utils2.createJsonErrorResponseHandler)(errorStructure);
   }
   get provider() {
     return this.config.provider;
@@ -928,15 +926,15 @@ var OpenAICompatibleCompletionLanguageModel = class {
       responseHeaders,
       value: response,
       rawValue: rawResponse
-    } = await (0, import_provider_utils3.postJsonToApi)({
+    } = await (0, import_provider_utils2.postJsonToApi)({
       url: this.config.url({
         path: "/completions",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
       body: args,
       failedResponseHandler: this.failedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(
         openaiCompatibleCompletionResponseSchema
       ),
       abortSignal: options.abortSignal,
@@ -952,10 +950,13 @@ var OpenAICompatibleCompletionLanguageModel = class {
       },
       finishReason: mapOpenAICompatibleFinishReason(choice.finish_reason),
       rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders, body: rawResponse },
-      response: getResponseMetadata(response),
-      warnings,
-      request: { body: JSON.stringify(args) }
+      request: { body: JSON.stringify(args) },
+      response: {
+        ...getResponseMetadata(response),
+        headers: responseHeaders,
+        body: rawResponse
+      },
+      warnings
     };
   }
   async doStream(options) {
@@ -964,15 +965,15 @@ var OpenAICompatibleCompletionLanguageModel = class {
       ...args,
       stream: true
     };
-    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
       url: this.config.url({
         path: "/completions",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
       body,
       failedResponseHandler: this.failedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils3.createEventSourceResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils2.createEventSourceResponseHandler)(
         this.chunkSchema
       ),
       abortSignal: options.abortSignal,
@@ -1036,9 +1037,9 @@ var OpenAICompatibleCompletionLanguageModel = class {
         })
       ),
       rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders },
-      warnings,
-      request: { body: JSON.stringify(body) }
+      request: { body: JSON.stringify(body) },
+      response: { headers: responseHeaders },
+      warnings
     };
   }
 };
@@ -1079,7 +1080,7 @@ var createOpenAICompatibleCompletionChunkSchema = (errorSchema) => import_zod3.z
 
 // src/openai-compatible-embedding-model.ts
 var import_provider5 = require("@ai-sdk/provider");
-var import_provider_utils4 = require("@ai-sdk/provider-utils");
+var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_zod4 = require("zod");
 var OpenAICompatibleEmbeddingModel = class {
   constructor(modelId, settings, config) {
@@ -1113,12 +1114,12 @@ var OpenAICompatibleEmbeddingModel = class {
         values
       });
     }
-    const { responseHeaders, value: response } = await (0, import_provider_utils4.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
       url: this.config.url({
         path: "/embeddings",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils4.combineHeaders)(this.config.headers(), headers),
+      headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), headers),
       body: {
         model: this.modelId,
         input: values,
@@ -1126,10 +1127,10 @@ var OpenAICompatibleEmbeddingModel = class {
         dimensions: this.settings.dimensions,
         user: this.settings.user
       },
-      failedResponseHandler: (0, import_provider_utils4.createJsonErrorResponseHandler)(
+      failedResponseHandler: (0, import_provider_utils3.createJsonErrorResponseHandler)(
         (_a = this.config.errorStructure) != null ? _a : defaultOpenAICompatibleErrorStructure
       ),
-      successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(
         openaiTextEmbeddingResponseSchema
       ),
       abortSignal,
@@ -1148,7 +1149,7 @@ var openaiTextEmbeddingResponseSchema = import_zod4.z.object({
 });
 
 // src/openai-compatible-image-model.ts
-var import_provider_utils5 = require("@ai-sdk/provider-utils");
+var import_provider_utils4 = require("@ai-sdk/provider-utils");
 var import_zod5 = require("zod");
 var OpenAICompatibleImageModel = class {
   constructor(modelId, settings, config) {
@@ -1187,12 +1188,12 @@ var OpenAICompatibleImageModel = class {
       warnings.push({ type: "unsupported-setting", setting: "seed" });
     }
     const currentDate = (_c = (_b = (_a = this.config._internal) == null ? void 0 : _a.currentDate) == null ? void 0 : _b.call(_a)) != null ? _c : /* @__PURE__ */ new Date();
-    const { value: response, responseHeaders } = await (0, import_provider_utils5.postJsonToApi)({
+    const { value: response, responseHeaders } = await (0, import_provider_utils4.postJsonToApi)({
       url: this.config.url({
         path: "/images/generations",
         modelId: this.modelId
       }),
-      headers: (0, import_provider_utils5.combineHeaders)(this.config.headers(), headers),
+      headers: (0, import_provider_utils4.combineHeaders)(this.config.headers(), headers),
       body: {
         model: this.modelId,
         prompt,
@@ -1202,10 +1203,10 @@ var OpenAICompatibleImageModel = class {
         response_format: "b64_json",
         ...this.settings.user ? { user: this.settings.user } : {}
       },
-      failedResponseHandler: (0, import_provider_utils5.createJsonErrorResponseHandler)(
+      failedResponseHandler: (0, import_provider_utils4.createJsonErrorResponseHandler)(
         (_e = this.config.errorStructure) != null ? _e : defaultOpenAICompatibleErrorStructure
       ),
-      successfulResponseHandler: (0, import_provider_utils5.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(
         openaiCompatibleImageResponseSchema
       ),
       abortSignal,
@@ -1227,9 +1228,9 @@ var openaiCompatibleImageResponseSchema = import_zod5.z.object({
 });
 
 // src/openai-compatible-provider.ts
-var import_provider_utils6 = require("@ai-sdk/provider-utils");
+var import_provider_utils5 = require("@ai-sdk/provider-utils");
 function createOpenAICompatible(options) {
-  const baseURL = (0, import_provider_utils6.withoutTrailingSlash)(options.baseURL);
+  const baseURL = (0, import_provider_utils5.withoutTrailingSlash)(options.baseURL);
   const providerName = options.name;
   const getHeaders = () => ({
     ...options.apiKey && { Authorization: `Bearer ${options.apiKey}` },