auto-coder 0.1.361__py3-none-any.whl → 0.1.363__py3-none-any.whl

autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py

@@ -14,7 +14,9 @@ class ReplaceInFileToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: ReplaceInFileTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: ReplaceInFileTool = tool  # For type hinting
+        self.args = args
         self.shadow_manager = self.agent.shadow_manager if self.agent else None
+        self.shadow_linter = self.agent.shadow_linter if self.agent else None
 
     def parse_diff(self, diff_content: str) -> List[Tuple[str, str]]:
         """
@@ -58,6 +60,30 @@ class ReplaceInFileToolResolver(BaseToolResolver):
             logger.warning(f"Could not parse any SEARCH/REPLACE blocks from diff: {diff_content}")
         return blocks
 
+    def _format_lint_issues(self, lint_result):
+        """
+        将 lint 结果格式化为可读的文本格式
+        
+        参数:
+            lint_result: 单个文件的 lint 结果对象
+            
+        返回:
+            str: 格式化的问题描述
+        """
+        formatted_issues = []
+        
+        for issue in lint_result.issues:
+            severity = "错误" if issue.severity.value == 3 else "警告" if issue.severity.value == 2 else "信息"
+            line_info = f"第{issue.position.line}行"
+            if issue.position.column:
+                line_info += f", 第{issue.position.column}列"
+            
+            formatted_issues.append(
+                f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
+            )
+        
+        return "\n".join(formatted_issues)
+
     def resolve(self) -> ToolResult:
         file_path = self.tool.path
         diff_content = self.tool.diff
@@ -130,6 +156,36 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                 f.write(current_content)
             logger.info(f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to file: {file_path}")
 
+            # 新增：执行代码质量检查
+            lint_results = None
+            lint_message = ""
+            formatted_issues = ""
+            has_lint_issues = False
+            
+            # 检查是否启用了Lint功能
+            enable_lint = self.args.enable_auto_fix_lint
+            
+            if enable_lint:
+                try:
+                    if self.shadow_linter and self.shadow_manager:
+                        # 对修改后的文件进行 lint 检查
+                        shadow_path = target_path  # 已经是影子路径
+                        lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                        
+                        if lint_results and lint_results.issues:
+                            has_lint_issues = True
+                            # 格式化 lint 问题
+                            formatted_issues = self._format_lint_issues(lint_results)
+                            lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                        else:
+                            lint_message = "\n\n代码质量检查通过，未发现问题。"
+                except Exception as e:
+                    logger.error(f"Lint 检查失败: {str(e)}")
+                    lint_message = "\n\n尝试进行代码质量检查时出错。"
+            else:
+                logger.info("代码质量检查已禁用")
+
+            # 构建包含 lint 结果的返回消息
             if errors:
                 message = get_message_with_format("replace_in_file.apply_success_with_warnings", 
                                                   applied=applied_count, 
@@ -141,13 +197,29 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                                                   applied=applied_count, 
                                                   total=len(parsed_blocks), 
                                                   file_path=file_path)
+            
+            # 将 lint 消息添加到结果中，如果启用了Lint
+            if enable_lint:
+                message += lint_message
 
             # 变更跟踪，回调AgenticEdit
             if self.agent:
                 rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                 self.agent.record_file_change(rel_path, "modified", diff=diff_content, content=current_content)
 
-            return ToolResult(success=True, message=message, content=current_content)
+            # 附加 lint 结果到返回内容
+            result_content = {
+                "content": current_content,
+            }
+            
+            # 只有在启用Lint时才添加Lint结果
+            if enable_lint:
+                result_content["lint_results"] = {
+                    "has_issues": has_lint_issues,
+                    "issues": formatted_issues if has_lint_issues else None
+                }
+
+            return ToolResult(success=True, message=message, content=result_content)
         except Exception as e:
             logger.error(f"Error writing replaced content to file '{file_path}': {str(e)}")
             return ToolResult(success=False, message=get_message_with_format("replace_in_file.write_error", error=str(e)))

autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py

@@ -4,6 +4,7 @@ from autocoder.common.v2.agent.agentic_edit_types import WriteToFileTool, ToolRe
 from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import BaseToolResolver
 from loguru import logger
 from autocoder.common import AutoCoderArgs
+from autocoder.common.auto_coder_lang import get_message_with_format
 import typing
 
 if typing.TYPE_CHECKING:
@@ -13,7 +14,33 @@ class WriteToFileToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: WriteToFileTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: WriteToFileTool = tool  # For type hinting
+        self.args = args
         self.shadow_manager = self.agent.shadow_manager if self.agent else None
+        self.shadow_linter = self.agent.shadow_linter if self.agent else None
+        
+    def _format_lint_issues(self, lint_result):
+        """
+        将 lint 结果格式化为可读的文本格式
+        
+        参数:
+            lint_result: 单个文件的 lint 结果对象
+            
+        返回:
+            str: 格式化的问题描述
+        """
+        formatted_issues = []
+        
+        for issue in lint_result.issues:
+            severity = "错误" if issue.severity.value == 3 else "警告" if issue.severity.value == 2 else "信息"
+            line_info = f"第{issue.position.line}行"
+            if issue.position.column:
+                line_info += f", 第{issue.position.column}列"
+            
+            formatted_issues.append(
+                f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
+            )
+        
+        return "\n".join(formatted_issues)
 
     def resolve(self) -> ToolResult:
         file_path = self.tool.path
@@ -39,8 +66,56 @@ class WriteToFileToolResolver(BaseToolResolver):
                 if self.agent:
                     rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                     self.agent.record_file_change(rel_path, "added", diff=None, content=content)
-
-                return ToolResult(success=True, message=f"Successfully wrote to file (shadow): {file_path}", content=content)
+                
+                # 新增：执行代码质量检查
+                lint_results = None
+                lint_message = ""
+                formatted_issues = ""
+                has_lint_issues = False
+                
+                # 检查是否启用了Lint功能
+                enable_lint = self.args.enable_auto_fix_lint
+                
+                if enable_lint:
+                    try:
+                        if self.shadow_linter and self.shadow_manager:
+                            # 对新创建的文件进行 lint 检查
+                            shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
+                            lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                            
+                            if lint_results and lint_results.issues:
+                                has_lint_issues = True
+                                # 格式化 lint 问题
+                                formatted_issues = self._format_lint_issues(lint_results)
+                                lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                            else:
+                                lint_message = "\n\n代码质量检查通过，未发现问题。"
+                    except Exception as e:
+                        logger.error(f"Lint 检查失败: {str(e)}")
+                        lint_message = "\n\n尝试进行代码质量检查时出错。"
+                else:
+                    logger.info("代码质量检查已禁用")
+                
+                # 构建包含 lint 结果的返回消息
+                message = f"Successfully wrote to file (shadow): {file_path}"
+                
+                # 将 lint 消息添加到结果中，如果启用了Lint
+                if enable_lint:
+                    message += lint_message
+                
+                # 附加 lint 结果到返回内容
+                result_content = {
+                    "content": content,
+                }
+                
+                # 只有在启用Lint时才添加Lint结果
+                if enable_lint:
+                    result_content["lint_results"] = {
+                        "has_issues": has_lint_issues,
+                        "issues": formatted_issues if has_lint_issues else None
+                    }
+                
+                return ToolResult(success=True, message=message, content=result_content)
             else:
                 # No shadow manager fallback to original file
                 os.makedirs(os.path.dirname(abs_file_path), exist_ok=True)
@@ -51,8 +126,61 @@ class WriteToFileToolResolver(BaseToolResolver):
                 if self.agent:
                     rel_path = os.path.relpath(abs_file_path, abs_project_dir)
                     self.agent.record_file_change(rel_path, "added", diff=None, content=content)
-
-                return ToolResult(success=True, message=f"Successfully wrote to file: {file_path}", content=content)
+                
+                # 新增：执行代码质量检查
+                lint_results = None
+                lint_message = ""
+                formatted_issues = ""
+                has_lint_issues = False
+                
+                # 检查是否启用了Lint功能
+                enable_lint = self.args.enable_auto_fix_lint
+                
+                if enable_lint:
+                    try:
+                        if self.shadow_linter and self.shadow_manager:
+                            # 对新创建的文件进行 lint 检查
+                            # 由于没有shadow系统，需要先创建shadow文件
+                            shadow_path = self.shadow_manager.to_shadow_path(abs_file_path)
+                            os.makedirs(os.path.dirname(shadow_path), exist_ok=True)
+                            with open(shadow_path, 'w', encoding='utf-8') as f:
+                                f.write(content)
+                            
+                            lint_results = self.shadow_linter.lint_shadow_file(shadow_path)
+                            
+                            if lint_results and lint_results.issues:
+                                has_lint_issues = True
+                                # 格式化 lint 问题
+                                formatted_issues = self._format_lint_issues(lint_results)
+                                lint_message = f"\n\n代码质量检查发现 {len(lint_results.issues)} 个问题:\n{formatted_issues}"
+                            else:
+                                lint_message = "\n\n代码质量检查通过，未发现问题。"
+                    except Exception as e:
+                        logger.error(f"Lint 检查失败: {str(e)}")
+                        lint_message = "\n\n尝试进行代码质量检查时出错。"
+                else:
+                    logger.info("代码质量检查已禁用")
+                
+                # 构建包含 lint 结果的返回消息
+                message = f"Successfully wrote to file: {file_path}"
+                
+                # 将 lint 消息添加到结果中，如果启用了Lint
+                if enable_lint:
+                    message += lint_message
+                
+                # 附加 lint 结果到返回内容
+                result_content = {
+                    "content": content,
+                }
+                
+                # 只有在启用Lint时才添加Lint结果
+                if enable_lint:
+                    result_content["lint_results"] = {
+                        "has_issues": has_lint_issues,
+                        "issues": formatted_issues if has_lint_issues else None
+                    }
+                
+                return ToolResult(success=True, message=message, content=result_content)
         except Exception as e:
             logger.error(f"Error writing to file '{file_path}': {str(e)}")
             return ToolResult(success=False, message=f"An error occurred while writing to the file: {str(e)}")

autocoder/common/v2/agent/agentic_edit_types.py

@@ -2,7 +2,6 @@ from pydantic import BaseModel
 from typing import List, Dict, Any, Callable, Optional, Type
 from pydantic import SkipValidation
 
-
 # Result class used by Tool Resolvers
 class ToolResult(BaseModel):
     success: bool
@@ -115,7 +114,7 @@ TOOL_MODEL_MAP: Dict[str, Type[BaseTool]] = {
     "attempt_completion": AttemptCompletionTool,
     "plan_mode_respond": PlanModeRespondTool,
     "use_mcp_tool": UseMcpTool,
-    "list_package_info": ListPackageInfoTool,
+    "list_package_info": ListPackageInfoTool,    
 }
 
 class FileChangeEntry(BaseModel):

autocoder/common/v2/agent/agentic_tool_display.py

@@ -93,8 +93,7 @@ TOOL_DISPLAY_MESSAGES: Dict[Type[BaseTool], Dict[str, str]] = {
             "[dim]工具：[/dim] [blue]{{ tool_name }}[/]\n"
             "[dim]参数：[/dim] {{ arguments_snippet }}{{ ellipsis }}"
         )
-    }    
-    # AttemptCompletionTool is handled separately in the display loop
+    }
 }
 
 def get_tool_display_message(tool: BaseTool) -> str:
@@ -172,7 +171,7 @@ def get_tool_display_message(tool: BaseTool) -> str:
             "tool_name": tool.tool_name,
             "arguments_snippet": snippet,
             "ellipsis": '...' if len(args_str) > 100 else ''
-        }
+        }    
     else:
         # Generic context for tools not specifically handled above
         context = tool.model_dump()

autocoder/common/v2/code_auto_generate_editblock.py

@@ -215,8 +215,10 @@ class CodeAutoGenerateEditBlock:
 
         ====
         下面是用户的需求：
-
+        
+        <user_instruction>
         {{ instruction }}
+        </user_instruction>
 
         """
         if not self.args.include_project_structure:

autocoder/index/index.py

@@ -31,6 +31,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.common.stream_out_type import IndexStreamOutType
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
+from loguru import logger
 
 class IndexManager:
     def __init__(
@@ -220,7 +221,7 @@ class IndexManager:
         5. 导入语句中需要包含 jsp:include 整个标签，类似 <jsp:include page="/jspf/prelude.jspf" />
         6. 导入语句中需要包含 form 标签，类似 <form name="ActionPlanLinkedForm" action="/ri/ActionPlanController.do" method="post">
         7. 导入语句中需要包含 有 src 属性的 script 标签。比如 <script language="script" src="xxx">        
-        8. 导入语句中需要包含 有 src 属性的 link 标签。 比如 <link rel="stylesheet" type="text/css" href="/ri/ui/styles/xptheme.css">
+        8. 导入语句中需要包含 有 src 属性的 link 标签。 比如 <link rel="stylesheet" type="text/css" href="/ri/ui/styles/xptheme.css">
         9. 导入语句中需要包含 ajax 请求里的url,比如 $.ajax({  
         type : "post",  
         url : "admWorkingDay!updateAdmWorkingDayList.action",  中，那么对应的为 <ajax method="post" url="admWorkingDay!updateAdmWorkingDayList.action">
@@ -656,13 +657,18 @@ class IndexManager:
 
         index_items = []
         for module_name, data in index_data.items():
-            index_item = IndexItem(
-                module_name=module_name,
-                symbols=data["symbols"],
-                last_modified=data["last_modified"],
-                md5=data["md5"],
-            )
-            index_items.append(index_item)
+            try:                                
+                index_item = IndexItem(
+                    module_name=module_name,
+                    symbols=data["symbols"],
+                    last_modified=data["last_modified"],
+                    md5=data["md5"],
+                )
+                index_items.append(index_item)
+            except (KeyError, TypeError) as e:
+                logger.warning(f"处理索引条目 {module_name} 时出错: {str(e)}")
+                logger.exception(e)
+                continue
 
         return index_items