myagent-ai 1.15.63 → 1.15.65

package/core/deps_checker.py

@@ -12,7 +12,7 @@ core/deps_checker.py - 自动依赖检测与安装
 
 依赖映射:
   核心功能: openai, aiohttp, requests
-  搜索技能: duckduckgo_search, bs4
+  搜索技能: bs4
   系统技能: psutil
   托盘功能: pystray, PIL
   语音合成: edge_tts
@@ -62,7 +62,6 @@ DEPENDENCIES: List[DepInfo] = [
     DepInfo("requests", "requests", "2.31.0", "core", "all"),
 
     # ── 搜索技能 ──
-    DepInfo("duckduckgo_search", "duckduckgo-search", "6.0.0", "search", "all"),
     DepInfo("bs4", "beautifulsoup4", "4.12.0", "search", "all"),
 
     # ── 系统技能 ──

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.15.63",
+  "version": "1.15.65",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/requirements.txt

@@ -11,7 +11,6 @@ requests>=2.31.0
 # ============================================================
 # 技能系统 - 搜索
 # ============================================================
-duckduckgo-search>=6.0.0
 beautifulsoup4>=4.12.0
 psutil>=5.9.0
 

package/start.js

@@ -171,7 +171,7 @@ function pipInstall(venvPython, pkgSpec, quiet) {
   for (const getMirror of MIRRORS) {
     try {
       const mirrorArgs = getMirror();
-      const args = ["-m", "pip", "install", "--disable-pip-version-check"];
+      const args = ["-m", "pip", "install", "--disable-pip-version-check", "--prefer-binary"];
       if (mirrorArgs.length) args.push(...mirrorArgs);
       if (quiet) args.push("-q");
       args.push(pkgSpec);
@@ -180,7 +180,6 @@ function pipInstall(venvPython, pkgSpec, quiet) {
       });
       return { ok: true, err: "" };
     } catch (e) {
-      // 保留最后 5 行 stderr 作为错误信息
       const raw = (e.stderr || "");
       lastErr = raw.trim().split("\n").slice(-5).join("\n").trim() || e.message || "unknown error";
     }
@@ -188,6 +187,35 @@ function pipInstall(venvPython, pkgSpec, quiet) {
   return { ok: false, err: lastErr };
 }
 
+/**
+ * 尝试安装包（带依赖），如果失败则尝试 --no-deps（裸装）
+ * 用于处理 openai→jiter 这类"主包能装但子依赖编译失败"的情况
+ */
+function pipInstallWithFallback(venvPython, pkgSpec, quiet) {
+  // 正常安装
+  const r1 = pipInstall(venvPython, pkgSpec, quiet);
+  if (r1.ok) return r1;
+
+  // 回退: --no-deps 安装主包，跳过编译失败的子依赖
+  for (const getMirror of MIRRORS) {
+    try {
+      const mirrorArgs = getMirror();
+      const args = ["-m", "pip", "install", "--disable-pip-version-check", "--prefer-binary", "--no-deps"];
+      if (mirrorArgs.length) args.push(...mirrorArgs);
+      if (quiet) args.push("-q");
+      args.push(pkgSpec);
+      execFileSync(venvPython, args, {
+        encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 180000,
+      });
+      return { ok: true, err: "(--no-deps)" };
+    } catch (e) {
+      const raw = (e.stderr || "");
+      lastErr = raw.trim().split("\n").slice(-5).join("\n").trim() || e.message || "unknown error";
+    }
+  }
+  return r1;
+}
+
 /**
  * 从 requirements.txt 解析包列表
  * @returns {string[]} 如 ["openai>=1.12.0", "aiohttp>=3.9.0", ...]
@@ -268,9 +296,10 @@ function installAllDeps(venvPython, pkgDir) {
     const isCore = CORE_DEPS.includes(baseName);
     process.stdout.write(`    [${idx}/${total}] ${pkg} ... `);
 
-    const result = pipInstall(venvPython, pkg, true);
+    const result = isCore ? pipInstallWithFallback(venvPython, pkg, true) : pipInstall(venvPython, pkg, true);
     if (result.ok) {
-      console.log("\x1b[32m✓\x1b[0m");
+      const note = result.err === "(--no-deps)" ? " \x1b[33m(部分子依赖跳过)\x1b[0m" : "";
+      console.log("\x1b[32m✓\x1b[0m" + note);
     } else {
       if (isCore) {
         console.log("\x1b[31m✗\x1b[0m");

package/web/api_server.py

@@ -5559,7 +5559,16 @@ class ApiServer:
         self._runner = web.AppRunner(self.app)
         await self._runner.setup()
         site = web.TCPSite(self._runner, host, port)
-        await site.start()
+        try:
+            await site.start()
+        except OSError as e:
+            if e.errno == 98 or "address already in use" in str(e).lower():
+                logger.error(f"端口 {port} 已被占用！")
+                logger.error(f"  可能是上次的 MyAgent 还在运行，请先关闭后再启动")
+                logger.error(f"  或者使用其他端口: myagent-ai web --port 8768")
+                logger.error(f"  查看占用端口的进程: lsof -i :{port}  或  netstat -tlnp | grep {port}")
+                raise SystemExit(1)
+            raise
         logger.info(f"管理后台: http://{host}:{port}/ui/")
 
     async def stop(self):