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

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

autocoder/common/stats_panel.py

@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+from rich.console import Console
+from rich.panel import Panel
+from rich.columns import Columns
+from rich.text import Text
+import math
+
+class StatsPanel:
+    def __init__(self, console: Console = None):
+        self.console = console if console else Console()
+
+    def _format_speed_bar(self, speed: float) -> Text:
+        """生成速度可视化进度条（保持原30-60区间）"""
+        if speed < 30:
+            color = "red"
+            level = "低"
+        elif 30 <= speed < 60:
+            color = "yellow"
+            level = "中"
+        else:
+            color = "green"
+            level = "高"
+
+        bar_length = min(int(speed), 100)
+        bar = Text("▮" * bar_length, style=color)
+        bar.append(f" {speed:.1f} tokens/s ({level})", style="bold white")
+        return bar
+
+    def _format_progress_bar(self, value: int, max_value: int, label: str, color: str) -> Text:
+        """生成通用进度条"""
+        progress = min(value / max_value, 1.0)
+        bar_length = int(progress * 20)
+        bar = Text("▮" * bar_length, style=color)
+        bar.append(f" {value} ({label})", style="bold white")
+        return bar
+
+    def generate(
+         self,
+         model_names: str,
+         duration: float,
+         sampling_count: int,
+         input_tokens: int,
+         output_tokens: int,
+         input_cost: float,
+         output_cost: float,
+         speed: float,
+     ) -> None:
+         """新版紧凑布局"""
+         # 复合标题（带图标和关键数据）
+         title = Text.assemble(
+             "📊 ", ("代码生成统计", "bold cyan underline"),
+             " │ ⚡", (f"{speed:.1f}t/s ", "bold green"),
+             "│ 💰", (f"${input_cost + output_cost:.4f}", "bold yellow")
+         )
+
+         # 处理耗时颜色逻辑（新增15-30-60区间）
+         duration_color = "green"
+         if 15 <= duration < 30:
+             duration_color = "yellow"
+         elif duration >= 30:
+             duration_color = "red"
+
+         # 处理成本颜色逻辑（新增0.5-1区间）
+         def get_cost_color(cost: float) -> str:
+             if cost < 0.5: return "green"
+             elif 0.5 <= cost < 1: return "yellow"
+             else: return "red"
+
+         # 紧凑网格布局
+         grid = [
+             Panel(
+                 Text.assemble(
+                     ("🤖 模型: ", "bold"), model_names + "\n",
+                     self._format_mini_progress(duration, 60.0, duration_color),  # 耗时max=60
+                     (" ⏱", duration_color), f" {duration:.1f}s │ ",
+                     self._format_mini_progress(sampling_count, 100, "blue"),
+                     (" 🔢", "blue"), f" {sampling_count}\n",
+                     ("📥", "green"), " ", 
+                     self._format_mini_progress(input_tokens, 65536.0, "green"),  # token分母改为65536
+                     f" {input_tokens} ({input_tokens/65536*100:.2f}%) │ ",  # 新增百分比显示
+                     ("📤", "bright_green"), " ", 
+                     self._format_mini_progress(output_tokens, 65536.0, "bright_green"),
+                     f" {output_tokens} ({output_tokens/65536*100:.2f}%)"  # 新增百分比显示
+                 ),
+                 border_style="cyan",
+                 padding=(0, 2)
+             ),
+             Panel(
+                 Text.assemble(
+                     ("💵 成本: ", "bold"), 
+                     self._format_mini_progress(input_cost, 1.0, get_cost_color(input_cost)),  # 成本max=1
+                     (" IN", get_cost_color(input_cost)), f" {input_cost:.3f}\n",
+                     ("💸 ", "bold"), 
+                     self._format_mini_progress(output_cost, 1.0, get_cost_color(output_cost)),
+                     (" OUT", get_cost_color(output_cost)), f" {output_cost:.3f}\n",
+                     self._format_speed_bar(speed)
+                 ),
+                 border_style="yellow",
+                 padding=(0, 1)
+             )
+         ]
+
+         # 组合布局
+         main_panel = Panel(
+             Columns(grid, equal=True, expand=True),
+             title=title,
+             border_style="bright_blue",
+             padding=(1, 2)
+         )
+
+         self.console.print(main_panel)
+    
+
+    def _format_mini_progress(self, value: float, max_value: float, color: str) -> Text:
+        """紧凑型进度条（支持浮点数）"""
+        progress = min(value / max_value, 1.0)
+        filled = "▮" * int(progress * 10)
+        empty = "▯" * (10 - len(filled))
+        return Text(filled + empty, style=color)

autocoder/dispacher/actions/action.py

@@ -86,7 +86,7 @@ class ActionTSProject(BaseAction):
                 max_iter=self.args.image_max_iter,
             )
             html_code = ""
-            with open(html_path, "r") as f:
+            with open(html_path, "r",encoding="utf-8") as f:
                 html_code = f.read()
             
             source_code_list.sources.append(SourceCode( 
@@ -190,9 +190,7 @@ class ActionTSProject(BaseAction):
                         conversations=generate_result.conversations[0],
                         model=self.llm.default_model_name,
                     )
-
-                with open(args.target_file, "w") as file:
-                    file.write(content)
+                
 
 
 class ActionPyScriptProject(BaseAction):
@@ -300,11 +298,7 @@ class ActionPyScriptProject(BaseAction):
                     instruction=self.args.query,
                     conversations=generate_result.conversations[0],
                     model=self.llm.default_model_name,
-                )
-
-            end_time = time.time()            
-            with open(self.args.target_file, "w") as file:
-                file.write(content)
+                )                        
 
 
 class ActionPyProject(BaseAction):
@@ -435,9 +429,7 @@ class ActionPyProject(BaseAction):
                     instruction=self.args.query,
                     conversations=generate_result.conversations[0],
                     model=self.llm.default_model_name,
-                )            
-            with open(args.target_file, "w") as file:
-                file.write(content)
+                )                        
 
 
 class ActionSuffixProject(BaseAction):
@@ -551,9 +543,7 @@ class ActionSuffixProject(BaseAction):
                 instruction=self.args.query,
                 conversations=merge_result.conversations[0],
                 model=self.llm.default_model_name,
-            )
-            with open(args.target_file, "w") as file:
-                file.write(content)
+            )            
         else:
             content = generate_result.contents[0]
 
@@ -563,7 +553,5 @@ class ActionSuffixProject(BaseAction):
                 conversations=generate_result.conversations[0],
                 model=self.llm.default_model_name,
             )
-
-            with open(args.target_file, "w") as file:
-                file.write(content)
+            
 

autocoder/dispacher/actions/copilot.py

@@ -343,7 +343,7 @@ class ActionCopilot:
             logger.info(
                 "model is not specified and we will generate prompt to the target file"
             )
-            with open(args.target_file, "w") as f:
+            with open(args.target_file, "w",encoding="utf-8") as f:
                 f.write(q)
             return True
 
@@ -379,7 +379,7 @@ class ActionCopilot:
         logger.info(result)
 
         # 将结果写入文件
-        with open(args.target_file, "w") as f:
+        with open(args.target_file, "w",encoding="utf-8") as f:
             f.write("=================CONVERSATION==================\n\n")
             for conversation in conversations:
                 f.write(f"{conversation['role']}: {conversation['content']}\n")

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -146,6 +146,4 @@ class ActionRegexProject:
                     conversations=generate_result.conversations[0],
                     model=self.llm.default_model_name,
                 )
-
-            with open(args.target_file, "w") as file:
-                file.write(content)
+            

autocoder/dispacher/actions/plugins/action_translate.py

@@ -209,6 +209,6 @@ class ActionTranslate:
                 new_filename = f"{filename}{new_file_mark}{extension}"
 
             logger.info(f"Writing to {new_filename}...")
-            with open(new_filename, "w") as file:
+            with open(new_filename, "w",encoding="utf-8") as file:
                 file.write(readme.content)
         return True

autocoder/index/entry.py

@@ -110,8 +110,8 @@ def build_index_and_filter_files(
             printer.print_in_terminal("quick_filter_start", style="blue", model_name=model_name)
             quick_filter = QuickFilter(index_manager,stats,sources)        
             quick_filter_result = quick_filter.filter(index_manager.read_index(),args.query)
-            if quick_filter_result.has_error:                
-                raise KeyboardInterrupt(printer.get_message_from_key_with_format("quick_filter_failed",error=quick_filter_result.error_message))
+            # if quick_filter_result.has_error:                
+            #     raise KeyboardInterrupt(printer.get_message_from_key_with_format("quick_filter_failed",error=quick_filter_result.error_message))
 
             # Merge quick filter results into final_files
             if args.context_prune:

autocoder/index/filter/normal_filter.py

@@ -31,7 +31,7 @@ class NormalFilterResult(BaseModel):
     files: Dict[str, TargetFile]
     has_error: bool
     error_message: Optional[str] = None
-    file_positions: Optional[Dict[str, int]]
+    file_positions: Optional[Dict[str, int]] = {}
 
 class NormalFilter():
     def __init__(self, index_manager: IndexManager,stats:Dict[str,Any],sources:List[SourceCode]):

autocoder/index/filter/quick_filter.py

@@ -154,7 +154,7 @@ class QuickFilter():
                 else:
                     # 其他chunks直接使用with_llm
                     meta_holder = MetaHolder()
-                    start_time = time.monotonic()
+                    start_time = time.monotonic()                    
                     file_number_list = self.quick_filter_files.with_llm(self.index_manager.index_filter_llm).with_meta(
                         meta_holder).with_return_type(FileNumberList).run(chunk, self.args.query)
                     end_time = time.monotonic()

autocoder/index/index.py

@@ -342,7 +342,7 @@ class IndexManager:
 
     def build_index(self):
         if os.path.exists(self.index_file):
-            with open(self.index_file, "r") as file:
+            with open(self.index_file, "r",encoding="utf-8") as file:
                 index_data = json.load(file)
         else:
             index_data = {}
@@ -433,13 +433,13 @@ class IndexManager:
                     index_data[module_name] = result
                     updated_sources.append(module_name)
                     if len(updated_sources) > 5:
-                        with open(self.index_file, "w") as file:
+                        with open(self.index_file, "w",encoding="utf-8") as file:
                             json.dump(index_data, file, ensure_ascii=False, indent=2)
                         updated_sources = []
         
         # 如果 updated_sources 或 keys_to_remove 有值，则保存索引文件
         if updated_sources or keys_to_remove:
-            with open(self.index_file, "w") as file:
+            with open(self.index_file, "w",encoding="utf-8") as file:
                 json.dump(index_data, file, ensure_ascii=False, indent=2)
 
             print("")    
@@ -461,14 +461,14 @@ class IndexManager:
         if not os.path.exists(self.index_file):
             return []
 
-        with open(self.index_file, "r") as file:
+        with open(self.index_file, "r",encoding="utf-8") as file:
             return file.read()
 
     def read_index(self) -> List[IndexItem]:
         if not os.path.exists(self.index_file):
             return []
 
-        with open(self.index_file, "r") as file:
+        with open(self.index_file, "r",encoding="utf-8") as file:
             index_data = json.load(file)
 
         index_items = []

autocoder/models.py

@@ -97,7 +97,7 @@ def load_models() -> List[Dict]:
         if model.get("api_key_path",""):           
             api_key_file = os.path.join(api_key_dir, model["api_key_path"])
             if os.path.exists(api_key_file):
-                with open(api_key_file, "r") as f:
+                with open(api_key_file, "r",encoding="utf-8") as f:
                     model["api_key"] = f.read()                   
     return target_models
 
@@ -269,7 +269,7 @@ def update_model_with_api_key(name: str, api_key: str) -> Dict:
         api_key_dir = os.path.expanduser("~/.auto-coder/keys")
         os.makedirs(api_key_dir, exist_ok=True)
         api_key_file = os.path.join(api_key_dir, api_key_path)
-        with open(api_key_file, "w") as f:
+        with open(api_key_file, "w",encoding="utf-8") as f:
             f.write(api_key.strip())
         
         # 如果是新模型，添加到模型列表中

autocoder/pyproject/__init__.py

@@ -174,7 +174,8 @@ class PyProject:
         return False
 
     def output(self):
-        return open(self.target_file, "r").read()
+        with open(self.target_file, "r",encoding="utf-8") as file:
+            return file.read()
 
     def is_python_file(self, file_path):
         return file_path.endswith(".py")
@@ -182,9 +183,8 @@ class PyProject:
     def read_file_content(self, file_path):
         if self.args.auto_merge == "strict_diff":
             result = []
-            with open(file_path, "r") as file:
-                for line_number, line in enumerate(file, start=1):
-                    result.append(f"{line_number}:{line}")
+            for line_number, line in FileUtils.read_file_with_line_numbers(file_path,line_number_start=1):
+                result.append(f"{line_number}:{line}")
             return "\n".join(result)
 
         return FileUtils.read_file(file_path)
@@ -357,7 +357,7 @@ class PyProject:
             self.clone_repository()
 
         if self.target_file:
-            with open(self.target_file, "w") as file:
+            with open(self.target_file, "w",encoding="utf-8") as file:
 
                 for code in self.get_rest_source_codes():
                     self.sources.append(code)