auto-coder 0.1.260__py3-none-any.whl → 0.1.262__py3-none-any.whl

autocoder/common/shells.py

@@ -9,6 +9,8 @@ from rich.panel import Panel
 from rich.text import Text
 from rich.live import Live
 
+from autocoder.common.result_manager import ResultManager
+
 def get_terminal_name() -> str:
     """
     获取当前终端名称(自动适配 Windows/Linux/Mac)
@@ -139,6 +141,7 @@ def execute_shell_command(command: str):
         encoding (str, optional): Override default encoding. Defaults to None.
     """
     console = Console()
+    result_manager = ResultManager()
     try:
         # Get terminal encoding
         encoding = get_terminal_encoding()
@@ -199,7 +202,13 @@ def execute_shell_command(command: str):
             output.append(safe_decode(remaining_out, encoding))
         if remaining_err:
             output.append(f"ERROR: {safe_decode(remaining_err, encoding)}")
-
+        
+        result_manager.add_result(content="\n".join(output),meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         # Show final output
         console.print(
             Panel(
@@ -210,16 +219,23 @@ def execute_shell_command(command: str):
             )
         )
 
-        if process.returncode != 0:
-            console.print(
-                f"[bold red]Command failed with code {process.returncode}[/bold red]"
-            )
-
     except FileNotFoundError:
+        result_manager.add_result(content=f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]",meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         console.print(
             f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]"
         )
     except Exception as e:
+        result_manager.add_result(content=f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]",meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         console.print(
             f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]"
         )

autocoder/dispacher/actions/action.py

@@ -29,6 +29,7 @@ from autocoder.common.printer import Printer
 from autocoder.utils.llms import get_llm_names
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.common import SourceCodeList
+from autocoder.common.global_cancel import global_cancel
 
 
 class BaseAction:    
@@ -106,6 +107,10 @@ class ActionTSProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )                
 
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+                             
         if args.execute:             
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -148,6 +153,11 @@ class ActionTSProject(BaseAction):
                 model_names=model_names,
                 sampling_count=len(generate_result.contents)
             )
+            
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -207,6 +217,10 @@ class ActionPyScriptProject(BaseAction):
 
     def process_content(self, source_code_list: SourceCodeList):
         args = self.args
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -249,6 +263,11 @@ class ActionPyScriptProject(BaseAction):
                 model_names=model_names,
                 sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -331,6 +350,10 @@ class ActionPyProject(BaseAction):
                 content_length=content_length,
                 max_length=self.args.model_max_input_length
             )
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -375,6 +398,11 @@ class ActionPyProject(BaseAction):
                 model_names=model_names,
                 sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -449,6 +477,10 @@ class ActionSuffixProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )                
 
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -491,6 +523,11 @@ class ActionSuffixProject(BaseAction):
             model_names=model_names,
             sampling_count=len(generate_result.contents)
         )
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")                    )
+        
         merge_result = None
         if args.execute and args.auto_merge:
             self.printer.print_in_terminal("code_merge_start")

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -16,6 +16,7 @@ from autocoder.common.printer import Printer
 import time
 from autocoder.utils.llms import get_llm_names
 from autocoder.common import SourceCodeList
+from autocoder.common.global_cancel import global_cancel
 from loguru import logger
 class ActionRegexProject:
     def __init__(
@@ -61,6 +62,11 @@ class ActionRegexProject:
                 content = content[: self.args.model_max_input_length]
 
         start_time = time.time()
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             
@@ -103,6 +109,11 @@ class ActionRegexProject:
                 model_names=model_names,
                 sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")

autocoder/index/entry.py

@@ -318,16 +318,16 @@ def build_index_and_filter_files(
 • Total time: {total_time:.2f}s
 
 """
-    printer.print_panel(
-        summary,
-        text_options={"justify": "left", "style": "bold white"},
-        panel_options={
-            "title": "Indexing and Filtering Summary", 
-            "border_style": "bold blue",
-            "padding": (1, 2),
-            "expand": False
-        }
-    )
+    # printer.print_panel(
+    #     summary,
+    #     text_options={"justify": "left", "style": "bold white"},
+    #     panel_options={
+    #         "title": "Indexing and Filtering Summary", 
+    #         "border_style": "bold blue",
+    #         "padding": (1, 2),
+    #         "expand": False
+    #     }
+    # )
 
     if args.request_id and not args.skip_events:
         queue_communicate.send_event(

autocoder/index/filter/quick_filter.py

@@ -230,7 +230,8 @@ class QuickFilter():
         {{ content }}
         </index>
 
-        索引文件包含文件序号(##[]括起来的部分)，文件路径，文件符号信息等。
+        索引文件包含文件序号(##[]括起来的部分)，文件路径，文件符号信息等。            
+
         下面是用户的查询需求：
 
         <query>
@@ -249,16 +250,19 @@ class QuickFilter():
         }
         ```
 
-        特别注意
-        1. 如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且查看他们依赖的文件是否相关。        
+        特别注意    
+        1. 如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且尝试通过索引文件诸如导入语句等信息找到这些文件依赖的其他文件，再分析这些文件是否需要提供才能满足后续编码。
         2. 如果 query 里是一段历史对话，那么对话里的内容提及的文件路径必须要返回。
-        3. json格式数据不允许有注释        
+        3. 想想，如果是你需要修改代码，然后满足这个需求，根据索引文件，你希望查看哪些文件，修改哪些文件，然后返回这些文件。
+        4. 如果用户需求为空，则直接返回空列表即可。
+        5. 返回的 json格式数据不允许有注释
         '''
+
         file_meta_str = "\n".join(
             [f"##[{index}]{item.module_name}\n{item.symbols}" for index, item in enumerate(file_meta_list)])
         context = {
             "content": file_meta_str,
-            "query": query
+            "query": query            
         }
         return context
 

autocoder/index/symbols_utils.py

@@ -27,8 +27,11 @@ def extract_symbols(text: str) -> SymbolsInfo:
         "variables": r"变量：(.+)",
         "classes": r"类：(.+)",
         "import_statements": r"导入语句：(.+)",
-    }
-
+    }    
+    ## index.json 中可能会出现 text 为 null 的情况
+    if not text or text == "null":        
+        return SymbolsInfo(usage="",functions=[],variables=[],classes=[],import_statements=[])
+    
     info = SymbolsInfo()
     for field, pattern in patterns.items():
         match = re.search(pattern, text)

autocoder/utils/project_structure.py

@@ -0,0 +1,15 @@
+from autocoder.pyproject import PyProject
+from autocoder.tsproject import TSProject
+from autocoder.suffixproject import SuffixProject
+from autocoder.common import AutoCoderArgs
+import byzerllm
+from typing import Union
+
+def get_project_structure(args:AutoCoderArgs, llm:Union[byzerllm.ByzerLLM, byzerllm.SimpleByzerLLM]):
+    if args.project_type == "ts":
+        pp = TSProject(args=args, llm=llm)
+    elif args.project_type == "py":
+        pp = PyProject(args=args, llm=llm)
+    else:
+        pp = SuffixProject(args=args, llm=llm, file_filter=None)
+    return pp.get_tree_like_directory_structure()

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.260"
+__version__ = "0.1.262"