autoglm-gui 0.4.8__tar.gz → 0.4.9__tar.gz

autoglm_gui-0.4.9/AutoGLM_GUI/__init__.py

@@ -0,0 +1,52 @@
+"""AutoGLM-GUI package metadata."""
+
+import subprocess
+import sys
+from functools import wraps
+from importlib import metadata
+
+# ============================================================================
+# Fix Windows encoding issue: Force UTF-8 for all subprocess calls
+# ============================================================================
+# On Windows, subprocess defaults to GBK encoding which fails when ADB/scrcpy
+# output UTF-8 characters. This monkey patch ensures all subprocess calls
+# use UTF-8 encoding by default.
+
+_original_run = subprocess.run
+_original_popen = subprocess.Popen
+
+
+@wraps(_original_run)
+def _patched_run(*args, **kwargs):
+    """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
+        if kwargs.get("text") or kwargs.get("universal_newlines"):
+            if "encoding" not in kwargs:
+                kwargs["encoding"] = "utf-8"
+    return _original_run(*args, **kwargs)
+
+
+class _PatchedPopen(_original_popen):
+    """Patched subprocess.Popen that defaults to UTF-8 encoding on Windows."""
+
+    def __init__(self, *args, **kwargs):
+        if sys.platform == "win32":
+            # Add encoding='utf-8' if text=True is set but encoding is not specified
+            if kwargs.get("text") or kwargs.get("universal_newlines"):
+                if "encoding" not in kwargs:
+                    kwargs["encoding"] = "utf-8"
+        super().__init__(*args, **kwargs)
+
+
+# Apply the patches globally
+subprocess.run = _patched_run
+subprocess.Popen = _PatchedPopen
+
+# ============================================================================
+
+# Expose package version at runtime; fall back to "unknown" during editable/dev runs
+try:
+    __version__ = metadata.version("autoglm-gui")
+except metadata.PackageNotFoundError:
+    __version__ = "unknown"

{autoglm_gui-0.4.8 → autoglm_gui-0.4.9}/AutoGLM_GUI/api/media.py

@@ -91,7 +91,9 @@ async def video_stream_ws(
     if DEBUG_SAVE_STREAM:
         debug_dir = Path("debug_streams")
         debug_dir.mkdir(exist_ok=True)
-        debug_file_path = debug_dir / f"{device_id}_{int(__import__('time').time())}.h264"
+        debug_file_path = (
+            debug_dir / f"{device_id}_{int(__import__('time').time())}.h264"
+        )
         debug_file = open(debug_file_path, "wb")
         print(f"[video/stream] DEBUG: Saving stream to {debug_file_path}")
 

autoglm_gui-0.4.9/AutoGLM_GUI/platform_utils.py

@@ -0,0 +1,37 @@
+"""Platform-aware subprocess helpers to avoid duplicated Windows branches."""
+
+import asyncio
+import platform
+import subprocess
+from typing import Any, Sequence
+
+
+def is_windows() -> bool:
+    """Return True if running on Windows."""
+    return platform.system() == "Windows"
+
+
+async def run_cmd_silently(cmd: Sequence[str]) -> subprocess.CompletedProcess:
+    """Run a command, suppressing output; safe for async contexts on all platforms."""
+    if is_windows():
+        # Avoid blocking the event loop with a blocking subprocess call on Windows.
+        return await asyncio.to_thread(
+            subprocess.run, cmd, capture_output=True, check=False
+        )
+
+    process = await asyncio.create_subprocess_exec(
+        *cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+    )
+    await process.wait()
+    return subprocess.CompletedProcess(cmd, process.returncode, None, None)
+
+
+async def spawn_process(cmd: Sequence[str], *, capture_output: bool = False) -> Any:
+    """Start a long-running process with optional stdio capture."""
+    stdout = subprocess.PIPE if capture_output else None
+    stderr = subprocess.PIPE if capture_output else None
+
+    if is_windows():
+        return subprocess.Popen(cmd, stdout=stdout, stderr=stderr)
+
+    return await asyncio.create_subprocess_exec(*cmd, stdout=stdout, stderr=stderr)

{autoglm_gui-0.4.8 → autoglm_gui-0.4.9}/AutoGLM_GUI/scrcpy_stream.py

@@ -2,10 +2,12 @@
 
 import asyncio
 import os
-import platform
 import socket
 import subprocess
 from pathlib import Path
+from typing import Any
+
+from AutoGLM_GUI.platform_utils import is_windows, run_cmd_silently, spawn_process
 
 
 class ScrcpyStreamer:
@@ -34,7 +36,7 @@ class ScrcpyStreamer:
         self.port = port
         self.idr_interval_s = idr_interval_s
 
-        self.scrcpy_process: subprocess.Popen | None = None
+        self.scrcpy_process: Any | None = None
         self.tcp_socket: socket.socket | None = None
         self.forward_cleanup_needed = False
 
@@ -126,50 +128,20 @@ class ScrcpyStreamer:
         if self.device_id:
             cmd_base.extend(["-s", self.device_id])
 
-        # On Windows, use subprocess.run instead of asyncio.create_subprocess_exec
-        # to avoid NotImplementedError in some Windows environments
-        if platform.system() == "Windows":
-            # Method 1: Try pkill
-            cmd = cmd_base + ["shell", "pkill", "-9", "-f", "app_process.*scrcpy"]
-            subprocess.run(cmd, capture_output=True, check=False)
+        # Method 1: Try pkill
+        cmd = cmd_base + ["shell", "pkill", "-9", "-f", "app_process.*scrcpy"]
+        await run_cmd_silently(cmd)
 
-            # Method 2: Find and kill by PID (more reliable)
-            cmd = cmd_base + [
-                "shell",
-                "ps -ef | grep 'app_process.*scrcpy' | grep -v grep | awk '{print $2}' | xargs kill -9",
-            ]
-            subprocess.run(cmd, capture_output=True, check=False)
-
-            # Method 3: Remove port forward if exists
-            cmd_remove_forward = cmd_base + ["forward", "--remove", f"tcp:{self.port}"]
-            subprocess.run(cmd_remove_forward, capture_output=True, check=False)
-        else:
-            # Original asyncio-based implementation for Unix systems
-            # Method 1: Try pkill
-            cmd = cmd_base + ["shell", "pkill", "-9", "-f", "app_process.*scrcpy"]
-            process = await asyncio.create_subprocess_exec(
-                *cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-            )
-            await process.wait()
+        # Method 2: Find and kill by PID (more reliable)
+        cmd = cmd_base + [
+            "shell",
+            "ps -ef | grep 'app_process.*scrcpy' | grep -v grep | awk '{print $2}' | xargs kill -9",
+        ]
+        await run_cmd_silently(cmd)
 
-            # Method 2: Find and kill by PID (more reliable)
-            cmd = cmd_base + [
-                "shell",
-                "ps -ef | grep 'app_process.*scrcpy' | grep -v grep | awk '{print $2}' | xargs kill -9",
-            ]
-            process = await asyncio.create_subprocess_exec(
-                *cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-            )
-            await process.wait()
-
-            # Method 3: Remove port forward if exists
-            cmd_remove_forward = cmd_base + ["forward", "--remove", f"tcp:{self.port}"]
-            process = await asyncio.create_subprocess_exec(
-                *cmd_remove_forward,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
-            )
-            await process.wait()
+        # Method 3: Remove port forward if exists
+        cmd_remove_forward = cmd_base + ["forward", "--remove", f"tcp:{self.port}"]
+        await run_cmd_silently(cmd_remove_forward)
 
         # Wait longer for resources to be released
         print("[ScrcpyStreamer] Waiting for cleanup to complete...")
@@ -182,13 +154,7 @@ class ScrcpyStreamer:
             cmd.extend(["-s", self.device_id])
         cmd.extend(["push", self.scrcpy_server_path, "/data/local/tmp/scrcpy-server"])
 
-        if platform.system() == "Windows":
-            subprocess.run(cmd, capture_output=True, check=False)
-        else:
-            process = await asyncio.create_subprocess_exec(
-                *cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-            )
-            await process.wait()
+        await run_cmd_silently(cmd)
 
     async def _setup_port_forward(self) -> None:
         """Setup ADB port forwarding."""
@@ -197,13 +163,7 @@ class ScrcpyStreamer:
             cmd.extend(["-s", self.device_id])
         cmd.extend(["forward", f"tcp:{self.port}", "localabstract:scrcpy"])
 
-        if platform.system() == "Windows":
-            subprocess.run(cmd, capture_output=True, check=False)
-        else:
-            process = await asyncio.create_subprocess_exec(
-                *cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-            )
-            await process.wait()
+        await run_cmd_silently(cmd)
         self.forward_cleanup_needed = True
 
     async def _start_server(self) -> None:
@@ -238,22 +198,14 @@ class ScrcpyStreamer:
             cmd.extend(server_args)
 
             # Capture stderr to see error messages
-            if platform.system() == "Windows":
-                # On Windows, use subprocess.Popen for async-like behavior
-                self.scrcpy_process = subprocess.Popen(
-                    cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-                )
-            else:
-                self.scrcpy_process = await asyncio.create_subprocess_exec(
-                    *cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-                )
+            self.scrcpy_process = await spawn_process(cmd, capture_output=True)
 
             # Wait for server to start
             await asyncio.sleep(2)
 
             # Check if process is still running
             error_msg = None
-            if platform.system() == "Windows":
+            if is_windows():
                 # For Windows Popen, check returncode directly
                 if self.scrcpy_process.poll() is not None:
                     # Process has exited
@@ -314,9 +266,7 @@ class ScrcpyStreamer:
 
         raise ConnectionError("Failed to connect to scrcpy server")
 
-    def _find_nal_units(
-        self, data: bytes
-    ) -> list[tuple[int, int, int, bool]]:
+    def _find_nal_units(self, data: bytes) -> list[tuple[int, int, int, bool]]:
         """Find NAL units in H.264 data.
 
         Returns:
@@ -392,9 +342,7 @@ class ScrcpyStreamer:
                             f"[ScrcpyStreamer] ✓ Cached SPS ({size} bytes, complete={is_complete}): {hex_preview}..."
                         )
                     elif size < 10:
-                        print(
-                            f"[ScrcpyStreamer] ✗ Skipped short SPS ({size} bytes)"
-                        )
+                        print(f"[ScrcpyStreamer] ✗ Skipped short SPS ({size} bytes)")
 
             elif nal_type == 8:  # PPS
                 # Only cache PPS if not yet locked
@@ -409,9 +357,7 @@ class ScrcpyStreamer:
                             f"[ScrcpyStreamer] ✓ Cached PPS ({size} bytes, complete={is_complete}): {hex_preview}..."
                         )
                     elif size < 6:
-                        print(
-                            f"[ScrcpyStreamer] ✗ Skipped short PPS ({size} bytes)"
-                        )
+                        print(f"[ScrcpyStreamer] ✗ Skipped short PPS ({size} bytes)")
 
             elif nal_type == 5:  # IDR frame
                 # Cache IDR if it's large enough (size check is sufficient)
@@ -422,9 +368,7 @@ class ScrcpyStreamer:
                     is_first = self.cached_idr is None
                     self.cached_idr = nal_data
                     if is_first:
-                        print(
-                            f"[ScrcpyStreamer] ✓ Cached IDR frame ({size} bytes)"
-                        )
+                        print(f"[ScrcpyStreamer] ✓ Cached IDR frame ({size} bytes)")
                     # Don't log every IDR update (too verbose)
                 elif size < 1024:
                     print(

{autoglm_gui-0.4.8 → autoglm_gui-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoglm-gui
-Version: 0.4.8
+Version: 0.4.9
 Summary: Web GUI for AutoGLM Phone Agent - AI-powered Android automation
 Project-URL: Homepage, https://github.com/suyiiyii/AutoGLM-GUI
 Project-URL: Repository, https://github.com/suyiiyii/AutoGLM-GUI
@@ -51,6 +51,9 @@ AutoGLM 手机助手的现代化 Web 图形界面 - 让 AI 自动化操作 Andro
 ### 任务执行完成
 ![任务结束](https://github.com/user-attachments/assets/b32f2e46-5340-42f5-a0db-0033729e1605)
 
+### 多设备控制
+![多设备控制](https://github.com/user-attachments/assets/f826736f-c41f-4d64-bf54-3ca65c69068d)
+
 ## 🚀 快速开始
 
 ## 🎯 模型服务配置

{autoglm_gui-0.4.8 → autoglm_gui-0.4.9}/README.md

@@ -23,6 +23,9 @@ AutoGLM 手机助手的现代化 Web 图形界面 - 让 AI 自动化操作 Andro
 ### 任务执行完成
 ![任务结束](https://github.com/user-attachments/assets/b32f2e46-5340-42f5-a0db-0033729e1605)
 
+### 多设备控制
+![多设备控制](https://github.com/user-attachments/assets/f826736f-c41f-4d64-bf54-3ca65c69068d)
+
 ## 🚀 快速开始
 
 ## 🎯 模型服务配置

{autoglm_gui-0.4.8 → autoglm_gui-0.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoglm-gui"
-version = "0.4.8"
+version = "0.4.9"
 description = "Web GUI for AutoGLM Phone Agent - AI-powered Android automation"
 readme = "README.md"
 requires-python = ">=3.10"

autoglm_gui-0.4.8/AutoGLM_GUI/__init__.py

@@ -1,9 +0,0 @@
-"""AutoGLM-GUI package metadata."""
-
-from importlib import metadata
-
-# Expose package version at runtime; fall back to "unknown" during editable/dev runs
-try:
-    __version__ = metadata.version("autoglm-gui")
-except metadata.PackageNotFoundError:
-    __version__ = "unknown"