auto-coder 0.1.334__py3-none-any.whl → 0.1.335__py3-none-any.whl

autocoder/common/v2/code_editblock_manager.py

@@ -5,14 +5,14 @@ import time
 import byzerllm
 
 from autocoder.common.types import Mode, CodeGenerateResult, MergeCodeWithoutEffect
-from autocoder.common import AutoCoderArgs,  SourceCodeList,SourceCode
+from autocoder.common import AutoCoderArgs,  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 LintStreamOutType, CompileStreamOutType, UnmergedBlocksStreamOutType
+from autocoder.common.stream_out_type import LintStreamOutType, CompileStreamOutType, UnmergedBlocksStreamOutType, ContextMissingCheckStreamOutType
 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
@@ -242,11 +242,34 @@ class CodeEditBlockManager:
         返回:
             CodeGenerateResult: 修复后的代码结果
         """
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/context/check/start")),
+            metadata={
+                # Using a placeholder type, replace if ContextFixStreamOutType is defined
+                "stream_out_type": ContextMissingCheckStreamOutType.CONTEXT_MISSING_CHECK.value,
+                "action_file": self.args.file,
+                "path": "/context/check/start"
+            }
+        )
+
+        def write_end_event():
+            get_event_manager(self.args.event_file).write_result(
+                EventContentCreator.create_result(
+                    content=self.printer.get_message_from_key("/context/check/end")),
+                metadata={
+                    # Using a placeholder type, replace if ContextFixStreamOutType is defined
+                    "stream_out_type": ContextMissingCheckStreamOutType.CONTEXT_MISSING_CHECK.value,
+                    "action_file": self.args.file,
+                    "path": "/context/check/end"
+                }
+            )
+
         token_cost_calculator = TokenCostCalculator(args=self.args)
-        
+
         # 获取编辑块
         codes = self.code_merger.get_edits(generation_result.contents[0])
-        
+
         # 检查是否有空的SEARCH块但目标文件存在
         missing_files = []
         for file_path, head, update in codes:
@@ -258,7 +281,7 @@ class CodeEditBlockManager:
                     in_context = file_path in self.args.urls
                 if hasattr(self.args, 'dynamic_urls') and self.args.dynamic_urls and not in_context:
                     in_context = file_path in self.args.dynamic_urls
-                
+
                 # 如果文件存在但不在上下文中，添加到缺失文件列表
                 if not in_context:
                     missing_files.append(file_path)
@@ -267,58 +290,61 @@ class CodeEditBlockManager:
                         self.args.dynamic_urls = []
                     if file_path not in self.args.dynamic_urls:
                         self.args.dynamic_urls.append(file_path)
-        
+
         # 如果没有缺失文件，直接返回原结果
         if not missing_files:
+            write_end_event()
             return generation_result
-        
+
         # 格式化缺失文件列表
         missing_files_text = "\n".join(missing_files)
-        
+
         # 打印当前修复状态
         self.printer.print_in_terminal(
             "missing_context_attempt_status",
             style="yellow",
             missing_files=missing_files_text
         )
-        
+
         # 更新源代码列表，包含新添加的文件
         updated_source_code_list = SourceCodeList([])
         for source in source_code_list.sources:
             updated_source_code_list.sources.append(source)
-        
+
         # 添加缺失的文件到源代码列表
         for file_path in missing_files:
             if os.path.exists(file_path):
                 with open(file_path, 'r') as f:
                     file_content = f.read()
-                source = SourceCode(module_name=file_path, source_code=file_content)
+                source = SourceCode(module_name=file_path,
+                                    source_code=file_content)
                 updated_source_code_list.sources.append(source)
-        
+
         # 更新action yml文件
         if missing_files and hasattr(self.args, 'dynamic_urls') and self.args.dynamic_urls:
-            action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+            action_yml_file_manager = ActionYmlFileManager(
+                self.args.source_dir)
             action_file_name = os.path.basename(self.args.file)
             update_yaml_success = action_yml_file_manager.update_yaml_field(
                 action_file_name, "dynamic_urls", self.args.dynamic_urls)
             if not update_yaml_success:
                 self.printer.print_in_terminal(
                     "yaml_save_error", style="red", yaml_file=action_file_name)
-        
+
         # 准备修复提示
         fix_prompt = self.fix_missing_context.prompt(
             query=query,
             original_code=generation_result.contents[0],
             missing_files=missing_files_text
         )
-        
+
         logger.info(f"fix_missing_context_prompt: {fix_prompt}")
-        
+
         # 使用修复提示重新生成代码
         start_time = time.time()
         generation_result = self.code_generator.single_round_run(
             fix_prompt, updated_source_code_list)
-        
+
         # 计算这次修复缺失上下文花费的token情况
         token_cost_calculator.track_token_usage_by_generate(
             llm=self.llm,
@@ -327,12 +353,15 @@ class CodeEditBlockManager:
             start_time=start_time,
             end_time=time.time()
         )
-        
+
         # 选择最佳结果
-        generation_result = self.code_merger.choose_best_choice(generation_result)
-        ## 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
-        generation_result = CodeGenerateResult(contents=[generation_result.contents[0]],conversations=[generation_result.conversations[0]],metadata=generation_result.metadata)
-        
+        generation_result = self.code_merger.choose_best_choice(
+            generation_result)
+        # 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
+        generation_result = CodeGenerateResult(contents=[generation_result.contents[0]], conversations=[
+                                               generation_result.conversations[0]], metadata=generation_result.metadata)
+
+        write_end_event()
         return generation_result
 
     def _fix_unmerged_blocks(self, query: str, generation_result: CodeGenerateResult, source_code_list: SourceCodeList) -> CodeGenerateResult:
@@ -348,11 +377,22 @@ class CodeEditBlockManager:
             CodeGenerateResult: 修复后的代码结果
         """
         token_cost_calculator = TokenCostCalculator(args=self.args)
-        merge = self.code_merger._merge_code_without_effect(generation_result.contents[0])
+        merge = self.code_merger._merge_code_without_effect(
+            generation_result.contents[0])
 
         if not self.args.enable_auto_fix_merge or not merge.failed_blocks:
             return generation_result
 
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/unmerged_blocks/check/start")),
+            metadata={
+                "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
+                "action_file": self.args.file,
+                "path": "/unmerged_blocks/check/start"
+            }
+        )
+
         def _format_blocks(merge: MergeCodeWithoutEffect) -> Tuple[str, str]:
             unmerged_formatted_text = ""
             for file_path, head, update in merge.failed_blocks:
@@ -386,14 +426,16 @@ class CodeEditBlockManager:
                                                           ).to_dict(),
                 metadata={
                     "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
-                    "action_file": self.args.file
+                    "action_file": self.args.file,
+                    "path": "/unmerged_blocks/check/message"
                 }
             ))
             return (unmerged_formatted_text, merged_formatted_text)
 
         for attempt in range(self.args.auto_fix_merge_max_attempts):
             global_cancel.check_and_raise()
-            unmerged_formatted_text, merged_formatted_text = _format_blocks(merge)
+            unmerged_formatted_text, merged_formatted_text = _format_blocks(
+                merge)
             fix_prompt = self.fix_unmerged_blocks.prompt(
                 query=query,
                 original_code=generation_result.contents[0],
@@ -416,7 +458,8 @@ class CodeEditBlockManager:
                                                           ).to_dict(),
                 metadata={
                     "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
-                    "action_file": self.args.file
+                    "action_file": self.args.file,
+                    "path": "/unmerged_blocks/check/message"
                 }
             ))
 
@@ -435,9 +478,11 @@ class CodeEditBlockManager:
             )
 
             # 检查修复后的代码是否仍有未合并块
-            generation_result = self.code_merger.choose_best_choice(generation_result)
-            ## 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
-            generation_result = CodeGenerateResult(contents=[generation_result.contents[0]],conversations=[generation_result.conversations[0]],metadata=generation_result.metadata)
+            generation_result = self.code_merger.choose_best_choice(
+                generation_result)
+            # 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
+            generation_result = CodeGenerateResult(contents=[generation_result.contents[0]], conversations=[
+                                                   generation_result.conversations[0]], metadata=generation_result.metadata)
             merge = self.code_merger._merge_code_without_effect(
                 generation_result.contents[0])
 
@@ -462,137 +507,16 @@ class CodeEditBlockManager:
                 ))
                 raise Exception(self.printer.get_message_from_key(
                     "max_unmerged_blocks_attempts_reached"))
-                
-        return generation_result
-     
-    def _fix_unmerged_blocks(self, query: str, generation_result: CodeGenerateResult, source_code_list: SourceCodeList) -> CodeGenerateResult:
-        """
-        修复未合并的代码块，最多尝试指定次数
-
-        参数:
-            query (str): 用户查询
-            generation_result (CodeGenerateResult): 生成的代码结果
-            source_code_list (SourceCodeList): 源代码列表
-
-        返回:
-            CodeGenerateResult: 修复后的代码结果
-        """
-        token_cost_calculator = TokenCostCalculator(args=self.args)
-        merge = self.code_merger._merge_code_without_effect(generation_result.contents[0])
 
-        if not self.args.enable_auto_fix_merge or not merge.failed_blocks:
-            return generation_result
-
-        def _format_blocks(merge: MergeCodeWithoutEffect) -> Tuple[str, str]:
-            unmerged_formatted_text = ""
-            for file_path, head, update in merge.failed_blocks:
-                unmerged_formatted_text += "```lang"
-                unmerged_formatted_text += f"##File: {file_path}\n"
-                unmerged_formatted_text += "<<<<<<< SEARCH\n"
-                unmerged_formatted_text += head
-                unmerged_formatted_text += "=======\n"
-                unmerged_formatted_text += update
-                unmerged_formatted_text += ">>>>>>> REPLACE\n"
-                unmerged_formatted_text += "```"
-                unmerged_formatted_text += "\n"
-
-            merged_formatted_text = ""
-            if merge.merged_blocks:
-                for file_path, head, update in merge.merged_blocks:
-                    merged_formatted_text += "```lang"
-                    merged_formatted_text += f"##File: {file_path}\n"
-                    merged_formatted_text += head
-                    merged_formatted_text += "=======\n"
-                    merged_formatted_text += update
-                    merged_formatted_text += "```"
-                    merged_formatted_text += "\n"
-
-            get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
-                content=EventContentCreator.ResultContent(content=f"Unmerged blocks:\\n {unmerged_formatted_text}",
-                                                          metadata={
-                                                              "merged_blocks": merge.success_blocks,
-                                                              "failed_blocks": merge.failed_blocks
-                                                          }
-                                                          ).to_dict(),
-                metadata={
-                    "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
-                    "action_file": self.args.file
-                }
-            ))
-            return (unmerged_formatted_text, merged_formatted_text)
-
-        for attempt in range(self.args.auto_fix_merge_max_attempts):
-            global_cancel.check_and_raise()
-            unmerged_formatted_text, merged_formatted_text = _format_blocks(merge)
-            fix_prompt = self.fix_unmerged_blocks.prompt(
-                query=query,
-                original_code=generation_result.contents[0],
-                unmerged_blocks=unmerged_formatted_text
-            )
-
-            logger.info(f"fix_prompt: {fix_prompt}")
-
-            # 打印当前修复尝试状态
-            self.printer.print_in_terminal(
-                "unmerged_blocks_attempt_status",
-                style="yellow",
-                attempt=(attempt + 1),
-                max_correction_attempts=self.args.auto_fix_merge_max_attempts
-            )
-
-            get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
-                content=EventContentCreator.ResultContent(content=f"Unmerged blocks attempt {attempt + 1}/{self.args.auto_fix_merge_max_attempts}: {unmerged_formatted_text}",
-                                                          metadata={}
-                                                          ).to_dict(),
-                metadata={
-                    "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
-                    "action_file": self.args.file
-                }
-            ))
-
-            # 使用修复提示重新生成代码
-            start_time = time.time()
-            generation_result = self.code_generator.single_round_run(
-                fix_prompt, source_code_list)
-
-            # 计算这次修复未合并块花费的token情况
-            token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
-                generate=generation_result,
-                operation_name="code_generation_complete",
-                start_time=start_time,
-                end_time=time.time()
-            )
-
-            # 检查修复后的代码是否仍有未合并块
-            generation_result = self.code_merger.choose_best_choice(generation_result)
-            ## 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
-            generation_result = CodeGenerateResult(contents=[generation_result.contents[0]],conversations=[generation_result.conversations[0]],metadata=generation_result.metadata)
-            merge = self.code_merger._merge_code_without_effect(
-                generation_result.contents[0])
-
-            # 如果没有失败的块，则修复成功，退出循环
-            if not merge.failed_blocks:
-                self.printer.print_in_terminal(
-                    "unmerged_blocks_fixed", style="green")
-                break
-
-            # 如果是最后一次尝试仍未成功，打印警告
-            if attempt == self.args.auto_fix_merge_max_attempts - 1:
-                self.printer.print_in_terminal(
-                    "max_unmerged_blocks_attempts_reached", style="yellow")
-                get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
-                    content=EventContentCreator.ResultContent(content=self.printer.get_message_from_key("max_unmerged_blocks_attempts_reached"),
-                                                              metadata={}
-                                                              ).to_dict(),
-                    metadata={
-                        "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
-                        "action_file": self.args.file
-                    }
-                ))
-                raise Exception(self.printer.get_message_from_key(
-                    "max_unmerged_blocks_attempts_reached"))
-                
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/unmerged_blocks/check/end")),
+            metadata={
+                "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
+                "action_file": self.args.file,
+                "path": "/unmerged_blocks/check/end"
+            }
+        )
         return generation_result
 
     def _fix_lint_errors(self, query: str, generation_result: CodeGenerateResult, source_code_list: SourceCodeList) -> CodeGenerateResult:
@@ -607,11 +531,22 @@ class CodeEditBlockManager:
         返回:
             CodeGenerateResult: 修复后的代码结果
         """
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/lint/check/start")),
+            metadata={
+                "stream_out_type": LintStreamOutType.LINT.value,
+                "action_file": self.args.file,
+                "path": "/lint/check/start"
+            }
+        )
+
         token_cost_calculator = TokenCostCalculator(args=self.args)
 
         for attempt in range(self.auto_fix_lint_max_attempts):
             global_cancel.check_and_raise()
             # 代码生成结果更新到影子文件里去
+            self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
                 generation_result)
 
@@ -651,7 +586,8 @@ class CodeEditBlockManager:
                                                           ).to_dict(),
                 metadata={
                     "stream_out_type": LintStreamOutType.LINT.value,
-                    "action_file": self.args.file
+                    "action_file": self.args.file,
+                    "path": "/lint/check/message"
                 }
             ))
 
@@ -681,7 +617,16 @@ class CodeEditBlockManager:
                 start_time=start_time,
                 end_time=time.time()
             )
-            
+
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/lint/check/end")),
+            metadata={
+                "stream_out_type": LintStreamOutType.LINT.value,
+                "action_file": self.args.file,
+                "path": "/lint/check/end"
+            }
+        )
         return generation_result
 
     def _fix_compile_errors(self, query: str, generation_result: CodeGenerateResult, source_code_list: SourceCodeList) -> CodeGenerateResult:
@@ -698,15 +643,26 @@ class CodeEditBlockManager:
         """
         if not self.args.enable_auto_fix_compile:
             return generation_result
-            
+
+        get_event_manager(self.args.event_file).write_result(
+            EventContentCreator.create_result(
+                content=self.printer.get_message_from_key("/compile/check/start")),
+            metadata={
+                "stream_out_type": CompileStreamOutType.COMPILE.value,
+                "action_file": self.args.file,
+                "path": "/compile/check/start"
+            }
+        )
+
         token_cost_calculator = TokenCostCalculator(args=self.args)
-        
+
         for attempt in range(self.auto_fix_compile_max_attempts):
             global_cancel.check_and_raise()
             # 先更新增量影子系统的文件
+            self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
                 generation_result)
-            
+
             # 在影子系统生成完整的项目，然后编译
             compile_result = self.shadow_compiler.compile_all_shadow_files()
 
@@ -723,7 +679,8 @@ class CodeEditBlockManager:
                                                           ).to_dict(),
                 metadata={
                     "stream_out_type": CompileStreamOutType.COMPILE.value,
-                    "action_file": self.args.file
+                    "action_file": self.args.file,
+                    "path": "/compile/check/message"
                 }
             ))
 
@@ -759,7 +716,18 @@ class CodeEditBlockManager:
                 start_time=start_time,
                 end_time=time.time()
             )
-            
+
+        # Log end only if enabled
+        if self.args.enable_auto_fix_compile:
+            get_event_manager(self.args.event_file).write_result(
+                EventContentCreator.create_result(
+                    content=self.printer.get_message_from_key("/compile/check/end")),
+                metadata={  
+                    "stream_out_type": CompileStreamOutType.COMPILE.value,
+                    "action_file": self.args.file,
+                    "path": "/compile/check/end"
+                }
+            )
         return generation_result
 
     def generate_and_fix(self, query: str, source_code_list: SourceCodeList) -> CodeGenerateResult:
@@ -792,27 +760,32 @@ class CodeEditBlockManager:
         if not generation_result.contents:
             self.printer.print_in_terminal("generation_failed", style="red")
             return generation_result
-        
-        ## 可能第一次触发排序
-        generation_result = self.code_merger.choose_best_choice(generation_result)        
 
-        ## 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
-        generation_result = CodeGenerateResult(contents=[generation_result.contents[0]],conversations=[generation_result.conversations[0]],metadata=generation_result.metadata)
+        # 可能第一次触发排序
+        generation_result = self.code_merger.choose_best_choice(
+            generation_result)
+
+        # 因为已经排完结果，就不要触发后面的排序了，所以只要保留第一个即可。
+        generation_result = CodeGenerateResult(contents=[generation_result.contents[0]], conversations=[
+                                               generation_result.conversations[0]], metadata=generation_result.metadata)
 
         # 修复缺少上下文的文件
-        generation_result = self._fix_missing_context(query, generation_result, source_code_list)
+        generation_result = self._fix_missing_context(
+            query, generation_result, source_code_list)
 
         # 修复未合并的代码块
-        generation_result = self._fix_unmerged_blocks(query, generation_result, source_code_list)
+        generation_result = self._fix_unmerged_blocks(
+            query, generation_result, source_code_list)
 
         # 修复lint错误
-        generation_result = self._fix_lint_errors(query, generation_result, source_code_list)
-        
+        generation_result = self._fix_lint_errors(
+            query, generation_result, source_code_list)
+
         # 修复编译错误
-        generation_result = self._fix_compile_errors(query, generation_result, source_code_list)
+        generation_result = self._fix_compile_errors(
+            query, generation_result, source_code_list)
 
-        # 清理临时影子文件
-        self.shadow_manager.clean_shadows()
+        # self.shadow_manager.clean_shadows()
 
         # 返回最终结果
         return generation_result

autocoder/compilers/provided_compiler.py

@@ -21,6 +21,7 @@ from autocoder.compilers.models import (
     CompilationErrorSeverity
 )
 from autocoder.utils.project_structure import EnhancedFileAnalyzer
+from loguru import logger
 
 
 class ProvidedCompiler(BaseCompiler):
@@ -307,12 +308,12 @@ class ProvidedCompiler(BaseCompiler):
             result.error_message = f"Compiler {target_compiler_name} not found in configuration"
             return result
                 
-        if self.verbose:
-            print(f"Running compiler: {target_compiler_name}")
+        logger.info(f"Using compiler to compile project({project_path}): {target_compiler_config.get('name','unknown')}")
 
         # Run the compilation command
         compile_result = self._run_compilation_command(project_path, target_compiler_config)
         compile_errors:List[CompilationError] = compile_result['errors']
+        # logger.info(f"compile_result: {compile_result}")
         error_count = len(compile_errors)
 
         result = ProjectCompilationResult(

autocoder/shadows/shadow_manager.py

@@ -84,7 +84,7 @@ class ShadowManager:
         abs_path = os.path.abspath(path)
         
         # 检查路径是否在源目录内
-        if not abs_path.startswith(self.source_dir):
+        if not abs_path.startswith(self.source_dir):            
             raise ValueError(f"路径 {path} 不在源目录 {self.source_dir} 内")
         
         # 获取相对于source_dir的相对路径

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.334"
+__version__ = "0.1.335"