autoglm-gui 1.5.1__tar.gz → 1.5.2__tar.gz

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/__init__.py

@@ -28,7 +28,7 @@ _original_popen = subprocess.Popen
 
 
 @wraps(_original_run)
-def _patched_run(*args, **kwargs):
+def _patched_run(*args, **kwargs) -> subprocess.CompletedProcess:
     """Patched subprocess.run that defaults to UTF-8 encoding on Windows."""
     if sys.platform == "win32":
         # Add encoding='utf-8' if text=True is set but encoding is not specified

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/__main__.py

@@ -56,7 +56,7 @@ def open_browser(
         delay: Delay in seconds before opening browser
     """
 
-    def _open():
+    def _open() -> None:
         time.sleep(delay)
         protocol = "https" if use_ssl else "http"
         url = (
@@ -141,6 +141,12 @@ def main() -> None:
         default=None,
         help="SSL certificate file path (for HTTPS)",
     )
+    parser.add_argument(
+        "--layered-max-turns",
+        type=int,
+        default=None,
+        help="Maximum turns for layered agent mode (default: 50, minimum: 1)",
+    )
 
     args = parser.parse_args()
 
@@ -170,7 +176,10 @@ def main() -> None:
 
     # 1. 设置 CLI 参数配置（最高优先级）
     config_manager.set_cli_config(
-        base_url=args.base_url, model_name=args.model, api_key=args.apikey
+        base_url=args.base_url,
+        model_name=args.model,
+        api_key=args.apikey,
+        layered_max_turns=args.layered_max_turns,
     )
 
     # 2. 加载环境变量配置

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/adb_plus/qr_pair.py

@@ -238,10 +238,10 @@ class QRPairingManager:
 
         return session
 
-    def _start_listener(self, session: PairingSession, adb_path: str):
+    def _start_listener(self, session: PairingSession, adb_path: str) -> None:
         """Start zeroconf listener (runs in thread pool to avoid blocking)."""
 
-        def _listen():
+        def _listen() -> None:
             """Listener thread function."""
             try:
                 zc = Zeroconf()
@@ -350,7 +350,7 @@ class QRPairingManager:
             logger.warning(f"[QR Pair] Session {session_id} not found for cancellation")
             return False
 
-    async def cleanup_expired_sessions(self):
+    async def cleanup_expired_sessions(self) -> None:
         """Background task to cleanup expired sessions.
 
         Runs indefinitely, checking every 60 seconds for expired sessions.

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/agents/__init__.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from typing import Callable
 
+from .protocols import AsyncAgent, BaseAgent, is_async_agent
+
 
 def register_agent(agent_type: str, creator: Callable) -> None:
     from .factory import register_agent as _register_agent
@@ -44,8 +46,11 @@ def is_agent_type_registered(agent_type: str) -> bool:
 
 
 __all__ = [
+    "AsyncAgent",
+    "BaseAgent",
     "create_agent",
-    "register_agent",
-    "list_agent_types",
     "is_agent_type_registered",
+    "is_async_agent",
+    "list_agent_types",
+    "register_agent",
 ]

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/agents/factory.py

@@ -12,7 +12,7 @@ from AutoGLM_GUI.config import AgentConfig, ModelConfig
 from AutoGLM_GUI.logger import logger
 from AutoGLM_GUI.types import AgentSpecificConfig
 
-from .protocols import BaseAgent
+from .protocols import AsyncAgent, BaseAgent
 
 
 # Agent registry: agent_type -> (creator_function, config_schema)
@@ -52,7 +52,7 @@ def create_agent(
     device,
     takeover_callback: Callable | None = None,
     confirmation_callback: Callable | None = None,
-) -> BaseAgent:
+) -> AsyncAgent | BaseAgent:
     """
     Create an agent instance using the factory pattern.
 
@@ -66,7 +66,8 @@ def create_agent(
         confirmation_callback: Confirmation callback
 
     Returns:
-        Agent instance implementing BaseAgent interface
+        Agent instance implementing AsyncAgent or BaseAgent interface.
+        Use runtime type detection (e.g., inspect.iscoroutinefunction) to determine which.
 
     Raises:
         ValueError: If agent_type is not registered
@@ -108,14 +109,51 @@ def is_agent_type_registered(agent_type: str) -> bool:
 # ==================== Built-in Agent Creators ====================
 
 
-def _create_glm_agent_v2(
+def _create_async_glm_agent(
     model_config: ModelConfig,
     agent_config: AgentConfig,
-    agent_specific_config: AgentSpecificConfig,
+    agent_specific_config: AgentSpecificConfig,  # noqa: ARG001
+    device,
+    takeover_callback: Callable | None = None,
+    confirmation_callback: Callable | None = None,
+) -> AsyncAgent:
+    """Create AsyncGLMAgent instance.
+
+    This is the default async implementation that supports:
+    - Native streaming with AsyncIterator
+    - Immediate cancellation with asyncio.CancelledError
+    - No worker threads or queues needed
+
+    Note: 'glm' now uses AsyncGLMAgent by default for better performance.
+    Use 'glm-sync' if you need the old synchronous implementation.
+    """
+    from .glm.async_agent import AsyncGLMAgent
+
+    # Note: AsyncGLMAgent implements AsyncAgent Protocol, but pyright cannot verify
+    # async generator function compatibility with Protocol. This is a known limitation
+    # of Python's type system. The implementation is correct at runtime.
+    return AsyncGLMAgent(  # type: ignore[return-value]
+        model_config=model_config,
+        agent_config=agent_config,
+        device=device,
+        confirmation_callback=confirmation_callback,
+        takeover_callback=takeover_callback,
+    )
+
+
+def _create_glm_agent_sync(
+    model_config: ModelConfig,
+    agent_config: AgentConfig,
+    agent_specific_config: AgentSpecificConfig,  # noqa: ARG001
     device,
     takeover_callback: Callable | None = None,
     confirmation_callback: Callable | None = None,
 ) -> BaseAgent:
+    """Create synchronous GLMAgent (legacy, for backward compatibility).
+
+    This is the old synchronous implementation using AgentStepStreamer.
+    Only use this if you have compatibility issues with AsyncGLMAgent.
+    """
     from .glm.agent import GLMAgent
 
     return GLMAgent(
@@ -149,5 +187,7 @@ def _create_internal_mai_agent(
     )
 
 
-register_agent("glm", _create_glm_agent_v2)
+register_agent("glm", _create_glm_agent_sync)  # 默认使用同步实现 (向后兼容)
+register_agent("glm-async", _create_async_glm_agent)  # 异步实现 (显式选择)
+register_agent("async-glm", _create_async_glm_agent)  # 别名
 register_agent("mai", _create_internal_mai_agent)

{autoglm_gui-1.5.1 → autoglm_gui-1.5.2}/AutoGLM_GUI/agents/glm/agent.py

@@ -1,6 +1,6 @@
 import json
 import traceback
-from typing import Any, Callable, cast
+from typing import Any, Callable
 
 from openai import OpenAI
 
@@ -90,7 +90,7 @@ class GLMAgent:
         on_thinking_chunk: Callable[[str], None] | None = None,
     ) -> tuple[str, str, str]:
         stream = self.openai_client.chat.completions.create(
-            messages=cast(Any, messages),
+            messages=messages,  # type: ignore[arg-type]
             model=self.model_config.model_name,
             max_tokens=self.model_config.max_tokens,
             temperature=self.model_config.temperature,