@ai-sdk/xai 4.0.56 → 4.0.58

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @ai-sdk/xai
 
+## 4.0.58
+
+### Patch Changes
+
+- 5ec21a6: fix: reject unsupported batch request types
+- 7469a3b: feat: support image generation requests in batches
+- 0096850: fix(deepseek): preserve reasoning streams across empty tool-call deltas
+- Updated dependencies [5ec21a6]
+- Updated dependencies [7469a3b]
+- Updated dependencies [813bb36]
+- Updated dependencies [c43e4b7]
+  - @ai-sdk/provider@4.0.14
+  - @ai-sdk/provider-utils@5.0.40
+
+## 4.0.57
+
+### Patch Changes
+
+- 4b8c4fa: feat(xai): add batch cancellation and listing
+- Updated dependencies [9942196]
+  - @ai-sdk/provider@4.0.13
+  - @ai-sdk/provider-utils@5.0.39
+
 ## 4.0.56
 
 ### Patch Changes

package/dist/index.d.ts

@@ -553,6 +553,7 @@ interface XaiProvider extends ProviderV4 {
      */
     experimental_batch(): Experimental_BatchV4<{
         text: XaiResponsesModelId;
+        image: XaiImageModelId;
     }>;
     /**
      * Creates an Xai image model for image generation.

package/dist/index.js

@@ -898,7 +898,7 @@ var XaiChatLanguageModel = class _XaiChatLanguageModel {
                 delta: delta.reasoning_content
               });
             }
-            if (delta.tool_calls != null) {
+            if (delta.tool_calls != null && delta.tool_calls.length > 0) {
               if (activeReasoningBlockId != null && !contentBlocks[activeReasoningBlockId].ended) {
                 controller.enqueue({
                   type: "reasoning-end",
@@ -1241,12 +1241,16 @@ var xaiImageResponseSchema = z6.object({
 
 // src/xai-batch.ts
 import {
-  InvalidArgumentError
+  InvalidArgumentError,
+  UnsupportedFunctionalityError as UnsupportedFunctionalityError5
 } from "@ai-sdk/provider";
 import {
   combineHeaders as combineHeaders4,
+  convertImageModelFileToDataUri as convertImageModelFileToDataUri2,
+  convertBase64ToUint8Array,
   convertAsyncIteratorToReadableStream,
   createJsonResponseHandler as createJsonResponseHandler4,
+  createBinaryResponseHandler as createBinaryResponseHandler2,
   createNullLanguageModelUsage,
   getFromApi as getFromApi2,
   lazySchema as lazySchema7,
@@ -3531,24 +3535,45 @@ var xaiBatchProviderOptionsSchema = lazySchema7(
     })
   )
 );
-var xaiBatchResponseSchema = lazySchema7(
-  () => zodSchema7(
+function assertSupportedBatchRequests(requests) {
+  for (const request of requests) {
+    const requestType = request.type;
+    if (requestType !== "text" && requestType !== "image") {
+      throw new UnsupportedFunctionalityError5({
+        functionality: `batch request type: ${requestType}`,
+        message: `The xAI Batch API does not support batch requests with type "${requestType}".`
+      });
+    }
+  }
+}
+var xaiBatchImageResponseSchema = z15.object({
+  data: z15.array(
     z15.object({
-      batch_id: z15.string(),
-      name: z15.string().nullish(),
-      create_time: z15.string().nullish(),
-      expire_time: z15.string().nullish(),
-      cancel_time: z15.string().nullish(),
-      cancel_by_xai_message: z15.string().nullish(),
-      state: z15.object({
-        num_requests: z15.number().nullish(),
-        num_pending: z15.number().nullish(),
-        num_success: z15.number().nullish(),
-        num_error: z15.number().nullish(),
-        num_cancelled: z15.number().nullish()
-      }).nullish()
+      url: z15.string().nullish(),
+      b64_json: z15.string().nullish(),
+      revised_prompt: z15.string().nullish(),
+      respect_moderation: z15.boolean().nullish()
     })
-  )
+  ),
+  usage: z15.object({ cost_in_usd_ticks: z15.number().nullish() }).nullish()
+});
+var xaiBatchResponseZodSchema = () => z15.object({
+  batch_id: z15.string(),
+  name: z15.string().nullish(),
+  create_time: z15.string().nullish(),
+  expire_time: z15.string().nullish(),
+  cancel_time: z15.string().nullish(),
+  cancel_by_xai_message: z15.string().nullish(),
+  state: z15.object({
+    num_requests: z15.number().nullish(),
+    num_pending: z15.number().nullish(),
+    num_success: z15.number().nullish(),
+    num_error: z15.number().nullish(),
+    num_cancelled: z15.number().nullish()
+  }).nullish()
+});
+var xaiBatchResponseSchema = lazySchema7(
+  () => zodSchema7(xaiBatchResponseZodSchema())
 );
 var xaiBatchErrorSchema = z15.object({
   code: z15.union([z15.string(), z15.number()]).nullish(),
@@ -3558,7 +3583,8 @@ var xaiBatchResultSchema = z15.object({
   batch_request_id: z15.string(),
   batch_result: z15.object({
     response: z15.object({
-      chat_get_completion: z15.unknown().nullish()
+      chat_get_completion: z15.unknown().nullish(),
+      image_generation: z15.unknown().nullish()
     }).nullish(),
     error: xaiBatchErrorSchema.nullish()
   }).nullish(),
@@ -3572,6 +3598,14 @@ var xaiBatchResultsPageSchema = lazySchema7(
     })
   )
 );
+var xaiBatchListResponseSchema = lazySchema7(
+  () => zodSchema7(
+    z15.object({
+      batches: z15.array(xaiBatchResponseZodSchema()),
+      pagination_token: z15.string().nullish()
+    })
+  )
+);
 var XaiBatch = class {
   constructor(options) {
     this.options = options;
@@ -3581,6 +3615,7 @@ var XaiBatch = class {
   }
   async doStartBatch(options) {
     var _a, _b;
+    assertSupportedBatchRequests(options.requests);
     const fileParts = [];
     const warnings = options.webhookUrl == null ? [] : [
       {
@@ -3602,7 +3637,7 @@ var XaiBatch = class {
         JSON.stringify({
           custom_id: request.id,
           method: "POST",
-          url: xaiBatchEndpoint,
+          url: preparedRequest.endpoint,
           body: preparedRequest.body
         }),
         "\n"
@@ -3670,6 +3705,51 @@ var XaiBatch = class {
   async doGetBatchStatus(options) {
     return convertXaiBatchStatus(await this.retrieveBatch(options));
   }
+  async doCancelBatch(options) {
+    var _a, _b;
+    await postJsonToApi4({
+      url: this.getUrl(
+        `/batches/${encodeURIComponent(options.batchId)}:cancel`
+      ),
+      headers: combineHeaders4((_b = (_a = this.options.config).headers) == null ? void 0 : _b.call(_a), options.headers),
+      body: {},
+      failedResponseHandler: xaiFailedResponseHandler,
+      successfulResponseHandler: createJsonResponseHandler4(
+        xaiBatchResponseSchema
+      ),
+      abortSignal: options.abortSignal,
+      fetch: this.options.config.fetch
+    });
+    return {};
+  }
+  async doListBatches(options) {
+    var _a, _b;
+    const url = new URL(this.getUrl("/batches"));
+    if (options.limit != null) {
+      url.searchParams.set("limit", String(options.limit));
+    }
+    if (options.cursor != null) {
+      url.searchParams.set("pagination_token", options.cursor);
+    }
+    const { value: page } = await getFromApi2({
+      url: url.toString(),
+      headers: combineHeaders4((_b = (_a = this.options.config).headers) == null ? void 0 : _b.call(_a), options.headers),
+      failedResponseHandler: xaiFailedResponseHandler,
+      successfulResponseHandler: createJsonResponseHandler4(
+        xaiBatchListResponseSchema
+      ),
+      abortSignal: options.abortSignal,
+      fetch: this.options.config.fetch,
+      validateUrl: false
+    });
+    return {
+      batches: page.batches.map((batch) => ({
+        batchId: batch.batch_id,
+        ...convertXaiBatchStatus(batch)
+      })),
+      ...page.pagination_token != null ? { nextCursor: page.pagination_token } : {}
+    };
+  }
   async doGetBatchResults(options) {
     const batch = await this.retrieveBatch(options);
     if (convertXaiBatchStatus(batch).status === "pending") {
@@ -3724,12 +3804,12 @@ var XaiBatch = class {
         validateUrl: false
       });
       for (const result of page.results) {
-        yield await this.convertBatchResult(result);
+        yield await this.convertBatchResult(result, options.abortSignal);
       }
       paginationToken = (_c = page.pagination_token) != null ? _c : void 0;
     } while (paginationToken != null);
   }
-  async convertBatchResult(result) {
+  async convertBatchResult(result, abortSignal) {
     var _a, _b, _c, _d, _e, _f;
     const error = (_a = result.batch_result) == null ? void 0 : _a.error;
     if (((_c = (_b = result.error_message) == null ? void 0 : _b.length) != null ? _c : 0) > 0 || (error == null ? void 0 : error.code) != null && error.code !== 0 && error.code !== "0" || (error == null ? void 0 : error.code) == null && ((_e = (_d = error == null ? void 0 : error.message) == null ? void 0 : _d.length) != null ? _e : 0) > 0) {
@@ -3763,14 +3843,127 @@ var XaiBatch = class {
         error: conversion.error
       };
     }
+    if ((response == null ? void 0 : response.image_generation) != null) {
+      const validation = await safeValidateTypes({
+        value: response.image_generation,
+        schema: zodSchema7(xaiBatchImageResponseSchema)
+      });
+      if (!validation.success) {
+        return invalidXaiImageBatchResult(result.batch_request_id);
+      }
+      if (validation.value.data.some((image) => image.respect_moderation === false)) {
+        return {
+          type: "image",
+          id: result.batch_request_id,
+          status: "failed",
+          error: {
+            message: "Image generation was blocked due to a content policy violation."
+          }
+        };
+      }
+      const imageResult = await this.convertImageBatchResponse(
+        validation.value,
+        abortSignal
+      );
+      return {
+        type: "image",
+        id: result.batch_request_id,
+        status: "succeeded",
+        result: imageResult
+      };
+    }
     return invalidXaiBatchResult(result.batch_request_id);
   }
   async prepareRequest(request) {
-    const { args: body, warnings } = await XaiResponsesLanguageModel.prepareRequest({
-      modelId: request.modelId,
-      options: request.options
+    if (request.type === "text") {
+      const { args: body2, warnings: warnings2 } = await XaiResponsesLanguageModel.prepareRequest({
+        modelId: request.modelId,
+        options: request.options
+      });
+      return { endpoint: xaiBatchEndpoint, body: body2, warnings: warnings2 };
+    }
+    const { prompt, n, size, aspectRatio, seed, files, mask, providerOptions } = request.options;
+    const warnings = [];
+    if (size != null) {
+      warnings.push({
+        type: "unsupported",
+        feature: "size",
+        details: "This model does not support the `size` option. Use `aspectRatio` instead."
+      });
+    }
+    if (seed != null) warnings.push({ type: "unsupported", feature: "seed" });
+    if (mask != null) warnings.push({ type: "unsupported", feature: "mask" });
+    const xaiOptions = await parseProviderOptions6({
+      provider: "xai",
+      providerOptions,
+      schema: xaiImageModelOptions
     });
-    return { body, warnings };
+    const imageUrls = (files != null ? files : []).map(convertImageModelFileToDataUri2);
+    const body = {
+      model: request.modelId,
+      prompt,
+      n,
+      response_format: "b64_json"
+    };
+    if (aspectRatio != null) body.aspect_ratio = aspectRatio;
+    if ((xaiOptions == null ? void 0 : xaiOptions.output_format) != null)
+      body.output_format = xaiOptions.output_format;
+    if ((xaiOptions == null ? void 0 : xaiOptions.sync_mode) != null) body.sync_mode = xaiOptions.sync_mode;
+    if ((xaiOptions == null ? void 0 : xaiOptions.aspect_ratio) != null && aspectRatio == null)
+      body.aspect_ratio = xaiOptions.aspect_ratio;
+    if ((xaiOptions == null ? void 0 : xaiOptions.resolution) != null) body.resolution = xaiOptions.resolution;
+    if ((xaiOptions == null ? void 0 : xaiOptions.quality) != null) body.quality = xaiOptions.quality;
+    if ((xaiOptions == null ? void 0 : xaiOptions.user) != null) body.user = xaiOptions.user;
+    if (imageUrls.length === 1) {
+      body.image = { url: imageUrls[0], type: "image_url" };
+    } else if (imageUrls.length > 1) {
+      body.images = imageUrls.map((url) => ({ url, type: "image_url" }));
+    }
+    return {
+      endpoint: (files == null ? void 0 : files.length) ? "/v1/images/edits" : "/v1/images/generations",
+      body,
+      warnings
+    };
+  }
+  async convertImageBatchResponse(response, abortSignal) {
+    var _a;
+    const hasAllBase64 = response.data.every((image) => image.b64_json != null);
+    const images = hasAllBase64 ? response.data.map((image) => image.b64_json) : await Promise.all(
+      response.data.map(async (image) => {
+        if (image.b64_json != null) {
+          return convertBase64ToUint8Array(image.b64_json);
+        }
+        if (image.url == null) {
+          throw new InvalidArgumentError({
+            argument: "batchResult",
+            message: "xAI returned an image without data or a URL."
+          });
+        }
+        const { value } = await getFromApi2({
+          url: image.url,
+          validateUrl: true,
+          trustedOrigin: this.options.config.baseURL,
+          abortSignal,
+          failedResponseHandler: xaiFailedResponseHandler,
+          successfulResponseHandler: createBinaryResponseHandler2(),
+          fetch: this.options.config.fetch
+        });
+        return value;
+      })
+    );
+    return {
+      images,
+      warnings: [],
+      response: { timestamp: /* @__PURE__ */ new Date(), modelId: "", headers: void 0 },
+      providerMetadata: {
+        xai: {
+          images: response.data.map(
+            (item) => item.revised_prompt != null ? { revisedPrompt: item.revised_prompt } : {}
+          ),
+          ...((_a = response.usage) == null ? void 0 : _a.cost_in_usd_ticks) != null ? { costInUsdTicks: response.usage.cost_in_usd_ticks } : {}
+        }
+      }
+    };
   }
   getUrl(path) {
     var _a;
@@ -3836,6 +4029,17 @@ function invalidXaiBatchResult(id) {
     }
   };
 }
+function invalidXaiImageBatchResult(id) {
+  return {
+    type: "image",
+    id,
+    status: "failed",
+    error: {
+      message: "xAI returned an invalid image batch result.",
+      code: "invalid_response"
+    }
+  };
+}
 function convertXaiChatBatchResponse(response) {
   var _a, _b, _c, _d, _e, _f;
   if (response.error != null) {
@@ -4358,7 +4562,7 @@ var xaiTools = {
 };
 
 // src/version.ts
-var VERSION = true ? "4.0.56" : "0.0.0-test";
+var VERSION = true ? "4.0.58" : "0.0.0-test";
 
 // src/files/xai-files.ts
 import {
@@ -5152,8 +5356,8 @@ var xaiVideoStatusResponseHandler = async (options) => {
 // src/xai-speech-model.ts
 import {
   combineHeaders as combineHeaders7,
-  convertBase64ToUint8Array,
-  createBinaryResponseHandler as createBinaryResponseHandler2,
+  convertBase64ToUint8Array as convertBase64ToUint8Array2,
+  createBinaryResponseHandler as createBinaryResponseHandler3,
   createJsonResponseHandler as createJsonResponseHandler7,
   parseProviderOptions as parseProviderOptions9,
   postJsonToApi as postJsonToApi6,
@@ -5315,7 +5519,7 @@ var XaiSpeechModel = class _XaiSpeechModel {
       ),
       body: requestBody,
       failedResponseHandler: xaiFailedResponseHandler,
-      successfulResponseHandler: withTimestamps ? createJsonResponseHandler7(xaiSpeechTimestampsResponseSchema) : createBinaryResponseHandler2(),
+      successfulResponseHandler: withTimestamps ? createJsonResponseHandler7(xaiSpeechTimestampsResponseSchema) : createBinaryResponseHandler3(),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
@@ -5325,7 +5529,7 @@ var XaiSpeechModel = class _XaiSpeechModel {
       audio = value;
     } else {
       envelope = value;
-      audio = envelope.audio != null ? convertBase64ToUint8Array(envelope.audio) : new Uint8Array(0);
+      audio = envelope.audio != null ? convertBase64ToUint8Array2(envelope.audio) : new Uint8Array(0);
     }
     const traceId = responseHeaders == null ? void 0 : responseHeaders["x-trace-id"];
     return {
@@ -5372,7 +5576,7 @@ import {
 } from "@ai-sdk/provider";
 import {
   combineHeaders as combineHeaders8,
-  convertBase64ToUint8Array as convertBase64ToUint8Array2,
+  convertBase64ToUint8Array as convertBase64ToUint8Array3,
   createJsonResponseHandler as createJsonResponseHandler8,
   connectToWebSocket,
   mediaTypeToExtension,
@@ -5516,7 +5720,7 @@ var XaiTranscriptionModel = class _XaiTranscriptionModel {
         formData.append("keyterm", keyterm);
       }
     }
-    const blob = audio instanceof Uint8Array ? new Blob([audio]) : new Blob([convertBase64ToUint8Array2(audio)]);
+    const blob = audio instanceof Uint8Array ? new Blob([audio]) : new Blob([convertBase64ToUint8Array3(audio)]);
     const fileExtension = mediaTypeToExtension(mediaType);
     formData.append(
       "file",
@@ -5675,7 +5879,7 @@ function createXaiStreamingTranscriptionStream({
             const { done, value } = await audioReader.read();
             if (done || finished) break;
             socket.send(
-              value instanceof Uint8Array ? value : convertBase64ToUint8Array2(value)
+              value instanceof Uint8Array ? value : convertBase64ToUint8Array3(value)
             );
             await waitForWebSocketBufferDrain(socket);
           }