autoglm-gui 1.5.3__tar.gz → 1.5.5__tar.gz

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/__main__.py

@@ -76,6 +76,39 @@ def open_browser(
 
 def main() -> None:
     """Start the AutoGLM-GUI server."""
+    # Configure logging BEFORE any other imports to ensure DEBUG level from the start
+    # This is especially important for --reload mode where subprocess reimports modules
+    import os
+    import sys
+
+    # Parse args early to get log level
+    early_parser = argparse.ArgumentParser(add_help=False)
+    early_parser.add_argument(
+        "--log-level",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+        default="INFO",
+    )
+    early_parser.add_argument(
+        "--log-file", default="logs/autoglm_{time:YYYY-MM-DD}.log"
+    )
+    early_parser.add_argument("--no-log-file", action="store_true")
+    early_args, _ = early_parser.parse_known_args()
+
+    # Set environment variable for reload mode (subprocess will read this)
+    os.environ["AUTOGLM_LOG_LEVEL"] = early_args.log_level
+    if early_args.no_log_file:
+        os.environ["AUTOGLM_NO_LOG_FILE"] = "1"
+    else:
+        os.environ["AUTOGLM_LOG_FILE"] = early_args.log_file
+
+    # Import and configure logger FIRST
+    from AutoGLM_GUI.logger import configure_logger
+
+    configure_logger(
+        console_level=early_args.log_level,
+        log_file=None if early_args.no_log_file else early_args.log_file,
+    )
+
     parser = argparse.ArgumentParser(
         description="AutoGLM-GUI - Web GUI for AutoGLM Phone Agent"
     )
@@ -163,13 +196,6 @@ def main() -> None:
 
     from AutoGLM_GUI import server
     from AutoGLM_GUI.config_manager import config_manager
-    from AutoGLM_GUI.logger import configure_logger
-
-    # Configure logging system
-    configure_logger(
-        console_level=args.log_level,
-        log_file=None if args.no_log_file else args.log_file,
-    )
 
     # ==================== 配置系统初始化 ====================
     # 使用统一配置管理器（四层优先级：CLI > ENV > FILE > DEFAULT）

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/agents/glm/async_agent.py

@@ -8,7 +8,8 @@ from typing import Any, AsyncIterator, Callable
 from openai import AsyncOpenAI
 
 from AutoGLM_GUI.actions import ActionHandler, ActionResult
-from AutoGLM_GUI.config import AgentConfig, ModelConfig, StepResult
+from AutoGLM_GUI.agents.protocols import AsyncAgent
+from AutoGLM_GUI.config import AgentConfig, ModelConfig
 from AutoGLM_GUI.device_protocol import DeviceProtocol
 from AutoGLM_GUI.logger import logger
 from AutoGLM_GUI.prompt_config import get_messages, get_system_prompt
@@ -17,7 +18,7 @@ from .message_builder import MessageBuilder
 from .parser import GLMParser
 
 
-class AsyncGLMAgent:
+class AsyncGLMAgent(AsyncAgent):
     """异步 GLM Agent 实现。
 
     核心特性:
@@ -61,8 +62,18 @@ class AsyncGLMAgent:
         # 取消机制
         self._cancel_event = asyncio.Event()
 
+        # 初始化 system prompt（Agent 一创建就有"人格"）
+        system_prompt = self.agent_config.system_prompt
+        if system_prompt is None:
+            system_prompt = get_system_prompt(self.agent_config.lang)
+
+        # 保存初始 system message 用于 reset()
+        self._initial_system_message = MessageBuilder.create_system_message(
+            system_prompt
+        )
+
         # 状态
-        self._context: list[dict[str, Any]] = []
+        self._context: list[dict[str, Any]] = [self._initial_system_message]
         self._step_count = 0
         self._is_running = False
 
@@ -82,35 +93,46 @@ class AsyncGLMAgent:
         - "cancelled": {"message": str}
         - "error": {"message": str}
         """
-        self._context = []
-        self._step_count = 0
         self._is_running = True
         self._cancel_event.clear()
 
         try:
-            # 首步执行
-            async for event in self._execute_step_async(task, is_first=True):
-                yield event
+            # ===== 初始化阶段：添加首次用户输入 =====
+            try:
+                screenshot = await asyncio.to_thread(self.device.get_screenshot)
+                current_app = await asyncio.to_thread(self.device.get_current_app)
+            except Exception as e:
+                logger.error(f"Failed to get device info during initialization: {e}")
+                yield {
+                    "type": "error",
+                    "data": {"message": f"Device error: {e}"},
+                }
+                yield {
+                    "type": "done",
+                    "data": {
+                        "message": f"Device error: {e}",
+                        "steps": 0,
+                        "success": False,
+                    },
+                }
+                return
 
-                # 检查是否完成
-                if event["type"] == "step" and event["data"].get("finished"):
-                    yield {
-                        "type": "done",
-                        "data": {
-                            "message": event["data"].get("message", "Task completed"),
-                            "steps": self._step_count,
-                            "success": event["data"].get("success", True),
-                        },
-                    }
-                    return
+            screen_info = MessageBuilder.build_screen_info(current_app)
+            initial_message = f"{task}\n\n** Screen Info **\n\n{screen_info}"
+
+            self._context.append(
+                MessageBuilder.create_user_message(
+                    text=initial_message, image_base64=screenshot.base64_data
+                )
+            )
 
-            # 后续步骤
+            # ===== 执行阶段：循环执行步骤 =====
             while self._step_count < self.agent_config.max_steps and self._is_running:
                 # 检查取消
                 if self._cancel_event.is_set():
                     raise asyncio.CancelledError()
 
-                async for event in self._execute_step_async(None, is_first=False):
+                async for event in self._execute_step_async():
                     yield event
 
                     # 检查是否完成
@@ -147,21 +169,19 @@ class AsyncGLMAgent:
         finally:
             self._is_running = False
 
-    async def _execute_step_async(
-        self, user_prompt: str | None, is_first: bool
-    ) -> AsyncIterator[dict[str, Any]]:
+    async def _execute_step_async(self) -> AsyncIterator[dict[str, Any]]:
         """执行单步，支持流式输出和取消。
 
-        Args:
-            user_prompt: 用户输入（首步必需，后续可选）
-            is_first: 是否是首步
+        注意：不再需要 user_prompt 参数，因为：
+        - 首次用户输入已在 stream() 的初始化阶段添加
+        - 此方法只负责执行步骤：获取屏幕 → 调用 LLM → 执行动作
 
         Yields:
             dict[str, Any]: 事件字典
         """
         self._step_count += 1
 
-        # 1. 截图和获取当前应用（使用线程池）
+        # 1. 获取当前屏幕状态（使用线程池）
         try:
             screenshot = await asyncio.to_thread(self.device.get_screenshot)
             current_app = await asyncio.to_thread(self.device.get_current_app)
@@ -184,42 +204,21 @@ class AsyncGLMAgent:
             }
             return
 
-        # 2. 构建消息
-        if is_first:
-            system_prompt = self.agent_config.system_prompt
-            if system_prompt is None:
-                system_prompt = get_system_prompt(self.agent_config.lang)
-
-            self._context.append(MessageBuilder.create_system_message(system_prompt))
-
-            screen_info = MessageBuilder.build_screen_info(current_app)
-            text_content = f"{user_prompt}\n\n{screen_info}"
-
-            self._context.append(
-                MessageBuilder.create_user_message(
-                    text=text_content, image_base64=screenshot.base64_data
-                )
-            )
-        else:
-            screen_info = MessageBuilder.build_screen_info(current_app)
-            if user_prompt:
-                text_content = f"{user_prompt}\n\n** Screen Info **\n\n{screen_info}"
-            else:
-                text_content = f"** Screen Info **\n\n{screen_info}"
+        # 2. 构建消息（统一格式：只有屏幕信息）
+        screen_info = MessageBuilder.build_screen_info(current_app)
+        text_content = f"** Screen Info **\n\n{screen_info}"
 
-            self._context.append(
-                MessageBuilder.create_user_message(
-                    text=text_content, image_base64=screenshot.base64_data
-                )
+        self._context.append(
+            MessageBuilder.create_user_message(
+                text=text_content, image_base64=screenshot.base64_data
             )
+        )
 
         # 3. 流式调用 OpenAI（真正的异步，可取消）
         try:
             if self.agent_config.verbose:
                 msgs = get_messages(self.agent_config.lang)
-                print("\n" + "=" * 50)
-                print(f"💭 {msgs['thinking']}:")
-                print("-" * 50)
+                logger.debug(f"💭 {msgs['thinking']}:")
 
             thinking_parts = []
             raw_content = ""
@@ -240,7 +239,7 @@ class AsyncGLMAgent:
 
                     # Verbose output
                     if self.agent_config.verbose:
-                        print(chunk_data["content"], end="", flush=True)
+                        logger.debug(chunk_data["content"])
 
                 elif chunk_data["type"] == "raw":
                     raw_content += chunk_data["content"]
@@ -254,7 +253,7 @@ class AsyncGLMAgent:
         except Exception as e:
             logger.error(f"LLM error: {e}")
             if self.agent_config.verbose:
-                traceback.print_exc()
+                logger.debug(traceback.format_exc())
 
             yield {
                 "type": "error",
@@ -285,11 +284,8 @@ class AsyncGLMAgent:
 
         if self.agent_config.verbose:
             msgs = get_messages(self.agent_config.lang)
-            print()
-            print("-" * 50)
-            print(f"🎯 {msgs['action']}:")
-            print(json.dumps(action, ensure_ascii=False, indent=2))
-            print("=" * 50 + "\n")
+            logger.debug(f"🎯 {msgs['action']}:")
+            logger.debug(json.dumps(action, ensure_ascii=False, indent=2))
 
         # 5. 执行 action（使用线程池）
         try:
@@ -299,7 +295,7 @@ class AsyncGLMAgent:
         except Exception as e:
             logger.error(f"Action execution error: {e}")
             if self.agent_config.verbose:
-                traceback.print_exc()
+                logger.debug(traceback.format_exc())
             result = ActionResult(success=False, should_finish=True, message=str(e))
 
         # 6. 更新上下文
@@ -316,11 +312,9 @@ class AsyncGLMAgent:
 
         if finished and self.agent_config.verbose:
             msgs = get_messages(self.agent_config.lang)
-            print("\n" + "🎉 " + "=" * 48)
-            print(
+            logger.debug(
                 f"✅ {msgs['task_completed']}: {result.message or action.get('message', msgs['done'])}"
             )
-            print("=" * 50 + "\n")
 
         # 8. 返回步骤结果
         yield {
@@ -452,8 +446,8 @@ class AsyncGLMAgent:
         logger.info("AsyncGLMAgent cancelled by user")
 
     def reset(self) -> None:
-        """重置状态。"""
-        self._context = []
+        """重置状态（恢复到初始状态，保留 system message）。"""
+        self._context = [self._initial_system_message]
         self._step_count = 0
         self._is_running = False
         self._cancel_event.clear()
@@ -473,35 +467,6 @@ class AsyncGLMAgent:
                 final_message = event["data"].get("message", "")
         return final_message
 
-    async def step(self, task: str | None = None) -> StepResult:
-        """执行单步（兼容接口）。
-
-        Args:
-            task: 任务描述（首步必需，后续可选）
-
-        Returns:
-            StepResult: 步骤结果
-        """
-        is_first = len(self._context) == 0
-        if is_first and not task:
-            raise ValueError("Task is required for the first step")
-
-        result = None
-        async for event in self._execute_step_async(task, is_first):
-            if event["type"] == "step":
-                result = StepResult(
-                    thinking=event["data"]["thinking"],
-                    action=event["data"]["action"],
-                    success=event["data"]["success"],
-                    finished=event["data"]["finished"],
-                    message=event["data"].get("message"),
-                )
-
-        if result is None:
-            raise RuntimeError("Step execution did not produce a result")
-
-        return result
-
     @property
     def step_count(self) -> int:
         return self._step_count

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/agents/protocols.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import inspect
-from typing import Any, AsyncIterator, Protocol
+from typing import Any, Protocol
 
 from AutoGLM_GUI.config import AgentConfig, ModelConfig, StepResult
 
@@ -76,19 +76,8 @@ class AsyncAgent(Protocol):
         """
         ...
 
-    async def step(self, task: str | None = None) -> StepResult:
-        """执行单步，返回步骤结果。
-
-        Args:
-            task: 任务描述（首步必需，后续可选）
-
-        Returns:
-            StepResult: 步骤结果
-        """
-        ...
-
-    async def stream(self, task: str) -> AsyncIterator[dict[str, Any]]:
-        """流式执行任务，yield 事件字典。
+    def stream(self, task: str) -> Any:
+        """流式执行任务，返回异步生成器。
 
         这是核心方法，支持:
         - 实时流式输出 (thinking chunks)

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/api/__init__.py

@@ -79,6 +79,22 @@ def _get_static_dir() -> Path | None:
 def create_app() -> FastAPI:
     """Build the FastAPI app with routers and static assets."""
 
+    # Configure logging from environment variables (for reload mode)
+    # In reload mode, the subprocess imports this module directly, bypassing __main__.py
+    # So we need to read log config from environment variables set by the parent process
+    import os
+
+    log_level = os.getenv("AUTOGLM_LOG_LEVEL", "INFO")
+    log_file = (
+        None
+        if os.getenv("AUTOGLM_NO_LOG_FILE")
+        else os.getenv("AUTOGLM_LOG_FILE", "logs/autoglm_{time:YYYY-MM-DD}.log")
+    )
+
+    from AutoGLM_GUI.logger import configure_logger
+
+    configure_logger(console_level=log_level, log_file=log_file)
+
     # Create MCP ASGI app
     mcp_app = mcp.get_mcp_asgi_app()
 

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/api/agents.py

@@ -182,7 +182,6 @@ async def chat(request: ChatRequest) -> ChatResponse:
         result = await agent.run(request.message)  # type: ignore[misc]
 
         steps = agent.step_count
-        agent.reset()
         return ChatResponse(result=result, steps=steps, success=True)  # type: ignore[arg-type]
 
     except AgentInitializationError as e:

{autoglm_gui-1.5.3 → autoglm_gui-1.5.5}/AutoGLM_GUI/logger.py

@@ -79,7 +79,8 @@ def configure_logger(
     _configured = True
 
 
-# Default initialization (can be reconfigured later)
-configure_logger()
+# Note: Logger is NOT auto-initialized to allow early configuration
+# The first call to configure_logger() will initialize the logger
+# If not configured before use, it will use loguru's default behavior (no handlers)
 
 __all__ = ["logger", "configure_logger"]

autoglm_gui-1.5.3/AutoGLM_GUI/static/assets/about-DTrVqEQH.js → autoglm_gui-1.5.5/AutoGLM_GUI/static/assets/about-BwLRPh96.js

@@ -1 +1 @@
-import{j as o}from"./index-BzP-Te33.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};
+import{j as o}from"./index-CH4jPveL.js";function t(){return o.jsx("div",{className:"p-2",children:o.jsx("h3",{children:"About"})})}export{t as component};

autoglm_gui-1.5.3/AutoGLM_GUI/static/assets/alert-dialog-B2KxPLtZ.js → autoglm_gui-1.5.5/AutoGLM_GUI/static/assets/alert-dialog-BvDNaR9v.js

@@ -1 +1 @@
-import{o as u,r as o,j as a,b as r,B as d}from"./index-BzP-Te33.js";import{P as g,c as x,b as f,d as m}from"./popover-BHbCs5Wl.js";import{D as p,d as h,e as w,f as j,g as D}from"./dialog-Cuw3N8_F.js";const N=[["path",{d:"M20 6 9 17l-5-5",key:"1gmf2c"}]],b=u("check",N),c=o.createContext(void 0),P=({value:t="",onValueChange:e,children:s})=>{const[n,l]=o.useState(!1);return a.jsx(c.Provider,{value:{value:t,onValueChange:e||(()=>{}),open:n,setOpen:l},children:a.jsx(g,{open:n,onOpenChange:l,children:s})})},C=o.forwardRef(({className:t,children:e,...s},n)=>{if(!o.useContext(c))throw new Error("SelectTrigger must be used within Select");return a.jsx(x,{asChild:!0,children:a.jsxs("button",{ref:n,className:r("flex h-10 w-full items-center justify-between rounded-md border border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-slate-950 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus:ring-slate-300",t),...s,children:[e,a.jsx(f,{className:"h-4 w-4 opacity-50"})]})})});C.displayName="SelectTrigger";const V=({placeholder:t})=>{const e=o.useContext(c);if(!e)throw new Error("SelectValue must be used within Select");return a.jsx("span",{className:e.value?"":"text-slate-500",children:e.value||t})},I=({children:t,className:e})=>a.jsx(m,{className:r("w-[var(--radix-popover-trigger-width)] p-1",e),children:t}),O=({value:t,children:e,disabled:s,className:n})=>{const l=o.useContext(c);if(!l)throw new Error("SelectItem must be used within Select");const i=l.value===t;return a.jsxs("div",{role:"option","aria-selected":i,className:r("relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none hover:bg-slate-100 focus:bg-slate-100 dark:hover:bg-slate-800 dark:focus:bg-slate-800",s&&"pointer-events-none opacity-50",n),onClick:()=>{s||(l.onValueChange(t),l.setOpen(!1))},children:[a.jsx("span",{className:"absolute left-2 flex h-3.5 w-3.5 items-center justify-center",children:i&&a.jsx(b,{className:"h-4 w-4"})}),e]})},B=({open:t,onOpenChange:e,children:s})=>a.jsx(p,{open:t,onOpenChange:e,children:s}),v=o.forwardRef(({className:t,...e},s)=>a.jsx(h,{ref:s,className:r("sm:max-w-[425px]",t),...e}));v.displayName="AlertDialogContent";const F=({className:t,...e})=>a.jsx(w,{className:r(t),...e}),H=({className:t,...e})=>a.jsx(D,{className:r(t),...e}),A=o.forwardRef(({className:t,...e},s)=>a.jsx(j,{ref:s,className:r(t),...e}));A.displayName="AlertDialogTitle";const S=o.forwardRef(({className:t,...e},s)=>a.jsx("p",{ref:s,className:r("text-sm text-slate-500 dark:text-slate-400",t),...e}));S.displayName="AlertDialogDescription";const y=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,className:r(t),...e}));y.displayName="AlertDialogAction";const k=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,variant:"outline",className:r(t),...e}));k.displayName="AlertDialogCancel";export{B as A,P as S,C as a,V as b,I as c,O as d,v as e,F as f,A as g,S as h,H as i,k as j,y as k};
+import{o as u,r as o,j as a,b as r,B as d}from"./index-CH4jPveL.js";import{P as g,c as x,b as f,d as m}from"./popover-BnpBfSOh.js";import{D as p,d as h,e as w,f as j,g as D}from"./dialog-IM0Ds7Lf.js";const N=[["path",{d:"M20 6 9 17l-5-5",key:"1gmf2c"}]],b=u("check",N),c=o.createContext(void 0),P=({value:t="",onValueChange:e,children:s})=>{const[n,l]=o.useState(!1);return a.jsx(c.Provider,{value:{value:t,onValueChange:e||(()=>{}),open:n,setOpen:l},children:a.jsx(g,{open:n,onOpenChange:l,children:s})})},C=o.forwardRef(({className:t,children:e,...s},n)=>{if(!o.useContext(c))throw new Error("SelectTrigger must be used within Select");return a.jsx(x,{asChild:!0,children:a.jsxs("button",{ref:n,className:r("flex h-10 w-full items-center justify-between rounded-md border border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-slate-950 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus:ring-slate-300",t),...s,children:[e,a.jsx(f,{className:"h-4 w-4 opacity-50"})]})})});C.displayName="SelectTrigger";const V=({placeholder:t})=>{const e=o.useContext(c);if(!e)throw new Error("SelectValue must be used within Select");return a.jsx("span",{className:e.value?"":"text-slate-500",children:e.value||t})},I=({children:t,className:e})=>a.jsx(m,{className:r("w-[var(--radix-popover-trigger-width)] p-1",e),children:t}),O=({value:t,children:e,disabled:s,className:n})=>{const l=o.useContext(c);if(!l)throw new Error("SelectItem must be used within Select");const i=l.value===t;return a.jsxs("div",{role:"option","aria-selected":i,className:r("relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none hover:bg-slate-100 focus:bg-slate-100 dark:hover:bg-slate-800 dark:focus:bg-slate-800",s&&"pointer-events-none opacity-50",n),onClick:()=>{s||(l.onValueChange(t),l.setOpen(!1))},children:[a.jsx("span",{className:"absolute left-2 flex h-3.5 w-3.5 items-center justify-center",children:i&&a.jsx(b,{className:"h-4 w-4"})}),e]})},B=({open:t,onOpenChange:e,children:s})=>a.jsx(p,{open:t,onOpenChange:e,children:s}),v=o.forwardRef(({className:t,...e},s)=>a.jsx(h,{ref:s,className:r("sm:max-w-[425px]",t),...e}));v.displayName="AlertDialogContent";const F=({className:t,...e})=>a.jsx(w,{className:r(t),...e}),H=({className:t,...e})=>a.jsx(D,{className:r(t),...e}),A=o.forwardRef(({className:t,...e},s)=>a.jsx(j,{ref:s,className:r(t),...e}));A.displayName="AlertDialogTitle";const S=o.forwardRef(({className:t,...e},s)=>a.jsx("p",{ref:s,className:r("text-sm text-slate-500 dark:text-slate-400",t),...e}));S.displayName="AlertDialogDescription";const y=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,className:r(t),...e}));y.displayName="AlertDialogAction";const k=o.forwardRef(({className:t,...e},s)=>a.jsx(d,{ref:s,variant:"outline",className:r(t),...e}));k.displayName="AlertDialogCancel";export{B as A,P as S,C as a,V as b,I as c,O as d,v as e,F as f,A as g,S as h,H as i,k as j,y as k};