Merge pull request #27 from JianJang2017/my-baoyu-skills

Adapting baoyu-image-gen to the Tongyi Text-to-Image Model
2026-07-13 06:19:46 +08:00 · 2026-01-28 12:23:34 -06:00
parent 64945f3341 74c08def06
commit 45c109ce88
7 changed files with 195 additions and 17 deletions
@@ -152,3 +152,8 @@ slide-deck/
 infographic/
 illustrations/
 comic/
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
@@ -543,7 +543,7 @@ AI-powered generation backends.

 #### baoyu-image-gen

-AI SDK-based image generation using official OpenAI and Google APIs. Supports text-to-image, reference images, aspect ratios, and quality presets.
+AI SDK-based image generation using official OpenAI, Google and DashScope (Aliyun Tongyi Wanxiang) APIs. Supports text-to-image, reference images, aspect ratios, and quality presets.

 ```bash
 # Basic generation (auto-detect provider)
@@ -558,6 +558,9 @@ AI SDK-based image generation using official OpenAI and Google APIs. Supports te
 # Specific provider
 /baoyu-image-gen --prompt "A cat" --image cat.png --provider openai

+# DashScope (Aliyun Tongyi Wanxiang)
+/baoyu-image-gen --prompt "一只可爱的猫" --image cat.png --provider dashscope
+
 # With reference images (Google multimodal only)
 /baoyu-image-gen --prompt "Make it blue" --image out.png --ref source.png
 ```
@@ -568,7 +571,7 @@ AI SDK-based image generation using official OpenAI and Google APIs. Supports te
 | `--prompt`, `-p` | Prompt text |
 | `--promptfiles` | Read prompt from files (concatenated) |
 | `--image` | Output image path (required) |
-| `--provider` | `google` or `openai` (default: google) |
+| `--provider` | `google`, `openai` or `dashscope` (default: google) |
 | `--model`, `-m` | Model ID |
 | `--ar` | Aspect ratio (e.g., `16:9`, `1:1`, `4:3`) |
 | `--size` | Size (e.g., `1024x1024`) |
@@ -580,15 +583,18 @@ AI SDK-based image generation using official OpenAI and Google APIs. Supports te
 |----------|-------------|---------|
 | `OPENAI_API_KEY` | OpenAI API key | - |
 | `GOOGLE_API_KEY` | Google API key | - |
+| `DASHSCOPE_API_KEY` | DashScope API key (Aliyun) | - |
 | `OPENAI_IMAGE_MODEL` | OpenAI model | `gpt-image-1.5` |
 | `GOOGLE_IMAGE_MODEL` | Google model | `gemini-3-pro-image-preview` |
+| `DASHSCOPE_IMAGE_MODEL` | DashScope model | `z-image-turbo` |
 | `OPENAI_BASE_URL` | Custom OpenAI endpoint | - |
 | `GOOGLE_BASE_URL` | Custom Google endpoint | - |
+| `DASHSCOPE_BASE_URL` | Custom DashScope endpoint | - |

 **Provider Auto-Selection**:
 1. If `--provider` specified → use it
 2. If only one API key available → use that provider
-3. If both available → default to Google
+3. If multiple available → default to Google

 #### baoyu-danger-gemini-web

@@ -699,6 +705,11 @@ OPENAI_IMAGE_MODEL=gpt-image-1.5
 GOOGLE_API_KEY=xxx
 GOOGLE_IMAGE_MODEL=gemini-3-pro-image-preview
 # GOOGLE_BASE_URL=https://generativelanguage.googleapis.com/v1beta
+
+# DashScope (Aliyun Tongyi Wanxiang)
+DASHSCOPE_API_KEY=sk-xxx
+DASHSCOPE_IMAGE_MODEL=z-image-turbo
+# DASHSCOPE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
 EOF
 ```

@@ -543,7 +543,7 @@ AI 驱动的生成后端。

 #### baoyu-image-gen

-基于 AI SDK 的图像生成，使用官方 OpenAI 和 Google API。支持文生图、参考图、宽高比和质量预设。
+基于 AI SDK 的图像生成，使用官方 OpenAI、Google 和 DashScope（阿里通义万相）API。支持文生图、参考图、宽高比和质量预设。

 ```bash
 # 基础生成（自动检测服务商）
@@ -558,6 +558,9 @@ AI 驱动的生成后端。
 # 指定服务商
 /baoyu-image-gen --prompt "一只猫" --image cat.png --provider openai

+# DashScope（阿里通义万相）
+/baoyu-image-gen --prompt "一只可爱的猫" --image cat.png --provider dashscope
+
 # 带参考图（仅 Google 多模态支持）
 /baoyu-image-gen --prompt "把它变成蓝色" --image out.png --ref source.png
 ```
@@ -568,7 +571,7 @@ AI 驱动的生成后端。
 | `--prompt`, `-p` | 提示词文本 |
 | `--promptfiles` | 从文件读取提示词（多文件拼接） |
 | `--image` | 输出图片路径（必需） |
-| `--provider` | `google` 或 `openai`（默认：google） |
+| `--provider` | `google`、`openai` 或 `dashscope`（默认：google） |
 | `--model`, `-m` | 模型 ID |
 | `--ar` | 宽高比（如 `16:9`、`1:1`、`4:3`） |
 | `--size` | 尺寸（如 `1024x1024`） |
@@ -580,15 +583,18 @@ AI 驱动的生成后端。
 |------|------|--------|
 | `OPENAI_API_KEY` | OpenAI API 密钥 | - |
 | `GOOGLE_API_KEY` | Google API 密钥 | - |
+| `DASHSCOPE_API_KEY` | DashScope API 密钥（阿里云） | - |
 | `OPENAI_IMAGE_MODEL` | OpenAI 模型 | `gpt-image-1.5` |
 | `GOOGLE_IMAGE_MODEL` | Google 模型 | `gemini-3-pro-image-preview` |
+| `DASHSCOPE_IMAGE_MODEL` | DashScope 模型 | `z-image-turbo` |
 | `OPENAI_BASE_URL` | 自定义 OpenAI 端点 | - |
 | `GOOGLE_BASE_URL` | 自定义 Google 端点 | - |
+| `DASHSCOPE_BASE_URL` | 自定义 DashScope 端点 | - |

 **服务商自动选择**：
 1. 如果指定了 `--provider` → 使用指定的
 2. 如果只有一个 API 密钥 → 使用对应服务商
-3. 如果两个都有 → 默认使用 Google
+3. 如果多个可用 → 默认使用 Google

 #### baoyu-danger-gemini-web

@@ -699,6 +705,11 @@ OPENAI_IMAGE_MODEL=gpt-image-1.5
 GOOGLE_API_KEY=xxx
 GOOGLE_IMAGE_MODEL=gemini-3-pro-image-preview
 # GOOGLE_BASE_URL=https://generativelanguage.googleapis.com/v1beta
+
+# DashScope（阿里通义万相）
+DASHSCOPE_API_KEY=sk-xxx
+DASHSCOPE_IMAGE_MODEL=z-image-turbo
+# DASHSCOPE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
 EOF
 ```

@@ -1,11 +1,11 @@
 ---
 name: baoyu-image-gen
-description: AI image generation with OpenAI and Google APIs. Supports text-to-image, reference images, aspect ratios, and parallel generation (recommended 4 concurrent subagents). Use when user asks to generate, create, or draw images.
+description: AI image generation with OpenAI, Google and DashScope APIs. Supports text-to-image, reference images, aspect ratios, and parallel generation (recommended 4 concurrent subagents). Use when user asks to generate, create, or draw images.
 ---

 # Image Generation (AI SDK)

-Official API-based image generation. Supports OpenAI and Google providers.
+Official API-based image generation. Supports OpenAI, Google and DashScope (阿里通义万象) providers.

 ## Script Directory

@@ -63,6 +63,9 @@ npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "Make blue" --image out.png --r

 # Specific provider
 npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "A cat" --image out.png --provider openai
+
+# DashScope (阿里通义万象)
+npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "一只可爱的猫" --image out.png --provider dashscope
 ```

 ## Options
@@ -72,7 +75,7 @@ npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "A cat" --image out.png --provi
 | `--prompt <text>`, `-p` | Prompt text |
 | `--promptfiles <files...>` | Read prompt from files (concatenated) |
 | `--image <path>` | Output image path (required) |
-| `--provider google\|openai` | Force provider (default: google) |
+| `--provider google\|openai\|dashscope` | Force provider (default: google) |
 | `--model <id>`, `-m` | Model ID |
 | `--ar <ratio>` | Aspect ratio (e.g., `16:9`, `1:1`, `4:3`) |
 | `--size <WxH>` | Size (e.g., `1024x1024`) |
@@ -88,10 +91,13 @@ npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "A cat" --image out.png --provi
 |----------|-------------|
 | `OPENAI_API_KEY` | OpenAI API key |
 | `GOOGLE_API_KEY` | Google API key |
+| `DASHSCOPE_API_KEY` | DashScope API key (阿里云) |
 | `OPENAI_IMAGE_MODEL` | OpenAI model override |
 | `GOOGLE_IMAGE_MODEL` | Google model override |
+| `DASHSCOPE_IMAGE_MODEL` | DashScope model override (default: z-image-turbo) |
 | `OPENAI_BASE_URL` | Custom OpenAI endpoint |
 | `GOOGLE_BASE_URL` | Custom Google endpoint |
+| `DASHSCOPE_BASE_URL` | Custom DashScope endpoint |

 **Load Priority**: CLI args > env vars > `<cwd>/.baoyu-skills/.env` > `~/.baoyu-skills/.env`

@@ -99,7 +105,7 @@ npx -y bun ${SKILL_DIR}/scripts/main.ts --prompt "A cat" --image out.png --provi

 1. `--provider` specified → use it
 2. Only one API key available → use that provider
-3. Both available → default to Google
+3. Multiple available → default to Google

 ## Quality Presets

@@ -14,7 +14,7 @@ Options:
  -p, --prompt <text>       Prompt text
  --promptfiles <files...>  Read prompt from files (concatenated)
  --image <path>            Output image path (required)
-  --provider google|openai  Force provider (auto-detect by default)
+  --provider google|openai|dashscope  Force provider (auto-detect by default)
  -m, --model <id>          Model ID
  --ar <ratio>              Aspect ratio (e.g., 16:9, 1:1, 4:3)
  --size <WxH>              Size (e.g., 1024x1024)
@@ -29,10 +29,13 @@ Environment variables:
  OPENAI_API_KEY            OpenAI API key
  GOOGLE_API_KEY            Google API key
  GEMINI_API_KEY            Gemini API key (alias for GOOGLE_API_KEY)
+  DASHSCOPE_API_KEY         DashScope API key (阿里云通义万象)
  OPENAI_IMAGE_MODEL        Default OpenAI model (gpt-image-1.5)
  GOOGLE_IMAGE_MODEL        Default Google model (gemini-3-pro-image-preview)
+  DASHSCOPE_IMAGE_MODEL     Default DashScope model (z-image-turbo)
  OPENAI_BASE_URL           Custom OpenAI endpoint
  GOOGLE_BASE_URL           Custom Google endpoint
+  DASHSCOPE_BASE_URL        Custom DashScope endpoint

 Env file load order: CLI args > process.env > <cwd>/.baoyu-skills/.env > ~/.baoyu-skills/.env`);
 }
@@ -105,7 +108,7 @@ function parseArgs(argv: string[]): CliArgs {

    if (a === "--provider") {
      const v = argv[++i];
-      if (v !== "google" && v !== "openai") throw new Error(`Invalid provider: ${v}`);
+      if (v !== "google" && v !== "openai" && v !== "dashscope") throw new Error(`Invalid provider: ${v}`);
      out.provider = v;
      continue;
    }
@@ -243,13 +246,15 @@ function detectProvider(args: CliArgs): Provider {

  const hasGoogle = !!(process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY);
  const hasOpenai = !!process.env.OPENAI_API_KEY;
+  const hasDashscope = !!process.env.DASHSCOPE_API_KEY;

-  if (hasGoogle && !hasOpenai) return "google";
-  if (hasOpenai && !hasGoogle) return "openai";
-  if (hasGoogle && hasOpenai) return "google";
+  const available = [hasGoogle && "google", hasOpenai && "openai", hasDashscope && "dashscope"].filter(Boolean) as Provider[];
+
+  if (available.length === 1) return available[0]!;
+  if (available.length > 1) return available[0]!;

  throw new Error(
-    "No API key found. Set GOOGLE_API_KEY, GEMINI_API_KEY, or OPENAI_API_KEY.\n" +
+    "No API key found. Set GOOGLE_API_KEY, GEMINI_API_KEY, OPENAI_API_KEY, or DASHSCOPE_API_KEY.\n" +
      "Create ~/.baoyu-skills/.env or <cwd>/.baoyu-skills/.env with your keys."
  );
 }
@@ -263,6 +268,9 @@ async function loadProviderModule(provider: Provider): Promise<ProviderModule> {
  if (provider === "google") {
    return (await import("./providers/google")) as ProviderModule;
  }
+  if (provider === "dashscope") {
+    return (await import("./providers/dashscope")) as ProviderModule;
+  }
  return (await import("./providers/openai")) as ProviderModule;
 }

@@ -0,0 +1,137 @@
+import type { CliArgs } from "../types";
+
+export function getDefaultModel(): string {
+  return process.env.DASHSCOPE_IMAGE_MODEL || "z-image-turbo";
+}
+
+function getApiKey(): string | null {
+  return process.env.DASHSCOPE_API_KEY || null;
+}
+
+function getBaseUrl(): string {
+  const base = process.env.DASHSCOPE_BASE_URL || "https://dashscope.aliyuncs.com";
+  return base.replace(/\/+$/g, "");
+}
+
+function parseAspectRatio(ar: string): { width: number; height: number } | null {
+  const match = ar.match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
+  if (!match) return null;
+  const w = parseFloat(match[1]!);
+  const h = parseFloat(match[2]!);
+  if (w <= 0 || h <= 0) return null;
+  return { width: w, height: h };
+}
+
+function getSizeFromAspectRatio(ar: string | null, quality: CliArgs["quality"]): string {
+  const baseSize = quality === "2k" ? 1440 : 1024;
+
+  if (!ar) return `${baseSize}*${baseSize}`;
+
+  const parsed = parseAspectRatio(ar);
+  if (!parsed) return `${baseSize}*${baseSize}`;
+
+  const ratio = parsed.width / parsed.height;
+
+  if (Math.abs(ratio - 1) < 0.1) {
+    return `${baseSize}*${baseSize}`;
+  }
+
+  if (ratio > 1) {
+    const w = Math.round(baseSize * ratio);
+    return `${w}*${baseSize}`;
+  }
+
+  const h = Math.round(baseSize / ratio);
+  return `${baseSize}*${h}`;
+}
+
+function normalizeSize(size: string): string {
+  return size.replace("x", "*");
+}
+
+export async function generateImage(
+  prompt: string,
+  model: string,
+  args: CliArgs
+): Promise<Uint8Array> {
+  const apiKey = getApiKey();
+  if (!apiKey) throw new Error("DASHSCOPE_API_KEY is required");
+
+  if (args.referenceImages.length > 0) {
+    console.error("Warning: Reference images not yet supported with DashScope, ignoring.");
+  }
+
+  const size = args.size ? normalizeSize(args.size) : getSizeFromAspectRatio(args.aspectRatio, args.quality);
+  const url = `${getBaseUrl()}/api/v1/services/aigc/multimodal-generation/generation`;
+
+  const body = {
+    model,
+    input: {
+      messages: [
+        {
+          role: "user",
+          content: [{ text: prompt }],
+        },
+      ],
+    },
+    parameters: {
+      prompt_extend: false,
+      size,
+    },
+  };
+
+  console.log(`Generating image with DashScope (${model})...`, { size });
+
+  const res = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`,
+    },
+    body: JSON.stringify(body),
+  });
+
+  if (!res.ok) {
+    const err = await res.text();
+    throw new Error(`DashScope API error (${res.status}): ${err}`);
+  }
+
+  const result = await res.json() as {
+    output?: {
+      result_image?: string;
+      choices?: Array<{
+        message?: {
+          content?: Array<{ image?: string }>;
+        };
+      }>;
+    };
+  };
+
+  let imageData: string | null = null;
+
+  if (result.output?.result_image) {
+    imageData = result.output.result_image;
+  } else if (result.output?.choices?.[0]?.message?.content) {
+    const content = result.output.choices[0].message.content;
+    for (const item of content) {
+      if (item.image) {
+        imageData = item.image;
+        break;
+      }
+    }
+  }
+
+  if (!imageData) {
+    console.error("Response:", JSON.stringify(result, null, 2));
+    throw new Error("No image in response");
+  }
+
+  if (imageData.startsWith("http://") || imageData.startsWith("https://")) {
+    const imgRes = await fetch(imageData);
+    if (!imgRes.ok) throw new Error("Failed to download image");
+    const buf = await imgRes.arrayBuffer();
+    return new Uint8Array(buf);
+  }
+
+  return Uint8Array.from(Buffer.from(imageData, "base64"));
+}
@@ -1,4 +1,4 @@
-export type Provider = "google" | "openai";
+export type Provider = "google" | "openai" | "dashscope";
 export type Quality = "normal" | "2k";

 export type CliArgs = {