autoglm-gui 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

AutoGLM_GUI/api/agents.py

@@ -1,20 +1,16 @@
 """Agent lifecycle and chat routes."""
 
 import json
-import queue
-import threading
 
 from fastapi import APIRouter, HTTPException
 from fastapi.responses import StreamingResponse
-from phone_agent.agent import StepResult
 from pydantic import ValidationError
 
+from AutoGLM_GUI.agents.events import AgentEventType
+from AutoGLM_GUI.config import AgentConfig, ModelConfig
 from AutoGLM_GUI.logger import logger
-from AutoGLM_GUI.phone_agent_patches import apply_patches
 from AutoGLM_GUI.schemas import (
     AbortRequest,
-    APIAgentConfig,
-    APIModelConfig,
     ChatRequest,
     ChatResponse,
     ConfigResponse,
@@ -27,11 +23,6 @@ from AutoGLM_GUI.state import (
     non_blocking_takeover,
 )
 from AutoGLM_GUI.version import APP_VERSION
-from phone_agent.agent import AgentConfig
-from phone_agent.model import ModelConfig
-
-# Apply monkey patches to phone_agent
-apply_patches()
 
 router = APIRouter()
 
@@ -59,37 +50,6 @@ def _setup_adb_keyboard(device_id: str) -> None:
         logger.info(f"✓ Device {device_id}: ADB Keyboard ready")
 
 
-def _initialize_agent_with_config(
-    device_id: str,
-    model_config: ModelConfig,
-    agent_config: AgentConfig,
-) -> None:
-    """使用给定配置初始化 Agent。
-
-    Args:
-        device_id: 设备 ID
-        model_config: 模型配置
-        agent_config: Agent 配置
-
-    Raises:
-        Exception: 初始化失败时抛出异常
-    """
-    from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
-
-    # Setup ADB Keyboard first
-    _setup_adb_keyboard(device_id)
-
-    # Initialize agent
-    manager = PhoneAgentManager.get_instance()
-    manager.initialize_agent(
-        device_id=device_id,
-        model_config=model_config,
-        agent_config=agent_config,
-        takeover_callback=non_blocking_takeover,
-    )
-    logger.info(f"Agent initialized successfully for device {device_id}")
-
-
 SSEPayload = dict[str, str | int | bool | None | dict]
 
 
@@ -101,57 +61,50 @@ def _create_sse_event(
     return event_data
 
 
-@router.post("/api/init")
+@router.post("/api/init", deprecated=True)
 def init_agent(request: InitRequest) -> dict:
-    """初始化 PhoneAgent（多设备支持）。"""
-    from AutoGLM_GUI.config_manager import config_manager
+    """初始化 PhoneAgent（已废弃，多设备支持）。
+
+    ⚠️ 此端点已废弃，将在未来版本移除。
 
-    req_model_config = request.model or APIModelConfig()
-    req_agent_config = request.agent or APIAgentConfig()
+    Agent 现在会在首次使用时自动初始化，无需手动调用此端点。
+    如需修改配置，请使用 /api/config 端点或直接修改配置文件 ~/.config/autoglm/config.json。
+    配置保存后会自动销毁所有 Agent，确保下次使用时应用新配置。
+
+    配置完全由 ConfigManager 提供（CLI > ENV > FILE > DEFAULT），
+    不接受运行时覆盖。
+    """
+    from AutoGLM_GUI.config_manager import config_manager
 
-    device_id = req_agent_config.device_id
+    device_id = request.device_id
     if not device_id:
-        raise HTTPException(
-            status_code=400, detail="device_id is required in agent_config"
-        )
+        raise HTTPException(status_code=400, detail="device_id is required")
 
     # 热重载配置文件（支持运行时手动修改）
     config_manager.load_file_config()
     config_manager.sync_to_env()
 
-    # 获取有效配置（已合并 CLI > ENV > FILE > DEFAULT）
+    # 获取有效配置（CLI > ENV > FILE > DEFAULT）
     effective_config = config_manager.get_effective_config()
 
-    # 优先级：请求参数 > 有效配置
-    base_url = req_model_config.base_url or effective_config.base_url
-    api_key = req_model_config.api_key or effective_config.api_key
-    model_name = req_model_config.model_name or effective_config.model_name
-
-    # 获取配置的默认最大步数
-    max_steps = effective_config.default_max_steps
-
-    if not base_url:
+    if not effective_config.base_url:
         raise HTTPException(
             status_code=400,
             detail="base_url is required. Please configure via Settings or start with --base-url",
         )
 
+    # 直接使用有效配置构造 ModelConfig 和 AgentConfig
     model_config = ModelConfig(
-        base_url=base_url,
-        api_key=api_key,
-        model_name=model_name,
-        max_tokens=req_model_config.max_tokens,
-        temperature=req_model_config.temperature,
-        top_p=req_model_config.top_p,
-        frequency_penalty=req_model_config.frequency_penalty,
+        base_url=effective_config.base_url,
+        api_key=effective_config.api_key,
+        model_name=effective_config.model_name,
+        # max_tokens, temperature, top_p, frequency_penalty 使用 ModelConfig 默认值
     )
 
     agent_config = AgentConfig(
-        max_steps=max_steps,
+        max_steps=effective_config.default_max_steps,
         device_id=device_id,
-        lang=req_agent_config.lang,
-        system_prompt=req_agent_config.system_prompt,
-        verbose=req_agent_config.verbose,
+        # lang, system_prompt, verbose 使用 AgentConfig 默认值
     )
 
     # Initialize agent (includes ADB Keyboard setup)
@@ -182,8 +135,9 @@ def init_agent(request: InitRequest) -> dict:
             force=request.force,
         )
 
-        logger.info(
-            f"Agent of type '{request.agent_type}' initialized for device {device_id}"
+        logger.warning(
+            f"/api/init is deprecated. Agent of type '{request.agent_type}' initialized for device {device_id}. "
+            f"Consider using auto-initialization instead."
         )
     except Exception as e:
         logger.error(f"Failed to initialize agent: {e}")
@@ -192,193 +146,137 @@ def init_agent(request: InitRequest) -> dict:
     return {
         "success": True,
         "device_id": device_id,
-        "message": f"Agent initialized for device {device_id}",
+        "message": f"Agent initialized for device {device_id} (⚠️ /api/init is deprecated)",
         "agent_type": request.agent_type,
+        "deprecated": True,
+        "hint": "Agent 会在首次使用时自动初始化，无需手动调用此端点",
     }
 
 
 @router.post("/api/chat", response_model=ChatResponse)
 def chat(request: ChatRequest) -> ChatResponse:
-    """发送任务给 Agent 并执行。"""
-    from AutoGLM_GUI.exceptions import DeviceBusyError
+    """发送任务给 Agent 并执行。
+
+    Agent 会在首次使用时自动初始化，无需手动调用 /api/init。
+    """
+    from AutoGLM_GUI.exceptions import AgentInitializationError, DeviceBusyError
     from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
 
     device_id = request.device_id
     manager = PhoneAgentManager.get_instance()
 
-    # Check if agent is initialized
-    if not manager.is_initialized(device_id):
-        raise HTTPException(
-            status_code=400, detail="Agent not initialized. Call /api/init first."
-        )
-
-    # Use context manager for automatic lock management
+    # use_agent 默认 auto_initialize=True，会自动初始化 Agent
     try:
         with manager.use_agent(device_id, timeout=None) as agent:
             result = agent.run(request.message)
             steps = agent.step_count
             agent.reset()
             return ChatResponse(result=result, steps=steps, success=True)
+    except AgentInitializationError as e:
+        # 配置错误或初始化失败
+        logger.error(f"Failed to initialize agent for {device_id}: {e}")
+        raise HTTPException(
+            status_code=500,
+            detail=f"初始化失败: {str(e)}. 请检查全局配置 (base_url, api_key, model_name)",
+        )
     except DeviceBusyError:
         raise HTTPException(
             status_code=409, detail=f"Device {device_id} is busy. Please wait."
         )
     except Exception as e:
+        logger.exception(f"Unexpected error in chat for {device_id}")
         return ChatResponse(result=str(e), steps=0, success=False)
 
 
 @router.post("/api/chat/stream")
 def chat_stream(request: ChatRequest):
-    """发送任务给 Agent 并实时推送执行进度（SSE，多设备支持）。"""
-    from AutoGLM_GUI.exceptions import DeviceBusyError
+    """发送任务给 Agent 并实时推送执行进度（SSE，多设备支持）。
+
+    Agent 会在首次使用时自动初始化，无需手动调用 /api/init。
+    """
+    from datetime import datetime
+
+    from AutoGLM_GUI.agents.stream_runner import AgentStepStreamer
+    from AutoGLM_GUI.device_manager import DeviceManager
+    from AutoGLM_GUI.exceptions import AgentInitializationError, DeviceBusyError
+    from AutoGLM_GUI.history_manager import history_manager
+    from AutoGLM_GUI.models.history import ConversationRecord
     from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
 
     device_id = request.device_id
     manager = PhoneAgentManager.get_instance()
 
-    # 验证 agent 已初始化
-    if not manager.is_initialized(device_id):
-        raise HTTPException(
-            status_code=400,
-            detail=f"Device {device_id} not initialized. Call /api/init first.",
-        )
-
     def event_generator():
-        threads: list[threading.Thread] = []
-        stop_event: threading.Event | None = None
+        acquired = False
+        start_time = datetime.now()
+        final_message = ""
+        final_success = False
+        final_steps = 0
 
         try:
-            # 创建事件队列用于 agent → SSE 通信
-            event_queue: queue.Queue[tuple[str, SSEPayload | None]] = queue.Queue()
-
-            # 思考块回调
-            def on_thinking_chunk(chunk: str):
-                chunk_data = _create_sse_event("thinking_chunk", {"chunk": chunk})
-                event_queue.put(("thinking_chunk", chunk_data))
-
-            # 使用 streaming agent context manager（自动处理所有管理逻辑！）
-            with manager.use_streaming_agent(
-                device_id, on_thinking_chunk, timeout=0
-            ) as (streaming_agent, stop_event):
-                # 早期 abort 检查
-                if stop_event.is_set():
-                    logger.info(f"[Abort] Chat aborted before starting for {device_id}")
-                    yield "event: aborted\n"
-                    yield 'data: {"type": "aborted", "role": "assistant", "message": "Chat aborted by user"}\n\n'
-                    return
-
-                # 在线程中运行 agent 步骤
-                step_result: list[StepResult | None] = [None]
-                error_result: list[Exception | None] = [None]
-
-                def run_step(is_first: bool = True, task: str | None = None):
-                    try:
-                        if stop_event.is_set():
-                            return
-
-                        result = (
-                            streaming_agent.step(task)
-                            if is_first
-                            else streaming_agent.step()
-                        )
-
-                        if stop_event.is_set():
-                            return
-
-                        step_result[0] = result
-                    except Exception as e:
-                        error_result[0] = e
-                    finally:
-                        event_queue.put(("step_done", None))
-
-                # 启动第一步
-                thread = threading.Thread(
-                    target=run_step, args=(True, request.message), daemon=True
-                )
-                thread.start()
-                threads.append(thread)
-
-                # 事件循环
-                while not stop_event.is_set():
-                    try:
-                        event_type, event_data = event_queue.get(timeout=0.1)
-                    except queue.Empty:
-                        continue
-
-                    if event_type == "thinking_chunk":
-                        yield "event: thinking_chunk\n"
-                        yield f"data: {json.dumps(event_data, ensure_ascii=False)}\n\n"
+            acquired = manager.acquire_device(
+                device_id, timeout=0, raise_on_timeout=True, auto_initialize=True
+            )
 
-                    elif event_type == "step_done":
-                        if error_result[0]:
-                            raise error_result[0]
-
-                        result = step_result[0]
-                        if result is None:
-                            raise RuntimeError("step_result is None after step_done")
-
-                        event_data = _create_sse_event(
-                            "step",
-                            {
-                                "step": streaming_agent.step_count,
-                                "thinking": result.thinking,
-                                "action": result.action,
-                                "success": result.success,
-                                "finished": result.finished,
-                            },
-                        )
-
-                        yield "event: step\n"
-                        yield f"data: {json.dumps(event_data, ensure_ascii=False)}\n\n"
+            try:
+                agent = manager.get_agent(device_id)
+                streamer = AgentStepStreamer(agent=agent, task=request.message)
+
+                with streamer.stream_context() as abort_fn:
+                    manager.register_abort_handler(device_id, abort_fn)
 
-                        if result.finished:
-                            done_data = _create_sse_event(
-                                "done",
-                                {
-                                    "message": result.message,
-                                    "steps": streaming_agent.step_count,
-                                    "success": result.success,
-                                },
-                            )
-                            yield "event: done\n"
-                            yield f"data: {json.dumps(done_data, ensure_ascii=False)}\n\n"
-                            break
+                    for event in streamer:
+                        event_type = event["type"]
+                        event_data_dict = event["data"]
 
                         if (
-                            streaming_agent.step_count
-                            >= streaming_agent.agent_config.max_steps
+                            event_type == AgentEventType.STEP.value
+                            and event_data_dict.get("step") == -1
                         ):
-                            done_data = _create_sse_event(
-                                "done",
-                                {
-                                    "message": "Max steps reached",
-                                    "steps": streaming_agent.step_count,
-                                    "success": result.success,
-                                },
-                            )
-                            yield "event: done\n"
-                            yield f"data: {json.dumps(done_data, ensure_ascii=False)}\n\n"
-                            break
-
-                        # 启动下一步
-                        step_result[0] = None
-                        error_result[0] = None
-                        thread = threading.Thread(
-                            target=run_step, args=(False, None), daemon=True
-                        )
-                        thread.start()
-                        threads.append(thread)
-
-                # 检查是否被中止
-                if stop_event.is_set():
-                    logger.info(f"[Abort] Streaming chat terminated for {device_id}")
-                    yield "event: aborted\n"
-                    yield 'data: {"type": "aborted", "role": "assistant", "message": "Chat aborted by user"}\n\n'
-
-                # 重置原始 agent（context 已由 use_streaming_agent 同步）
-                original_agent = manager.get_agent(device_id)
-                original_agent.reset()
+                            continue
 
+                        if event_type == AgentEventType.DONE.value:
+                            final_message = event_data_dict.get("message", "")
+                            final_success = event_data_dict.get("success", False)
+                            final_steps = event_data_dict.get("steps", 0)
+
+                        event_data = _create_sse_event(event_type, event_data_dict)
+
+                        yield f"event: {event_type}\n"
+                        yield f"data: {json.dumps(event_data, ensure_ascii=False)}\n\n"
+
+            finally:
+                if acquired:
+                    manager.release_device(device_id)
+
+                device_manager = DeviceManager.get_instance()
+                serialno = device_manager.get_serial_by_device_id(device_id)
+                if serialno and final_message:
+                    end_time = datetime.now()
+                    record = ConversationRecord(
+                        task_text=request.message,
+                        final_message=final_message,
+                        success=final_success,
+                        steps=final_steps,
+                        start_time=start_time,
+                        end_time=end_time,
+                        duration_ms=int((end_time - start_time).total_seconds() * 1000),
+                        source="chat",
+                        error_message=None if final_success else final_message,
+                    )
+                    history_manager.add_record(serialno, record)
+
+        except AgentInitializationError as e:
+            logger.error(f"Failed to initialize agent for {device_id}: {e}")
+            error_data = _create_sse_event(
+                "error",
+                {
+                    "message": f"初始化失败: {str(e)}",
+                    "hint": "请检查全局配置 (base_url, api_key, model_name)",
+                },
+            )
+            yield "event: error\n"
+            yield f"data: {json.dumps(error_data, ensure_ascii=False)}\n\n"
         except DeviceBusyError:
             error_data = _create_sse_event("error", {"message": "Device is busy"})
             yield "event: error\n"
@@ -389,13 +287,7 @@ def chat_stream(request: ChatRequest):
             yield "event: error\n"
             yield f"data: {json.dumps(error_data, ensure_ascii=False)}\n\n"
         finally:
-            if stop_event is not None:
-                stop_event.set()
-
-            # 等待线程完成（带超时）
-            for thread in threads:
-                if thread.is_alive():
-                    thread.join(timeout=5.0)
+            manager.unregister_abort_handler(device_id)
 
     return StreamingResponse(
         event_generator(),
@@ -493,15 +385,12 @@ def get_config_endpoint() -> ConfigResponse:
         model_name=effective_config.model_name,
         api_key=effective_config.api_key if effective_config.api_key != "EMPTY" else "",
         source=source.value,
-        dual_model_enabled=effective_config.dual_model_enabled,
-        decision_base_url=effective_config.decision_base_url,
-        decision_model_name=effective_config.decision_model_name,
-        decision_api_key=effective_config.decision_api_key
-        if effective_config.decision_api_key
-        else "",
         agent_type=effective_config.agent_type,
         agent_config_params=effective_config.agent_config_params,
         default_max_steps=effective_config.default_max_steps,
+        decision_base_url=effective_config.decision_base_url,
+        decision_model_name=effective_config.decision_model_name,
+        decision_api_key=effective_config.decision_api_key,
         conflicts=[
             {
                 "field": c.field,
@@ -518,8 +407,13 @@ def get_config_endpoint() -> ConfigResponse:
 
 @router.post("/api/config")
 def save_config_endpoint(request: ConfigSaveRequest) -> dict:
-    """保存配置到文件."""
+    """保存配置到文件.
+
+    副作用：保存配置后会自动销毁所有已初始化的 Agent，
+    确保下次使用时所有 Agent 都使用新配置。
+    """
     from AutoGLM_GUI.config_manager import ConfigModel, config_manager
+    from AutoGLM_GUI.phone_agent_manager import PhoneAgentManager
 
     try:
         # Validate incoming configuration
@@ -534,13 +428,12 @@ def save_config_endpoint(request: ConfigSaveRequest) -> dict:
             base_url=request.base_url,
             model_name=request.model_name,
             api_key=request.api_key,
-            dual_model_enabled=request.dual_model_enabled,
-            decision_base_url=request.decision_base_url,
-            decision_model_name=request.decision_model_name,
-            decision_api_key=request.decision_api_key,
             agent_type=request.agent_type,
             agent_config_params=request.agent_config_params,
             default_max_steps=request.default_max_steps,
+            decision_base_url=request.decision_base_url,
+            decision_model_name=request.decision_model_name,
+            decision_api_key=request.decision_api_key,
             merge_mode=True,
         )
 
@@ -550,9 +443,26 @@ def save_config_endpoint(request: ConfigSaveRequest) -> dict:
         # 同步到环境变量
         config_manager.sync_to_env()
 
+        # 副作用：销毁所有已初始化的 Agent，确保下次使用新配置
+        manager = PhoneAgentManager.get_instance()
+        destroyed_agents = manager.list_agents()  # 获取需要销毁的 agent 列表
+
+        for device_id in destroyed_agents:
+            try:
+                manager.destroy_agent(device_id)
+                logger.info(f"Destroyed agent for {device_id} after config change")
+            except Exception as e:
+                logger.warning(f"Failed to destroy agent for {device_id}: {e}")
+
         # 检测冲突并返回警告
         conflicts = config_manager.detect_conflicts()
 
+        response_message = f"Configuration saved to {config_manager.get_config_path()}"
+        if destroyed_agents:
+            response_message += (
+                f". Destroyed {len(destroyed_agents)} agent(s) to apply new config."
+            )
+
         if conflicts:
             warnings = [
                 f"{c.field}: file value overridden by {c.override_source.value}"
@@ -560,13 +470,15 @@ def save_config_endpoint(request: ConfigSaveRequest) -> dict:
             ]
             return {
                 "success": True,
-                "message": f"Configuration saved to {config_manager.get_config_path()}",
+                "message": response_message,
                 "warnings": warnings,
+                "destroyed_agents": len(destroyed_agents),
             }
 
         return {
             "success": True,
-            "message": f"Configuration saved to {config_manager.get_config_path()}",
+            "message": response_message,
+            "destroyed_agents": len(destroyed_agents),
         }
 
     except ValidationError as e:
@@ -590,3 +502,8 @@ def delete_config_endpoint() -> dict:
 
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+
+# ✅ 已删除 /api/agents/reinit-all 端点
+# 原因：配置保存时自动销毁所有 Agent（副作用），无需单独的 reinit 端点
+# 见 /api/config POST 端点的实现

AutoGLM_GUI/api/control.py

@@ -2,6 +2,7 @@
 
 from fastapi import APIRouter
 
+from AutoGLM_GUI.devices.adb_device import ADBDevice
 from AutoGLM_GUI.schemas import (
     SwipeRequest,
     SwipeResponse,
@@ -22,12 +23,13 @@ router = APIRouter()
 def control_tap(request: TapRequest) -> TapResponse:
     """Execute tap at specified device coordinates."""
     try:
-        from phone_agent.adb import tap
+        if not request.device_id:
+            return TapResponse(success=False, error="device_id is required")
 
-        tap(
+        device = ADBDevice(request.device_id)
+        device.tap(
             x=request.x,
             y=request.y,
-            device_id=request.device_id,
             delay=request.delay,
         )
 
@@ -40,15 +42,16 @@ def control_tap(request: TapRequest) -> TapResponse:
 def control_swipe(request: SwipeRequest) -> SwipeResponse:
     """Execute swipe from start to end coordinates."""
     try:
-        from phone_agent.adb import swipe
+        if not request.device_id:
+            return SwipeResponse(success=False, error="device_id is required")
 
-        swipe(
+        device = ADBDevice(request.device_id)
+        device.swipe(
             start_x=request.start_x,
             start_y=request.start_y,
             end_x=request.end_x,
             end_y=request.end_y,
             duration_ms=request.duration_ms,
-            device_id=request.device_id,
             delay=request.delay,
         )