auto-coder-web 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

auto_coder_web/terminal.py

@@ -1,84 +1,90 @@
 from fastapi import WebSocket
 import asyncio
 import websockets
-import pty
 import os
 import json
 import struct
-import fcntl
-import termios
 import signal
 from typing import Dict, Optional
 import threading
 import select
 import psutil
 import time
+import sys
+import platform
 
+# 为不同平台选择合适的终端库
+if platform.system() == 'Windows':
+    import winpty
+else:
+    import pty
+    import fcntl
+    import termios
 
 class TerminalSession:
-    def __init__(self, websocket: WebSocket, shell: str = '/bin/bash'):
+    def __init__(self, websocket: WebSocket, shell: str = None):
         self.websocket = websocket
-        self.shell = shell
+        # 根据平台选择默认shell
+        if shell is None:
+            if platform.system() == 'Windows':
+                self.shell = 'cmd.exe'
+            else:
+                self.shell = '/bin/bash'
+        else:
+            self.shell = shell
+        
         self.fd: Optional[int] = None
         self.pid: Optional[int] = None
         self.running = False
         self._lock = threading.Lock()
         self._last_heartbeat = time.time()
+        self.platform = platform.system()
+        self.pty = None  # 用于Windows的winpty实例
 
     async def start(self):
         """Start the terminal session"""
-        # Fork a new process for the shell
-        self.pid, self.fd = pty.fork()
-
-        if self.pid == 0:  # Child process
-            # Execute the shell
-            env = os.environ.copy()
-            env["TERM"] = "xterm-256color"
-            os.execvpe(self.shell, [self.shell], env)
-        else:  # Parent process
-            self.running = True
-            asyncio.create_task(self._handle_io())
-            # await self._handle_io()
-
-    def resize(self, rows: int, cols: int):
-        """Resize the terminal"""        
-        if self.fd is not None:
-            # Get the current window size
-            size = struct.pack("HHHH", rows, cols, 0, 0)
-            # Set new window size
-            fcntl.ioctl(self.fd, termios.TIOCSWINSZ, size)
-
-    async def _send_heartbeat(self):
-        while self.running:
+        if self.platform == 'Windows':
+            # Windows下使用winpty
             try:
-                # Shorter heartbeat timeout
-                if time.time() - self._last_heartbeat > 15:  # Reduced from 30 to 15 seconds
-                    print(
-                        "No heartbeat received for 15 seconds, initiating reconnection")
-                    self.running = False
-                    try:
-                        await self.websocket.close(code=1000, reason="Heartbeat timeout")
-                    except Exception:
-                        pass
-                    break
-
-                if self.websocket.client_state.CONNECTED:
-                    await self.websocket.send_json({"type": "heartbeat"})
-                else:
-                    print("WebSocket disconnected, stopping heartbeat")
-                    break
-
-                await asyncio.sleep(5)  # Reduced from 15 to 5 seconds
-
-            except websockets.exceptions.ConnectionClosed:
-                print("Connection closed normally during heartbeat")
-                break
+                self.pty = winpty.PTY(
+                    cols=80,
+                    rows=24
+                )
+                # 在Windows下，pid就是process.pid
+                self.pid = self.pty.spawn(self.shell)
+                self.fd = self.pty.fd  # winpty提供了类似的文件描述符
+                self.running = True
+                asyncio.create_task(self._handle_io())
             except Exception as e:
-                print(f"Error in heartbeat: {str(e)}")
-                if not self.running:
-                    break
-                await asyncio.sleep(1)  # Brief pause before retry
-                continue
+                print(f"Failed to start Windows terminal: {e}")
+                raise
+        else:
+            # Unix系统使用原有的pty
+            self.pid, self.fd = pty.fork()
+
+            if self.pid == 0:  # Child process
+                # Execute the shell
+                env = os.environ.copy()
+                env["TERM"] = "xterm-256color"
+                os.execvpe(self.shell, [self.shell], env)
+            else:  # Parent process
+                self.running = True
+                asyncio.create_task(self._handle_io())
+
+    def resize(self, rows: int, cols: int):
+        """Resize the terminal"""
+        if not self.running:
+            return
+            
+        if self.platform == 'Windows':
+            if self.pty:
+                self.pty.set_size(rows, cols)
+        else:
+            if self.fd is not None:
+                # Get the current window size
+                size = struct.pack("HHHH", rows, cols, 0, 0)
+                # Set new window size
+                fcntl.ioctl(self.fd, termios.TIOCSWINSZ, size)
 
     async def _handle_io(self):
         """Handle I/O between PTY and WebSocket"""
@@ -87,18 +93,29 @@ class TerminalSession:
         def _read_pty(fd, size=1024):
             """Synchronous PTY read with timeout"""
             try:
-                r, _, _ = select.select([fd], [], [], 0.1)
-                if r:
-                    try:
-                        data = os.read(fd, size)
-                        return data if data else None  # 返回None表示EOF
-                    except (OSError, EOFError) as e:
-                        print(f"Error reading PTY: {e}")
-                        return None
-                return b''  # 没有数据可读但不是错误
+                if self.platform == 'Windows':
+                    # Windows下使用winpty的读取方法
+                    if self.pty:
+                        try:
+                            data = self.pty.read(size)
+                            return data.encode('utf-8') if isinstance(data, str) else data
+                        except Exception as e:
+                            print(f"Error reading from winpty: {e}")
+                            return None
+                else:
+                    # Unix系统使用select
+                    r, _, _ = select.select([fd], [], [], 0.1)
+                    if r:
+                        try:
+                            data = os.read(fd, size)
+                            return data if data else None
+                        except (OSError, EOFError) as e:
+                            print(f"Error reading PTY: {e}")
+                            return None
+                    return b''
             except Exception as e:
                 print(f"Fatal error in PTY read: {e}")
-                return None  # 严重错误
+                return None
 
         async def _safe_send(data: bytes):
             """Safely send data to websocket with error handling"""
@@ -113,8 +130,8 @@ class TerminalSession:
                 print(f"WebSocket send error: {e}")
                 return False
 
-        read_errors = 0  # 跟踪连续读取错误
-        MAX_READ_ERRORS = 3  # 最大允许的连续读取错误
+        read_errors = 0
+        MAX_READ_ERRORS = 3
 
         try:
             while self.running:
@@ -126,23 +143,21 @@ class TerminalSession:
                     if not self.running:
                         break
 
-                    if data is None:  # 严重错误或EOF
+                    if data is None:
                         read_errors += 1
                         if read_errors >= MAX_READ_ERRORS:
-                            print(
-                                f"Too many PTY read errors ({read_errors}), stopping")
+                            print(f"Too many PTY read errors ({read_errors}), stopping")
                             break
-                        await asyncio.sleep(0.1)  # 错误后短暂等待
+                        await asyncio.sleep(0.1)
                         continue
 
-                    read_errors = 0  # 重置错误计数
+                    read_errors = 0
 
-                    if data:  # 有实际数据
-                        print(f"Received data from PTY: {data.decode('utf-8', errors='replace')}")
+                    if data:
                         if not await _safe_send(data):
                             break
 
-                    await asyncio.sleep(0.001)  # 防止CPU过度使用
+                    await asyncio.sleep(0.001)
 
                 except Exception as e:
                     print(f"IO handling error: {e}")
@@ -154,45 +169,48 @@ class TerminalSession:
         except Exception as e:
             print(f"Fatal error in IO handling: {e}")
         finally:
-            self.running = False  # 确保设置运行状态
+            self.running = False
             print("IO handling stopped")
-            # 确保清理
-            if self.fd is not None:
-                try:
-                    os.close(self.fd)
-                except:
-                    pass
-                self.fd = None
+            self.cleanup()
 
     def write(self, data: str):
         """Write data to the terminal"""        
-        if self.fd is not None:
-            try:
-                print(f"Writing data to pty: {data}")
-                encoded_data = data.encode('utf-8')
-                bytes_written = os.write(self.fd, encoded_data)
-                if bytes_written != len(encoded_data):
-                    print(
-                        f"Warning: Not all bytes written. Expected {len(encoded_data)}, wrote {bytes_written}")
-            except Exception as e:
-                print(f"Error writing to terminal: {e}")
+        if not self.running:
+            return
+            
+        try:
+            encoded_data = data.encode('utf-8')
+            if self.platform == 'Windows':
+                if self.pty:
+                    self.pty.write(data)  # winpty接受字符串输入
+            else:
+                if self.fd is not None:
+                    os.write(self.fd, encoded_data)
+        except Exception as e:
+            print(f"Error writing to terminal: {e}")
 
     def cleanup(self):
         """Clean up the terminal session"""
         print("Cleaning up terminal session...")
         self.running = False
-        if self.pid:
-            try:
-                os.kill(self.pid, signal.SIGTERM)
-            except ProcessLookupError:
-                pass
-        if self.fd is not None:
-            try:
-                os.close(self.fd)
-            except OSError:
-                # File descriptor may already be closed
-                pass
-
+        
+        if self.platform == 'Windows':
+            if self.pty:
+                try:
+                    self.pty.close()
+                except Exception as e:
+                    print(f"Error closing winpty: {e}")
+        else:
+            if self.pid:
+                try:
+                    os.kill(self.pid, signal.SIGTERM)
+                except ProcessLookupError:
+                    pass
+            if self.fd is not None:
+                try:
+                    os.close(self.fd)
+                except OSError:
+                    pass
 
 class TerminalManager:
     def __init__(self):
@@ -200,9 +218,6 @@ class TerminalManager:
 
     async def create_session(self, websocket: WebSocket, session_id: str):
         """Create a new terminal session"""
-
-        # if self.sessions:
-        #     return list(self.sessions.values())[-1]
         if session_id in self.sessions:
             await self.close_session(session_id)
 
@@ -237,7 +252,6 @@ class TerminalManager:
                             else:
                                 session.write(data)
                         except json.JSONDecodeError:
-                            # 如果不是JSON，就当作普通输入处理
                             session.write(data)
                     except RuntimeError as e:
                         if "WebSocket is not connected" in str(e):
@@ -255,5 +269,4 @@ class TerminalManager:
                 await self.close_session(session_id)
             raise
 
-
-terminal_manager = TerminalManager()
+terminal_manager = TerminalManager()

auto_coder_web/version.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

{auto_coder_web-0.1.6.dist-info → auto_coder_web-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto_coder_web
-Version: 0.1.6
+Version: 0.1.7
 Summary: auto-coder.web: A Python Project
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.9
@@ -12,6 +12,7 @@ Requires-Dist: aiofiles
 Requires-Dist: psutil
 Requires-Dist: sse-starlette
 Requires-Dist: websockets
+Requires-Dist: pywinpty ; sys_platform == "win32"
 
 # auto-coder.web
 
@@ -45,6 +46,7 @@ docker run  \
   -e BASE_URL=https://api.deepseek.com/v1 \
   -e API_KEY=$MODEL_DEEPSEEK_TOKEN \
   -e MODEL=deepseek-chat \
+  -p 8006:8006 \
   -p 8007:8007 \
   -p 8265:8265 \
   -v <你的项目>:/app/work \

{auto_coder_web-0.1.6.dist-info → auto_coder_web-0.1.7.dist-info}/RECORD

@@ -5,8 +5,8 @@ auto_coder_web/file_manager.py,sha256=wYe0NKqclhB22zTXT7du-5WRqne65tAZiTVAKsEZia
 auto_coder_web/hello.py,sha256=H-BM5gdpcfTT4T2pn7Q1qWfquf0jwzGRuOBozbc8dbA,741
 auto_coder_web/json_file_storage.py,sha256=elthpcdclXITX3jew2EtT-ypyxZzDAzG1U7_k3looHI,1757
 auto_coder_web/proxy.py,sha256=mqh8UiP9lsAuwPP0Cy5nmgVle4yn4rWCtI75W6uomjw,21478
-auto_coder_web/terminal.py,sha256=1oQRIeLCifdBG4KBGvVeigpDJXILbw1cTdMs1gFihn8,9539
-auto_coder_web/version.py,sha256=n3oM6B_EMz93NsTI18NNZd-jKFcUPzUkbIKj5VFK5ok,22
+auto_coder_web/terminal.py,sha256=jtAH7FaC573cgxc7FnI_mOZ3D2dSCO3PrZN0OehtbNQ,9521
+auto_coder_web/version.py,sha256=YpKDcdV7CqL8n45u267wKtyloM13FSVbOdrqgNZnSLM,22
 auto_coder_web/web/asset-manifest.json,sha256=ZQGrHji5YM4uPTc4Nk06E90t6PD1aSR3F9KunHkDKQ4,517
 auto_coder_web/web/favicon.ico,sha256=PRD32mxgMXg0AIFmjErFs66XQ8qaJiqw_NMS-7n0i90,3870
 auto_coder_web/web/index.html,sha256=UXEdzAYIuMzJZf52RPcMlm9A9mTGLsshVJwaYwMUnW0,644
@@ -44,8 +44,8 @@ auto_coder_web/web/static/js/main.af855afe.js.map,sha256=G2tu9r9hPw_lWkYlNUC6wv_
 auto_coder_web/web/static/js/main.ba643932.js,sha256=cYOdfCQIkfNoYhlX1XkHRH044pEkTVe6bz4odmfQe3c,1256033
 auto_coder_web/web/static/js/main.ba643932.js.LICENSE.txt,sha256=rseC9BHzhrHoQhEIcUKYbKYTmaZc3jx198-A7figAUo,22630
 auto_coder_web/web/static/js/main.ba643932.js.map,sha256=TnZnz40mVLDqMY_cD4XjcIoER5ewUPLyVZEgUuO3w50,5007072
-auto_coder_web-0.1.6.dist-info/METADATA,sha256=XBAL1guf_qOnxNoCPQTekKAdv8TIHC4bHmu3KgCAz94,1230
-auto_coder_web-0.1.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder_web-0.1.6.dist-info/entry_points.txt,sha256=oh8kd1ZecWDgdv-bIj_ru3phvl4scuxwXl9DK0Khltg,61
-auto_coder_web-0.1.6.dist-info/top_level.txt,sha256=UCzEw494Im0KvR-FTYf2jh-okqHvLsC_0JLOrQZoSpg,15
-auto_coder_web-0.1.6.dist-info/RECORD,,
+auto_coder_web-0.1.7.dist-info/METADATA,sha256=J8DdSVRkTXK64VRkOKd-gDEcHC9JKYufAkAbfL2m6bM,1297
+auto_coder_web-0.1.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder_web-0.1.7.dist-info/entry_points.txt,sha256=oh8kd1ZecWDgdv-bIj_ru3phvl4scuxwXl9DK0Khltg,61
+auto_coder_web-0.1.7.dist-info/top_level.txt,sha256=UCzEw494Im0KvR-FTYf2jh-okqHvLsC_0JLOrQZoSpg,15
+auto_coder_web-0.1.7.dist-info/RECORD,,