@ai-sdk/openai-compatible 2.0.84 → 2.0.86

package/dist/index.mjs

@@ -581,7 +581,6 @@ var OpenAICompatibleChatLanguageModel = class {
       });
     }
     const content = [];
-    content.push(...convertOpenAICompatibleContent(choice.message.content));
     const reasoning = (_a = choice.message.reasoning_content) != null ? _a : choice.message.reasoning;
     if (reasoning != null && reasoning.length > 0) {
       content.push({
@@ -589,6 +588,7 @@ var OpenAICompatibleChatLanguageModel = class {
         text: reasoning
       });
     }
+    content.push(...convertOpenAICompatibleContent(choice.message.content));
     if (choice.message.tool_calls != null) {
       for (const toolCall of choice.message.tool_calls) {
         const thoughtSignature = (_c = (_b = toolCall.extra_content) == null ? void 0 : _b.google) == null ? void 0 : _c.thought_signature;
@@ -1578,13 +1578,19 @@ var openaiTextEmbeddingResponseSchema = z7.object({
 });
 
 // src/image/openai-compatible-image-model.ts
+import {
+  InvalidResponseDataError as InvalidResponseDataError2
+} from "@ai-sdk/provider";
 import {
   combineHeaders as combineHeaders4,
   convertBase64ToUint8Array as convertBase64ToUint8Array2,
   convertToFormData,
+  createBinaryResponseHandler,
   createJsonErrorResponseHandler as createJsonErrorResponseHandler4,
   createJsonResponseHandler as createJsonResponseHandler4,
+  createStatusCodeErrorResponseHandler,
   downloadBlob,
+  getFromApi,
   postFormDataToApi,
   postJsonToApi as postJsonToApi4
 } from "@ai-sdk/provider-utils";
@@ -1638,13 +1644,16 @@ var OpenAICompatibleImageModel = class {
     }
     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 args = this.getArgs(providerOptions);
-    if (files != null && files.length > 0) {
+    const isEditing = files != null && files.length > 0;
+    const url = this.config.url({
+      path: isEditing ? "/images/edits" : "/images/generations",
+      modelId: this.modelId
+    });
+    const requestHeaders = combineHeaders4(this.config.headers(), headers);
+    if (isEditing) {
       const { value: response2, responseHeaders: responseHeaders2 } = await postFormDataToApi({
-        url: this.config.url({
-          path: "/images/edits",
-          modelId: this.modelId
-        }),
-        headers: combineHeaders4(this.config.headers(), headers),
+        url,
+        headers: requestHeaders,
         formData: convertToFormData({
           model: this.modelId,
           prompt,
@@ -1664,7 +1673,11 @@ var OpenAICompatibleImageModel = class {
         fetch: this.config.fetch
       });
       return {
-        images: response2.data.map((item) => item.b64_json),
+        images: await this.getImages(response2.data, {
+          url,
+          headers: requestHeaders,
+          abortSignal
+        }),
         warnings,
         response: {
           timestamp: currentDate,
@@ -1674,11 +1687,8 @@ var OpenAICompatibleImageModel = class {
       };
     }
     const { value: response, responseHeaders } = await postJsonToApi4({
-      url: this.config.url({
-        path: "/images/generations",
-        modelId: this.modelId
-      }),
-      headers: combineHeaders4(this.config.headers(), headers),
+      url,
+      headers: requestHeaders,
       body: {
         model: this.modelId,
         prompt,
@@ -1697,7 +1707,11 @@ var OpenAICompatibleImageModel = class {
       fetch: this.config.fetch
     });
     return {
-      images: response.data.map((item) => item.b64_json),
+      images: await this.getImages(response.data, {
+        url,
+        headers: requestHeaders,
+        abortSignal
+      }),
       warnings,
       response: {
         timestamp: currentDate,
@@ -1706,9 +1720,46 @@ var OpenAICompatibleImageModel = class {
       }
     };
   }
+  async getImages(data, options) {
+    if (data.every((image) => image.b64_json != null)) {
+      return data.map((image) => image.b64_json);
+    }
+    return Promise.all(
+      data.map(async (image) => {
+        if (image.b64_json != null) {
+          return convertBase64ToUint8Array2(image.b64_json);
+        }
+        if (image.url == null) {
+          throw new InvalidResponseDataError2({
+            data: image,
+            message: "Expected url in the image response"
+          });
+        }
+        const { value } = await getFromApi({
+          url: image.url,
+          validateUrl: true,
+          trustedOrigin: options.url,
+          credentialedOrigin: options.url,
+          headers: options.headers,
+          abortSignal: options.abortSignal,
+          fetch: this.config.fetch,
+          successfulResponseHandler: createBinaryResponseHandler(),
+          failedResponseHandler: createStatusCodeErrorResponseHandler()
+        });
+        return value;
+      })
+    );
+  }
 };
 var openaiCompatibleImageResponseSchema = z8.object({
-  data: z8.array(z8.object({ b64_json: z8.string() }))
+  data: z8.array(
+    z8.object({
+      b64_json: z8.string().nullish(),
+      url: z8.string().nullish()
+    }).refine((image) => image.b64_json != null || image.url != null, {
+      message: "Expected b64_json or url in the image response"
+    })
+  )
 });
 async function fileToBlob(file) {
   if (file.type === "url") {
@@ -1725,7 +1776,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "2.0.84" : "0.0.0-test";
+var VERSION = true ? "2.0.86" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {