auto-coder 0.1.372__tar.gz → 0.1.374__tar.gz

{auto_coder-0.1.372 → auto_coder-0.1.374}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.372
+Version: 0.1.374
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.182
+Requires-Dist: byzerllm[saas]>=0.1.184
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.372
+Version: 0.1.374
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.182
+Requires-Dist: byzerllm[saas]>=0.1.184
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/auto_coder.egg-info/SOURCES.txt

@@ -106,7 +106,6 @@ src/autocoder/common/global_cancel.py
 src/autocoder/common/image_to_page.py
 src/autocoder/common/index_import_export.py
 src/autocoder/common/interpreter.py
-src/autocoder/common/llm_rerank.py
 src/autocoder/common/mcp_hub.py
 src/autocoder/common/mcp_server.py
 src/autocoder/common/mcp_server_install.py
@@ -279,8 +278,6 @@ src/autocoder/rag/rag_entry.py
 src/autocoder/rag/raw_rag.py
 src/autocoder/rag/relevant_utils.py
 src/autocoder/rag/searchable.py
-src/autocoder/rag/simple_directory_reader.py
-src/autocoder/rag/simple_rag.py
 src/autocoder/rag/test_doc_filter.py
 src/autocoder/rag/test_long_context_rag.py
 src/autocoder/rag/test_token_limiter.py
@@ -333,7 +330,6 @@ src/autocoder/utils/request_event_queue.py
 src/autocoder/utils/request_queue.py
 src/autocoder/utils/rest.py
 src/autocoder/utils/stream_thinking.py
-src/autocoder/utils/tests.py
 src/autocoder/utils/thread_utils.py
 src/autocoder/utils/types.py
 src/autocoder/utils/auto_coder_utils/__init__.py

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/auto_coder.egg-info/requires.txt

@@ -18,7 +18,7 @@ prompt-toolkit
 tokenizers
 aiofiles
 readerwriterlock
-byzerllm[saas]>=0.1.182
+byzerllm[saas]>=0.1.184
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/agent/auto_tool.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
 from autocoder.suffixproject import SuffixProject
@@ -7,7 +5,6 @@ from autocoder.common import AutoCoderArgs
 from autocoder.common.interpreter import Interpreter
 from autocoder.common import ExecuteSteps, ExecuteStep, detect_env
 from autocoder.common import code_auto_execute
-from byzerllm.apps.llama_index.byzerai import ByzerAI
 from loguru import logger
 import os
 import io
@@ -252,6 +249,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
         
         console.print("[bold red]达到最大尝试次数，任务未能完成。[/bold red]")
         return result
+        
+    from llama_index.core.tools import FunctionTool
 
     tools = [
         FunctionTool.from_defaults(run_python_code),
@@ -284,6 +283,8 @@ class AutoTool:
         return self.pp.get_tree_like_directory_structure.prompt()
 
     def run(self, query: str, max_iterations: int = 20):
+        from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.code_model),

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/agent/planner.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.index.index import IndexManager
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
@@ -182,7 +180,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
         args.collections = old_collections
 
         return "\n".join([sc.source_code for sc in source_codes])
-
+        
+    from llama_index.core.tools import FunctionTool
     tools = [
         FunctionTool.from_defaults(get_project_related_files),
         FunctionTool.from_defaults(generate_auto_coder_yaml),
@@ -202,6 +201,7 @@ class Planner:
 
     def run(self, query: str, max_iterations: int = 10):
         from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.llm),

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/agent/project_reader.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.index.index import IndexManager
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
@@ -176,7 +174,7 @@ def detect_rm_command(command: str) -> Bool:
 
 
 def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
-
+    
     def ask_user(question:str) -> str:
         '''
         如果你对用户的问题有什么疑问，或者你想从用户收集一些额外信息，可以调用
@@ -404,7 +402,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
                     pass
 
         return ",".join(matched_files)
-
+    
+    from llama_index.core.tools import FunctionTool
     tools = [
         # FunctionTool.from_defaults(get_project_related_files),
         FunctionTool.from_defaults(get_related_files_by_symbols),
@@ -440,6 +439,7 @@ class ProjectReader:
 
     def run(self, query: str, max_iterations: int = 20):
         from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.llm),

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/chat_auto_coder.py

@@ -19,12 +19,11 @@ from autocoder.events.event_manager_singleton import gengerate_event_file_path
 from autocoder.common.global_cancel import global_cancel
 from autocoder.chat.models_command import handle_models_command
 from autocoder.auto_coder_runner import (
-    auto_command,
-    load_memory,
-    save_memory,
+    auto_command,    
     configure, # Keep configure if it's used elsewhere or by handle_conf_command internally (though we adapted handle_conf_command not to)
     # manage_models, # Removed
     # print_conf, # Removed
+    save_memory,
     exclude_dirs,
     exclude_files,
     ask,
@@ -122,10 +121,7 @@ def show_help():
     )
     print(
         f"  \033[94m/coding\033[0m \033[93m<query>\033[0m - \033[92m{get_message('coding_desc')}\033[0m"
-    )
-    print(
-        f"  \033[94m/ask\033[0m \033[93m<query>\033[0m - \033[92m{get_message('ask_desc')}\033[0m"
-    )
+    )    
     print(
         f"  \033[94m/summon\033[0m \033[93m<query>\033[0m - \033[92m{get_message('summon_desc')}\033[0m"
     )
@@ -302,7 +298,6 @@ def main():
     # 加载保存的运行时配置
     plugin_manager.load_runtime_cfg()
 
-    load_memory()
     memory = get_memory()
 
     configure(f"product_mode:{ARGS.product_mode}")
@@ -345,7 +340,8 @@ def main():
             memory["mode"] = "voice_input"
         else:  # voice_input
             memory["mode"] = "normal"
-
+        
+        save_memory()
         event.app.invalidate()
 
     @kb.add("c-n")
@@ -467,8 +463,8 @@ def main():
             else:
                 user_input = session.prompt(FormattedText(prompt_message), style=style)
             new_prompt = ""
-
-            if "mode" not in memory:
+            
+            if "mode" not in memory:                
                 memory["mode"] = "auto_detect"
 
             # 处理 user_input 的空格
@@ -545,9 +541,11 @@ def main():
                     print(memory["mode"])
                 else:
                     memory["mode"] = conf
+                    save_memory()
 
             elif user_input.startswith("/conf/export"):
                 from autocoder.common.conf_import_export import export_conf
+                export_conf(os.getcwd(), user_input[len("/conf/export") :].strip() or ".")
 
             elif user_input.startswith("/plugins"):
                 # 提取命令参数并交由 plugin_manager 处理
@@ -580,14 +578,7 @@ def main():
 
             elif user_input.startswith("/exclude_files"):
                 query = user_input[len("/exclude_files") :].strip()
-                exclude_files(query)
-
-            elif user_input.startswith("/ask"):
-                query = user_input[len("/ask") :].strip()
-                if not query:
-                    print("Please enter your question.")
-                else:
-                    ask(query)
+                exclude_files(query)           
 
             elif user_input.startswith("/exit"):
                 raise EOFError()

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -850,7 +850,8 @@ class AgenticEdit:
                 
         iteration_count = 0
         tool_executed = False 
-        should_yield_completion_event = False       
+        should_yield_completion_event = False   
+        completion_event = None    
 
         while True:
             iteration_count += 1            
@@ -860,10 +861,13 @@ class AgenticEdit:
             if last_message["role"] == "assistant":
                 logger.info(f"Last message is assistant, skipping LLM interaction cycle")
                 if should_yield_completion_event:
-                    yield CompletionEvent(completion=AttemptCompletionTool(
-                        result=last_message["content"],
-                        command=""
-                    ), completion_xml="")                    
+                    if completion_event is None:
+                        yield CompletionEvent(completion=AttemptCompletionTool(
+                            result=last_message["content"],
+                            command=""
+                        ), completion_xml="")  
+                    else:
+                        yield completion_event                     
                 break
             logger.info(
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
@@ -935,7 +939,7 @@ class AgenticEdit:
                         logger.info(
                             "AttemptCompletionTool received. Finalizing session.")
                         logger.info(f"Completion result: {tool_obj.result[:50]}...")
-                        # yield CompletionEvent(completion=tool_obj, completion_xml=tool_xml)
+                        completion_event = CompletionEvent(completion=tool_obj, completion_xml=tool_xml)
                         logger.info(
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
                         save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")        

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py

@@ -13,7 +13,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 from autocoder.common.result_manager import ResultManager
-
+from autocoder.common.printer import Printer
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
 
@@ -22,6 +22,7 @@ class AskFollowupQuestionToolResolver(BaseToolResolver):
         super().__init__(agent, tool, args)
         self.tool: AskFollowupQuestionTool = tool # For type hinting
         self.result_manager = ResultManager()
+        self.printer = Printer()
 
     def resolve(self) -> ToolResult:
         """

{auto_coder-0.1.372 → auto_coder-0.1.374}/src/autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py

@@ -7,6 +7,7 @@ from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import Base
 from autocoder.common.v2.agent.agentic_edit_types import ReplaceInFileTool, ToolResult
 from autocoder.common.file_checkpoint.models import FileChange as CheckpointFileChange
 from autocoder.common.file_checkpoint.manager import FileChangeManager as CheckpointFileChangeManager
+from autocoder.linters.models import IssueSeverity, FileLintResult
 from loguru import logger
 from autocoder.common.auto_coder_lang import get_message_with_format
 if typing.TYPE_CHECKING:
@@ -62,7 +63,38 @@ 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):
+    def _filter_lint_issues(self, lint_result:FileLintResult, levels: List[IssueSeverity] = [IssueSeverity.ERROR, IssueSeverity.WARNING]):
+        """
+        过滤 lint 结果，只保留指定级别的问题
+        
+        参数:
+            lint_result: 单个文件的 lint 结果对象
+            levels: 要保留的问题级别列表，默认保留 ERROR 和 WARNING 级别
+            
+        返回:
+            过滤后的 lint 结果对象（原对象的副本）
+        """
+        if not lint_result or not lint_result.issues:
+            return lint_result
+            
+        # 创建一个新的 issues 列表，只包含指定级别的问题
+        filtered_issues = []
+        for issue in lint_result.issues:
+            if issue.severity in levels:                
+                filtered_issues.append(issue)
+                
+        # 更新 lint_result 的副本
+        filtered_result = lint_result
+        filtered_result.issues = filtered_issues
+        
+        # 更新计数
+        filtered_result.error_count = sum(1 for issue in filtered_result.issues if issue.severity == IssueSeverity.ERROR)
+        filtered_result.warning_count = sum(1 for issue in filtered_result.issues if issue.severity == IssueSeverity.WARNING)
+        filtered_result.info_count = sum(1 for issue in filtered_result.issues if issue.severity == IssueSeverity.INFO)
+        
+        return filtered_result
+        
+    def _format_lint_issues(self, lint_result:FileLintResult):
         """
         将 lint 结果格式化为可读的文本格式
         
@@ -86,130 +118,7 @@ class ReplaceInFileToolResolver(BaseToolResolver):
         
         return "\n".join(formatted_issues)
 
-    def replace_in_file_with_shadow(self, file_path: str, diff_content: str, source_dir: str, abs_project_dir: str, abs_file_path: str) -> ToolResult:
-        """Replace content in file using shadow manager for path translation"""
-        try:
-            # Determine target path: shadow file
-            target_path = self.shadow_manager.to_shadow_path(abs_file_path)
-
-            # Read original content
-            if os.path.exists(target_path) and os.path.isfile(target_path):
-                with open(target_path, 'r', encoding='utf-8', errors='replace') as f:
-                    original_content = f.read()
-            elif os.path.exists(abs_file_path) and os.path.isfile(abs_file_path):
-                # If shadow doesn't exist, but original exists, read original content
-                with open(abs_file_path, 'r', encoding='utf-8', errors='replace') as f:
-                    original_content = f.read()
-                # create parent dirs of shadow if needed
-                os.makedirs(os.path.dirname(target_path), exist_ok=True)
-                # write original content into shadow file as baseline
-                with open(target_path, 'w', encoding='utf-8') as f:
-                    f.write(original_content)
-                logger.info(f"[Shadow] Initialized shadow file from original: {target_path}")
-            else:
-                return ToolResult(success=False, message=get_message_with_format("replace_in_file.file_not_found", file_path=file_path))
-
-            parsed_blocks = self.parse_diff(diff_content)
-            if not parsed_blocks:
-                return ToolResult(success=False, message=get_message_with_format("replace_in_file.no_valid_blocks"))
-
-            current_content = original_content
-            applied_count = 0
-            errors = []
-
-            # Apply blocks sequentially
-            for i, (search_block, replace_block) in enumerate(parsed_blocks):
-                start_index = current_content.find(search_block)
-
-                if start_index != -1:
-                    current_content = current_content[:start_index] + replace_block + current_content[start_index + len(search_block):]
-                    applied_count += 1
-                    logger.info(f"Applied SEARCH/REPLACE block {i+1} in file {file_path}")
-                else:
-                    error_message = f"SEARCH block {i+1} not found in the current file content. Content to search:\n---\n{search_block}\n---"
-                    logger.warning(error_message)
-                    context_start = max(0, original_content.find(search_block[:20]) - 100)
-                    context_end = min(len(original_content), context_start + 200 + len(search_block[:20]))
-                    logger.warning(f"Approximate context in file:\n---\n{original_content[context_start:context_end]}\n---")
-                    errors.append(error_message)
-
-            if applied_count == 0 and errors:
-                return ToolResult(success=False, message=get_message_with_format("replace_in_file.apply_failed", errors="\n".join(errors)))
-
-            # Write the modified content back to shadow file
-            os.makedirs(os.path.dirname(target_path), exist_ok=True)
-            with open(target_path, 'w', encoding='utf-8') as f:
-                f.write(current_content)
-            
-            logger.info(f"Successfully applied {applied_count}/{len(parsed_blocks)} changes to shadow 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, 
-                                                  total=len(parsed_blocks), 
-                                                  file_path=file_path,
-                                                  errors="\n".join(errors))
-            else:
-                message = get_message_with_format("replace_in_file.apply_success", 
-                                                  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)
-
-            # 附加 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 shadow file '{file_path}': {str(e)}")
-            return ToolResult(success=False, message=get_message_with_format("replace_in_file.write_error", error=str(e)))
+    
 
     def replace_in_file_normal(self, file_path: str, diff_content: str, source_dir: str, abs_project_dir: str, abs_file_path: str) -> ToolResult:
         """Replace content in file directly without using shadow manager"""
@@ -282,16 +191,20 @@ class ReplaceInFileToolResolver(BaseToolResolver):
             
             # 检查是否启用了Lint功能
             enable_lint = self.args.enable_auto_fix_lint
+            logger.info(f"检查Lint功能状态: enable_lint={enable_lint}")
             
             if enable_lint:
                 try:
                     if self.agent.linter:
                         lint_results = self.agent.linter.lint_file(file_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}"
+                            # 过滤 lint 结果，只保留 ERROR 和 WARNING 级别的问题
+                            filtered_results = self._filter_lint_issues(lint_results)
+                            if filtered_results.issues:
+                                has_lint_issues = True
+                                # 格式化 lint 问题
+                                formatted_issues = self._format_lint_issues(filtered_results)
+                                lint_message = f"\n\n代码质量检查发现 {len(filtered_results.issues)} 个问题"
                 except Exception as e:
                     logger.error(f"Lint 检查失败: {str(e)}")
                     lint_message = "\n\n尝试进行代码质量检查时出错。"
@@ -309,17 +222,13 @@ class ReplaceInFileToolResolver(BaseToolResolver):
                 message = get_message_with_format("replace_in_file.apply_success", 
                                                   applied=applied_count, 
                                                   total=len(parsed_blocks), 
-                                                  file_path=file_path)
-            
-            # 将 lint 消息添加到结果中，如果启用了Lint
-            if enable_lint:
-                message += lint_message
+                                                  file_path=file_path)                        
 
             # 变更跟踪，回调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)
-
+                        
             # 附加 lint 结果到返回内容
             result_content = {
                 "content": current_content,
@@ -327,6 +236,7 @@ class ReplaceInFileToolResolver(BaseToolResolver):
             
             # 只有在启用Lint时才添加Lint结果
             if enable_lint:
+                message = message + "\n" + lint_message
                 result_content["lint_results"] = {
                     "has_issues": has_lint_issues,
                     "issues": formatted_issues if has_lint_issues else None
@@ -348,9 +258,5 @@ class ReplaceInFileToolResolver(BaseToolResolver):
         # Security check
         if not abs_file_path.startswith(abs_project_dir):
             return ToolResult(success=False, message=get_message_with_format("replace_in_file.access_denied", file_path=file_path))
-
-        # Choose the appropriate implementation based on whether shadow_manager is available
-        if self.shadow_manager:
-            return self.replace_in_file_with_shadow(file_path, diff_content, source_dir, abs_project_dir, abs_file_path)
-        else:
-            return self.replace_in_file_normal(file_path, diff_content, source_dir, abs_project_dir, abs_file_path)
+                
+        return self.replace_in_file_normal(file_path, diff_content, source_dir, abs_project_dir, abs_file_path)