myagent-ai 1.4.2 → 1.4.3

package/core/version.py

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

package/install/install.ps1

@@ -9,7 +9,7 @@ param(
 
 $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
-$PKG_VERSION = "1.4.2"
+$PKG_VERSION = "1.4.3"
 
 # Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {

package/install/install.sh

@@ -21,7 +21,7 @@ NO_DEPS=false
 DRY_RUN=false
 SCRIPT_URL="https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh"
 PKG_NAME="myagent-ai"
-PKG_VERSION="1.4.2"
+PKG_VERSION="1.4.3"
 
 for arg in "$@"; do
   case "$arg" in

package/main.py

@@ -1007,6 +1007,251 @@ WantedBy=default.target
             print("✅ 已取消 Linux 开机自启")
 
 
+# ==============================================================================
+# 首次运行引导
+# ==============================================================================
+
+def _first_run_setup(config_mgr: ConfigManager):
+    """
+    首次运行引导：检测是否已配置 LLM API Key。
+    如果没有，进入交互式配置向导。
+    """
+    cfg = config_mgr.config
+
+    # 判断是否需要配置: api_key 为空且 provider 不是 ollama（ollama 本地无需 key）
+    has_api_key = bool(cfg.llm.api_key) or bool(cfg.llm.anthropic_api_key)
+    is_ollama = cfg.llm.provider == "ollama"
+    has_env_key = bool(os.environ.get("MYAGENT_LLM_API_KEY")) or \
+                  bool(os.environ.get("MYAGENT_ANTHROPIC_API_KEY")) or \
+                  bool(os.environ.get("OPENAI_API_KEY")) or \
+                  bool(os.environ.get("ANTHROPIC_API_KEY"))
+
+    if has_api_key or is_ollama or has_env_key:
+        return  # 已配置或通过环境变量提供，跳过
+
+    # 进入配置向导
+    print()
+    print("=" * 55)
+    print("  MyAgent  -  LLM API 配置向导")
+    print(f"  版本: v{get_version()}")
+    print("=" * 55)
+    print()
+    print("  检测到尚未配置 LLM API Key，MyAgent 需要")
+    print("  一个大模型 API 才能工作。")
+    print()
+    print("  支持的提供商:")
+    print("    1. OpenAI / 兼容 API (推荐)")
+    print("    2. Anthropic (Claude)")
+    print("    3. Ollama (本地模型，无需 API Key)")
+    print()
+
+    while True:
+        try:
+            choice = input("  请选择 [1/2/3]: ").strip()
+        except (EOFError, KeyboardInterrupt):
+            print("\n\n  已取消配置。可通过 myagent-ai setup 重新配置。")
+            sys.exit(0)
+
+        if choice == "1":
+            _setup_openai_compatible(config_mgr)
+            break
+        elif choice == "2":
+            _setup_anthropic(config_mgr)
+            break
+        elif choice == "3":
+            _setup_ollama(config_mgr)
+            break
+        else:
+            print("  无效选择，请输入 1/2/3")
+
+    # 保存配置
+    config_mgr.save()
+    print()
+    print("  配置已保存!")
+    print(f"  配置文件: {config_mgr._config_file}")
+    print()
+
+
+def _setup_openai_compatible(config_mgr: ConfigManager):
+    """配置 OpenAI 或兼容 API"""
+    print()
+    print("  -- OpenAI / 兼容 API 配置 --")
+    print()
+
+    # 预设模板
+    print("  预设模板:")
+    print("    1. OpenAI 官方 (https://api.openai.com/v1)")
+    print("    2. 智谱 GLM (https://open.bigmodel.cn/api/paas/v4)")
+    print("    3. DeepSeek (https://api.deepseek.com/v1)")
+    print("    4. 月之暗面 Moonshot (https://api.moonshot.cn/v1)")
+    print("    5. 自定义 Base URL")
+    print()
+
+    while True:
+        try:
+            choice = input("  选择模板 [1/2/3/4/5]: ").strip()
+        except (EOFError, KeyboardInterrupt):
+            sys.exit(0)
+
+        templates = {
+            "1": ("https://api.openai.com/v1", "gpt-4o"),
+            "2": ("https://open.bigmodel.cn/api/paas/v4", "glm-4-flash"),
+            "3": ("https://api.deepseek.com/v1", "deepseek-chat"),
+            "4": ("https://api.moonshot.cn/v1", "moonshot-v1-8k"),
+        }
+
+        if choice in templates:
+            base_url, model = templates[choice]
+            break
+        elif choice == "5":
+            try:
+                base_url = input("  Base URL: ").strip().rstrip("/")
+                model = input("  模型名称 (如 gpt-4o): ").strip() or "gpt-4o"
+            except (EOFError, KeyboardInterrupt):
+                sys.exit(0)
+            break
+        else:
+            print("  无效选择")
+
+    while True:
+        try:
+            api_key = input("  API Key: ").strip()
+        except (EOFError, KeyboardInterrupt):
+            sys.exit(0)
+        if api_key:
+            break
+        print("  API Key 不能为空!")
+
+    print()
+    try:
+        temp_input = input(f"  Temperature (默认 0.1, 直接回车跳过): ").strip()
+        temperature = float(temp_input) if temp_input else 0.1
+    except (EOFError, KeyboardInterrupt, ValueError):
+        temperature = 0.1
+
+    # 写入配置
+    config_mgr.config.llm.provider = "openai"
+    config_mgr.config.llm.api_key = api_key
+    config_mgr.config.llm.base_url = base_url
+    config_mgr.config.llm.model = model
+    config_mgr.config.llm.temperature = temperature
+
+    # 验证连接
+    print()
+    print("  正在验证连接...")
+    try:
+        import requests
+        headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+        test_body = {
+            "model": model,
+            "messages": [{"role": "user", "content": "hi"}],
+            "max_tokens": 5,
+        }
+        resp = requests.post(
+            f"{base_url}/chat/completions",
+            headers=headers, json=test_body, timeout=15,
+        )
+        if resp.status_code == 200:
+            print("  连接成功!")
+        else:
+            print(f"  API 返回 {resp.status_code}，请检查 Key 和 URL 是否正确")
+            print(f"  (已保存配置，启动后可在 Web 界面修改)")
+    except Exception as e:
+        print(f"  连接测试失败: {e}")
+        print(f"  (已保存配置，启动后可在 Web 界面修改)")
+
+
+def _setup_anthropic(config_mgr: ConfigManager):
+    """配置 Anthropic Claude"""
+    print()
+    print("  -- Anthropic Claude 配置 --")
+    print()
+
+    while True:
+        try:
+            api_key = input("  Anthropic API Key: ").strip()
+        except (EOFError, KeyboardInterrupt):
+            sys.exit(0)
+        if api_key:
+            break
+        print("  API Key 不能为空!")
+
+    print()
+    print("  可选模型: claude-sonnet-4-20250514 / claude-opus-4-20250514")
+    try:
+        model = input("  模型 (默认 claude-sonnet-4-20250514): ").strip() or "claude-sonnet-4-20250514"
+    except (EOFError, KeyboardInterrupt):
+        model = "claude-sonnet-4-20250514"
+
+    config_mgr.config.llm.provider = "anthropic"
+    config_mgr.config.llm.anthropic_api_key = api_key
+    config_mgr.config.llm.model = model
+
+    print()
+    print("  正在验证连接...")
+    try:
+        import requests
+        headers = {
+            "x-api-key": api_key,
+            "anthropic-version": "2023-06-01",
+            "Content-Type": "application/json",
+        }
+        test_body = {
+            "model": model,
+            "messages": [{"role": "user", "content": "hi"}],
+            "max_tokens": 5,
+        }
+        resp = requests.post(
+            "https://api.anthropic.com/v1/messages",
+            headers=headers, json=test_body, timeout=15,
+        )
+        if resp.status_code == 200:
+            print("  连接成功!")
+        else:
+            print(f"  API 返回 {resp.status_code}，请检查 Key 是否正确")
+            print(f"  (已保存配置，启动后可在 Web 界面修改)")
+    except Exception as e:
+        print(f"  连接测试失败: {e}")
+        print(f"  (已保存配置，启动后可在 Web 界面修改)")
+
+
+def _setup_ollama(config_mgr: ConfigManager):
+    """配置 Ollama 本地模型"""
+    print()
+    print("  -- Ollama 本地模型配置 --")
+    print()
+
+    try:
+        base_url = input("  Ollama 地址 (默认 http://localhost:11434): ").strip()
+    except (EOFError, KeyboardInterrupt):
+        sys.exit(0)
+    base_url = base_url or "http://localhost:11434"
+
+    try:
+        model = input("  模型名称 (默认 llama3): ").strip() or "llama3"
+    except (EOFError, KeyboardInterrupt):
+        model = "llama3"
+
+    config_mgr.config.llm.provider = "ollama"
+    config_mgr.config.llm.ollama_base_url = base_url
+    config_mgr.config.llm.ollama_model = model
+
+    print()
+    print("  正在验证连接...")
+    try:
+        import requests
+        resp = requests.get(f"{base_url}/api/tags", timeout=5)
+        if resp.status_code == 200:
+            models = [m.get("name", "") for m in resp.json().get("models", [])]
+            print(f"  连接成功! 可用模型: {', '.join(models) if models else '(无)'}")
+        else:
+            print(f"  无法连接 Ollama，请确认 Ollama 已启动")
+            print(f"  (已保存配置，启动后可在 Web 界面修改)")
+    except Exception as e:
+        print(f"  连接测试失败: {e}")
+        print(f"  (已保存配置，启动后可在 Web 界面修改)")
+
+
 # ==============================================================================
 # 主函数
 # ==============================================================================
@@ -1024,6 +1269,7 @@ def main():
     parser.add_argument("--no-autostart", action="store_true", help="取消开机自启")
     parser.add_argument("--config", type=str, help="指定配置文件路径")
     parser.add_argument("--debug", action="store_true", help="调试模式")
+    parser.add_argument("--setup", action="store_true", help="配置向导")
     args = parser.parse_args()
 
     # 配置
@@ -1042,6 +1288,16 @@ def main():
         setup_auto_start(False)
         return
 
+    # 手动触发配置向导
+    if args.setup:
+        _first_run_setup(config_mgr)
+        return
+
+    # ══════════════════════════════════════════════════════════
+    # 首次运行: 引导配置 LLM API Key
+    # ══════════════════════════════════════════════════════════
+    _first_run_setup(config_mgr)
+
     # 创建应用
     app = MyAgentApp()
     app._restart_requested = False

package/package.json

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

package/setup.py

@@ -9,7 +9,7 @@ from pathlib import Path
 _version_path = Path(__file__).parent / "core" / "version.py"
 _version_vars = {}
 exec(_version_path.read_text(), _version_vars)
-__version__ = _version_vars.get("BASE_VERSION", "1.4.2")
+__version__ = _version_vars.get("BASE_VERSION", "1.4.3")
 
 setup(
     name="myagent",