@ai-sdk/xai 2.0.48 → 2.0.50

package/dist/index.mjs

@@ -13,12 +13,17 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/xai-chat-language-model.ts
+import {
+  APICallError
+} from "@ai-sdk/provider";
 import {
   combineHeaders,
   createEventSourceResponseHandler,
   createJsonResponseHandler,
+  extractResponseHeaders,
   parseProviderOptions,
-  postJsonToApi
+  postJsonToApi,
+  safeParseJSON
 } from "@ai-sdk/provider-utils";
 import { z as z3 } from "zod/v4";
 
@@ -452,14 +457,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 postJsonToApi({
-      url: `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`,
+      url,
       headers: combineHeaders(this.config.headers(), options.headers),
       body,
       failedResponseHandler: xaiFailedResponseHandler,
@@ -469,6 +475,27 @@ var XaiChatLanguageModel = class {
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
+    if (response.error != null) {
+      throw new 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 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) {
@@ -498,12 +525,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
         });
       }
     }
@@ -511,11 +538,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: {
@@ -536,12 +563,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 postJsonToApi({
-      url: `${(_a = this.config.baseURL) != null ? _a : "https://api.x.ai/v1"}/chat/completions`,
+      url,
       headers: combineHeaders(this.config.headers(), options.headers),
       body,
       failedResponseHandler: xaiFailedResponseHandler,
-      successfulResponseHandler: createEventSourceResponseHandler(xaiChatChunkSchema),
+      successfulResponseHandler: async ({ response: response2 }) => {
+        const responseHeaders2 = 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 safeParseJSON({
+            text: responseBody,
+            schema: xaiStreamErrorSchema
+          });
+          if (parsedError.success) {
+            throw new APICallError({
+              message: parsedError.value.error,
+              url,
+              requestBodyValues: body,
+              statusCode: 200,
+              responseHeaders: responseHeaders2,
+              responseBody,
+              isRetryable: parsedError.value.code === "The service is currently unavailable"
+            });
+          }
+          throw new APICallError({
+            message: "Invalid JSON response",
+            url,
+            requestBodyValues: body,
+            statusCode: 200,
+            responseHeaders: responseHeaders2,
+            responseBody
+          });
+        }
+        return createEventSourceResponseHandler(xaiChatChunkSchema)({
+          response: response2,
+          url,
+          requestBodyValues: body
+        });
+      },
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
@@ -556,6 +618,7 @@ var XaiChatLanguageModel = class {
     let isFirstChunk = true;
     const contentBlocks = {};
     const lastReasoningDeltas = {};
+    let activeReasoningBlockId = void 0;
     const self = this;
     return {
       stream: response.pipeThrough(
@@ -581,12 +644,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
                 });
               }
             }
@@ -608,13 +671,21 @@ var XaiChatLanguageModel = class {
             const choiceIndex = choice.index;
             if (delta.content != null && delta.content.length > 0) {
               const textContent = delta.content;
+              if (activeReasoningBlockId != null && !contentBlocks[activeReasoningBlockId].ended) {
+                controller.enqueue({
+                  type: "reasoning-end",
+                  id: activeReasoningBlockId
+                });
+                contentBlocks[activeReasoningBlockId].ended = true;
+                activeReasoningBlockId = void 0;
+              }
               const lastMessage = body.messages[body.messages.length - 1];
               if ((lastMessage == null ? void 0 : lastMessage.role) === "assistant" && textContent === lastMessage.content) {
                 return;
               }
               const blockId = `text-${value.id || choiceIndex}`;
               if (contentBlocks[blockId] == null) {
-                contentBlocks[blockId] = { type: "text" };
+                contentBlocks[blockId] = { type: "text", ended: false };
                 controller.enqueue({
                   type: "text-start",
                   id: blockId
@@ -633,7 +704,8 @@ var XaiChatLanguageModel = class {
               }
               lastReasoningDeltas[blockId] = delta.reasoning_content;
               if (contentBlocks[blockId] == null) {
-                contentBlocks[blockId] = { type: "reasoning" };
+                contentBlocks[blockId] = { type: "reasoning", ended: false };
+                activeReasoningBlockId = blockId;
                 controller.enqueue({
                   type: "reasoning-start",
                   id: blockId
@@ -646,6 +718,14 @@ var XaiChatLanguageModel = class {
               });
             }
             if (delta.tool_calls != null) {
+              if (activeReasoningBlockId != null && !contentBlocks[activeReasoningBlockId].ended) {
+                controller.enqueue({
+                  type: "reasoning-end",
+                  id: activeReasoningBlockId
+                });
+                contentBlocks[activeReasoningBlockId].ended = true;
+                activeReasoningBlockId = void 0;
+              }
               for (const toolCall of delta.tool_calls) {
                 const toolCallId = toolCall.id;
                 controller.enqueue({
@@ -673,10 +753,12 @@ var XaiChatLanguageModel = class {
           },
           flush(controller) {
             for (const [blockId, block] of Object.entries(contentBlocks)) {
-              controller.enqueue({
-                type: block.type === "text" ? "text-end" : "reasoning-end",
-                id: blockId
-              });
+              if (!block.ended) {
+                controller.enqueue({
+                  type: block.type === "text" ? "text-end" : "reasoning-end",
+                  id: blockId
+                });
+              }
             }
             controller.enqueue({ type: "finish", finishReason, usage });
           }
@@ -728,10 +810,12 @@ var xaiChatResponseSchema = z3.object({
       index: z3.number(),
       finish_reason: z3.string().nullish()
     })
-  ),
-  object: z3.literal("chat.completion"),
-  usage: xaiUsageSchema,
-  citations: z3.array(z3.string().url()).nullish()
+  ).nullish(),
+  object: z3.literal("chat.completion").nullish(),
+  usage: xaiUsageSchema.nullish(),
+  citations: z3.array(z3.string().url()).nullish(),
+  code: z3.string().nullish(),
+  error: z3.string().nullish()
 });
 var xaiChatChunkSchema = z3.object({
   id: z3.string().nullish(),
@@ -761,6 +845,10 @@ var xaiChatChunkSchema = z3.object({
   usage: xaiUsageSchema.nullish(),
   citations: z3.array(z3.string().url()).nullish()
 });
+var xaiStreamErrorSchema = z3.object({
+  code: z3.string(),
+  error: z3.string()
+});
 
 // src/responses/xai-responses-language-model.ts
 import {
@@ -2025,7 +2113,7 @@ var xaiTools = {
 };
 
 // src/version.ts
-var VERSION = true ? "2.0.48" : "0.0.0-test";
+var VERSION = true ? "2.0.50" : "0.0.0-test";
 
 // src/xai-provider.ts
 var xaiErrorStructure = {