@ai-sdk/xai 2.0.47 → 2.0.49

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/xai
 
+## 2.0.49
+
+### Patch Changes
+
+- 0c419f8: fix(provider/xai): handle error responses returned with 200 status
+
+## 2.0.48
+
+### Patch Changes
+
+- c7d45b4: fixed streaming tool input for custom_tool_call types (x_search, view_x_video) which were incorrectly returning empty input values
+- 547e0c2: fix (provider/xai): no duplicate text delta in responses api
+
 ## 2.0.47
 
 ### Patch Changes

package/dist/index.js

@@ -34,10 +34,11 @@ module.exports = __toCommonJS(src_exports);
 
 // src/xai-provider.ts
 var import_openai_compatible = require("@ai-sdk/openai-compatible");
-var import_provider4 = require("@ai-sdk/provider");
+var import_provider5 = require("@ai-sdk/provider");
 var import_provider_utils11 = require("@ai-sdk/provider-utils");
 
 // src/xai-chat-language-model.ts
+var import_provider3 = require("@ai-sdk/provider");
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_v43 = require("zod/v4");
 
@@ -467,14 +468,15 @@ var XaiChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const { args: body, warnings } = await this.getArgs(options);
+    const url = `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`;
     const {
       responseHeaders,
       value: response,
       rawValue: rawResponse
     } = await (0, import_provider_utils3.postJsonToApi)({
-      url: `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`,
+      url,
       headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
       body,
       failedResponseHandler: xaiFailedResponseHandler,
@@ -484,6 +486,27 @@ var XaiChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
+    if (response.error != null) {
+      throw new import_provider3.APICallError({
+        message: response.error,
+        url,
+        requestBodyValues: body,
+        statusCode: 200,
+        responseHeaders,
+        responseBody: JSON.stringify(rawResponse),
+        isRetryable: response.code === "The service is currently unavailable"
+      });
+    }
+    if (!response.choices || response.choices.length === 0) {
+      throw new import_provider3.APICallError({
+        message: "No choices returned from the API",
+        url,
+        requestBodyValues: body,
+        statusCode: 200,
+        responseHeaders,
+        responseBody: JSON.stringify(rawResponse)
+      });
+    }
     const choice = response.choices[0];
     const content = [];
     if (choice.message.content != null && choice.message.content.length > 0) {
@@ -513,12 +536,12 @@ var XaiChatLanguageModel = class {
       }
     }
     if (response.citations != null) {
-      for (const url of response.citations) {
+      for (const url2 of response.citations) {
         content.push({
           type: "source",
           sourceType: "url",
           id: this.config.generateId(),
-          url
+          url: url2
         });
       }
     }
@@ -526,11 +549,11 @@ var XaiChatLanguageModel = class {
       content,
       finishReason: mapXaiFinishReason(choice.finish_reason),
       usage: {
-        inputTokens: response.usage.prompt_tokens,
-        outputTokens: response.usage.completion_tokens,
-        totalTokens: response.usage.total_tokens,
-        reasoningTokens: (_c = (_b = response.usage.completion_tokens_details) == null ? void 0 : _b.reasoning_tokens) != null ? _c : void 0,
-        cachedInputTokens: (_e = (_d = response.usage.prompt_tokens_details) == null ? void 0 : _d.cached_tokens) != null ? _e : void 0
+        inputTokens: (_b = response.usage) == null ? void 0 : _b.prompt_tokens,
+        outputTokens: (_c = response.usage) == null ? void 0 : _c.completion_tokens,
+        totalTokens: (_d = response.usage) == null ? void 0 : _d.total_tokens,
+        reasoningTokens: (_g = (_f = (_e = response.usage) == null ? void 0 : _e.completion_tokens_details) == null ? void 0 : _f.reasoning_tokens) != null ? _g : void 0,
+        cachedInputTokens: (_j = (_i = (_h = response.usage) == null ? void 0 : _h.prompt_tokens_details) == null ? void 0 : _i.cached_tokens) != null ? _j : void 0
       },
       request: { body },
       response: {
@@ -551,12 +574,47 @@ var XaiChatLanguageModel = class {
         include_usage: true
       }
     };
+    const url = `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`;
     const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
-      url: `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`,
+      url,
       headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
       body,
       failedResponseHandler: xaiFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils3.createEventSourceResponseHandler)(xaiChatChunkSchema),
+      successfulResponseHandler: async ({ response: response2 }) => {
+        const responseHeaders2 = (0, import_provider_utils3.extractResponseHeaders)(response2);
+        const contentType = response2.headers.get("content-type");
+        if (contentType == null ? void 0 : contentType.includes("application/json")) {
+          const responseBody = await response2.text();
+          const parsedError = await (0, import_provider_utils3.safeParseJSON)({
+            text: responseBody,
+            schema: xaiStreamErrorSchema
+          });
+          if (parsedError.success) {
+            throw new import_provider3.APICallError({
+              message: parsedError.value.error,
+              url,
+              requestBodyValues: body,
+              statusCode: 200,
+              responseHeaders: responseHeaders2,
+              responseBody,
+              isRetryable: parsedError.value.code === "The service is currently unavailable"
+            });
+          }
+          throw new import_provider3.APICallError({
+            message: "Invalid JSON response",
+            url,
+            requestBodyValues: body,
+            statusCode: 200,
+            responseHeaders: responseHeaders2,
+            responseBody
+          });
+        }
+        return (0, import_provider_utils3.createEventSourceResponseHandler)(xaiChatChunkSchema)({
+          response: response2,
+          url,
+          requestBodyValues: body
+        });
+      },
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
@@ -596,12 +654,12 @@ var XaiChatLanguageModel = class {
               isFirstChunk = false;
             }
             if (value.citations != null) {
-              for (const url of value.citations) {
+              for (const url2 of value.citations) {
                 controller.enqueue({
                   type: "source",
                   sourceType: "url",
                   id: self.config.generateId(),
-                  url
+                  url: url2
                 });
               }
             }
@@ -743,10 +801,12 @@ var xaiChatResponseSchema = import_v43.z.object({
       index: import_v43.z.number(),
       finish_reason: import_v43.z.string().nullish()
     })
-  ),
-  object: import_v43.z.literal("chat.completion"),
-  usage: xaiUsageSchema,
-  citations: import_v43.z.array(import_v43.z.string().url()).nullish()
+  ).nullish(),
+  object: import_v43.z.literal("chat.completion").nullish(),
+  usage: xaiUsageSchema.nullish(),
+  citations: import_v43.z.array(import_v43.z.string().url()).nullish(),
+  code: import_v43.z.string().nullish(),
+  error: import_v43.z.string().nullish()
 });
 var xaiChatChunkSchema = import_v43.z.object({
   id: import_v43.z.string().nullish(),
@@ -776,6 +836,10 @@ var xaiChatChunkSchema = import_v43.z.object({
   usage: xaiUsageSchema.nullish(),
   citations: import_v43.z.array(import_v43.z.string().url()).nullish()
 });
+var xaiStreamErrorSchema = import_v43.z.object({
+  code: import_v43.z.string(),
+  error: import_v43.z.string()
+});
 
 // src/responses/xai-responses-language-model.ts
 var import_provider_utils7 = require("@ai-sdk/provider-utils");
@@ -1246,7 +1310,7 @@ async function convertToXaiResponsesInput({
 }
 
 // src/responses/xai-responses-prepare-tools.ts
-var import_provider3 = require("@ai-sdk/provider");
+var import_provider4 = require("@ai-sdk/provider");
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 
 // src/tool/web-search.ts
@@ -1486,7 +1550,7 @@ async function prepareResponsesTools({
     }
     default: {
       const _exhaustiveCheck = type;
-      throw new import_provider3.UnsupportedFunctionalityError({
+      throw new import_provider4.UnsupportedFunctionalityError({
         functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
@@ -1844,28 +1908,29 @@ var XaiResponsesLanguageModel = class {
             if (event.type === "response.output_item.added" || event.type === "response.output_item.done") {
               const part = event.item;
               if (part.type === "web_search_call" || part.type === "x_search_call" || part.type === "code_interpreter_call" || part.type === "code_execution_call" || part.type === "view_image_call" || part.type === "view_x_video_call" || part.type === "custom_tool_call") {
-                if (!seenToolCalls.has(part.id)) {
+                const webSearchSubTools = [
+                  "web_search",
+                  "web_search_with_snippets",
+                  "browse_page"
+                ];
+                const xSearchSubTools = [
+                  "x_user_search",
+                  "x_keyword_search",
+                  "x_semantic_search",
+                  "x_thread_fetch"
+                ];
+                let toolName = (_e = part.name) != null ? _e : "";
+                if (webSearchSubTools.includes((_f = part.name) != null ? _f : "") || part.type === "web_search_call") {
+                  toolName = webSearchToolName != null ? webSearchToolName : "web_search";
+                } else if (xSearchSubTools.includes((_g = part.name) != null ? _g : "") || part.type === "x_search_call") {
+                  toolName = xSearchToolName != null ? xSearchToolName : "x_search";
+                } else if (part.name === "code_execution" || part.type === "code_interpreter_call" || part.type === "code_execution_call") {
+                  toolName = codeExecutionToolName != null ? codeExecutionToolName : "code_execution";
+                }
+                const toolInput = part.type === "custom_tool_call" ? (_h = part.input) != null ? _h : "" : (_i = part.arguments) != null ? _i : "";
+                const shouldEmit = part.type === "custom_tool_call" ? event.type === "response.output_item.done" : !seenToolCalls.has(part.id);
+                if (shouldEmit && !seenToolCalls.has(part.id)) {
                   seenToolCalls.add(part.id);
-                  const webSearchSubTools = [
-                    "web_search",
-                    "web_search_with_snippets",
-                    "browse_page"
-                  ];
-                  const xSearchSubTools = [
-                    "x_user_search",
-                    "x_keyword_search",
-                    "x_semantic_search",
-                    "x_thread_fetch"
-                  ];
-                  let toolName = (_e = part.name) != null ? _e : "";
-                  if (webSearchSubTools.includes((_f = part.name) != null ? _f : "") || part.type === "web_search_call") {
-                    toolName = webSearchToolName != null ? webSearchToolName : "web_search";
-                  } else if (xSearchSubTools.includes((_g = part.name) != null ? _g : "") || part.type === "x_search_call") {
-                    toolName = xSearchToolName != null ? xSearchToolName : "x_search";
-                  } else if (part.name === "code_execution" || part.type === "code_interpreter_call" || part.type === "code_execution_call") {
-                    toolName = codeExecutionToolName != null ? codeExecutionToolName : "code_execution";
-                  }
-                  const toolInput = part.type === "custom_tool_call" ? (_h = part.input) != null ? _h : "" : (_i = part.arguments) != null ? _i : "";
                   controller.enqueue({
                     type: "tool-input-start",
                     id: part.id,
@@ -1900,12 +1965,12 @@ var XaiResponsesLanguageModel = class {
                         type: "text-start",
                         id: blockId
                       });
+                      controller.enqueue({
+                        type: "text-delta",
+                        id: blockId,
+                        delta: contentPart.text
+                      });
                     }
-                    controller.enqueue({
-                      type: "text-delta",
-                      id: blockId,
-                      delta: contentPart.text
-                    });
                   }
                   if (contentPart.annotations) {
                     for (const annotation of contentPart.annotations) {
@@ -2023,7 +2088,7 @@ var xaiTools = {
 };
 
 // src/version.ts
-var VERSION = true ? "2.0.47" : "0.0.0-test";
+var VERSION = true ? "2.0.49" : "0.0.0-test";
 
 // src/xai-provider.ts
 var xaiErrorStructure = {
@@ -2079,7 +2144,7 @@ function createXai(options = {}) {
   provider.chat = createChatLanguageModel;
   provider.responses = createResponsesLanguageModel;
   provider.textEmbeddingModel = (modelId) => {
-    throw new import_provider4.NoSuchModelError({ modelId, modelType: "textEmbeddingModel" });
+    throw new import_provider5.NoSuchModelError({ modelId, modelType: "textEmbeddingModel" });
   };
   provider.imageModel = createImageModel;
   provider.image = createImageModel;