@ai-sdk/alibaba 1.0.18 → 1.0.19

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @ai-sdk/alibaba
 
+## 1.0.19
+
+### Patch Changes
+
+- a727da4: chore: ensure consistent import handling and avoid import duplicates or cycles
+- Updated dependencies [a727da4]
+  - @ai-sdk/openai-compatible@2.0.43
+  - @ai-sdk/provider-utils@4.0.25
+  - @ai-sdk/provider@3.0.10
+
 ## 1.0.18
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { z } from 'zod/v4';
-import { FetchFunction } from '@ai-sdk/provider-utils';
 import { ProviderV3, LanguageModelV3, Experimental_VideoModelV3 } from '@ai-sdk/provider';
+import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type AlibabaChatModelId = 'qwen3-max' | 'qwen3-max-preview' | 'qwen-plus' | 'qwen-plus-latest' | 'qwen-flash' | 'qwen-turbo' | 'qwen-turbo-latest' | 'qwen3-235b-a22b' | 'qwen3-32b' | 'qwen3-30b-a3b' | 'qwen3-14b' | 'qwen3-next-80b-a3b-thinking' | 'qwen3-235b-a22b-thinking-2507' | 'qwen3-30b-a3b-thinking-2507' | 'qwq-plus' | 'qwq-plus-latest' | 'qwq-32b' | 'qwen-coder' | 'qwen3-coder-plus' | 'qwen3-coder-flash' | (string & {});
 declare const alibabaLanguageModelOptions: z.ZodObject<{

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod/v4';
-import { FetchFunction } from '@ai-sdk/provider-utils';
 import { ProviderV3, LanguageModelV3, Experimental_VideoModelV3 } from '@ai-sdk/provider';
+import { FetchFunction } from '@ai-sdk/provider-utils';
 
 type AlibabaChatModelId = 'qwen3-max' | 'qwen3-max-preview' | 'qwen-plus' | 'qwen-plus-latest' | 'qwen-flash' | 'qwen-turbo' | 'qwen-turbo-latest' | 'qwen3-235b-a22b' | 'qwen3-32b' | 'qwen3-30b-a3b' | 'qwen3-14b' | 'qwen3-next-80b-a3b-thinking' | 'qwen3-235b-a22b-thinking-2507' | 'qwen3-30b-a3b-thinking-2507' | 'qwq-plus' | 'qwq-plus-latest' | 'qwq-32b' | 'qwen-coder' | 'qwen3-coder-plus' | 'qwen3-coder-flash' | (string & {});
 declare const alibabaLanguageModelOptions: z.ZodObject<{

package/dist/index.js

@@ -28,14 +28,13 @@ module.exports = __toCommonJS(index_exports);
 
 // src/alibaba-provider.ts
 var import_provider4 = require("@ai-sdk/provider");
-var import_provider_utils4 = require("@ai-sdk/provider-utils");
-var import_v44 = require("zod/v4");
+var import_provider_utils5 = require("@ai-sdk/provider-utils");
 
 // src/alibaba-chat-language-model.ts
 var import_internal2 = require("@ai-sdk/openai-compatible/internal");
 var import_provider2 = require("@ai-sdk/provider");
-var import_provider_utils2 = require("@ai-sdk/provider-utils");
-var import_v42 = require("zod/v4");
+var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var import_v43 = require("zod/v4");
 
 // src/alibaba-chat-options.ts
 var import_v4 = require("zod/v4");
@@ -59,6 +58,21 @@ var alibabaLanguageModelOptions = import_v4.z.object({
   parallelToolCalls: import_v4.z.boolean().optional()
 });
 
+// src/alibaba-error.ts
+var import_provider_utils = require("@ai-sdk/provider-utils");
+var import_v42 = require("zod/v4");
+var alibabaErrorDataSchema = import_v42.z.object({
+  error: import_v42.z.object({
+    message: import_v42.z.string(),
+    code: import_v42.z.string().nullish(),
+    type: import_v42.z.string().nullish()
+  })
+});
+var alibabaFailedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)({
+  errorSchema: alibabaErrorDataSchema,
+  errorToMessage: (data) => data.error.message
+});
+
 // src/convert-alibaba-usage.ts
 var import_internal = require("@ai-sdk/openai-compatible/internal");
 function convertAlibabaUsage(usage) {
@@ -78,12 +92,12 @@ function convertAlibabaUsage(usage) {
 
 // src/convert-to-alibaba-chat-messages.ts
 var import_provider = require("@ai-sdk/provider");
-var import_provider_utils = require("@ai-sdk/provider-utils");
+var import_provider_utils2 = require("@ai-sdk/provider-utils");
 function formatImageUrl({
   data,
   mediaType
 }) {
-  return data instanceof URL ? data.toString() : `data:${mediaType};base64,${(0, import_provider_utils.convertToBase64)(data)}`;
+  return data instanceof URL ? data.toString() : `data:${mediaType};base64,${(0, import_provider_utils2.convertToBase64)(data)}`;
 }
 function convertToAlibabaChatMessages({
   prompt,
@@ -298,7 +312,7 @@ var AlibabaLanguageModel = class {
     var _a;
     const warnings = [];
     const cacheControlValidator = new CacheControlValidator();
-    const alibabaOptions = await (0, import_provider_utils2.parseProviderOptions)({
+    const alibabaOptions = await (0, import_provider_utils3.parseProviderOptions)({
       provider: "alibaba",
       providerOptions,
       schema: alibabaLanguageModelOptions
@@ -355,12 +369,12 @@ var AlibabaLanguageModel = class {
       responseHeaders,
       value: response,
       rawValue: rawResponse
-    } = await (0, import_provider_utils2.postJsonToApi)({
+    } = await (0, import_provider_utils3.postJsonToApi)({
       url: `${this.config.baseURL}/chat/completions`,
-      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
       body: args,
       failedResponseHandler: alibabaFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(
         alibabaChatResponseSchema
       ),
       abortSignal: options.abortSignal,
@@ -412,12 +426,12 @@ var AlibabaLanguageModel = class {
       stream: true,
       stream_options: this.config.includeUsage ? { include_usage: true } : void 0
     };
-    const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
       url: `${this.config.baseURL}/chat/completions`,
-      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
+      headers: (0, import_provider_utils3.combineHeaders)(this.config.headers(), options.headers),
       body,
       failedResponseHandler: alibabaFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils2.createEventSourceResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils3.createEventSourceResponseHandler)(
         alibabaChatChunkSchema
       ),
       abortSignal: options.abortSignal,
@@ -469,7 +483,7 @@ var AlibabaLanguageModel = class {
                   controller.enqueue({ type: "text-end", id: "0" });
                   activeText = false;
                 }
-                activeReasoningId = (0, import_provider_utils2.generateId)();
+                activeReasoningId = (0, import_provider_utils3.generateId)();
                 controller.enqueue({
                   type: "reasoning-start",
                   id: activeReasoningId
@@ -548,7 +562,7 @@ var AlibabaLanguageModel = class {
                       delta: toolCall2.function.arguments
                     });
                   }
-                  if ((0, import_provider_utils2.isParsableJson)(toolCall2.function.arguments)) {
+                  if ((0, import_provider_utils3.isParsableJson)(toolCall2.function.arguments)) {
                     controller.enqueue({
                       type: "tool-input-end",
                       id: toolCall2.id
@@ -575,7 +589,7 @@ var AlibabaLanguageModel = class {
                     delta: toolCallDelta.function.arguments
                   });
                 }
-                if ((0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                if ((0, import_provider_utils3.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-input-end",
                     id: toolCall.id
@@ -620,72 +634,72 @@ var AlibabaLanguageModel = class {
     };
   }
 };
-var alibabaUsageSchema = import_v42.z.object({
-  prompt_tokens: import_v42.z.number(),
-  completion_tokens: import_v42.z.number(),
-  total_tokens: import_v42.z.number(),
-  prompt_tokens_details: import_v42.z.object({
-    cached_tokens: import_v42.z.number().nullish(),
-    cache_creation_input_tokens: import_v42.z.number().nullish()
+var alibabaUsageSchema = import_v43.z.object({
+  prompt_tokens: import_v43.z.number(),
+  completion_tokens: import_v43.z.number(),
+  total_tokens: import_v43.z.number(),
+  prompt_tokens_details: import_v43.z.object({
+    cached_tokens: import_v43.z.number().nullish(),
+    cache_creation_input_tokens: import_v43.z.number().nullish()
   }).nullish(),
-  completion_tokens_details: import_v42.z.object({
-    reasoning_tokens: import_v42.z.number().nullish()
+  completion_tokens_details: import_v43.z.object({
+    reasoning_tokens: import_v43.z.number().nullish()
   }).nullish()
 });
-var alibabaChatResponseSchema = import_v42.z.object({
-  id: import_v42.z.string().nullish(),
-  created: import_v42.z.number().nullish(),
-  model: import_v42.z.string().nullish(),
-  choices: import_v42.z.array(
-    import_v42.z.object({
-      message: import_v42.z.object({
-        role: import_v42.z.literal("assistant").nullish(),
-        content: import_v42.z.string().nullish(),
-        reasoning_content: import_v42.z.string().nullish(),
+var alibabaChatResponseSchema = import_v43.z.object({
+  id: import_v43.z.string().nullish(),
+  created: import_v43.z.number().nullish(),
+  model: import_v43.z.string().nullish(),
+  choices: import_v43.z.array(
+    import_v43.z.object({
+      message: import_v43.z.object({
+        role: import_v43.z.literal("assistant").nullish(),
+        content: import_v43.z.string().nullish(),
+        reasoning_content: import_v43.z.string().nullish(),
         // Alibaba thinking mode
-        tool_calls: import_v42.z.array(
-          import_v42.z.object({
-            id: import_v42.z.string(),
-            type: import_v42.z.literal("function"),
-            function: import_v42.z.object({
-              name: import_v42.z.string(),
-              arguments: import_v42.z.string()
+        tool_calls: import_v43.z.array(
+          import_v43.z.object({
+            id: import_v43.z.string(),
+            type: import_v43.z.literal("function"),
+            function: import_v43.z.object({
+              name: import_v43.z.string(),
+              arguments: import_v43.z.string()
             })
           })
         ).nullish()
       }),
-      finish_reason: import_v42.z.string().nullish(),
-      index: import_v42.z.number()
+      finish_reason: import_v43.z.string().nullish(),
+      index: import_v43.z.number()
     })
   ),
   usage: alibabaUsageSchema.nullish()
 });
-var alibabaChatChunkSchema = import_v42.z.object({
-  id: import_v42.z.string().nullish(),
-  created: import_v42.z.number().nullish(),
-  model: import_v42.z.string().nullish(),
-  choices: import_v42.z.array(
-    import_v42.z.object({
-      delta: import_v42.z.object({
-        role: import_v42.z.enum(["assistant"]).nullish(),
-        content: import_v42.z.string().nullish(),
-        reasoning_content: import_v42.z.string().nullish(),
+var alibabaChatChunkSchema = import_v43.z.object({
+  id: import_v43.z.string().nullish(),
+  created: import_v43.z.number().nullish(),
+  model: import_v43.z.string().nullish(),
+  choices: import_v43.z.array(
+    import_v43.z.object({
+      delta: import_v43.z.object({
+        role: import_v43.z.enum(["assistant"]).nullish(),
+        content: import_v43.z.string().nullish(),
+        reasoning_content: import_v43.z.string().nullish(),
         // Alibaba thinking mode delta
-        tool_calls: import_v42.z.array(
-          import_v42.z.object({
-            index: import_v42.z.number().nullish(),
+        tool_calls: import_v43.z.array(
+          import_v43.z.object({
+            index: import_v43.z.number().nullish(),
             // Index for accumulating tool calls
-            id: import_v42.z.string().nullish(),
-            type: import_v42.z.literal("function").nullish(),
-            function: import_v42.z.object({
-              name: import_v42.z.string().nullish(),
-              arguments: import_v42.z.string().nullish()
+            id: import_v43.z.string().nullish(),
+            type: import_v43.z.literal("function").nullish(),
+            function: import_v43.z.object({
+              name: import_v43.z.string().nullish(),
+              arguments: import_v43.z.string().nullish()
             }).nullish()
           })
         ).nullish()
       }),
-      finish_reason: import_v42.z.string().nullish(),
-      index: import_v42.z.number()
+      finish_reason: import_v43.z.string().nullish(),
+      index: import_v43.z.number()
     })
   ),
   usage: alibabaUsageSchema.nullish()
@@ -694,59 +708,59 @@ var alibabaChatChunkSchema = import_v42.z.object({
 
 // src/alibaba-video-model.ts
 var import_provider3 = require("@ai-sdk/provider");
-var import_provider_utils3 = require("@ai-sdk/provider-utils");
-var import_v43 = require("zod/v4");
-var alibabaVideoModelOptionsSchema = (0, import_provider_utils3.lazySchema)(
-  () => (0, import_provider_utils3.zodSchema)(
-    import_v43.z.object({
-      negativePrompt: import_v43.z.string().nullish(),
-      audioUrl: import_v43.z.string().nullish(),
-      promptExtend: import_v43.z.boolean().nullish(),
-      shotType: import_v43.z.enum(["single", "multi"]).nullish(),
-      watermark: import_v43.z.boolean().nullish(),
-      audio: import_v43.z.boolean().nullish(),
-      referenceUrls: import_v43.z.array(import_v43.z.string()).nullish(),
-      pollIntervalMs: import_v43.z.number().positive().nullish(),
-      pollTimeoutMs: import_v43.z.number().positive().nullish()
+var import_provider_utils4 = require("@ai-sdk/provider-utils");
+var import_v44 = require("zod/v4");
+var alibabaVideoModelOptionsSchema = (0, import_provider_utils4.lazySchema)(
+  () => (0, import_provider_utils4.zodSchema)(
+    import_v44.z.object({
+      negativePrompt: import_v44.z.string().nullish(),
+      audioUrl: import_v44.z.string().nullish(),
+      promptExtend: import_v44.z.boolean().nullish(),
+      shotType: import_v44.z.enum(["single", "multi"]).nullish(),
+      watermark: import_v44.z.boolean().nullish(),
+      audio: import_v44.z.boolean().nullish(),
+      referenceUrls: import_v44.z.array(import_v44.z.string()).nullish(),
+      pollIntervalMs: import_v44.z.number().positive().nullish(),
+      pollTimeoutMs: import_v44.z.number().positive().nullish()
     }).passthrough()
   )
 );
-var alibabaVideoErrorSchema = import_v43.z.object({
-  code: import_v43.z.string().nullish(),
-  message: import_v43.z.string(),
-  request_id: import_v43.z.string().nullish()
+var alibabaVideoErrorSchema = import_v44.z.object({
+  code: import_v44.z.string().nullish(),
+  message: import_v44.z.string(),
+  request_id: import_v44.z.string().nullish()
 });
-var alibabaVideoFailedResponseHandler = (0, import_provider_utils3.createJsonErrorResponseHandler)({
+var alibabaVideoFailedResponseHandler = (0, import_provider_utils4.createJsonErrorResponseHandler)({
   errorSchema: alibabaVideoErrorSchema,
   errorToMessage: (data) => data.message
 });
-var alibabaVideoCreateTaskSchema = import_v43.z.object({
-  output: import_v43.z.object({
-    task_status: import_v43.z.string(),
-    task_id: import_v43.z.string()
+var alibabaVideoCreateTaskSchema = import_v44.z.object({
+  output: import_v44.z.object({
+    task_status: import_v44.z.string(),
+    task_id: import_v44.z.string()
   }).nullish(),
-  request_id: import_v43.z.string().nullish()
+  request_id: import_v44.z.string().nullish()
 });
-var alibabaVideoTaskStatusSchema = import_v43.z.object({
-  output: import_v43.z.object({
-    task_id: import_v43.z.string(),
-    task_status: import_v43.z.string(),
-    video_url: import_v43.z.string().nullish(),
-    submit_time: import_v43.z.string().nullish(),
-    scheduled_time: import_v43.z.string().nullish(),
-    end_time: import_v43.z.string().nullish(),
-    orig_prompt: import_v43.z.string().nullish(),
-    actual_prompt: import_v43.z.string().nullish(),
-    code: import_v43.z.string().nullish(),
-    message: import_v43.z.string().nullish()
+var alibabaVideoTaskStatusSchema = import_v44.z.object({
+  output: import_v44.z.object({
+    task_id: import_v44.z.string(),
+    task_status: import_v44.z.string(),
+    video_url: import_v44.z.string().nullish(),
+    submit_time: import_v44.z.string().nullish(),
+    scheduled_time: import_v44.z.string().nullish(),
+    end_time: import_v44.z.string().nullish(),
+    orig_prompt: import_v44.z.string().nullish(),
+    actual_prompt: import_v44.z.string().nullish(),
+    code: import_v44.z.string().nullish(),
+    message: import_v44.z.string().nullish()
   }).nullish(),
-  usage: import_v43.z.object({
-    duration: import_v43.z.number().nullish(),
-    output_video_duration: import_v43.z.number().nullish(),
-    SR: import_v43.z.number().nullish(),
-    size: import_v43.z.string().nullish()
+  usage: import_v44.z.object({
+    duration: import_v44.z.number().nullish(),
+    output_video_duration: import_v44.z.number().nullish(),
+    SR: import_v44.z.number().nullish(),
+    size: import_v44.z.string().nullish()
   }).nullish(),
-  request_id: import_v43.z.string().nullish()
+  request_id: import_v44.z.string().nullish()
 });
 function detectMode(modelId) {
   if (modelId.includes("-i2v")) return "i2v";
@@ -768,7 +782,7 @@ var AlibabaVideoModel = 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 warnings = [];
     const mode = detectMode(this.modelId);
-    const alibabaOptions = await (0, import_provider_utils3.parseProviderOptions)({
+    const alibabaOptions = await (0, import_provider_utils4.parseProviderOptions)({
       provider: "alibaba",
       providerOptions: options.providerOptions,
       schema: alibabaVideoModelOptionsSchema
@@ -787,7 +801,7 @@ var AlibabaVideoModel = class {
       if (options.image.type === "url") {
         input.img_url = options.image.url;
       } else {
-        const base64Data = typeof options.image.data === "string" ? options.image.data : (0, import_provider_utils3.convertUint8ArrayToBase64)(options.image.data);
+        const base64Data = typeof options.image.data === "string" ? options.image.data : (0, import_provider_utils4.convertUint8ArrayToBase64)(options.image.data);
         input.img_url = base64Data;
       }
     }
@@ -856,10 +870,10 @@ var AlibabaVideoModel = class {
         details: "Alibaba video models only support generating 1 video per call."
       });
     }
-    const { value: createResponse } = await (0, import_provider_utils3.postJsonToApi)({
+    const { value: createResponse } = await (0, import_provider_utils4.postJsonToApi)({
       url: `${this.config.baseURL}/api/v1/services/aigc/video-generation/video-synthesis`,
-      headers: (0, import_provider_utils3.combineHeaders)(
-        await (0, import_provider_utils3.resolve)(this.config.headers),
+      headers: (0, import_provider_utils4.combineHeaders)(
+        await (0, import_provider_utils4.resolve)(this.config.headers),
         options.headers,
         {
           "X-DashScope-Async": "enable"
@@ -870,7 +884,7 @@ var AlibabaVideoModel = class {
         input,
         parameters
       },
-      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(
+      successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(
         alibabaVideoCreateTaskSchema
       ),
       failedResponseHandler: alibabaVideoFailedResponseHandler,
@@ -890,20 +904,20 @@ var AlibabaVideoModel = class {
     let finalResponse;
     let responseHeaders;
     while (true) {
-      await (0, import_provider_utils3.delay)(pollIntervalMs, { abortSignal: options.abortSignal });
+      await (0, import_provider_utils4.delay)(pollIntervalMs, { abortSignal: options.abortSignal });
       if (Date.now() - startTime > pollTimeoutMs) {
         throw new import_provider3.AISDKError({
           name: "ALIBABA_VIDEO_GENERATION_TIMEOUT",
           message: `Video generation timed out after ${pollTimeoutMs}ms`
         });
       }
-      const { value: statusResponse, responseHeaders: pollHeaders } = await (0, import_provider_utils3.getFromApi)({
+      const { value: statusResponse, responseHeaders: pollHeaders } = await (0, import_provider_utils4.getFromApi)({
         url: `${this.config.baseURL}/api/v1/tasks/${taskId}`,
-        headers: (0, import_provider_utils3.combineHeaders)(
-          await (0, import_provider_utils3.resolve)(this.config.headers),
+        headers: (0, import_provider_utils4.combineHeaders)(
+          await (0, import_provider_utils4.resolve)(this.config.headers),
           options.headers
         ),
-        successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(
+        successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(
           alibabaVideoTaskStatusSchema
         ),
         failedResponseHandler: alibabaVideoFailedResponseHandler,
@@ -964,27 +978,16 @@ var AlibabaVideoModel = class {
 };
 
 // src/version.ts
-var VERSION = "1.0.18";
+var VERSION = "1.0.19";
 
 // src/alibaba-provider.ts
-var alibabaErrorDataSchema = import_v44.z.object({
-  error: import_v44.z.object({
-    message: import_v44.z.string(),
-    code: import_v44.z.string().nullish(),
-    type: import_v44.z.string().nullish()
-  })
-});
-var alibabaFailedResponseHandler = (0, import_provider_utils4.createJsonErrorResponseHandler)({
-  errorSchema: alibabaErrorDataSchema,
-  errorToMessage: (data) => data.error.message
-});
 function createAlibaba(options = {}) {
   var _a, _b;
-  const baseURL = (_a = (0, import_provider_utils4.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://dashscope-intl.aliyuncs.com/compatible-mode/v1";
-  const videoBaseURL = (_b = (0, import_provider_utils4.withoutTrailingSlash)(options.videoBaseURL)) != null ? _b : "https://dashscope-intl.aliyuncs.com";
-  const getHeaders = () => (0, import_provider_utils4.withUserAgentSuffix)(
+  const baseURL = (_a = (0, import_provider_utils5.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://dashscope-intl.aliyuncs.com/compatible-mode/v1";
+  const videoBaseURL = (_b = (0, import_provider_utils5.withoutTrailingSlash)(options.videoBaseURL)) != null ? _b : "https://dashscope-intl.aliyuncs.com";
+  const getHeaders = () => (0, import_provider_utils5.withUserAgentSuffix)(
     {
-      Authorization: `Bearer ${(0, import_provider_utils4.loadApiKey)({
+      Authorization: `Bearer ${(0, import_provider_utils5.loadApiKey)({
         apiKey: options.apiKey,
         environmentVariableName: "ALIBABA_API_KEY",
         description: "Alibaba Cloud (DashScope)"