myagent-ai 1.2.2 → 1.3.1

package/agents/main_agent.py

@@ -428,6 +428,13 @@ class MainAgent(BaseAgent):
         # 浏览器技能需要网络
         if skill_name in ("browser_open", "browser_click", "browser_fill"):
             return "network"
+        # 浏览器扩展技能 - 截图/JS执行/导航/关闭
+        if skill_name in ("browser_screenshot", "browser_eval", "browser_navigate", "browser_close"):
+            return "network"
+        # 桌面 GUI 自动化技能 - 涉及系统级执行权限
+        if skill_name in ("screenshot", "mouse_click", "mouse_drag", "type_text",
+                          "hotkey", "window_list", "window_focus", "screen_element"):
+            return "execution"
         # 其他技能不需要特殊权限检查
         return None
 

package/core/deps_checker.py

@@ -0,0 +1,473 @@
+"""
+core/deps_checker.py - 自动依赖检测与安装
+==========================================
+开箱即用：启动时自动检测缺失依赖并安装，确保所有技能可直接使用。
+
+设计原则:
+  - 轻量化：仅检测实际需要的模块，不做全量 pip check
+  - 高效率：使用 importlib.util.find_spec 快速检测，0网络开销
+  - 自动修复：缺失时自动 pip install，无需用户干预
+  - 幂等安全：已安装的模块直接跳过，重复调用无副作用
+  - 平台适配：自动区分 Windows/macOS/Linux，跳过不适用的依赖
+
+依赖映射:
+  核心功能: openai, aiohttp, requests
+  搜索技能: duckduckgo_search, bs4, lxml
+  系统技能: psutil
+  托盘功能: pystray, PIL
+  语音合成: edge_tts
+  浏览器自动化: playwright (+ chromium 浏览器二进制)
+  桌面GUI自动化: mss, pynput, pygetwindow
+"""
+from __future__ import annotations
+
+import importlib.util
+import subprocess
+import sys
+import threading
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Dict, List, Optional, Set, Tuple
+
+from core.logger import get_logger
+
+logger = get_logger("myagent.deps")
+
+# 平台检测
+IS_MACOS = sys.platform == "darwin"
+IS_WINDOWS = sys.platform == "win32"
+IS_LINUX = sys.platform.startswith("linux")
+
+
+# ── 依赖定义 ──────────────────────────────────────────────
+
+@dataclass
+class DepInfo:
+    """单个依赖的信息"""
+    import_name: str          # Python import 名
+    pip_name: str             # pip install 名
+    min_version: str = ""     # 最低版本（可选）
+    category: str = "core"    # 分类：core/browser/gui/tts/tray/optional
+    platform: str = "all"     # 适用平台：all/windows/macos/linux
+    note: str = ""            # 安装说明（失败时展示给用户）
+
+
+# 所有需要自动管理的依赖
+DEPENDENCIES: List[DepInfo] = [
+    # ── 核心依赖 ──
+    DepInfo("openai", "openai", "1.12.0", "core", "all"),
+    DepInfo("aiohttp", "aiohttp", "3.9.0", "core", "all"),
+    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"),
+    DepInfo("lxml", "lxml", "5.0.0", "search", "all"),
+
+    # ── 系统技能 ──
+    DepInfo("psutil", "psutil", "5.9.0", "system", "all"),
+
+    # ── 系统托盘 ──
+    DepInfo("pystray", "pystray", "0.19.5", "tray", "all"),
+    DepInfo("PIL", "Pillow", "10.0.0", "tray", "all"),
+
+    # ── 语音合成 ──
+    DepInfo("edge_tts", "edge-tts", "6.1.0", "tts", "all"),
+
+    # ── 浏览器自动化 (Playwright) ──
+    DepInfo("playwright", "playwright", "1.41.0", "browser", "all",
+            note="安装后还需运行: playwright install chromium"),
+
+    # ── 桌面 GUI 自动化 ──
+    DepInfo("mss", "mss", "9.0.0", "gui", "all",
+            note="跨平台屏幕截图库 (~1MB)"),
+    DepInfo("pynput", "pynput", "1.7.6", "gui", "all",
+            note="鼠标/键盘控制 (~500KB)"),
+    DepInfo("pygetwindow", "pygetwindow", "0.0.9", "gui", "windows_macos",
+            note="窗口管理 (仅 Windows/macOS)"),
+]
+
+
+# ── 检测与安装 ────────────────────────────────────────────
+
+def _is_platform_match(dep: DepInfo) -> bool:
+    """检查依赖是否适用于当前平台"""
+    if dep.platform == "all":
+        return True
+    if dep.platform == "windows" and IS_WINDOWS:
+        return True
+    if dep.platform == "macos" and IS_MACOS:
+        return True
+    if dep.platform == "linux" and IS_LINUX:
+        return True
+    if dep.platform == "windows_macos" and (IS_WINDOWS or IS_MACOS):
+        return True
+    return False
+
+
+def _is_module_available(import_name: str) -> bool:
+    """快速检测 Python 模块是否可导入（不实际导入，无副作用）"""
+    spec = importlib.util.find_spec(import_name)
+    return spec is not None
+
+
+def _get_python_executable() -> str:
+    """获取当前 Python 解释器路径"""
+    return sys.executable
+
+
+def _pip_install(pip_names: List[str], category: str = "") -> Tuple[bool, str]:
+    """
+    使用当前 Python 解释器执行 pip install。
+
+    Returns:
+        (success, message)
+    """
+    python = _get_python_executable()
+    packages = " ".join(pip_names)
+
+    # 构建安装命令
+    cmd = [python, "-m", "pip", "install", "--quiet"] + pip_names
+
+    # 处理 PEP668 (externally-managed-environment)
+    # 尝试: 1) 直接安装  2) --break-system-packages  3) 用户空间 --user
+    install_attempts = [
+        [python, "-m", "pip", "install", "--quiet", "--disable-pip-version-check"] + pip_names,
+        [python, "-m", "pip", "install", "--quiet", "--disable-pip-version-check",
+         "--break-system-packages"] + pip_names,
+        [python, "-m", "pip", "install", "--quiet", "--disable-pip-version-check",
+         "--user"] + pip_names,
+    ]
+
+    last_error = ""
+    for attempt_cmd in install_attempts:
+        try:
+            result = subprocess.run(
+                attempt_cmd,
+                capture_output=True,
+                text=True,
+                timeout=120,  # 2分钟超时
+            )
+            if result.returncode == 0:
+                return True, f"已安装: {packages}"
+            last_error = result.stderr.strip()
+            # 如果已经安装（满足要求），也算成功
+            if "Requirement already satisfied" in result.stdout or \
+               "Requirement already satisfied" in result.stderr:
+                return True, f"已就绪: {packages}"
+        except subprocess.TimeoutExpired:
+            last_error = "安装超时（120秒）"
+            continue
+        except Exception as e:
+            last_error = str(e)
+            continue
+
+    return False, f"安装失败: {packages} - {last_error}"
+
+
+def _install_playwright_browsers() -> Tuple[bool, str]:
+    """
+    安装 Playwright 浏览器二进制文件（Chromium）。
+    这是一个独立的步骤，因为 pip install playwright 只安装 Python 包，
+    浏览器二进制需要单独下载。
+    """
+    python = _get_python_executable()
+    try:
+        result = subprocess.run(
+            [python, "-m", "playwright", "install", "chromium"],
+            capture_output=True,
+            text=True,
+            timeout=300,  # 5分钟超时（浏览器较大）
+        )
+        if result.returncode == 0:
+            return True, "Chromium 浏览器已安装"
+        # 检查是否已经安装
+        if "Chromium" in result.stdout and "already" in result.stdout.lower():
+            return True, "Chromium 浏览器已就绪"
+        return False, f"Chromium 安装失败: {result.stderr[:200]}"
+    except subprocess.TimeoutExpired:
+        return False, "Chromium 安装超时（5分钟），请手动运行: playwright install chromium"
+    except Exception as e:
+        return False, f"Chromium 安装异常: {e}"
+
+
+def _check_version(import_name: str, min_version: str) -> bool:
+    """检查模块版本是否满足最低要求"""
+    if not min_version:
+        return True
+    try:
+        spec = importlib.util.find_spec(import_name)
+        if spec is None:
+            return False
+        mod = importlib.import_module(import_name)
+        ver = getattr(mod, "__version__", "0.0.0")
+        # 简单版本比较
+        from packaging.version import parse as parse_ver
+        return parse_ver(ver) >= parse_ver(min_version)
+    except Exception:
+        return True  # 无法获取版本时保守通过
+
+
+# ── 主流程 ────────────────────────────────────────────────
+
+def check_and_install_deps(
+    categories: Optional[Set[str]] = None,
+    auto_fix: bool = True,
+    silent: bool = False,
+) -> Dict[str, any]:
+    """
+    检测依赖并在缺失时自动安装。
+
+    Args:
+        categories: 要检查的依赖分类集合。
+                    None = 检查所有分类。
+                    例如: {"browser", "gui"} 只检查浏览器和GUI依赖。
+        auto_fix: 是否自动安装缺失的依赖（默认 True）。
+        silent: 是否静默模式，不打印日志（默认 False）。
+
+    Returns:
+        {
+            "checked": int,        # 检查的依赖数量
+            "available": int,      # 已安装的数量
+            "missing": int,        # 缺失的数量
+            "installed": int,      # 本次新安装的数量
+            "failed": int,         # 安装失败的数量
+            "skipped_platform": int,  # 因平台不匹配而跳过的数量
+            "details": {...},      # 每个依赖的状态
+            "playwright_browser": str,  # Chromium 状态
+        }
+    """
+    stats = {
+        "checked": 0,
+        "available": 0,
+        "missing": 0,
+        "installed": 0,
+        "failed": 0,
+        "skipped_platform": 0,
+        "details": {},
+        "playwright_browser": "not_checked",
+    }
+
+    # 按分类收集缺失的依赖，批量安装以减少 pip 调用次数
+    missing_by_category: Dict[str, List[str]] = {}  # category -> [pip_name, ...]
+    dep_pip_map: Dict[str, DepInfo] = {}  # pip_name -> DepInfo (用于记录安装状态)
+
+    # 第一遍：检测所有依赖
+    for dep in DEPENDENCIES:
+        # 平台过滤
+        if not _is_platform_match(dep):
+            stats["skipped_platform"] += 1
+            stats["details"][dep.import_name] = {
+                "status": "skipped",
+                "reason": f"平台不匹配 (需要: {dep.platform}, 当前: {sys.platform})",
+            }
+            continue
+
+        # 分类过滤
+        if categories and dep.category not in categories:
+            continue
+
+        stats["checked"] += 1
+
+        # 检测模块是否可用
+        if _is_module_available(dep.import_name):
+            stats["available"] += 1
+            stats["details"][dep.import_name] = {"status": "available"}
+            if not silent:
+                logger.debug(f"依赖已就绪: {dep.import_name}")
+            continue
+
+        # 缺失
+        stats["missing"] += 1
+        stats["details"][dep.import_name] = {
+            "status": "missing",
+            "pip_name": dep.pip_name,
+            "category": dep.category,
+        }
+
+        if dep.pip_name not in dep_pip_map:
+            dep_pip_map[dep.pip_name] = dep
+            missing_by_category.setdefault(dep.category, []).append(dep.pip_name)
+
+        if not silent:
+            logger.info(f"依赖缺失: {dep.import_name} (pip: {dep.pip_name}, 分类: {dep.category})")
+
+    if not auto_fix or stats["missing"] == 0:
+        return stats
+
+    # 第二遍：批量安装缺失的依赖（按分类分批）
+    if not silent:
+        logger.info(f"开始自动安装 {stats['missing']} 个缺失依赖...")
+
+    total_installed = 0
+    total_failed = 0
+
+    for category, pip_names in missing_by_category.items():
+        success, message = _pip_install(pip_names, category)
+
+        # 更新所有相关依赖的状态
+        for pip_name in pip_names:
+            dep = dep_pip_map[pip_name]
+            if success:
+                stats["installed"] += 1
+                stats["details"][dep.import_name]["status"] = "installed"
+                total_installed += 1
+                if not silent:
+                    logger.info(f"  ✓ 已安装: {dep.import_name} ({dep.category})")
+            else:
+                stats["failed"] += 1
+                stats["details"][dep.import_name]["status"] = "install_failed"
+                stats["details"][dep.import_name]["error"] = message
+                total_failed += 1
+                if not silent:
+                    logger.warning(f"  ✗ 安装失败: {dep.import_name} - {message}")
+
+    # 第三遍：如果 playwright 安装成功，还需要安装 Chromium 浏览器二进制
+    playwright_dep = next((d for d in DEPENDENCIES if d.import_name == "playwright"), None)
+    if playwright_dep and stats["details"].get("playwright", {}).get("status") == "installed":
+        if not silent:
+            logger.info("正在安装 Chromium 浏览器二进制...")
+        success, message = _install_playwright_browsers()
+        stats["playwright_browser"] = "installed" if success else "failed"
+        if not silent:
+            if success:
+                logger.info(f"  ✓ {message}")
+            else:
+                logger.warning(f"  ✗ {message}")
+    elif playwright_dep and stats["details"].get("playwright", {}).get("status") == "available":
+        # playwright 已安装，检查 chromium 是否已安装
+        try:
+            result = subprocess.run(
+                [_get_python_executable(), "-m", "playwright", "install", "--dry-run", "chromium"],
+                capture_output=True, text=True, timeout=10,
+            )
+            if result.returncode == 0:
+                stats["playwright_browser"] = "ready"
+            else:
+                # 尝试安装
+                if not silent:
+                    logger.info("正在安装 Chromium 浏览器二进制...")
+                success, message = _install_playwright_browsers()
+                stats["playwright_browser"] = "installed" if success else "failed"
+        except Exception:
+            stats["playwright_browser"] = "unknown"
+
+    # 汇总日志
+    if not silent and (total_installed > 0 or total_failed > 0):
+        logger.info(
+            f"依赖检查完成: {stats['available']}/{stats['checked']} 已就绪, "
+            f"{total_installed} 新安装, {total_failed} 失败"
+        )
+
+    return stats
+
+
+def ensure_skill_deps(skill_category: str) -> bool:
+    """
+    确保指定技能分类的依赖已安装。
+    在技能执行前调用，提供懒加载安装能力。
+
+    Args:
+        skill_category: 技能分类名称
+                        "browser" - 浏览器自动化 (playwright)
+                        "gui" - 桌面GUI自动化 (mss, pynput, pygetwindow)
+                        "search" - 搜索技能
+                        "tts" - 语音合成
+
+    Returns:
+        True 如果所有依赖已就绪（包括刚安装的）
+    """
+    category_map = {
+        "browser": {"browser"},
+        "gui": {"gui"},
+        "search": {"search"},
+        "tts": {"tts"},
+        "tray": {"tray"},
+    }
+
+    cats = category_map.get(skill_category, {skill_category})
+    result = check_and_install_deps(categories=cats, auto_fix=True, silent=True)
+
+    return result["failed"] == 0 and result["missing"] == result["installed"]
+
+
+def get_deps_status() -> Dict[str, Dict]:
+    """
+    获取所有依赖的当前状态（不自动安装）。
+    供 API 和 UI 展示使用。
+
+    Returns:
+        {import_name: {"status": "available"|"missing", "version": "...", "category": "..."}}
+    """
+    status = {}
+    for dep in DEPENDENCIES:
+        if not _is_platform_match(dep):
+            continue
+
+        available = _is_module_available(dep.import_name)
+        version = ""
+        if available:
+            try:
+                mod = importlib.import_module(dep.import_name)
+                version = getattr(mod, "__version__", "")
+            except Exception:
+                pass
+
+        status[dep.import_name] = {
+            "status": "available" if available else "missing",
+            "version": version,
+            "category": dep.category,
+            "pip_name": dep.pip_name,
+        }
+
+    return status
+
+
+# ── 后台预安装（非阻塞） ──────────────────────────────────
+
+_background_check_done = False
+_background_check_running = False
+
+
+def start_background_check():
+    """
+    在后台线程中执行依赖检查和安装（非阻塞）。
+    适用于启动时不想等待安装完成的场景。
+    """
+    global _background_check_done, _background_check_running
+
+    if _background_check_done or _background_check_running:
+        return
+
+    _background_check_running = True
+
+    def _do_check():
+        global _background_check_done, _background_check_running
+        try:
+            check_and_install_deps(auto_fix=True, silent=True)
+        except Exception as e:
+            logger.warning(f"后台依赖检查失败: {e}")
+        finally:
+            _background_check_done = True
+            _background_check_running = False
+
+    t = threading.Thread(target=_do_check, daemon=True, name="deps-checker")
+    t.start()
+    logger.info("后台依赖检查已启动")
+
+
+def wait_background_check(timeout: float = 30.0) -> bool:
+    """
+    等待后台依赖检查完成。
+
+    Args:
+        timeout: 最长等待时间（秒）
+
+    Returns:
+        True 如果检查已完成，False 如果超时
+    """
+    import time
+    deadline = time.monotonic() + timeout
+    while _background_check_running and time.monotonic() < deadline:
+        time.sleep(0.5)
+    return _background_check_done

package/core/version.py

@@ -11,7 +11,7 @@ import subprocess
 from pathlib import Path
 
 # ── 基线版本（与 setup.py / package.json 保持一致） ──
-BASE_VERSION = "1.2.2"
+BASE_VERSION = "1.3.1"
 
 
 def _version_from_git() -> str: