auto-coder 0.1.264__py3-none-any.whl → 0.1.265__py3-none-any.whl

autocoder/common/image_to_page.py

@@ -122,7 +122,7 @@ class ImageToPageDirectly:
 
         counter = 1 
         target_html_path = os.path.join(html_dir,f"{html_file_name}-{counter}.html") 
-        with open(target_html_path, "w") as f:
+        with open(target_html_path, "w",encoding="utf-8") as f:
             f.write(html)               
         
         while counter < max_iter:
@@ -137,11 +137,11 @@ class ImageToPageDirectly:
             
             target_html_path = os.path.join(html_dir,f"{html_file_name}-{counter}.html")
             logger.info(f"generate html: {target_html_path}")                
-            with open(target_html_path, "w") as f:
+            with open(target_html_path, "w",encoding="utf-8") as f:
                 f.write(html)            
         
         logger.info(f"finally generate html: {html_path}")
-        with open(html_path, "w") as f:
+        with open(html_path, "w",encoding="utf-8") as f:
             f.write(html)    
              
 
@@ -248,7 +248,7 @@ class ImageToPage:
                 file_path = block.path
                 os.makedirs(os.path.dirname(file_path), exist_ok=True)
 
-                with open(file_path, "w") as f:
+                with open(file_path, "w",encoding="utf-8") as f:
                     logger.info(f"Upsert path: {file_path}")                                       
                     f.write(block.content)
                     file_modified_num += 1
@@ -268,7 +268,7 @@ class ImageToPage:
         ## generate html by image description        
         content_contains_html_prompt = self.generate_html.prompt(desc,html_path) 
 
-        with open(self.args.target_file, "w") as f:
+        with open(self.args.target_file, "w",encoding="utf-8") as f:
             f.write(content_contains_html_prompt) 
 
         t = self.llm.chat_oai(conversations=[{
@@ -278,7 +278,7 @@ class ImageToPage:
 
         content_contains_html = t[0].output 
 
-        with open(self.args.target_file, "w") as f:
+        with open(self.args.target_file, "w",encoding="utf-8") as f:
             f.write(content_contains_html)
         
         
@@ -296,7 +296,7 @@ class ImageToPage:
 
         for i in range(max_iter):
             logger.info(f"iterate  {i}")
-            with open(html_path,"r") as f:
+            with open(html_path,"r",encoding="utf-8") as f:
                 prev_html = f.read()
 
             gen_screenshots(url=html_path,image_dir=new_image_dir)        
@@ -309,7 +309,7 @@ class ImageToPage:
             ## get new description prompt by comparing old and new image
             new_desc_prompt = self.get_optimize(self.score(origin_image,new_image))
 
-            with open(self.args.target_file, "w") as f:
+            with open(self.args.target_file, "w",encoding="utf-8") as f:
                 f.write(new_desc_prompt) 
 
             t = self.llm.chat_oai(conversations=[{
@@ -319,7 +319,7 @@ class ImageToPage:
 
             new_desc = t[0].output 
 
-            with open(self.args.target_file, "w") as f:
+            with open(self.args.target_file, "w",encoding="utf-8") as f:
                 f.write(new_desc)            
 
             logger.info(f"score old/new image: {new_desc}")
@@ -327,7 +327,7 @@ class ImageToPage:
             ## generate new html by new description
             optimze_html_prompt =  self.optimize_html.prompt(desc=new_desc,html=prev_html,html_path=html_path)                                    
             
-            with open(self.args.target_file, "w") as f:
+            with open(self.args.target_file, "w",encoding="utf-8") as f:
                 f.write(optimze_html_prompt) 
 
             t = self.llm.chat_oai(conversations=[{
@@ -336,7 +336,7 @@ class ImageToPage:
             }],llm_config={**extra_llm_config}) 
             new_code = t[0].output
             
-            with open(self.args.target_file, "w") as f:
+            with open(self.args.target_file, "w",encoding="utf-8") as f:
                 f.write(new_code) 
 
             self.write_code(new_code,html_path)

autocoder/common/index_import_export.py

@@ -3,6 +3,9 @@ import json
 import shutil
 from loguru import logger
 from autocoder.common.printer import Printer
+from autocoder.common.result_manager import ResultManager
+
+result_manager = ResultManager()
 
 
 def export_index(project_root: str, export_path: str) -> bool:
@@ -22,11 +25,11 @@ def export_index(project_root: str, export_path: str) -> bool:
         if not os.path.exists(index_path):
             printer.print_in_terminal("index_not_found", path=index_path)
             return False
-            
+
         # Read and convert paths
-        with open(index_path, "r") as f:
+        with open(index_path, "r",encoding="utf-8") as f:
             index_data = json.load(f)
-            
+
         # Convert absolute paths to relative
         converted_data = {}
         for abs_path, data in index_data.items():
@@ -35,21 +38,29 @@ def export_index(project_root: str, export_path: str) -> bool:
                 data["module_name"] = rel_path
                 converted_data[rel_path] = data
             except ValueError:
-                printer.print_in_terminal("index_convert_path_fail", path=abs_path)
+                printer.print_in_terminal(
+                    "index_convert_path_fail", path=abs_path)
                 converted_data[abs_path] = data
-        
+
         # Write to export location
         export_file = os.path.join(export_path, "index.json")
         os.makedirs(export_path, exist_ok=True)
-        with open(export_file, "w") as f:
+        with open(export_file, "w",encoding="utf-8") as f:
             json.dump(converted_data, f, indent=2)
-            
+        printer.print_in_terminal("index_export_success", path=export_file)
+        result_manager.add_result(content=printer.get_message_from_key_with_format("index_export_success", path=export_file), meta={"action": "index_export", "input": {
+            "path": export_file
+        }})
         return True
-        
+
     except Exception as e:
         printer.print_in_terminal("index_error", error=str(e))
+        result_manager.add_result(content=printer.get_message_from_key_with_format("index_error", error=str(e)), meta={"action": "index_export", "input": {
+            "path": export_file
+        }})
         return False
 
+
 def import_index(project_root: str, import_path: str) -> bool:
     printer = Printer()
     """
@@ -67,11 +78,11 @@ def import_index(project_root: str, import_path: str) -> bool:
         if not os.path.exists(import_file):
             printer.print_in_terminal("index_not_found", path=import_file)
             return False
-            
+
         # Read and convert paths
-        with open(import_file, "r") as f:
+        with open(import_file, "r",encoding="utf-8") as f:
             index_data = json.load(f)
-            
+
         # Convert relative paths to absolute
         converted_data = {}
         for rel_path, data in index_data.items():
@@ -80,22 +91,31 @@ def import_index(project_root: str, import_path: str) -> bool:
                 data["module_name"] = abs_path
                 converted_data[abs_path] = data
             except Exception:
-                printer.print_in_terminal("index_convert_path_fail", path=rel_path)
+                printer.print_in_terminal(
+                    "index_convert_path_fail", path=rel_path)
                 converted_data[rel_path] = data
-        
+
         # Backup existing index
         index_path = os.path.join(project_root, ".auto-coder", "index.json")
         if os.path.exists(index_path):
             backup_path = index_path + ".bak"
             shutil.copy2(index_path, backup_path)
             printer.print_in_terminal("index_backup_success", path=backup_path)
-            
+
         # Write new index
-        with open(index_path, "w") as f:
+        with open(index_path, "w",encoding="utf-8") as f:
             json.dump(converted_data, f, indent=2)
-            
-        return True
         
+        printer.print_in_terminal("index_import_success", path=index_path)
+        result_manager.add_result(content=printer.get_message_from_key_with_format("index_import_success", path=index_path), meta={"action": "index_import", "input": {
+            "path": index_path
+        }})
+
+        return True
+
     except Exception as e:
         printer.print_in_terminal("index_error", error=str(e))
-        return False
+        result_manager.add_result(content=printer.get_message_from_key_with_format("index_error", error=str(e)), meta={"action": "index_import", "input": {
+            "path": index_path
+        }})
+        return False

autocoder/common/mcp_hub.py

@@ -116,7 +116,7 @@ class McpHub:
     def _write_default_settings(self):
         """Write default MCP settings file"""
         default_settings = {"mcpServers": {}}
-        with open(self.settings_path, "w") as f:
+        with open(self.settings_path, "w",encoding="utf-8") as f:
             json.dump(default_settings, f, indent=2)
 
     async def add_server_config(self, name: str, config:Dict[str,Any]) -> None:
@@ -129,7 +129,7 @@ class McpHub:
         try:
             settings = self._read_settings()            
             settings["mcpServers"][name] = config
-            with open(self.settings_path, "w") as f:
+            with open(self.settings_path, "w",encoding="utf-8") as f:
                 json.dump(settings, f, indent=2, ensure_ascii=False)
             await self.initialize()
             logger.info(f"Added/updated MCP server config: {name}")
@@ -148,7 +148,7 @@ class McpHub:
             settings = self._read_settings()
             if name in settings["mcpServers"]:
                 del settings["mcpServers"][name]
-                with open(self.settings_path, "w") as f:
+                with open(self.settings_path, "w",encoding="utf-8") as f:
                     json.dump(settings, f, indent=2, ensure_ascii=False)
                 logger.info(f"Removed MCP server config: {name}")
                 await self.initialize()

autocoder/common/mcp_server.py

@@ -80,7 +80,7 @@ def get_mcp_external_servers() -> List[McpExternalServer]:
     if os.path.exists(cache_file):
         cache_time = os.path.getmtime(cache_file)
         if time.time() - cache_time < 3600:  # 1 hour cache
-            with open(cache_file, "r") as f:
+            with open(cache_file, "r",encoding="utf-8") as f:
                 raw_data = json.load(f)
                 return [McpExternalServer(**item) for item in raw_data]
 
@@ -91,7 +91,7 @@ def get_mcp_external_servers() -> List[McpExternalServer]:
         response = requests.get(url)
         if response.status_code == 200:
             raw_data = response.json()
-            with open(cache_file, "w") as f:
+            with open(cache_file, "w",encoding="utf-8") as f:
                 json.dump(raw_data, f)
             return [McpExternalServer(**item) for item in raw_data]
         return []

autocoder/common/shells.py

@@ -1,9 +1,10 @@
-
 import sys
 import os
 import locale
 import subprocess
 import platform
+import tempfile
+import uuid
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
@@ -21,18 +22,170 @@ def get_terminal_name() -> str:
     else:
         return _get_unix_terminal_name()
 
+def is_running_in_powershell() -> bool:
+    """
+    检查当前 Python 进程是否在 PowerShell 环境中运行
+    Returns:
+        bool: True 表示在 PowerShell 环境中，False 表示不在
+    """
+    try:
+        # 方法1: 检查特定的 PowerShell 环境变量
+        if any(key for key in os.environ if 'POWERSHELL' in key.upper()):
+            return True
+
+        # 方法2: 尝试执行 PowerShell 特定命令
+        try:
+            result = subprocess.run(
+                ['powershell', '-NoProfile', '-Command', '$PSVersionTable'],
+                capture_output=True,
+                timeout=1
+            )
+            if result.returncode == 0:
+                return True
+        except Exception:
+            pass
+
+        # 方法3: 检查父进程
+        try:
+            import psutil
+            current_process = psutil.Process()
+            parent = current_process.parent()
+            if parent:
+                parent_name = parent.name().lower()
+                if 'powershell' in parent_name or 'pwsh' in parent_name:
+                    return True
+                
+                # 递归检查父进程链
+                while parent and parent.pid != 1:  # 1 是系统初始进程
+                    if 'powershell' in parent.name().lower() or 'pwsh' in parent.name().lower():
+                        return True
+                    parent = parent.parent()
+        except Exception:
+            pass
+
+        # 方法4: 检查命令行参数
+        try:
+            import sys
+            if any('powershell' in arg.lower() for arg in sys.argv):
+                return True
+        except Exception:
+            pass
+
+        return False
+    except Exception:
+        return False
+
+def is_running_in_cmd() -> bool:
+    """
+    检查当前 Python 进程是否在 CMD 环境中运行
+    Returns:
+        bool: True 表示在 CMD 环境中，False 表示不在
+    """
+    # 如果在 PowerShell 中，直接返回 False
+    if is_running_in_powershell():
+        return False
+        
+    try:
+        # 方法1: 检查特定的 CMD 环境变量
+        env = os.environ
+        # CMD 特有的环境变量
+        if 'PROMPT' in env and not any(key for key in env if 'POWERSHELL' in key.upper()):
+            return True
+        
+        # 方法2: 检查 ComSpec 环境变量
+        comspec = env.get('ComSpec', '').lower()
+        if 'cmd.exe' in comspec:
+            return True
+
+        # 方法3: 检查父进程
+        try:
+            import psutil
+            current_process = psutil.Process()
+            parent = current_process.parent()
+            if parent:
+                parent_name = parent.name().lower()
+                if 'cmd.exe' in parent_name:
+                    return True
+                
+                # 递归检查父进程链
+                while parent and parent.pid != 1:  # 1 是系统初始进程
+                    if 'cmd.exe' in parent.name().lower():
+                        return True
+                    parent = parent.parent()
+        except Exception:
+            pass
+
+        return False
+    except Exception:
+        return False
+
 def _get_windows_terminal_name() -> str:
     """Windows 系统终端检测"""
-    # 检查是否在 PowerShell
-    if 'POWERSHELL_DISTRIBUTION_CHANNEL' in os.environ:
+    # 检查环境变量
+    env = os.environ
+
+    # 首先使用新方法检查是否在 PowerShell 环境中
+    if is_running_in_powershell():
+        # 进一步区分是否在 VSCode 的 PowerShell 终端
+        if 'VSCODE_GIT_IPC_HANDLE' in env:
+            return 'vscode-powershell'
         return 'powershell'
     
+    # 检查是否在 CMD 环境中
+    if is_running_in_cmd():
+        # 区分是否在 VSCode 的 CMD 终端
+        if 'VSCODE_GIT_IPC_HANDLE' in env:
+            return 'vscode-cmd'
+        return 'cmd'
+    
     # 检查是否在 Git Bash
-    if 'MINGW' in platform.system():
+    if ('MINGW' in platform.system() or 
+        'MSYSTEM' in env or 
+        any('bash.exe' in path.lower() for path in env.get('PATH', '').split(os.pathsep))):
+        # 区分是否在 VSCode 的 Git Bash 终端
+        if 'VSCODE_GIT_IPC_HANDLE' in env:
+            return 'vscode-git-bash'
         return 'git-bash'
     
+    # 检查是否在 VSCode 的集成终端
+    if 'VSCODE_GIT_IPC_HANDLE' in env:
+        if 'WT_SESSION' in env:  # Windows Terminal
+            return 'vscode-windows-terminal'
+        return 'vscode-terminal'
+    
+    # 检查是否在 Windows Terminal
+    if 'WT_SESSION' in env:
+        return 'windows-terminal'
+    
+    # 检查是否在 Cygwin
+    if 'CYGWIN' in platform.system():
+        return 'cygwin'
+    
+    # 检查 TERM 环境变量
+    term = env.get('TERM', '').lower()
+    if term:
+        if 'xterm' in term:
+            return 'xterm'
+        elif 'cygwin' in term:
+            return 'cygwin'
+    
+    # 检查进程名
+    try:
+        import psutil
+        parent = psutil.Process().parent()
+        if parent:
+            parent_name = parent.name().lower()
+            if 'powershell' in parent_name:
+                return 'powershell'
+            elif 'windowsterminal' in parent_name:
+                return 'windows-terminal'
+            elif 'cmd.exe' in parent_name:
+                return 'cmd'
+    except (ImportError, Exception):
+        pass
+    
     # 默认返回 cmd.exe
-    return 'cmd.exe'
+    return 'cmd'
 
 def _get_unix_terminal_name() -> str:
     """Linux/Mac 系统终端检测"""
@@ -138,28 +291,109 @@ def execute_shell_command(command: str):
     
     Args:
         command (str): The shell command to execute
-        encoding (str, optional): Override default encoding. Defaults to None.
     """
     console = Console()
     result_manager = ResultManager()
+    temp_file = None
     try:
-        # Get terminal encoding
+        # Get terminal encoding and name
         encoding = get_terminal_encoding()
+        terminal_name = get_terminal_name()
+
+        # Windows系统特殊处理
+        if sys.platform == 'win32':
+            # 设置控制台代码页为 UTF-8
+            os.system('chcp 65001 > nul')
+            # 强制使用 UTF-8 编码
+            encoding = 'utf-8'
+            # 设置环境变量
+            os.environ['PYTHONIOENCODING'] = 'utf-8'
+
+        # Create temp script file
+        if sys.platform == 'win32':
+            if is_running_in_powershell():
+                # Create temp PowerShell script with UTF-8 BOM
+                temp_file = tempfile.NamedTemporaryFile(
+                    mode='wb',
+                    suffix='.ps1',
+                    delete=False
+                )
+                # 添加 UTF-8 BOM
+                temp_file.write(b'\xef\xbb\xbf')
+                # 设置输出编码
+                ps_command = f'$OutputEncoding = [Console]::OutputEncoding = [Text.Encoding]::UTF8\n{command}'
+                temp_file.write(ps_command.encode('utf-8'))
+                temp_file.close()
+                # Execute the temp script with PowerShell
+                command = f'powershell.exe -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "{temp_file.name}"'
+            elif is_running_in_cmd():
+                # Create temp batch script with UTF-8
+                temp_file = tempfile.NamedTemporaryFile(
+                    mode='wb',
+                    suffix='.cmd',
+                    delete=False
+                )
+                # 添加 UTF-8 BOM
+                temp_file.write(b'\xef\xbb\xbf')
+                # 写入命令内容，确保UTF-8输出
+                content = f"""@echo off
+chcp 65001 > nul
+set PYTHONIOENCODING=utf-8
+{command}
+"""
+                temp_file.write(content.encode('utf-8'))
+                temp_file.close()
+                # Execute the temp batch script
+                command = f'cmd.exe /c "{temp_file.name}"'
+        else:
+            # Create temp shell script for Unix-like systems
+            temp_file = tempfile.NamedTemporaryFile(
+                mode='w',
+                suffix='.sh',
+                encoding='utf-8',
+                delete=False
+            )
+            temp_file.write('#!/bin/bash\n' + command)
+            temp_file.close()
+            # Make the script executable
+            os.chmod(temp_file.name, 0o755)
+            command = temp_file.name
 
-        # Start subprocess
+        # Start subprocess with UTF-8 encoding
+        startupinfo = None
+        if sys.platform == 'win32':
+            startupinfo = subprocess.STARTUPINFO()
+            startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+            
+        # 创建子进程时设置环境变量
+        env = os.environ.copy()
+        env['PYTHONIOENCODING'] = 'utf-8'
+        
         process = subprocess.Popen(
             command,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            shell=True
+            shell=True,
+            encoding='utf-8',  # 直接指定 UTF-8 编码
+            errors='replace',  # 处理无法解码的字符
+            env=env,          # 传递修改后的环境变量
+            startupinfo=startupinfo
         )
 
-        # Safe decoding helper
+        # Safe decoding helper (for binary output)
         def safe_decode(byte_stream, encoding):
+            if isinstance(byte_stream, str):
+                return byte_stream.strip()
             try:
-                return byte_stream.decode(encoding).strip()
+                # 首先尝试 UTF-8
+                return byte_stream.decode('utf-8').strip()
             except UnicodeDecodeError:
-                return byte_stream.decode(encoding, errors='replace').strip()
+                try:
+                    # 如果失败，尝试 GBK
+                    return byte_stream.decode('gbk').strip()
+                except UnicodeDecodeError:
+                    # 最后使用替换模式
+                    return byte_stream.decode(encoding, errors='replace').strip()
 
         output = []
         with Live(console=console, refresh_per_second=4) as live:
@@ -238,4 +472,11 @@ def execute_shell_command(command: str):
         })
         console.print(
             f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]"
-        )
+        )
+    finally:
+        # Clean up temp file
+        if temp_file and os.path.exists(temp_file.name):
+            try:
+                os.unlink(temp_file.name)
+            except Exception:
+                pass