@untiny/qwen-ai-provider 0.0.2 → 0.0.3

package/README.md

@@ -33,6 +33,11 @@ const { embedding } = await embed({
   model: qwen.embeddingModel('text-embedding-v4'),
   value: 'sunny day at the beach',
 });
+
+const { image } = await generateImage({
+  model: qwen.imageModel('qwen-image-plus'),
+  prompt: '一个在海边沙滩上的小狗',
+});
 ```
 
 ## Documentation

package/dist/index.d.mts

@@ -7,6 +7,8 @@ type QwenCompletionModelId = 'qwen2.5-coder-0.5b-instruct' | 'qwen2.5-coder-1.5b
 
 type QwenEmbeddingModelId = 'text-embedding-v4' | (string & {});
 
+type QwenImageModelId = 'qwen-image-plus' | (string & {});
+
 interface QwenProvider extends ProviderV3 {
     (modelId: QwenChatModeId): LanguageModelV3;
     /**
@@ -38,7 +40,7 @@ interface QwenProvider extends ProviderV3 {
      * @deprecated Use `embeddingModel` instead.
      */
     textEmbeddingModel(modelId: QwenEmbeddingModelId): EmbeddingModelV3;
-    imageModel(modelId: string): ImageModelV3;
+    imageModel(modelId: QwenImageModelId): ImageModelV3;
 }
 interface QwenProviderSettings {
     /**
@@ -46,6 +48,11 @@ interface QwenProviderSettings {
      * 默认前缀是"https://dashscope.aliyuncs.com/compatible-mode/v1"。
      */
     baseURL?: string;
+    /**
+     * 对 API 调用使用不同的 URL 前缀，例如使用代理服务器。
+     * 默认前缀是"https://dashscope.aliyuncs.com/api/v1"。
+     */
+    apiUrl?: string;
     /**
      * 使用“Authorization”标头发送的 API 密钥。
      * 它默认为“DASHSCOPE_API_KEY”环境变量。

package/dist/index.d.ts

@@ -7,6 +7,8 @@ type QwenCompletionModelId = 'qwen2.5-coder-0.5b-instruct' | 'qwen2.5-coder-1.5b
 
 type QwenEmbeddingModelId = 'text-embedding-v4' | (string & {});
 
+type QwenImageModelId = 'qwen-image-plus' | (string & {});
+
 interface QwenProvider extends ProviderV3 {
     (modelId: QwenChatModeId): LanguageModelV3;
     /**
@@ -38,7 +40,7 @@ interface QwenProvider extends ProviderV3 {
      * @deprecated Use `embeddingModel` instead.
      */
     textEmbeddingModel(modelId: QwenEmbeddingModelId): EmbeddingModelV3;
-    imageModel(modelId: string): ImageModelV3;
+    imageModel(modelId: QwenImageModelId): ImageModelV3;
 }
 interface QwenProviderSettings {
     /**
@@ -46,6 +48,11 @@ interface QwenProviderSettings {
      * 默认前缀是"https://dashscope.aliyuncs.com/compatible-mode/v1"。
      */
     baseURL?: string;
+    /**
+     * 对 API 调用使用不同的 URL 前缀，例如使用代理服务器。
+     * 默认前缀是"https://dashscope.aliyuncs.com/api/v1"。
+     */
+    apiUrl?: string;
     /**
      * 使用“Authorization”标头发送的 API 密钥。
      * 它默认为“DASHSCOPE_API_KEY”环境变量。

package/dist/index.js

@@ -37,28 +37,12 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/qwen-provider.ts
-var import_provider6 = require("@ai-sdk/provider");
-var import_provider_utils10 = require("@ai-sdk/provider-utils");
+var import_provider_utils12 = require("@ai-sdk/provider-utils");
 
 // src/chat/qwen-chat-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
-// src/qwen-error.ts
-var import_provider_utils = require("@ai-sdk/provider-utils");
-var import_zod = __toESM(require("zod"));
-var qwenErrorDataSchema = import_zod.default.object({
-  object: import_zod.default.literal("error"),
-  message: import_zod.default.string(),
-  type: import_zod.default.string(),
-  param: import_zod.default.string().nullable(),
-  code: import_zod.default.string().nullable()
-});
-var qwenFailedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)({
-  errorSchema: qwenErrorDataSchema,
-  errorToMessage: (data) => data.message
-});
-
 // src/get-response-metadata.ts
 function getResponseMetadata({
   id,
@@ -89,6 +73,22 @@ function mapQwenFinishReason(finishReason) {
   }
 }
 
+// src/qwen-error.ts
+var import_provider_utils = require("@ai-sdk/provider-utils");
+var import_zod = __toESM(require("zod"));
+var qwenErrorDataSchema = import_zod.default.object({
+  error: import_zod.default.object({
+    message: import_zod.default.string(),
+    type: import_zod.default.string(),
+    param: import_zod.default.string().nullish(),
+    code: import_zod.default.string().nullish()
+  })
+});
+var qwenFailedResponseHandler = (0, import_provider_utils.createJsonErrorResponseHandler)({
+  errorSchema: qwenErrorDataSchema,
+  errorToMessage: (data) => data.error.message
+});
+
 // src/chat/convert-qwen-chat-usage.ts
 function convertQwenChatUsage(usage) {
   var _a, _b, _c, _d;
@@ -580,11 +580,11 @@ var QwenChatLanguageModel = class {
               return;
             }
             const value = chunk.value;
-            if ("object" in value) {
+            if ("error" in value) {
               finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({
                 type: "error",
-                error: value.message
+                error: value.error.message
               });
               return;
             }
@@ -1074,9 +1074,9 @@ var QwenCompletionLanguageModel = class {
               return;
             }
             const value = chunk.value;
-            if ("object" in value) {
+            if ("error" in value) {
               finishReason = { unified: "error", raw: void 0 };
-              controller.enqueue({ type: "error", error: value.message });
+              controller.enqueue({ type: "error", error: value.error.message });
               return;
             }
             if (isFirstChunk) {
@@ -1217,31 +1217,153 @@ var QwenEmbeddingModel = class {
   }
 };
 
+// src/image/qwen-image-model.ts
+var import_provider_utils11 = require("@ai-sdk/provider-utils");
+
+// src/image/qwen-image-api.ts
+var import_provider_utils10 = require("@ai-sdk/provider-utils");
+var import_zod6 = __toESM(require("zod"));
+var qwenImageErrorSchema = import_zod6.default.object({
+  error: import_zod6.default.string(),
+  message: import_zod6.default.string()
+});
+var qwenImageResponseSchema = (0, import_provider_utils10.lazySchema)(
+  () => (0, import_provider_utils10.zodSchema)(
+    import_zod6.default.object({
+      output: import_zod6.default.object({
+        choices: import_zod6.default.array(
+          import_zod6.default.object({
+            finish_reason: import_zod6.default.string(),
+            message: import_zod6.default.object({
+              role: import_zod6.default.literal("assistant"),
+              content: import_zod6.default.array(
+                import_zod6.default.object({
+                  image: import_zod6.default.string()
+                })
+              )
+            })
+          })
+        ),
+        task_metric: import_zod6.default.object({
+          TOTAL: import_zod6.default.number(),
+          SUCCEEDED: import_zod6.default.number(),
+          FAILED: import_zod6.default.number()
+        }).nullish(),
+        finished: import_zod6.default.boolean().nullish()
+      }),
+      usage: import_zod6.default.object({
+        image_count: import_zod6.default.number().nullish(),
+        size: import_zod6.default.string().nullish(),
+        width: import_zod6.default.number().nullish(),
+        height: import_zod6.default.number().nullish()
+      })
+    })
+  )
+);
+
+// src/image/qwen-image-model.ts
+var QwenImageModel = class {
+  constructor(modelId, config) {
+    this.specificationVersion = "v3";
+    this.maxImagesPerCall = 1;
+    this.modelId = modelId;
+    this.config = config;
+  }
+  get provider() {
+    return this.config.provider;
+  }
+  async doGenerate(options) {
+    var _a, _b;
+    const warnings = [];
+    if (options.aspectRatio != null) {
+      warnings.push({
+        type: "unsupported",
+        feature: "aspectRatio",
+        details: "This model does not support aspect ratio. Use `size` instead."
+      });
+    }
+    if (options.seed != null) {
+      warnings.push({ type: "unsupported", feature: "seed" });
+    }
+    const body = {
+      model: this.modelId,
+      input: {
+        messages: [
+          {
+            role: "user",
+            content: [{ text: (_a = options.prompt) != null ? _a : "" }]
+          }
+        ]
+      },
+      parameters: {
+        size: (_b = options.size) == null ? void 0 : _b.replace("x", "*"),
+        n: options.n,
+        watermark: false,
+        seed: options.seed
+      }
+    };
+    const { value: response, responseHeaders } = await (0, import_provider_utils11.postJsonToApi)({
+      url: this.config.url({
+        path: "/services/aigc/multimodal-generation/generation",
+        modelId: this.modelId
+      }),
+      headers: (0, import_provider_utils11.combineHeaders)(this.config.headers(), options.headers),
+      body,
+      failedResponseHandler: (0, import_provider_utils11.createJsonErrorResponseHandler)({
+        errorSchema: qwenImageErrorSchema,
+        errorToMessage: (data) => data.message
+      }),
+      successfulResponseHandler: (0, import_provider_utils11.createJsonResponseHandler)(qwenImageResponseSchema),
+      abortSignal: options.abortSignal,
+      fetch: this.config.fetch
+    });
+    const images = [];
+    for (const choice of response.output.choices) {
+      for (const content of choice.message.content) {
+        if ("image" in content) {
+          const imageResponse = await fetch(content.image);
+          const imageBuffer = await imageResponse.arrayBuffer();
+          images.push(new Uint8Array(imageBuffer));
+        }
+      }
+    }
+    return {
+      images,
+      warnings,
+      response: {
+        timestamp: /* @__PURE__ */ new Date(),
+        modelId: this.modelId,
+        headers: responseHeaders
+      }
+    };
+  }
+};
+
 // src/qwen-provider.ts
 function createQwen(options) {
-  var _a;
-  const baseURL = (_a = (0, import_provider_utils10.withoutTrailingSlash)(options == null ? void 0 : options.baseURL)) != null ? _a : "https://dashscope.aliyuncs.com/compatible-mode/v1";
+  var _a, _b;
+  const baseURL = (_a = (0, import_provider_utils12.withoutTrailingSlash)(options == null ? void 0 : options.baseURL)) != null ? _a : "https://dashscope.aliyuncs.com/compatible-mode/v1";
+  const apiUrl = (_b = (0, import_provider_utils12.withoutTrailingSlash)(options == null ? void 0 : options.apiUrl)) != null ? _b : "https://dashscope.aliyuncs.com/api/v1";
   const getHeaders = () => {
-    const apiKey = (0, import_provider_utils10.loadApiKey)({
+    const apiKey = (0, import_provider_utils12.loadApiKey)({
       apiKey: options == null ? void 0 : options.apiKey,
       environmentVariableName: "DASHSCOPE_API_KEY",
       description: "Qwen API key"
     });
-    return (0, import_provider_utils10.withUserAgentSuffix)(
+    return (0, import_provider_utils12.withUserAgentSuffix)(
       {
         Authorization: `Bearer ${apiKey}`,
         ...options == null ? void 0 : options.headers
       },
-      `ai-sdk/qwen/${import_provider_utils10.VERSION}`
+      `ai-sdk/qwen/${import_provider_utils12.VERSION}`
     );
   };
   const createChatModel = (modelId) => {
     return new QwenChatLanguageModel(modelId, {
       provider: "qwen.chat",
-      baseURL,
+      url: ({ path }) => `${baseURL}${path}`,
       headers: getHeaders,
-      fetch: options == null ? void 0 : options.fetch,
-      url: ({ path }) => `${baseURL}${path}`
+      fetch: options == null ? void 0 : options.fetch
     });
   };
   const createCompletionModel = (modelId) => {
@@ -1260,6 +1382,14 @@ function createQwen(options) {
       fetch: options == null ? void 0 : options.fetch
     });
   };
+  const createImageModel = (modelId) => {
+    return new QwenImageModel(modelId, {
+      provider: `qwen.image`,
+      url: ({ path }) => `${apiUrl}${path}`,
+      headers: getHeaders,
+      fetch: options == null ? void 0 : options.fetch
+    });
+  };
   const provider = (modelId) => {
     if (new.target) {
       throw new Error("The Qwen model function cannot be called with the new keyword.");
@@ -1274,15 +1404,13 @@ function createQwen(options) {
   provider.embeddingModel = createEmbeddingModel;
   provider.textEmbedding = createEmbeddingModel;
   provider.textEmbeddingModel = createEmbeddingModel;
-  provider.imageModel = (modelId) => {
-    throw new import_provider6.NoSuchModelError({ modelId, modelType: "imageModel" });
-  };
+  provider.imageModel = createImageModel;
   return provider;
 }
 var qwen = createQwen();
 
 // src/version.ts
-var VERSION2 = true ? "0.0.2" : "0.0.0-test";
+var VERSION2 = true ? "0.0.3" : "0.0.0-test";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   VERSION,