@ai-sdk/openai-compatible 2.0.84 → 2.0.86

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @ai-sdk/openai-compatible
 
+## 2.0.86
+
+### Patch Changes
+
+- b3c2bb4: fix(openai-compatible, groq, alibaba): put reasoning before text in doGenerate
+
+## 2.0.85
+
+### Patch Changes
+
+- 5aa3086: feat(openai-compatible): support URL-based image responses
+
+  Add opt-in URL validation and credential origin handling to `getFromApi` for URL-based image responses. Validate redirect targets, strip unsafe request headers, and drop credentials on cross-origin redirects while preserving existing unvalidated requests.
+
+- Updated dependencies [5aa3086]
+  - @ai-sdk/provider-utils@4.0.61
+
 ## 2.0.84
 
 ### Patch Changes

package/dist/index.d.mts

@@ -235,6 +235,7 @@ declare class OpenAICompatibleImageModel implements ImageModelV3 {
     constructor(modelId: OpenAICompatibleImageModelId, config: OpenAICompatibleImageModelConfig);
     private getArgs;
     doGenerate({ prompt, n, size, aspectRatio, seed, providerOptions, headers, abortSignal, files, mask, }: Parameters<ImageModelV3['doGenerate']>[0]): Promise<Awaited<ReturnType<ImageModelV3['doGenerate']>>>;
+    private getImages;
 }
 
 interface OpenAICompatibleProvider<CHAT_MODEL_IDS extends string = string, COMPLETION_MODEL_IDS extends string = string, EMBEDDING_MODEL_IDS extends string = string, IMAGE_MODEL_IDS extends string = string> extends Omit<ProviderV3, 'imageModel'> {

package/dist/index.d.ts

@@ -235,6 +235,7 @@ declare class OpenAICompatibleImageModel implements ImageModelV3 {
     constructor(modelId: OpenAICompatibleImageModelId, config: OpenAICompatibleImageModelConfig);
     private getArgs;
     doGenerate({ prompt, n, size, aspectRatio, seed, providerOptions, headers, abortSignal, files, mask, }: Parameters<ImageModelV3['doGenerate']>[0]): Promise<Awaited<ReturnType<ImageModelV3['doGenerate']>>>;
+    private getImages;
 }
 
 interface OpenAICompatibleProvider<CHAT_MODEL_IDS extends string = string, COMPLETION_MODEL_IDS extends string = string, EMBEDDING_MODEL_IDS extends string = string, IMAGE_MODEL_IDS extends string = string> extends Omit<ProviderV3, 'imageModel'> {

package/dist/index.js

@@ -594,7 +594,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({
@@ -602,6 +601,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;
@@ -1573,6 +1573,7 @@ var openaiTextEmbeddingResponseSchema = import_v47.z.object({
 });
 
 // src/image/openai-compatible-image-model.ts
+var import_provider6 = require("@ai-sdk/provider");
 var import_provider_utils5 = require("@ai-sdk/provider-utils");
 var import_v48 = require("zod/v4");
 var OpenAICompatibleImageModel = class {
@@ -1624,13 +1625,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 = (0, import_provider_utils5.combineHeaders)(this.config.headers(), headers);
+    if (isEditing) {
       const { value: response2, responseHeaders: responseHeaders2 } = await (0, import_provider_utils5.postFormDataToApi)({
-        url: this.config.url({
-          path: "/images/edits",
-          modelId: this.modelId
-        }),
-        headers: (0, import_provider_utils5.combineHeaders)(this.config.headers(), headers),
+        url,
+        headers: requestHeaders,
         formData: (0, import_provider_utils5.convertToFormData)({
           model: this.modelId,
           prompt,
@@ -1650,7 +1654,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,
@@ -1660,11 +1668,8 @@ var OpenAICompatibleImageModel = class {
       };
     }
     const { value: response, responseHeaders } = await (0, import_provider_utils5.postJsonToApi)({
-      url: this.config.url({
-        path: "/images/generations",
-        modelId: this.modelId
-      }),
-      headers: (0, import_provider_utils5.combineHeaders)(this.config.headers(), headers),
+      url,
+      headers: requestHeaders,
       body: {
         model: this.modelId,
         prompt,
@@ -1683,7 +1688,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,
@@ -1692,9 +1701,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 (0, import_provider_utils5.convertBase64ToUint8Array)(image.b64_json);
+        }
+        if (image.url == null) {
+          throw new import_provider6.InvalidResponseDataError({
+            data: image,
+            message: "Expected url in the image response"
+          });
+        }
+        const { value } = await (0, import_provider_utils5.getFromApi)({
+          url: image.url,
+          validateUrl: true,
+          trustedOrigin: options.url,
+          credentialedOrigin: options.url,
+          headers: options.headers,
+          abortSignal: options.abortSignal,
+          fetch: this.config.fetch,
+          successfulResponseHandler: (0, import_provider_utils5.createBinaryResponseHandler)(),
+          failedResponseHandler: (0, import_provider_utils5.createStatusCodeErrorResponseHandler)()
+        });
+        return value;
+      })
+    );
+  }
 };
 var openaiCompatibleImageResponseSchema = import_v48.z.object({
-  data: import_v48.z.array(import_v48.z.object({ b64_json: import_v48.z.string() }))
+  data: import_v48.z.array(
+    import_v48.z.object({
+      b64_json: import_v48.z.string().nullish(),
+      url: import_v48.z.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") {
@@ -1708,7 +1754,7 @@ async function fileToBlob(file) {
 var import_provider_utils6 = require("@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) {