dsh-media-skills 0.5.2 → 0.5.3

package/client.js

@@ -65,6 +65,43 @@ window.__ModuleLoader__.load({
 .dshm-row b { font-weight: 500; color: var(--dsw-alias-label-secondary, #61666b); }
 .dshm-dot { width: 3px; height: 3px; border-radius: 50%; background: var(--dsw-alias-label-caption, #adb2b8); }
 
+.dshm-pickers { display: flex; align-items: center; gap: 8px; margin-top: 12px; flex-wrap: wrap; }
+.dshm-pickwrap { position: relative; display: inline-block; }
+.dshm-pick {
+  height: 28px; padding: 0 11px; border-radius: 14px; cursor: pointer;
+  border: 1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12));
+  background: var(--dsw-alias-bg-base, #fff); color: var(--dsw-alias-label-secondary, #61666b);
+  font: inherit; font-size: 12.5px; display: inline-flex; align-items: center; gap: 7px;
+}
+.dshm-pick:hover { border-color: var(--dsw-alias-label-caption, #adb2b8); }
+.dshm-pick .car { width: 6px; height: 6px; border-right: 1.3px solid currentColor; border-bottom: 1.3px solid currentColor; transform: rotate(45deg) translate(-1px, -1px); opacity: .7; }
+.dshm-menu {
+  position: absolute; left: 0; top: 34px; z-index: 30; min-width: 252px; display: grid; padding: 4px;
+  background: var(--dsw-alias-bg-elevated, #fff); border: 1px solid var(--dsw-alias-border-l2, rgba(0,0,0,.12));
+  border-radius: 10px; box-shadow: 0 10px 28px rgba(0,0,0,.14);
+}
+.dshm-menu button {
+  border: 0; background: none; font: inherit; font-size: 13px; color: inherit; cursor: pointer;
+  padding: 7px 10px; border-radius: 7px; text-align: left; display: flex; justify-content: space-between; gap: 14px;
+  white-space: nowrap;
+}
+.dshm-menu button:hover { background: var(--dsw-alias-bg-layer-2, #f2f3f5); }
+.dshm-menu button[data-on="true"] { font-weight: 500; }
+.dshm-menu button:disabled { color: var(--dsw-alias-label-caption, #adb2b8); cursor: not-allowed; }
+.dshm-menu button:disabled:hover { background: none; }
+.dshm-menu .off { font-size: 11.5px; color: var(--dsw-alias-label-caption, #adb2b8); }
+.dshm-size { font-size: 12px; color: var(--dsw-alias-label-caption, #adb2b8); }
+
+.dshm-shield { display: flex; gap: 10px; align-items: flex-start; max-width: 680px; margin: 20px 0 0;
+  font-size: 12.5px; line-height: 1.65; color: var(--dsw-alias-label-tertiary, #81858c); }
+.dshm-shield svg { flex: none; margin-top: 2px; color: var(--dsw-alias-label-tertiary, #81858c); }
+.dshm-keywrap { position: relative; }
+.dshm-keywrap .dshm-input { padding-right: 38px; }
+.dshm-eye { position: absolute; right: 3px; top: 50%; transform: translateY(-50%); width: 26px; height: 26px;
+  display: flex; align-items: center; justify-content: center; border: 0; border-radius: 6px; padding: 0;
+  background: none; color: var(--dsw-alias-label-tertiary, #81858c); cursor: pointer; }
+.dshm-eye:hover { color: var(--dsw-alias-label-primary, #0f1115); background: var(--dsw-alias-bg-layer-2, #f2f3f5); }
+
 .dshm-cta {
   margin-top: 16px; height: 36px; border-radius: 18px; border: 0; cursor: pointer; width: 100%;
   background: var(--dsw-alias-button-primary-fill, #0f1115); color: var(--dsw-alias-label-primary-foreground, #fff);
@@ -176,13 +213,54 @@ window.__ModuleLoader__.load({
       return clean.length > 18 ? `${clean.slice(0, 18)}…` : clean
     }
 
+    const RATIOS = [['1:1', '1024x1024'], ['16:9', '1024x576'], ['9:16', '576x1024'], ['4:3', '1024x768'], ['3:4', '768x1024']]
+
+    function ShieldIcon() {
+      return h('svg', { width: 16, height: 16, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round' },
+        h('path', { d: 'M12 3l7 3v5.6c0 4.4-3 8.1-7 9.4-4-1.3-7-5-7-9.4V6l7-3z' }),
+        h('path', { d: 'M9.2 12.3l2 2 3.6-3.9' }))
+    }
+
+    function EyeIcon({ open }) {
+      const box = { width: 16, height: 16, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round' }
+      return open
+        ? h('svg', box, h('path', { d: 'M2 12s3.6-6.5 10-6.5S22 12 22 12s-3.6 6.5-10 6.5S2 12 2 12z' }), h('circle', { cx: 12, cy: 12, r: 2.6 }))
+        : h('svg', box, h('path', { d: 'M3 3l18 18' }), h('path', { d: 'M10.6 6.1A11 11 0 0 1 12 6c6.4 0 10 6 10 6a17.5 17.5 0 0 1-3.2 4' }), h('path', { d: 'M6.4 7.9A17.3 17.3 0 0 0 2 12s3.6 6 10 6a10.9 10.9 0 0 0 4.3-.9' }))
+    }
+
+    /** A small pill that opens a menu — the panel's only interactive control. */
+    function Picker({ value, options, onPick }) {
+      const [open, setOpen] = React.useState(false)
+      React.useEffect(() => {
+        if (!open) return undefined
+        const close = () => setOpen(false)
+        document.addEventListener('mousedown', close)
+        return () => document.removeEventListener('mousedown', close)
+      }, [open])
+      return h('div', { className: 'dshm-pickwrap', onMouseDown: (e) => e.stopPropagation() },
+        h('button', { className: 'dshm-pick', type: 'button', onClick: () => setOpen((v) => !v) },
+          h('span', null, value), h('i', { className: 'car' })),
+        open
+          ? h('div', { className: 'dshm-menu' }, options.map((option) =>
+              h('button', {
+                key: option.id, type: 'button', disabled: option.disabled === true,
+                'data-on': String(option.current === true),
+                onClick: () => { setOpen(false); onPick(option) },
+              },
+                h('span', null, option.label),
+                option.hint ? h('span', { className: 'off' }, option.hint) : null)))
+          : null)
+    }
+
     function KeysTab({ status, onSaved }) {
       const providers = status?.providers ?? []
       const [drafts, setDrafts] = React.useState({})
       const [saving, setSaving] = React.useState(null)
       const [error, setError] = React.useState(null)
       const [adding, setAdding] = React.useState(false)
+      const [reveal, setReveal] = React.useState({})
       const [form, setForm] = React.useState({ label: '', baseUrl: '', model: '', key: '' })
+      const toggleReveal = (id) => setReveal((all) => ({ ...all, [id]: all[id] !== true }))
 
       const draftOf = (provider) => ({
         baseUrl: provider.baseUrl ?? '',
@@ -213,6 +291,8 @@ window.__ModuleLoader__.load({
       }
 
       return h('div', null,
+        h('div', { className: 'dshm-shield' }, h(ShieldIcon),
+          h('span', null, 'Key 只写进本机 ~/.dsh/secrets/media-tools.env（权限 600），不会上传，也不会用于生成以外的用途。')),
         h('div', { className: 'dshm-keys' },
           providers.map((provider) => {
             const draft = draftOf(provider)
@@ -226,7 +306,10 @@ window.__ModuleLoader__.load({
                 h('div', null, h('label', { className: 'dshm-lab' }, '模型'),
                   h('input', { className: 'dshm-input', value: draft.model, onChange: (e) => edit(provider.id, { model: e.target.value }) }))),
               h('div', null, h('label', { className: 'dshm-lab' }, provider.configured ? 'API Key（留空表示不改）' : 'API Key'),
-                h('input', { className: 'dshm-input', type: 'password', placeholder: provider.configured ? '••••••••' : '粘贴你的 Key', value: draft.key, onChange: (e) => edit(provider.id, { key: e.target.value }) })),
+                h('div', { className: 'dshm-keywrap' },
+                  h('input', { className: 'dshm-input', type: reveal[provider.id] === true ? 'text' : 'password', placeholder: provider.configured ? '••••••••' : '粘贴你的 Key', value: draft.key, onChange: (e) => edit(provider.id, { key: e.target.value }) }),
+                  h('button', { className: 'dshm-eye', type: 'button', title: reveal[provider.id] === true ? '隐藏' : '显示', onClick: () => toggleReveal(provider.id) },
+                    h(EyeIcon, { open: reveal[provider.id] === true })))),
               h('div', { className: 'dshm-kfoot' },
                 provider.docs
                   ? h('a', { href: provider.docs, target: '_blank', rel: 'noreferrer' }, '获取 Key ↗')
@@ -245,14 +328,16 @@ window.__ModuleLoader__.load({
                 h('div', null, h('label', { className: 'dshm-lab' }, '地址'),
                   h('input', { className: 'dshm-input', placeholder: 'https://api.example.com/v1', value: form.baseUrl, onChange: (e) => setForm({ ...form, baseUrl: e.target.value }) })),
                 h('div', null, h('label', { className: 'dshm-lab' }, 'API Key'),
-                  h('input', { className: 'dshm-input', type: 'password', value: form.key, onChange: (e) => setForm({ ...form, key: e.target.value }) })),
+                  h('div', { className: 'dshm-keywrap' },
+                    h('input', { className: 'dshm-input', type: reveal.custom === true ? 'text' : 'password', value: form.key, onChange: (e) => setForm({ ...form, key: e.target.value }) }),
+                    h('button', { className: 'dshm-eye', type: 'button', title: reveal.custom === true ? '隐藏' : '显示', onClick: () => toggleReveal('custom') },
+                      h(EyeIcon, { open: reveal.custom === true })))),
                 h('div', { className: 'dshm-kfoot' },
                   h('a', { href: '#', onClick: (e) => { e.preventDefault(); setAdding(false) } }, '取消'),
                   h('button', { className: 'dshm-save', disabled: saving === 'custom', onClick: addCustom },
                     saving === 'custom' ? '保存中…' : '添加')))
             : h('button', { className: 'dshm-addrow', onClick: () => setAdding(true) }, '＋ 添加自定义提供方')),
-        error !== null ? h('div', { className: 'dshm-err' }, error) : null,
-        h('div', { className: 'dshm-hint' }, 'Key 写进本机 ~/.dsh/secrets/media-tools.env（权限 600），技能和面板共用同一份。'))
+        error !== null ? h('div', { className: 'dshm-err' }, error) : null)
     }
 
     function MediaPage() {
@@ -264,6 +349,8 @@ window.__ModuleLoader__.load({
       const [error, setError] = React.useState(null)
       const [works, setWorks] = React.useState(loadWorks)
       const [current, setCurrent] = React.useState(() => loadWorks()[0] ?? null)
+      const [providerId, setProviderId] = React.useState('')
+      const [ratio, setRatio] = React.useState('16:9')
 
       const refresh = React.useCallback(() => {
         setStatusError(null)
@@ -277,17 +364,21 @@ window.__ModuleLoader__.load({
       const usedToday = works.filter((work) => new Date(work.at).toDateString() === today).length
       const left = Math.max(0, limit - usedToday)
       const empty = prompt.trim() === ''
-      const model = status?.providers?.find((p) => p.configured)?.label ?? '未配置密钥'
+      const imageProviders = (status?.providers ?? []).filter((provider) => String(provider.role ?? '').startsWith('生图'))
+      const active = imageProviders.find((provider) => provider.id === providerId && provider.configured)
+        ?? imageProviders.find((provider) => provider.configured)
+        ?? null
+      const size = (RATIOS.find(([id]) => id === ratio) ?? RATIOS[1])[1]
+      const sizeLabel = size.replace('x', '×')
 
       const generate = React.useCallback(async () => {
         if (busy || empty || left === 0) return
         setBusy(true); setError(null)
         try {
-          const size = '16:9'
-          const result = await api('/generate', { method: 'POST', body: JSON.stringify({ prompt, size }) })
+          const result = await api('/generate', { method: 'POST', body: JSON.stringify({ prompt, size, provider: active?.id ?? '' }) })
           const work = {
             id: String(Date.now()), title: titleOf(prompt), prompt, size,
-            model, at: Date.now(),
+            model: result.model ?? active?.label ?? '未知模型', at: Date.now(),
             src: `/media/file?p=${encodeURIComponent(result.file)}`,
           }
           const next = [work, ...works]
@@ -297,7 +388,7 @@ window.__ModuleLoader__.load({
         } finally {
           setBusy(false)
         }
-      }, [busy, empty, left, prompt, works, model])
+      }, [busy, empty, left, prompt, works, active, size])
 
       const head = h('div', { className: 'dshm-head' },
         h('div', null,
@@ -334,9 +425,26 @@ window.__ModuleLoader__.load({
               onChange: (e) => setPrompt(e.target.value),
               onKeyDown: (e) => { if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') generate() },
             }),
-            h('div', { className: 'dshm-row' },
-              h('b', null, model), h('span', { className: 'dshm-dot' }), h('span', null, '16:9'),
-              h('span', { className: 'dshm-dot' }), h('span', null, '1024×576')),
+            h('div', { className: 'dshm-pickers' },
+              h(Picker, {
+                value: active !== null ? active.label : '未配置模型',
+                options: imageProviders.length === 0
+                  ? [{ id: 'none', label: '先去「生图 Key」配一个', disabled: true }]
+                  : imageProviders.map((provider) => ({
+                      id: provider.id,
+                      label: provider.label,
+                      current: active !== null && active.id === provider.id,
+                      hint: provider.configured ? provider.model : '未配置',
+                      disabled: !provider.configured,
+                    })),
+                onPick: (option) => setProviderId(option.id),
+              }),
+              h(Picker, {
+                value: ratio,
+                options: RATIOS.map(([id, px]) => ({ id, label: id, current: id === ratio, hint: px.replace('x', '×') })),
+                onPick: (option) => setRatio(option.id),
+              }),
+              h('span', { className: 'dshm-size' }, sizeLabel)),
             h('button', { className: 'dshm-cta', disabled: busy || empty || left === 0, onClick: generate },
               busy ? '生成中…' : left === 0 ? '本次配额已用完' : '生成'),
             h('div', { className: 'dshm-hint' }, '⌘⏎ 直接生成。结果只写进本机工作区，不会上传。')),

package/index.js

@@ -121,7 +121,7 @@ const MEDIA_PREFIX = '/media'
 const PROVIDERS = [
   {
     id: 'sensenova', label: 'SenseNova U1 Fast', env: 'SENSENOVA_API_KEY', role: '生图 · 主用',
-    baseUrl: 'https://api.sensenova.cn/v1', model: 'sense-nova-u1-fast',
+    baseUrl: 'https://token.sensenova.ai/v1', model: 'sensenova-u1-fast',
     docs: 'https://platform.sensenova.cn',
   },
   {
@@ -305,12 +305,45 @@ export function originAllowed(req) {
   }
 }
 
+/** Resolve one provider id into the env generate.py needs; throws a readable reason. */
+export function resolveProvider(id) {
+  const settings = readSettings()
+  const status = mediaStatus()
+  const candidates = status.providers.filter((provider) => provider.role.startsWith('生图'))
+  const wanted = candidates.find((provider) => provider.id === id)
+  const target = wanted ?? candidates.find((provider) => provider.configured)
+  if (target === undefined) throw new Error('还没有可用的生图 Key，先去「生图 Key」配置一个。')
+  if (!target.configured) throw new Error(`${target.label} 还没配置 Key。`)
+  if (target.custom) {
+    const row = (Array.isArray(settings.custom) ? settings.custom : []).find((item) => item.id === target.id)
+    if (row === undefined || row.key === undefined || row.key === '') throw new Error(`${target.label} 还没配置 Key。`)
+    return {
+      label: target.label,
+      model: target.model,
+      env: {
+        MEDIA_API_URL: joinEndpoint(row.baseUrl),
+        MEDIA_API_KEY: row.key,
+        MEDIA_MODEL: target.model,
+      },
+    }
+  }
+  return { label: target.label, model: target.model, env: { MEDIA_PROVIDER: target.id, MEDIA_MODEL: target.model } }
+}
+
+/** Append the images path unless the user already pasted a full endpoint. */
+export function joinEndpoint(baseUrl) {
+  const trimmed = String(baseUrl ?? '').trim().replace(/\/+$/, '')
+  if (trimmed === '') return ''
+  if (/\/images\/generations$/.test(trimmed)) return trimmed
+  return `${trimmed}/images/generations`
+}
+
 /** Run the same `generate.py` the media-tools skill runs — one implementation. */
-export function runGenerate({ prompt, size, out, timeoutMs = 180_000 }) {
+export function runGenerate({ prompt, size, out, env = {}, timeoutMs = 180_000 }) {
   const script = fileURLToPath(new URL('./skills/media-tools/scripts/generate.py', import.meta.url))
   return new Promise((resolve) => {
     let stderr = ''
-    const child = spawn('python3', [script, prompt, out, size], { cwd: dirname(script) })
+    const child = spawn('python3', [script, prompt, out, size], { cwd: dirname(script), env: { ...process.env, ...env } })
     const timer = setTimeout(() => child.kill('SIGTERM'), timeoutMs)
     child.stderr.on('data', (chunk) => { stderr += String(chunk) })
     child.on('error', (error) => { clearTimeout(timer); resolve({ ok: false, message: error.message }) })
@@ -390,10 +423,19 @@ export function createMediaHandler({ workspaceRoot } = {}) {
         return
       }
       const size = String(parsed.size ?? '1024x1024')
+      let provider
+      try {
+        provider = resolveProvider(String(parsed.provider ?? ''))
+      } catch (error) {
+        res.writeHead(400, { 'content-type': 'application/json; charset=utf-8' })
+        res.end(JSON.stringify({ ok: false, message: error.message }))
+        return
+      }
       const dir = join(root(), 'uploads', 'media')
       mkdirSync(dir, { recursive: true })
       const out = join(dir, `${Date.now()}.png`)
-      const result = await runGenerate({ prompt, size, out })
+      const result = await runGenerate({ prompt, size, out, env: provider.env })
+      if (result.ok) result.model = provider.label
       res.writeHead(result.ok ? 200 : 502, { 'content-type': 'application/json; charset=utf-8' })
       res.end(JSON.stringify(result))
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-media-skills",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Free image reading and generation skills for DeepSeek Harness v0.1.6+ (runtime-verified on desktop 0.2.0-rc.2; source-checked against dsh-v0.2.1-alpha.2): visual QA, illustration generation, provider fallback, and no bundled keys.",
   "type": "module",
   "main": "index.js",

package/skills/media-tools/SKILL.md

@@ -5,7 +5,7 @@ description: "图片生成。用户要求生成图片、插画、头像、封面
 
 # Media Tools（图片生成）
 
-通过用户自行配置的服务商生成图片素材。优先使用 SenseNova U1 Fast；未配置 SenseNova key 时，使用 SiliconFlow Kolors。
+通过用户自行配置的服务商生成图片素材。优先使用 SenseNova U1 Fast；未配置 SenseNova key 时，使用 SiliconFlow Kolors。面板里配置的自定义提供方（任意 OpenAI 兼容 `/images/generations`）也能用。
 
 ## 用法
 
@@ -27,6 +27,22 @@ python3 scripts/generate.py "简洁科技感产品发布会背景，深蓝渐变
 - SiliconFlow 会把第三参数作为 `image_size` 传给 Kolors。
 - 缺省尺寸为 `1024x1024`。
 
+## 选择服务商
+
+脚本默认按 key 是否存在自动挑。要指定服务商，用环境变量：
+
+```bash
+MEDIA_PROVIDER=siliconflow python3 scripts/generate.py "..." out.png 16:9   # 指定内置服务商
+MEDIA_MODEL=other-model    python3 scripts/generate.py "..." out.png 16:9   # 换模型 ID
+
+# 任意 OpenAI 兼容端点（面板里的「自定义提供方」走的就是这条）
+MEDIA_API_URL=https://api.example.com/v1/images/generations \
+MEDIA_API_KEY=sk-... MEDIA_MODEL=my-model \
+python3 scripts/generate.py "..." out.png 1024x1024
+```
+
+自定义端点按 OpenAI 兼容格式发送 `{"model","prompt","size","n"}`，接受 `data[0].url`、`data[0].b64_json`、`images[0].url` 三种返回。
+
 ## 密钥来源
 
 按顺序读取：

package/skills/media-tools/scripts/generate.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python3
-"""Generate images via SenseNova U1 Fast or SiliconFlow Kolors.
+"""Generate images via SenseNova U1 Fast, SiliconFlow Kolors, or any custom endpoint.
 
 Provider selection:
-1. If SENSENOVA_API_KEY is set, use SenseNova U1 Fast (https://token.sensenova.ai).
-2. Otherwise, if SILICONFLOW_API_KEY is set, use SiliconFlow Kolors.
+1. MEDIA_API_URL + MEDIA_API_KEY set  -> that OpenAI-compatible /images/generations endpoint.
+2. MEDIA_PROVIDER=sensenova|siliconflow -> that built-in, its own key.
+3. Neither set -> SENSENOVA_API_KEY wins, else SILICONFLOW_API_KEY.
+MEDIA_MODEL overrides the model id in every case.
 """
 import json, os, sys, urllib.request
 from pathlib import Path
@@ -69,8 +71,8 @@ def sensenova_size(size):
     except (ValueError, ZeroDivisionError):
         return "2048x2048"
 
-def generate_sensenova(prompt, out, size):
-    body = {"model": SENSENOVA_MODEL, "prompt": prompt, "size": sensenova_size(size), "n": 1}
+def generate_sensenova(prompt, out, size, model=None):
+    body = {"model": model or SENSENOVA_MODEL, "prompt": prompt, "size": sensenova_size(size), "n": 1}
     req = urllib.request.Request(SENSENOVA_URL,
         data=json.dumps(body).encode(),
         headers={"Content-Type": "application/json", "Authorization": "Bearer " + load_key("SENSENOVA_API_KEY")}, method="POST")
@@ -80,8 +82,8 @@ def generate_sensenova(prompt, out, size):
     urllib.request.urlretrieve(url, out)
     print("done:", out)
 
-def generate_siliconflow(prompt, out, size):
-    body = {"model": SILICONFLOW_MODEL, "prompt": prompt, "image_size": size, "batch_size": 1}
+def generate_siliconflow(prompt, out, size, model=None):
+    body = {"model": model or SILICONFLOW_MODEL, "prompt": prompt, "image_size": size, "batch_size": 1}
     req = urllib.request.Request(SILICONFLOW_URL,
         data=json.dumps(body).encode(),
         headers={"Content-Type": "application/json", "Authorization": "Bearer " + load_key("SILICONFLOW_API_KEY")}, method="POST")
@@ -91,15 +93,71 @@ def generate_siliconflow(prompt, out, size):
     urllib.request.urlretrieve(url, out)
     print("done:", out)
 
+def ratio_to_size(size):
+    """Turn `16:9` shorthand into a WxH string; pass WxH through untouched."""
+    size = (size or "1024x1024").strip().lower()
+    if ":" not in size:
+        return size
+    try:
+        wr, hr = map(int, size.split(":"))
+    except ValueError:
+        return "1024x1024"
+    long_side = 1024
+    if wr >= hr:
+        return f"{long_side}x{max(64, round(long_side * hr / wr))}"
+    return f"{max(64, round(long_side * wr / hr))}x{long_side}"
+
+def pick_image_url(payload):
+    """Accept the shapes OpenAI-compatible image endpoints return."""
+    for container in ("data", "images", "output"):
+        items = payload.get(container) if isinstance(payload, dict) else None
+        if isinstance(items, list) and items and isinstance(items[0], dict):
+            first = items[0]
+            if first.get("url"):
+                return first["url"]
+            if first.get("b64_json"):
+                return "data:image/png;base64," + first["b64_json"]
+    raise SystemExit("接口没有返回图片地址：" + json.dumps(payload, ensure_ascii=False)[:300])
+
+def generate_custom(prompt, out, size):
+    """Any OpenAI-compatible /images/generations endpoint the panel configured."""
+    url = os.environ.get("MEDIA_API_URL", "").strip()
+    key = os.environ.get("MEDIA_API_KEY", "").strip()
+    model = os.environ.get("MEDIA_MODEL", "").strip()
+    if not url or not key:
+        sys.exit("自定义提供方缺少地址或 Key，请在面板的「生图 Key」里补上。")
+    body = {"model": model, "prompt": prompt, "size": ratio_to_size(size), "n": 1}
+    req = urllib.request.Request(url,
+        data=json.dumps(body).encode(),
+        headers={"Content-Type": "application/json", "Authorization": "Bearer " + key}, method="POST")
+    with urllib.request.urlopen(req, timeout=300) as r:
+        data = json.load(r)
+    target = pick_image_url(data)
+    if target.startswith("data:"):
+        import base64
+        Path(out).write_bytes(base64.b64decode(target.split(",", 1)[1]))
+    else:
+        urllib.request.urlretrieve(target, out)
+    print("done:", out)
+
 def main():
     if len(sys.argv) < 3:
         sys.exit("用法: generate.py <prompt> <out.png> [size=1024x1024]")
     prompt, out = sys.argv[1], sys.argv[2]
     size = sys.argv[3] if len(sys.argv) > 3 else "1024x1024"
-    if get_key("SENSENOVA_API_KEY"):
-        generate_sensenova(prompt, out, size)
+    provider = os.environ.get("MEDIA_PROVIDER", "").strip()
+    model = os.environ.get("MEDIA_MODEL", "").strip() or None
+
+    if os.environ.get("MEDIA_API_URL"):
+        generate_custom(prompt, out, size)
+    elif provider == "siliconflow":
+        generate_siliconflow(prompt, out, size, model)
+    elif provider == "sensenova":
+        generate_sensenova(prompt, out, size, model)
+    elif get_key("SENSENOVA_API_KEY"):
+        generate_sensenova(prompt, out, size, model)
     elif get_key("SILICONFLOW_API_KEY"):
-        generate_siliconflow(prompt, out, size)
+        generate_siliconflow(prompt, out, size, model)
     else:
         sys.exit("缺少图片生成 Key：请配置 SENSENOVA_API_KEY 或 SILICONFLOW_API_KEY（环境变量或 ~/.dsh/secrets/media-tools.env）")