Upload 21 files

backend/config.py

@@ -23,13 +23,10 @@ class AppConfig(BaseModel):
     legacy_uc: bool = False
 
     # 通用配置
-    port: int = 9180
+    port: int = 7860
     save_output: bool = True
     # 输出根目录（默认：项目根/output）
     output_dir: str = str(Path(__file__).resolve().parent.parent / "output")
-    # 颜色方案：auto | bamboo | custom（前端即时应用）
-    color_scheme: str = "auto"
-    custom_primary: Optional[str] = None
     # 提示音配置
     sound_enabled: bool = False
     sound_url: Optional[str] = "/ring/ring.mp3"

backend/server.py

@@ -24,8 +24,15 @@ def _open_browser_later(url: str, delay: float = 1.5):
 
 if __name__ == "__main__":
     cfg = load_config()
-    port = int(cfg.port or 11451)
-    url = f"http://127.0.0.1:{port}"
-    _open_browser_later(url)
-    # 直接传 app 实例，避免模块路径问题
-    uvicorn.run(app, host="127.0.0.1", port=port, reload=False)
+    # HF 环境使用 0.0.0.0，默认端口 7860
+    port = int(cfg.port or 7860)
+    host = "0.0.0.0"
+    
+    print(f"[New NAI HF] 服务运行于 http://{host}:{port}")
+    print(f"[New NAI HF] HF Space 通过公共 URL 访问")
+    
+    # HF 环境不自动打开浏览器
+    # _open_browser_later(url)
+    
+    # 使用 0.0.0.0 监听以便 HF Space 外部访问
+    uvicorn.run(app, host=host, port=port, reload=False)

frontend/assets/app.js

@@ -18,15 +18,6 @@
     const btnMobile = byId('theme-toggle-mobile');
     if (btn) btn.textContent = text;
     if (btnMobile) btnMobile.textContent = text;
-    
-    // 主题切换时重新应用背景方案
-    const schemeSel = byId('cfg-color-scheme');
-    const customColor = byId('cfg-custom-primary');
-    if (schemeSel) {
-      const scheme = schemeSel.value || 'auto';
-      const custom = customColor?.value || '#7ba23f';
-      applyBackgroundScheme(scheme, custom);
-    }
   }
   const initialTheme = localStorage.getItem('theme') || 'dark';
   applyTheme(initialTheme);
@@ -102,31 +93,6 @@
   }
   setupSidebar();
  
-  // ===== 背景方案处理（非字体/主按钮）：根据配置切换页面背景 =====
-  function setBackground(color) {
-    // 统一覆盖背景变量，立即生效（无刷新）
-    rootEl.style.setProperty("--bg", color);
-  }
-  function applyBackgroundScheme(scheme, custom) {
-    const theme = rootEl.getAttribute("data-theme") || "dark";
-    if (scheme === "custom" && custom) {
-      setBackground(custom);
-      return;
-    }
-    if (scheme === "bamboo") {
-      setBackground("#7ba23f"); // 竹子色
-      return;
-    }
-    // auto：浅=白 深=深灰
-    if (theme === "light") setBackground("#ffffff");
-    else setBackground("#121315");
-  }
-  function applyAccentFromConfig(cfg) {
-    const scheme = cfg?.color_scheme || "auto";
-    const custom = cfg?.custom_primary || "";
-    applyBackgroundScheme(scheme, custom);
-  }
- 
   // Tabs（桌面端和侧边栏都要同步）
   $$(".tab-btn[data-tab]").forEach((btn) => {
     btn.addEventListener("click", () => {
@@ -186,13 +152,9 @@
       byId("cfg-uc-preset").value = cfg.uc_preset ?? "";
       byId("cfg-quality-toggle").checked = !!cfg.quality_toggle;
       byId("cfg-legacy-uc").checked = !!cfg.legacy_uc;
-      byId("cfg-port").value = cfg.port ?? 9180;
+      byId("cfg-port").value = cfg.port ?? 7860;
       byId("cfg-save-output").checked = !!cfg.save_output;
       if (byId("cfg-output-dir")) byId("cfg-output-dir").value = cfg.output_dir ?? "";
-      // 颜色配置（带预览）
-      if (byId("cfg-color-scheme")) byId("cfg-color-scheme").value = cfg.color_scheme ?? "auto";
-      if (byId("cfg-custom-primary")) byId("cfg-custom-primary").value = cfg.custom_primary ?? "#7ba23f";
-      applyAccentFromConfig(cfg);
 
       // 提示音配置
       soundEnabled = !!cfg.sound_enabled;
@@ -229,8 +191,6 @@
       port: byId("cfg-port").value ? Number(byId("cfg-port").value) : null,
       save_output: byId("cfg-save-output").checked,
       output_dir: nullIfEmpty(byId("cfg-output-dir")?.value),
-      color_scheme: nullIfEmpty(byId("cfg-color-scheme")?.value),
-      custom_primary: nullIfEmpty(byId("cfg-custom-primary")?.value),
       sound_enabled: !!soundEnabled,
       sound_url: nullIfEmpty(soundUrl),
     };
@@ -693,19 +653,7 @@
       }
     });
   }
-  // 颜色方案即时预览（无需保存即可体验）
-  const schemeSel = byId("cfg-color-scheme");
-  const customColor = byId("cfg-custom-primary");
-  if (schemeSel) {
-    schemeSel.addEventListener("change", () => {
-      applyBackgroundScheme(schemeSel.value || "auto", customColor?.value || "");
-    });
-  }
-  if (customColor) {
-    customColor.addEventListener("input", () => {
-      applyBackgroundScheme("custom", customColor.value || "#7ba23f");
-    });
-  }
+  
   byId("btn-t2i").addEventListener("click", handleT2I);
   byId("btn-i2i").addEventListener("click", handleI2I);
   byId("btn-inpaint").addEventListener("click", handleInpaint);

frontend/index.html

@@ -120,18 +120,6 @@
             <span>保存目录</span>
             <input id="cfg-output-dir" type="text" placeholder="例如：D:\Pictures\NAI 输出（留空=默认 output）" />
           </label>
-          <label>
-            <span>背景方案</span>
-            <select id="cfg-color-scheme">
-              <option value="auto">自动（浅=白/深=深灰）</option>
-              <option value="bamboo">竹子色</option>
-              <option value="custom">自定义</option>
-            </select>
-          </label>
-          <label>
-            <span>自定义背景色</span>
-            <input id="cfg-custom-primary" type="color" value="#7ba23f" />
-          </label>
         </div>
         <div class="actions">
           <button id="btn-load-config">读取配置</button>

server.js

@@ -86,9 +86,7 @@ const DEFAULT_CONFIG = {
   port: 7860,
   save_output: true,
   output_dir: path.join(ROOT, 'output'),
-  // UI 配色与提示音（与前端一致）
-  color_scheme: "auto",
-  custom_primary: null,
+  // 提示音配置
   sound_enabled: false,
   sound_url: "/ring/ring.mp3"
 };
@@ -144,35 +142,41 @@ function sleep(ms) {
 
 // Windows: 使用 COM Shell.Application 弹出目录选择器
 async function winBrowseForFolder() {
+  // 方案1：PowerShell COM
   try {
     const psCmd = `$f=(New-Object -ComObject Shell.Application).BrowseForFolder(0,"选择保存目录",0); if($f){$f.Self.Path}`;
     const { stdout } = await runSpawn('powershell.exe', ['-NoProfile', '-Command', psCmd], { timeout: 60000 });
     const out = (stdout || '').trim();
-    if (out) return out;
+    if (out && out.length > 0) return out;
   } catch (e) {
-    // ignore, fallback to VBS
+    // 继续尝试下一个方案
   }
 
-  // VBScript 兜底：cscript //nologo temp.vbs
-  const vbs = [
-    'Set sh = CreateObject("Shell.Application")',
-    'Set f = sh.BrowseForFolder(0, "选择保存目录", 0)',
-    'If (Not f Is Nothing) Then',
-    '  WScript.Echo f.Self.Path',
-    'End If'
-  ].join('\n');
-
-  const osTmp = os.tmpdir();
-  const vbsPath = path.join(osTmp, `browse_${Date.now()}.vbs`);
-  fs.writeFileSync(vbsPath, vbs, 'utf-8');
+  // 方案2：VBScript 兜底
   try {
-    const { stdout } = await runSpawn('cscript.exe', ['//nologo', vbsPath], { timeout: 60000 });
-    const out = (stdout || '').trim();
-    if (out) return out;
-  } finally {
-    try { fs.unlinkSync(vbsPath); } catch {}
+    const vbs = [
+      'Set sh = CreateObject("Shell.Application")',
+      'Set f = sh.BrowseForFolder(0, "选择保存目录", 0)',
+      'If (Not f Is Nothing) Then',
+      '  WScript.Echo f.Self.Path',
+      'End If'
+    ].join('\n');
+
+    const osTmp = os.tmpdir();
+    const vbsPath = path.join(osTmp, `browse_${Date.now()}.vbs`);
+    fs.writeFileSync(vbsPath, vbs, 'utf-8');
+    try {
+      const { stdout } = await runSpawn('cscript.exe', ['//nologo', vbsPath], { timeout: 60000 });
+      const out = (stdout || '').trim();
+      if (out && out.length > 0) return out;
+    } finally {
+      try { fs.unlinkSync(vbsPath); } catch {}
+    }
+  } catch (e) {
+    // 继续尝试下一个方案
   }
-  throw new Error('Windows 目录选择失败');
+
+  throw new Error('Windows 目录选择失败：所有方案均失败');
 }
 
 async function darwinChooseFolder() {
@@ -204,14 +208,24 @@ async function pickDirectory() {
 
 async function openDirectory(p) {
   const sys = os.platform();
+  const absPath = path.resolve(p);
+  
+  // 确保目录存在
+  await fse.ensureDir(absPath);
+  
   if (sys === 'win32') {
-    // 使用 explorer 打开目录；或 start 命令
-    await runSpawn('explorer.exe', [p]);
+    // Windows: 使用 explorer
+    try {
+      await runSpawn('explorer.exe', [absPath]);
+    } catch (e) {
+      // 回退方案：使用 cmd start
+      spawn('cmd', ['/c', 'start', '', absPath], { detached: true, stdio: 'ignore' }).unref();
+    }
   } else if (sys === 'darwin') {
-    await runSpawn('open', [p]);
+    await runSpawn('open', [absPath]);
   } else {
-    // linux
-    await runSpawn('xdg-open', [p]);
+    // Linux
+    await runSpawn('xdg-open', [absPath]);
   }
 }
 
@@ -388,32 +402,35 @@ function resolvePort() {
 }
 
 const PORT = resolvePort();
+// HF 必须使用 0.0.0.0 以便外部访问
 const HOST = process.env.HOST || '0.0.0.0';
 
 const server = http.createServer(app);
 server.listen(PORT, HOST, () => {
-  const url = `http://${HOST}:${PORT}`;
-  // 模拟 Python 版本的延迟打开浏览器（仅本地）
-  if (HOST === '127.0.0.1' || HOST === '0.0.0.0') {
-    const shouldOpen = process.env.AUTO_OPEN_BROWSER !== '0';
-    if (shouldOpen) {
-      setTimeout(() => {
-        try {
-          const platform = os.platform();
-          if (platform === 'win32') {
-            // start "" "url"
-            spawn('cmd', ['/c', 'start', '', url], { detached: true, stdio: 'ignore' }).unref();
-          } else if (platform === 'darwin') {
-            spawn('open', [url], { detached: true, stdio: 'ignore' }).unref();
-          } else {
-            spawn('xdg-open', [url], { detached: true, stdio: 'ignore' }).unref();
-          }
-        } catch { /* ignore */ }
-      }, 1500);
-    }
+  // HF 环境显示 0.0.0.0，但实际通过 Space URL 访问
+  const displayUrl = HOST === '0.0.0.0' ? `http://0.0.0.0:${PORT}` : `http://${HOST}:${PORT}`;
+  
+  // HF 环境不自动打开浏览器
+  const shouldOpen = process.env.AUTO_OPEN_BROWSER !== '0' && HOST === '127.0.0.1';
+  if (shouldOpen) {
+    setTimeout(() => {
+      try {
+        const localUrl = `http://127.0.0.1:${PORT}`;
+        const platform = os.platform();
+        if (platform === 'win32') {
+          spawn('cmd', ['/c', 'start', '', localUrl], { detached: true, stdio: 'ignore' }).unref();
+        } else if (platform === 'darwin') {
+          spawn('open', [localUrl], { detached: true, stdio: 'ignore' }).unref();
+        } else {
+          spawn('xdg-open', [localUrl], { detached: true, stdio: 'ignore' }).unref();
+        }
+      } catch { /* ignore */ }
+    }, 1500);
   }
+  
   // eslint-disable-next-line no-console
-  console.log(`[New NAI] Express server is running at ${url}`);
+  console.log(`[New NAI HF] 服务运行于 ${displayUrl}`);
+  console.log(`[New NAI HF] ${HOST === '0.0.0.0' ? 'HF Space 通过公共 URL 访问' : '按 Ctrl+C 停止服务'}`);
 });
 
 // 导出 app 以便测试或其他入口使用