auto-coder 0.1.316__py3-none-any.whl → 0.1.317__py3-none-any.whl

autocoder/common/v2/code_strict_diff_manager.py

@@ -0,0 +1,241 @@
+from typing import Dict
+from autocoder.common.types import CodeGenerateResult
+from autocoder.common.v2.code_auto_merge_strict_diff import CodeAutoMergeStrictDiff
+from autocoder.common.v2.code_auto_generate_strict_diff import CodeAutoGenerateStrictDiff
+import byzerllm
+from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList
+from autocoder.linters.shadow_linter import ShadowLinter
+from autocoder.shadows.shadow_manager import ShadowManager
+from autocoder.linters.models import IssueSeverity
+from autocoder.common.global_cancel import global_cancel
+from autocoder.linters.models import ProjectLintResult
+from autocoder.common.token_cost_caculate import TokenCostCalculator
+import time
+
+
+class CodeStrictDiffManager:
+    """
+    A class that combines code generation, linting, and merging with automatic error correction,
+    specifically for strict diff-based code generation.
+    """
+    
+    def __init__(
+        self,
+        llm: byzerllm.ByzerLLM,
+        args: AutoCoderArgs,
+        action=None,
+    ) -> None:
+        super().__init__(llm, args, action)
+        
+        # Initialize sub-components
+        self.code_generator = CodeAutoGenerateStrictDiff(llm, args, action)
+        self.code_merger = CodeAutoMergeStrictDiff(llm, args)
+        self.shadow_manager = ShadowManager(args.source_dir)
+        self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
+
+    @byzerllm.prompt()
+    def fix_linter_errors(self, query: str, lint_issues: str) -> str:
+        """        
+        Linter 检测到的问题:
+        <lint_issues>
+        {{ lint_issues }}
+        </lint_issues>
+        
+        用户原始需求:
+        <user_query_wrapper>
+        {{ query }}
+        </user_query_wrapper>
+
+        修复上述问题，请确保代码质量问题被解决，同时保持代码的原有功能。
+        请使用 unified diff 格式输出修改。
+        """
+        
+    def _create_shadow_files_from_edits(self, generation_result: CodeGenerateResult) -> Dict[str, str]:
+        """
+        从编辑块内容中提取代码并创建临时影子文件用于检查。
+        
+        参数:
+            generation_result (CodeGenerateResult): 包含diff格式的内容
+            
+        返回:
+            Dict[str, str]: 映射 {影子文件路径: 内容}
+        """
+        result = self.code_merger.choose_best_choice(generation_result)
+        merge = self.code_merger._merge_code_without_effect(result.contents[0])        
+        shadow_files = {}
+        for file_path, new_content in merge.success_blocks:
+            self.shadow_manager.update_file(file_path, new_content)
+            shadow_files[self.shadow_manager.to_shadow_path(file_path)] = new_content
+
+        return shadow_files
+
+    def _format_lint_issues(self, lint_results:ProjectLintResult,level:IssueSeverity) -> str:
+        """
+        将linter结果格式化为字符串供模型使用
+        
+        参数:
+            lint_results: Linter结果对象
+            level: 过滤问题的级别
+            
+        返回:
+            str: 格式化的问题描述
+        """
+        formatted_issues = []
+        
+        for file_path, result in lint_results.file_results.items():                        
+            file_has_issues = False
+            file_issues = []
+            
+            for issue in result.issues:                
+                if issue.severity.value != level.value:
+                    continue
+                    
+                if not file_has_issues:
+                    file_has_issues = True
+                    file_issues.append(f"文件: {file_path}")
+                
+                severity = "错误" if issue.severity == IssueSeverity.ERROR else "警告" if issue.severity == IssueSeverity.WARNING else "信息"
+                line_info = f"第{issue.position.line}行"
+                if issue.position.column:
+                    line_info += f", 第{issue.position.column}列"
+                
+                file_issues.append(
+                    f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
+                )
+            
+            if file_has_issues:
+                formatted_issues.extend(file_issues)
+                formatted_issues.append("")  # 空行分隔不同文件
+            
+        return "\n".join(formatted_issues)
+
+    def _count_errors(self, lint_results:ProjectLintResult) -> int:
+        """
+        计算lint结果中的错误数量
+        
+        参数:
+            lint_results: Linter结果对象
+            
+        返回:
+            int: 错误数量
+        """
+        error_count = 0
+        
+        for _, result in lint_results.file_results.items():                
+            error_count += result.error_count
+                
+        return error_count
+
+    def generate_and_fix(self, query: str, source_code_list: SourceCodeList) -> CodeGenerateResult:
+        """
+        生成代码，运行linter，修复错误，最多尝试指定次数
+        
+        参数:
+            query (str): 用户查询
+            source_code_list (SourceCodeList): 源代码列表
+            
+        返回:
+            CodeGenerateResult: 生成的代码结果
+        """
+        # 初始代码生成
+        self.printer.print_in_terminal("generating_initial_code")
+        start_time = time.time()
+        generation_result = self.code_generator.single_round_run(query, source_code_list)
+        
+        token_cost_calculator = TokenCostCalculator(args=self.args)
+        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()
+        )
+        
+        # 确保结果非空
+        if not generation_result.contents:
+            self.printer.print_in_terminal("generation_failed", style="red")
+            return generation_result
+                            
+        
+        # 最多尝试修复5次
+        for attempt in range(self.max_correction_attempts):
+            global_cancel.check_and_raise()
+            # 代码生成结果更新到影子文件里去
+            shadow_files = self._create_shadow_files_from_edits(generation_result)
+            
+            if not shadow_files:
+                self.printer.print_in_terminal("no_files_to_lint", style="yellow")
+                break
+                
+            # 运行linter
+            lint_results = self.shadow_linter.lint_all_shadow_files()
+            error_count = self._count_errors(lint_results)
+            
+            # 如果没有错误则完成
+            if error_count == 0:
+                self.printer.print_in_terminal("no_lint_errors_found", style="green")
+                break
+
+            # 格式化lint问题
+            formatted_issues = self._format_lint_issues(lint_results, IssueSeverity.ERROR)            
+
+            # 打印当前错误
+            self.printer.print_in_terminal(
+                "lint_attempt_status", 
+                style="yellow", 
+                attempt=(attempt + 1), 
+                max_correction_attempts=self.max_correction_attempts,
+                error_count=error_count,
+                formatted_issues=formatted_issues
+            )
+            
+            if attempt == self.max_correction_attempts - 1:
+                self.printer.print_in_terminal("max_attempts_reached", style="yellow")
+                break
+                
+            # 准备修复提示
+            fix_prompt = self.fix_linter_errors.prompt(
+                query=query,
+                lint_issues=formatted_issues
+            )
+            
+            for source in source_code_list.sources:
+                print(f"file_path: {source.module_name}")                
+            print(f"fix_prompt: {fix_prompt}")
+            
+            # 将 shadow_files 转化为 source_code_list
+            source_code_list = self.code_merger.get_source_code_list_from_shadow_files(shadow_files)
+            start_time = time.time()
+            generation_result = self.code_generator.single_round_run(fix_prompt, source_code_list)            
+            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()
+            )
+        
+        # 清理临时影子文件
+        self.shadow_manager.clean_shadows()
+        
+        # 返回最终结果
+        return generation_result
+
+    def run(self, query: str, source_code_list: SourceCodeList) -> CodeGenerateResult:
+        """
+        执行完整的代码生成、修复、合并流程
+        
+        参数:
+            query (str): 用户查询
+            source_code_list (SourceCodeList): 源代码列表
+            
+        返回:
+            CodeGenerateResult: 生成和修复的代码结果
+        """
+        # 生成代码并自动修复lint错误
+        generation_result = self.generate_and_fix(query, source_code_list)
+        global_cancel.check_and_raise()
+        # 合并代码        
+        self.code_merger.merge_code(generation_result)
+        
+        return generation_result 

autocoder/dispacher/actions/action.py

@@ -33,6 +33,7 @@ from autocoder.common.global_cancel import global_cancel
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.events.event_types import EventMetadata
+from autocoder.common.v2.code_editblock_manager import CodeEditBlockManager
 
 
 class BaseAction:
@@ -114,6 +115,11 @@ class ActionTSProject(BaseAction):
 
         global_cancel.check_and_raise()
 
+        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+            code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
+            code_merge_manager.run(query=args.query, source_code_list=source_code_list)
+            return
+
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -268,6 +274,11 @@ class ActionPyProject(BaseAction):
 
         global_cancel.check_and_raise()
 
+        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+            code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
+            code_merge_manager.run(query=args.query, source_code_list=source_code_list)
+            return
+
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -415,6 +426,11 @@ class ActionSuffixProject(BaseAction):
 
         global_cancel.check_and_raise()
 
+        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+            code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
+            code_merge_manager.run(query=args.query, source_code_list=source_code_list)
+            return
+
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -9,6 +9,7 @@ from autocoder.common.code_auto_generate import CodeAutoGenerate
 from autocoder.common.code_auto_generate_diff import CodeAutoGenerateDiff
 from autocoder.common.code_auto_generate_strict_diff import CodeAutoGenerateStrictDiff
 from autocoder.common.code_auto_generate_editblock import CodeAutoGenerateEditBlock
+from autocoder.common.v2.code_editblock_manager import CodeEditBlockManager
 from autocoder.index.entry import build_index_and_filter_files
 from autocoder.regexproject import RegexProject
 from autocoder.utils.conversation_store import store_code_model_conversation
@@ -67,6 +68,11 @@ class ActionRegexProject:
         start_time = time.time()
         
         global_cancel.check_and_raise()
+
+        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+            code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
+            code_merge_manager.run(query=args.query, source_code_list=source_code_list)
+            return
         
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")

autocoder/events/event_manager_singleton.py

@@ -1,6 +1,6 @@
 import os
 import threading
-from typing import Optional, Dict, Any, List
+from typing import Optional, Dict, Any, List, Tuple
 import uuid
 from datetime import datetime
 import glob
@@ -75,7 +75,7 @@ def get_event_file_path(file_id:str,project_path: Optional[str] = None) -> str:
     else:
         return os.path.join(project_path, ".auto-coder", "events", f"{file_id}.jsonl")
 
-def gengerate_event_file_path(project_path: Optional[str] = None) -> (str,str):
+def gengerate_event_file_path(project_path: Optional[str] = None) -> Tuple[str,str]:
     """
     生成一个格式为 uuid_timestamp.jsonl 的事件文件名。
     timestamp 格式为 YYYYMMDD-HHMMSS。