auto-coder 0.1.330__py3-none-any.whl → 0.1.332__py3-none-any.whl

autocoder/common/v2/code_auto_merge_editblock.py

@@ -269,10 +269,12 @@ class CodeAutoMergeEditBlock:
         codes = self.get_edits(content)
         file_content_mapping = {}
         failed_blocks = []
+        merged_blocks = []
 
         for block in codes:
-            file_path, head, update = block
+            file_path, head, update = block            
             if not os.path.exists(file_path):
+                merged_blocks.append((file_path, "", update))
                 file_content_mapping[file_path] = update
             else:
                 if file_path not in file_content_mapping:
@@ -286,7 +288,7 @@ class CodeAutoMergeEditBlock:
                     else existing_content + "\n" + update
                 )
 
-                # If exact match fails, try similarity match
+                # If exact match fails, try similarity match                
                 if new_content == existing_content and head:
                     similarity, best_window = TextSimilarity(
                         head, existing_content
@@ -297,6 +299,7 @@ class CodeAutoMergeEditBlock:
                         )
 
                 if new_content != existing_content:
+                    merged_blocks.append((file_path, head, update))
                     file_content_mapping[file_path] = new_content
                 else:
                     failed_blocks.append((file_path, head, update))
@@ -304,7 +307,8 @@ class CodeAutoMergeEditBlock:
         return MergeCodeWithoutEffect(
             success_blocks=[(path, content)
                             for path, content in file_content_mapping.items()],
-            failed_blocks=failed_blocks
+            failed_blocks=failed_blocks,
+            merged_blocks=merged_blocks
         )
     
 
@@ -363,35 +367,12 @@ class CodeAutoMergeEditBlock:
                     else:
                         unmerged_blocks.append(
                             (file_path, head, update, similarity))
-
-        if unmerged_blocks:
-            if self.args.request_id and not self.args.skip_events:
-                # collect unmerged blocks
-                event_data = []
-                for file_path, head, update, similarity in unmerged_blocks:
-                    event_data.append(
-                        {
-                            "file_path": file_path,
-                            "head": head,
-                            "update": update,
-                            "similarity": similarity,
-                        }
-                    )
-                return
             
-            self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
-            self._print_unmerged_blocks(unmerged_blocks)
-            return
-
-        # lint check
-        for file_path, new_content in file_content_mapping.items():
-            if file_path.endswith(".py"):
-                pylint_passed, error_message = self.run_pylint(new_content)
-                if not pylint_passed:
-                    self.printer.print_in_terminal("pylint_file_check_failed", 
-                                                  file_path=file_path, 
-                                                  error_message=error_message)
-
+            if unmerged_blocks:
+                self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
+                self._print_unmerged_blocks(unmerged_blocks)
+                return
+        
         if changes_made and not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(
@@ -410,20 +391,6 @@ class CodeAutoMergeEditBlock:
             with open(file_path, "w") as f:
                 f.write(new_content)
 
-        if self.args.request_id and not self.args.skip_events:
-            # collect modified files
-            event_data = []
-            for code in merged_blocks:
-                file_path, head, update, similarity = code
-                event_data.append(
-                    {
-                        "file_path": file_path,
-                        "head": head,
-                        "update": update,
-                        "similarity": similarity,
-                    }
-                )
-
 
         if changes_made:
             if not force_skip_git and not self.args.skip_commit:

autocoder/common/v2/code_auto_merge_strict_diff.py

@@ -1,14 +1,18 @@
 import os
 import difflib
 import diff_match_patch as dmp_module
-from pathlib import Path
-from typing import List, Dict, Tuple
+from autocoder.common import AutoCoderArgs, git_utils
+from typing import List,Tuple
 import pydantic
 import byzerllm
-from autocoder.common import AutoCoderArgs, git_utils
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+from autocoder.common.printer import Printer
+import hashlib
+from pathlib import Path
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
-from autocoder.common.v2.code_auto_merge import CodeAutoMerge
-from autocoder.common import files as FileUtils
+from autocoder.common.code_modification_ranker import CodeModificationRanker
+from autocoder.common import files as  FileUtils
+from autocoder.memory.active_context_manager import ActiveContextManager
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -49,6 +53,7 @@ def apply_hunk(content, hunk):
 
     return "\n".join(content_out)
 
+
 def hunk_to_before_after(hunk, lines=False):
     before = []
     after = []
@@ -77,7 +82,14 @@ def hunk_to_before_after(hunk, lines=False):
 
     return before, after
 
-class CodeAutoMergeStrictDiff(CodeAutoMerge):
+
+class CodeAutoMergeStrictDiff:
+    def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
+        self.llm = llm
+        self.args = args
+        self.printer = Printer()
+
+
     def parse_diff_block(self,text: str) -> List[PathAndCode]:
         lines = text.split('\n')
         lines_len = len(lines)    
@@ -121,6 +133,46 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
 
         return path_and_code_list
 
+    def merge_code(self, generate_result: CodeGenerateResult, force_skip_git: bool = False):
+        result = self.choose_best_choice(generate_result)
+        self._merge_code(result.contents[0], force_skip_git)
+        return result
+
+    def choose_best_choice(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
+        if len(generate_result.contents) == 1:
+            return generate_result
+        
+        merge_results = []
+        for content,conversations in zip(generate_result.contents,generate_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            merge_results.append(merge_result)
+
+        # If all merge results are None, return first one
+        if all(len(result.failed_blocks) != 0 for result in merge_results):
+            self.printer.print_in_terminal("all_merge_results_failed")
+            return CodeGenerateResult(contents=[generate_result.contents[0]], conversations=[generate_result.conversations[0]])
+        
+        # If only one merge result is not None, return that one
+        not_none_indices = [i for i, result in enumerate(merge_results) if len(result.failed_blocks) == 0]
+        if len(not_none_indices) == 1:
+            idx = not_none_indices[0]
+            self.printer.print_in_terminal("only_one_merge_result_success")
+            return CodeGenerateResult(contents=[generate_result.contents[idx]], conversations=[generate_result.conversations[idx]])        
+
+        # 最后，如果有多个，那么根据质量排序再返回
+        ranker = CodeModificationRanker(self.llm, self.args)
+        ranked_result = ranker.rank_modifications(generate_result,merge_results)        
+         
+        ## 得到的结果，再做一次合并，第一个通过的返回 , 返回做合并有点重复低效，未来修改。
+        for content,conversations in zip(ranked_result.contents,ranked_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            if not merge_result.failed_blocks:
+                return CodeGenerateResult(contents=[content], conversations=[conversations])
+
+        # 最后保底，但实际不会出现
+        return CodeGenerateResult(contents=[ranked_result.contents[0]], conversations=[ranked_result.conversations[0]])
+    
+
     def abs_root_path(self, path):
         if path.startswith(self.args.source_dir):
             return safe_abs_path(Path(path))
@@ -207,6 +259,7 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
         
         file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode('utf-8')).hexdigest()
+        # get the file name 
         file_name = os.path.basename(self.args.file)
         
         if not force_skip_git and not self.args.skip_commit:
@@ -256,4 +309,20 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print diff blocks for review
-            self.print_diff_blocks(diff_blocks) 
+            self.print_diff_blocks(diff_blocks)    
+
+    @byzerllm.prompt(render="jinja2")
+    def git_require_msg(self, source_dir: str, error: str) -> str:
+        '''
+        auto_merge only works for git repositories.
+         
+        Try to use git init in the source directory. 
+        
+        ```shell
+        cd {{ source_dir }}
+        git init .
+        ```
+
+        Then try to run auto-coder again.
+        Error: {{ error }}
+        '''

autocoder/common/v2/code_diff_manager.py

@@ -1,19 +1,19 @@
 from typing import List, Dict, Tuple, Optional, Any
 import os
-import json
 import time
-from concurrent.futures import ThreadPoolExecutor
 
 import byzerllm
 from byzerllm.utils.client import code_utils
 
 from autocoder.common.types import Mode, CodeGenerateResult, MergeCodeWithoutEffect
-from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList
+from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common import sys_prompt
+from autocoder.compilers.shadow_compiler import ShadowCompiler
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.common.utils_code_auto_generate import chat_with_continue, stream_chat_with_continue, ChatWithContinueResult
 from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
-from autocoder.common.stream_out_type import CodeGenerateStreamOutType
+from autocoder.common.stream_out_type import LintStreamOutType, CompileStreamOutType, UnmergedBlocksStreamOutType, CodeGenerateStreamOutType
 from autocoder.common.auto_coder_lang import get_message_with_format
 from autocoder.common.printer import Printer
 from autocoder.rag.token_counter import count_tokens
@@ -28,6 +28,9 @@ from loguru import logger
 from autocoder.common.global_cancel import global_cancel
 from autocoder.linters.models import ProjectLintResult
 from autocoder.common.token_cost_caculate import TokenCostCalculator
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.events.event_types import Event, EventType, EventMetadata
+from autocoder.events import event_content as EventContentCreator
 
 
 class CodeDiffManager:
@@ -47,7 +50,8 @@ class CodeDiffManager:
         self.args = args
         self.action = action
         self.generate_times_same_model = args.generate_times_same_model
-        self.max_correction_attempts = args.auto_fix_lint_max_attempts
+        self.auto_fix_lint_max_attempts = args.auto_fix_lint_max_attempts
+        self.auto_fix_compile_max_attempts = args.auto_fix_compile_max_attempts
         self.printer = Printer()
         
         # Initialize sub-components
@@ -55,8 +59,11 @@ class CodeDiffManager:
         self.code_merger = CodeAutoMergeDiff(llm, args)
         
         # Create shadow manager for linting
-        self.shadow_manager = ShadowManager(args.source_dir, args.event_file)
+        self.shadow_manager = ShadowManager(
+            args.source_dir, args.event_file, args.ignore_clean_shadows)
         self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
+        self.shadow_compiler = ShadowCompiler(
+            self.shadow_manager, verbose=False)
 
     @byzerllm.prompt()
     def fix_linter_errors(self, query: str, lint_issues: str) -> str:
@@ -75,6 +82,66 @@ class CodeDiffManager:
         请使用 unified diff 格式输出修改。
         """
         
+    @byzerllm.prompt()
+    def fix_compile_errors(self, query: str, compile_errors: str) -> str:
+        """
+        编译错误:
+        <compile_errors>
+        {{ compile_errors }}
+        </compile_errors>
+
+        用户原始需求:
+        <user_query_wrapper>
+        {{ query }}
+        </user_query_wrapper>
+
+        修复上述问题，请确保代码质量问题被解决，同时保持代码的原有功能。
+        请使用 unified diff 格式输出修改。
+        """
+
+    @byzerllm.prompt()
+    def fix_missing_context(self, query: str, original_code: str, missing_files: str) -> str:
+        """  
+        下面是你根据格式要求输出的一份修改代码:
+        <original_code>
+        {{ original_code }}
+        </original_code>
+
+        我发现你尝试修改以下文件，但这些文件没有在上下文中提供，所以你无法看到它们的内容:
+        <missing_files>
+        {{ missing_files }}
+        </missing_files>
+
+        下面是用户原始的需求:
+        <user_query_wrapper>
+        {{ query }}
+        </user_query_wrapper>
+
+        我已经将这些文件添加到上下文中，请重新生成代码，确保使用 unified diff 格式正确修改这些文件。
+        """
+
+    @byzerllm.prompt()
+    def fix_unmerged_blocks(self, query: str, original_code: str, unmerged_blocks: str) -> str:
+        """  
+        下面是你根据格式要求输出的一份修改代码:
+        <original_code>
+        {{ original_code }}
+        </original_code>
+
+        但是我发现下面的代码块无法合并:
+        <unmerged_blocks>
+        {{ unmerged_blocks }}
+        </unmerged_blocks>
+
+        下面是用户原始的需求:
+        <user_query_wrapper>
+        {{ query }}
+        </user_query_wrapper>
+
+        请根据反馈，回顾之前的格式要求，重新生成一份修改代码，确保所有代码块都能够正确合并。
+        请使用 unified diff 格式输出修改。
+        """
+        
     def _create_shadow_files_from_edits(self, generation_result: CodeGenerateResult) -> Dict[str, str]:
         """
         从编辑块内容中提取代码并创建临时影子文件用于检查。