auto-coder 0.1.265__tar.gz → 0.1.267__tar.gz

{auto_coder-0.1.265 → auto_coder-0.1.267}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.265
+Version: 0.1.267
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter_client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas]>=0.1.167
+Requires-Dist: byzerllm[saas]>=0.1.168
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.265
+Version: 0.1.267
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter_client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas]>=0.1.167
+Requires-Dist: byzerllm[saas]>=0.1.168
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/auto_coder.egg-info/requires.txt

@@ -16,7 +16,7 @@ tabulate
 jupyter_client
 prompt-toolkit
 tokenizers
-byzerllm[saas]>=0.1.167
+byzerllm[saas]>=0.1.168
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/chat_auto_coder.py

@@ -133,8 +133,7 @@ commands = [
     "/index/build",
     "/index/export",
     "/index/import",
-    "/exclude_dirs",
-    "/exclude_files",
+    "/exclude_files",        
     "/help",
     "/shell",
     "/voice_input",
@@ -148,6 +147,7 @@ commands = [
     "/auto",
     "/conf/export",
     "/conf/import",
+    "/exclude_dirs",
 ]
 
 
@@ -2284,10 +2284,44 @@ def exclude_dirs(dir_names: List[str]):
     save_memory()
     completer.refresh_files()
 
-def exclude_files(file_patterns: List[str]):
+def exclude_files(query: str):
     result_manager = ResultManager()
     printer = Printer()
-    new_file_patterns = file_patterns
+    if "/list" in query:
+        query = query.replace("/list", "", 1).strip()
+        existing_file_patterns = memory.get("exclude_files", []) 
+        console = Console()
+        # 打印表格
+        table = Table(title="Exclude Files")
+        table.add_column("File Pattern")
+        for file_pattern in existing_file_patterns:
+            table.add_row(file_pattern)
+        console.print(table)
+        result_manager.add_result(content=f"Exclude files: {existing_file_patterns}",meta={
+            "action": "exclude_files",
+            "input": {
+                "query": query
+            }
+        })
+        return
+
+    if "/drop" in query:
+        query = query.replace("/drop", "", 1).strip()
+        existing_file_patterns = memory.get("exclude_files", [])    
+        existing_file_patterns.remove(query.strip())
+        memory["exclude_files"] = existing_file_patterns
+        save_memory()
+        completer.refresh_files()
+        result_manager.add_result(content=f"Dropped exclude files: {query}",meta={
+            "action": "exclude_files",
+            "input": {
+                "query": query
+            }
+        })
+        return
+    
+    new_file_patterns = query.strip().split(",")
+    
     existing_file_patterns = memory.get("exclude_files", [])    
     file_patterns_to_add = [f for f in new_file_patterns if f not in existing_file_patterns]
 
@@ -2383,7 +2417,7 @@ def help(query: str):
     args = get_final_config()
     product_mode = memory.get("product_mode", "lite")
     llm = get_single_llm(args.chat_model or args.model, product_mode=product_mode)
-    auto_config_tuner = ConfigAutoTuner(llm=llm, memory_config=MemoryConfig(memory=memory, save_memory_func=save_memory))
+    auto_config_tuner = ConfigAutoTuner(args=args, llm=llm, memory_config=MemoryConfig(memory=memory, save_memory_func=save_memory))
     auto_config_tuner.tune(AutoConfigRequest(query=query))    
 
 @run_in_raw_thread()
@@ -2924,9 +2958,8 @@ def main():
                 exclude_dirs(dir_names)
 
             elif user_input.startswith("/exclude_files"):
-                file_patterns = user_input[len(
-                    "/exclude_files"):].strip().split(",")
-                exclude_files(file_patterns)
+                query = user_input[len("/exclude_files"):].strip()                
+                exclude_files(query)
 
             elif user_input.startswith("/ask"):
                 query = user_input[len("/ask"):].strip()

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/commands/auto_command.py

@@ -302,8 +302,7 @@ class CommandAutoTuner:
             # 提取 JSON 并转换为 AutoCommandResponse
             try:
                 response = to_model(content, AutoCommandResponse)  
-                if response.suggestions:
-                    print(response)
+                if response.suggestions:                    
                     command = response.suggestions[0].command
                     parameters = response.suggestions[0].parameters                    
                     if parameters:
@@ -507,11 +506,21 @@ class CommandAutoTuner:
           如果你检测到用户的coding执行结果，缺少必要的文件修改，可以尝试使用该函数先添加文件再执行coding。
         </description>
         <usage>
-         该方法只有一个参数 args，args 是一个列表，列表的元素是字符串。会包含子指令，例如 
-         
-         add_files(args=["/refresh"]) 
-        
-         会刷新文件列表。下面是常见的子指令：
+         该方法只有一个参数 args，args 是一个列表，列表的元素是字符串。
+
+         如果没有包含子指令，单纯的添加文件，那么 args 列表的元素是文件路径，注意我们需要使用绝对路径。
+
+         使用例子：
+
+         add_files(args=["/absolute/path/to/file1.py"])
+
+         也支持glob 语法，例如：
+
+         add_files(args=["**/*.py"])
+
+         这样会把项目根目录下的所有.py文件添加到活跃区，尽量确保少的添加文件。
+
+         如果是有子指令，参考下面是常见的子指令说明。
 
          ## /refresh 刷新文件列表
          刷新文件列表
@@ -641,9 +650,10 @@ class CommandAutoTuner:
         ## editblock_similarity: editblock相似度阈值
         - editblock相似度阈值，取值范围为0-1，默认值为0.9。如果设置的太低，虽然能合并进去，但是会引入错误。推荐不要修改该值。
 
-        ## generate_times_same_model: 相同模型生成次数
+        ## generate_times_same_model: 相同模型生成次数,也叫采样数
         当进行生成代码时，大模型会对同一个需求生成多份代码，然后会使用 generate_rerank_model 模型对多份代码进行重排序，
         然后选择得分最高的代码。一般次数越多，最终得到正确的代码概率越高。默认值为1，推荐设置为3。但是设置值越多，可能速度就越慢，消耗的token也越多。
+        当用户提到，帮我采样数设置为3， 那么你就设置该参数即可。
 
         ## skip_filter_index: 是否跳过索引过滤
         是否跳过根据用户的query 自动查找上下文。推荐设置为 false
@@ -756,6 +766,8 @@ class CommandAutoTuner:
          coding(query="@auth.py 添加JWT认证")
          coding(query="@@login 优化错误处理")
          coding(query="<img>design/flow.png</img> 实现这个流程图的功能")
+
+         在使用 coding 函数时，建议通过 ask_user 来确认是否执行 coding 函数，除非用户明确说不要询问，直接执行。
         </usage>
         </command>
 
@@ -1169,15 +1181,23 @@ class CommandAutoTuner:
         <name>exclude_files</name>
         <description>排除指定文件。</description>
         <usage>
-         该命令接受一个参数 file_patterns, 为要排除的文件模式字符串列表。
+         该命令接受一个参数 query, 为要排除的文件模式字符串,多个文件模式用逗号分隔。
          
          使用例子,比如你想要排除 package-lock.json 文件，你可以这样调用：
         
-         exclude_files(file_patterns=["regex://.*/package-lock\.json"])
+         exclude_files(query="regex://.*/package-lock\.json")
          
          注意：
          - 文件模式字符串必须以 regex:// 开头
          - regex:// 后面部分是标准的正则表达式         
+
+         也支持子命令：
+         /list 列出当前排除的文件模式
+         /drop 删除指定的文件模式
+
+         使用例子：
+         exclude_files(query="/list")
+         exclude_files(query="/drop regex://.*/package-lock\.json")
         </usage>
         </command>
         </commands>

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/common/auto_coder_lang.py

@@ -117,6 +117,7 @@ MESSAGES = {
         "quick_filter_stats": "{{ model_names }} Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}, input cost: {{ input_cost }}, output cost: {{ output_cost }} speed: {{ speed }} tokens/s",
         "upsert_file": "✅ Updated file: {{ file_path }}",
         "unmerged_blocks_title": "Unmerged Blocks",
+        "merged_blocks_title": "Merged Changes",
         "quick_filter_title": "{{ model_name }} is analyzing how to filter context...",
         "quick_filter_failed": "❌ Quick filter failed: {{ error }}. ",
         "unmerged_file_path": "File: {{file_path}}",
@@ -157,6 +158,8 @@ MESSAGES = {
         "conf_not_found": "Configuration file not found: {{path}}",
         "index_export_success": "Index exported successfully: {{path}}",
         "index_import_success": "Index imported successfully: {{path}}",
+        "edits_title": "edits",
+        "diff_blocks_title":"diff blocks"
     },
     "zh": {
         "invalid_file_pattern": "无效的文件模式: {{file_pattern}}. 例如: regex://.*/package-lock\\.json",
@@ -273,6 +276,7 @@ MESSAGES = {
         "merge_success": "✅ 成功合并了 {{ num_files }} 个文件中的更改 {{ num_changes }}/{{ total_blocks }} 个代码块。",
         "no_changes_made": "⚠️ 未对任何文件进行更改。这个原因可能是因为coding函数生成的文本块格式有问题，导致无法合并进项目",
         "unmerged_blocks_title": "未合并代码块",
+        "merged_blocks_title": "合并的更改",
         "unmerged_file_path": "文件: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
         "unmerged_replace_block": "Replace Block:",
@@ -311,6 +315,8 @@ MESSAGES = {
         "only_one_merge_result_success": "✅ 只有一个合并结果成功，返回该候选",
         "index_export_success": "索引导出成功: {{path}}",
         "index_import_success": "索引导入成功: {{path}}",
+        "edits_title": "编辑块",
+        "diff_blocks_title": "差异块",
     }}
 
 

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/common/auto_configure.py

@@ -14,6 +14,8 @@ from byzerllm.utils.str2model import to_model
 from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common.result_manager import ResultManager
 from autocoder.utils import llms as llms_utils
+from autocoder.common import AutoCoderArgs
+
 logger = logging.getLogger(__name__)
 
 class ConfigMessage(BaseModel):
@@ -120,9 +122,10 @@ class AutoConfigResponse(BaseModel):
     reasoning: str = ""        
 
 class ConfigAutoTuner:
-    def __init__(self, llm: Union[byzerllm.ByzerLLM, byzerllm.SimpleByzerLLM], memory_config: MemoryConfig):
+    def __init__(self,args: AutoCoderArgs, llm: Union[byzerllm.ByzerLLM, byzerllm.SimpleByzerLLM], memory_config: MemoryConfig):
         self.llm = llm
         self.memory_config = memory_config
+        self.args = args
             
 
     def configure(self, conf: str, skip_print: bool = False) -> None:

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/common/code_auto_merge_diff.py

@@ -528,6 +528,37 @@ class CodeAutoMergeDiff:
             failed_blocks=failed_blocks
         )
 
+    def print_edits(self, edits: List[Tuple[str, List[str]]]):
+        """Print diffs for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group edits by file path
+        file_edits = {}
+        for path, hunk in edits:
+            if path not in file_edits:
+                file_edits[path] = []
+            file_edits[path].append(hunk)
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for path, hunks in file_edits.items():
+            formatted_text += f"##File: {path}\n"
+            for hunk in hunks:
+                formatted_text += "".join(hunk)
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("edits_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Edits",
+                border_style="green",
+                expand=False
+            )
+        )
+
     def _merge_code(self, content: str,force_skip_git:bool=False):        
         total = 0
         
@@ -544,9 +575,12 @@ class CodeAutoMergeDiff:
                 return            
        
         edits = self.get_edits(content)        
-        self.apply_edits(edits)
+        self.apply_edits(edits)        
 
         self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)
+        else:
+            # Print edits for review
+            self.print_edits(edits)    

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/common/code_auto_merge_editblock.py

@@ -287,6 +287,7 @@ class CodeAutoMergeEditBlock:
                             for path, content in file_content_mapping.items()],
             failed_blocks=failed_blocks
         )
+    
 
     def _merge_code(self, content: str, force_skip_git: bool = False):
         file_content = FileUtils.read_file(self.args.file)
@@ -391,6 +392,7 @@ class CodeAutoMergeEditBlock:
                     style="red"
                 )
                 return
+            
         # Now, apply the changes
         for file_path, new_content in file_content_mapping.items():
             os.makedirs(os.path.dirname(file_path), exist_ok=True)
@@ -431,10 +433,14 @@ class CodeAutoMergeEditBlock:
                         self.git_require_msg(source_dir=self.args.source_dir, error=str(e)),
                         style="red"
                     )
+            else:
+                self.print_merged_blocks(merged_blocks)
+            
             self.printer.print_in_terminal("merge_success", 
                                          num_files=len(file_content_mapping.keys()),
                                          num_changes=len(changes_to_make),
                                          total_blocks=len(codes))
+            
         else:
             self.printer.print_in_terminal("no_changes_made")
 
@@ -455,3 +461,39 @@ class CodeAutoMergeEditBlock:
             syntax = Syntax(update, "python", theme="monokai", line_numbers=True)
             self.printer.console.print(Panel(syntax, expand=False))
         self.printer.print_in_terminal("unmerged_blocks_total", num_blocks=len(unmerged_blocks), style="bold red")
+
+
+    def print_merged_blocks(self, merged_blocks: List[tuple]):
+        """Print search/replace blocks for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group blocks by file path
+        file_blocks = {}
+        for file_path, head, update, similarity in merged_blocks:
+            if file_path not in file_blocks:
+                file_blocks[file_path] = []
+            file_blocks[file_path].append((head, update, similarity))
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for file_path, blocks in file_blocks.items():
+            formatted_text += f"##File: {file_path}\n"
+            for head, update, similarity in blocks:
+                formatted_text += "<<<<<<< SEARCH\n"
+                formatted_text += head + "\n"
+                formatted_text += "=======\n"
+                formatted_text += update + "\n"
+                formatted_text += ">>>>>>> REPLACE\n"
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("merged_blocks_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Merged Changes",
+                border_style="green",
+                expand=False
+            )
+        )

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/autocoder/common/code_auto_merge_strict_diff.py

@@ -221,6 +221,37 @@ class CodeAutoMergeStrictDiff:
             failed_blocks=failed_blocks
         )
 
+    def print_diff_blocks(self, diff_blocks: List[PathAndCode]):
+        """Print diff blocks for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group blocks by file path
+        file_blocks = {}
+        for block in diff_blocks:
+            if block.path not in file_blocks:
+                file_blocks[block.path] = []
+            file_blocks[block.path].append(block.content)
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for path, contents in file_blocks.items():
+            formatted_text += f"##File: {path}\n"
+            for content in contents:
+                formatted_text += content + "\n"
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("diff_blocks_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Diff Blocks",
+                border_style="green",
+                expand=False
+            )
+        )
+
     def _merge_code(self, content: str, force_skip_git: bool = False):        
         total = 0
         
@@ -236,7 +267,8 @@ class CodeAutoMergeStrictDiff:
                 self.printer.print_in_terminal("git_init_required", style="red", source_dir=self.args.source_dir, error=str(e))
                 return            
        
-        diff_blocks = self.parse_diff_block(content)
+        diff_blocks = self.parse_diff_block(content)        
+
         for diff_blocks in diff_blocks:
             path = diff_blocks.path
             content = diff_blocks.content          
@@ -255,6 +287,9 @@ class CodeAutoMergeStrictDiff:
         if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)
+        else:
+            # Print diff blocks for review
+            self.print_diff_blocks(diff_blocks)    
 
     @byzerllm.prompt(render="jinja2")
     def git_require_msg(self, source_dir: str, error: str) -> str:

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/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:
@@ -128,8 +128,9 @@ def build_index_and_filter_files(
                 model_name = "unknown(without default model name)" 
             printer.print_in_terminal("normal_filter_start", style="blue",model_name=model_name)
             normal_filter = NormalFilter(index_manager,stats,sources)
+            normal_filter_result = normal_filter.filter(index_manager.read_index(),args.query)
             # Merge normal filter results into final_files
-            final_files.update(normal_filter.filter(index_manager.read_index(),args.query))
+            final_files.update(normal_filter_result.files)
         
 
     def display_table_and_get_selections(data):
@@ -212,7 +213,7 @@ def build_index_and_filter_files(
 
     # Phase 6: File selection and limitation
     printer.print_in_terminal("phase6_file_selection")
-    phase_start = time.monotonic()
+    phase_start = time.monotonic()    
 
     if args.index_filter_file_num > 0:
         logger.info(
@@ -278,7 +279,7 @@ def build_index_and_filter_files(
             event=CommunicateEvent(
                 event_type=CommunicateEventType.CODE_INDEX_FILTER_FILE_SELECTED.value,
                 data=json.dumps([
-                    (file.file_path, file.reason)
+                    (file["file_path"], file.reason)
                     for file in final_files.values()
                     if file.file_path in depulicated_sources
                 ])

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/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]):

{auto_coder-0.1.265 → auto_coder-0.1.267}/src/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()

auto_coder-0.1.267/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.267"

auto_coder-0.1.265/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.265"