auto-coder 0.1.331__py3-none-any.whl → 0.1.333__py3-none-any.whl

autocoder/auto_coder.py

@@ -1197,21 +1197,7 @@ def main(input_args: Optional[List[str]] = None):
                             border_style="blue",
                             expand=False,
                         )
-                    )
-                if args.request_id:
-                    request_queue.add_request(
-                        args.request_id,
-                        RequestValue(
-                            value=StreamValue(value=[chat_content]), status=RequestOption.RUNNING
-                        ),
-                    )
-                    request_queue.add_request(
-                        args.request_id,
-                        RequestValue(
-                            value=StreamValue(value=[""]), status=RequestOption.COMPLETED
-                        ),
-                    )
-                    return {}
+                    )    
 
                 lines = []
                 while True:
@@ -1244,14 +1230,7 @@ def main(input_args: Optional[List[str]] = None):
                 )
 
                 with open(memory_file, "w",encoding="utf-8") as f:
-                    json.dump(chat_history, f, ensure_ascii=False)
-
-                request_queue.add_request(
-                    args.request_id,
-                    RequestValue(
-                        value=DefaultValue(value=result), status=RequestOption.COMPLETED
-                    ),
-                )
+                    json.dump(chat_history, f, ensure_ascii=False)                
 
                 if "save" in commands_info:
                     save_to_memory_file(ask_conversation=chat_history["ask_conversation"],
@@ -1311,6 +1290,9 @@ def main(input_args: Optional[List[str]] = None):
                 printer.print_in_terminal("estimated_chat_input_tokens", style="yellow",
                                   estimated_input_tokens=estimated_input_tokens
                                   )
+                
+                # with open("/tmp/output.txt", "w",encoding="utf-8") as f:
+                #     f.write(json.dumps(loaded_conversations, ensure_ascii=False, indent=4))
 
                 v = stream_chat_with_continue(
                     llm=chat_llm,

autocoder/auto_coder_runner.py

@@ -57,6 +57,8 @@ from autocoder import command_parser as CommandParser
 from loguru import logger
 from autocoder.utils.project_structure import EnhancedFileAnalyzer
 
+## 对外API，用于第三方集成 auto-coder 使用。
+
 class SymbolItem(BaseModel):
     symbol_name: str
     symbol_type: SymbolType

autocoder/commands/auto_command.py

@@ -785,7 +785,7 @@ class CommandAutoTuner:
 
         <command>
         <name>list_files</name>
-        <description>通过add_files 添加的文件</description>
+        <description>list_files 查看某个目录下的所有文件</description>
         <usage>
          该命令不需要任何参数，直接使用即可。
          使用例子：

autocoder/commands/tools.py

@@ -8,7 +8,7 @@ from autocoder.common import AutoCoderArgs, SourceCode
 from autocoder.common.interpreter import Interpreter
 from autocoder.common import ExecuteSteps, ExecuteStep, detect_env
 from autocoder.common import code_auto_execute
-from typing import List, Tuple
+from typing import List, Tuple,Dict
 import os
 import byzerllm
 import json
@@ -147,8 +147,11 @@ class AutoCommandTools:
 
         return answer
 
-    def response_user(self, response: str):
+    def response_user(self, response: Union[str, Dict]):
         # 如果是在web模式下，则使用event_manager事件来询问用户
+        if isinstance(response, dict):
+            response = json.dumps(response, ensure_ascii=False,indent=4)
+
         if get_run_context().is_web():
             try:
                 get_event_manager(
@@ -193,6 +196,56 @@ class AutoCommandTools:
         })
 
         return response
+    
+    def output_result(self, response: Union[str, Dict]):
+        # 如果是在web模式下，则使用event_manager事件来询问用户
+        if isinstance(response, dict):
+            response = json.dumps(response, ensure_ascii=False,indent=4)
+
+        if get_run_context().is_web():
+            try:
+                get_event_manager(
+                    self.args.event_file).write_result(
+                    EventContentCreator.create_result(
+                        EventContentCreator.MarkdownContent(
+                            content=response
+                        )
+                    )
+                )
+                self.result_manager.append(content=response, meta={
+                    "action": "output_result",
+                    "input": {
+                        "response": response
+                    }
+                })
+            except Exception as e:
+                error_message = f"Error: {str(e)}\n\n完整异常堆栈信息:\n{traceback.format_exc()}"
+                self.result_manager.append(content=f"Error: {error_message}", meta={
+                    "action": "output_result",
+                    "input": {
+                        "response": response
+                    }
+                })
+            return response
+
+        console = Console()
+        answer_text = Text(response, style="italic")
+        answer_panel = Panel(
+            answer_text,
+            title="",
+            border_style="green",
+            expand=False
+        )
+        console.print(answer_panel)
+
+        self.result_manager.append(content=response, meta={
+            "action": "output_result",
+            "input": {
+                "response": response
+            }
+        })
+
+        return response
 
     def run_python_code(self, code: str) -> str:
         """
@@ -690,6 +743,18 @@ class AutoCommandTools:
                     matched_files.append(os.path.join(root, file))
 
         v = ",".join(matched_files)
+        
+        tokens = count_tokens(v)
+        if tokens > self.args.conversation_prune_safe_zone_tokens / 2.0:
+            result = f"The result is too large to return. (tokens: {tokens}). Try to use another function or use another keyword to search."
+            self.result_manager.add_result(content=result, meta={
+                "action": "find_files_by_name",
+                "input": {
+                    "keyword": keyword
+                }
+            })
+            return result
+
         self.result_manager.add_result(content=v, meta={
             "action": "find_files_by_name",
             "input": {
@@ -731,7 +796,7 @@ class AutoCommandTools:
         excluded_dirs = [
             'node_modules', '.git', '.venv', 'venv', '__pycache__', 'dist', 'build',
             '.DS_Store', '.idea', '.vscode', 'tmp', 'temp', 'cache', 'coverage',
-            'htmlcov', '.mypy_cache', '.pytest_cache', '.hypothesis'
+            'htmlcov', '.mypy_cache', '.pytest_cache', '.hypothesis',".auto-coder"
         ]
         excluded_file_patterns = [
             '*.pyc', '*.pyo', '*.pyd', '*.egg-info', '*.log'

autocoder/common/__init__.py

@@ -270,6 +270,8 @@ class AutoCoderArgs(pydantic.BaseModel):
     index_model_max_length: Optional[int] = 0
     index_model_max_input_length: Optional[int] = 0
     index_model_anti_quota_limit: Optional[int] = 0
+
+    enable_agentic_filter: Optional[bool] = False
     
 
     index_filter_level: Optional[int] = 0

autocoder/common/auto_coder_lang.py

@@ -785,7 +785,15 @@ MESSAGES = {
     "max_unmerged_blocks_attempts_reached": {
         "en": "Maximum unmerged blocks fix attempts reached",
         "zh": "已达到最大未合并代码块修复尝试次数"
-    }
+    },
+    "agenticFilterContext": {
+    "en": "Start to find context...",
+    "zh": "开始智能查找上下文...."
+  },
+  "agenticFilterContextFinished": {
+    "en": "End to find context...",
+    "zh": "结束智能查找上下文...."
+  }
 }
 
 

autocoder/common/code_modification_ranker.py

@@ -148,17 +148,20 @@ class CodeModificationRanker:
         input_tokens_count = 0
         generated_tokens_count = 0
         try:
+            import traceback
+            traceback.print_stack()
             # Create a thread pool with (number of models * generate_times) workers
             with ThreadPoolExecutor(max_workers=total_tasks) as executor:
                 # Submit tasks for each model and generate_times
                 futures = []
+                count = 0
                 for llm in self.llms:                                                          
                     model_name = ",".join(get_llm_names(llm))
                     self.printer.print_in_terminal(
                         "ranking_start", style="blue", count=len(generate_result.contents), model_name=model_name)
                     
-                    for i in range(rank_times):
-                        if i == 0:
+                    for _ in range(rank_times):
+                        if count == 0:
                             futures.append(
                                 executor.submit(
                                     stream_chat_with_continue,
@@ -178,6 +181,7 @@ class CodeModificationRanker:
                                     self.args
                                 )
                             )
+                        count += 1
 
                 # Collect all results
                 results = []

autocoder/common/conf_utils.py

@@ -0,0 +1,36 @@
+import os
+import json
+import pkg_resources
+from autocoder.common import AutoCoderArgs
+
+## 用于auto-coder 内部使用
+
+def load_tokenizer():
+    from autocoder.rag.variable_holder import VariableHolder
+    from tokenizers import Tokenizer    
+    try:
+        tokenizer_path = pkg_resources.resource_filename(
+            "autocoder", "data/tokenizer.json"
+        )
+        VariableHolder.TOKENIZER_PATH = tokenizer_path
+        VariableHolder.TOKENIZER_MODEL = Tokenizer.from_file(tokenizer_path)
+    except FileNotFoundError:
+        tokenizer_path = None
+
+
+def save_memory(args: AutoCoderArgs,memory):    
+    with open(os.path.join(args.source_dir, ".auto-coder", "plugins", "chat-auto-coder", "memory.json"), "w",encoding="utf-8") as f:
+        json.dump(memory, f, indent=2, ensure_ascii=False)    
+
+def load_memory(args: AutoCoderArgs):        
+    memory_path = os.path.join(args.source_dir, ".auto-coder", "plugins", "chat-auto-coder", "memory.json")
+    if os.path.exists(memory_path):
+        with open(memory_path, "r", encoding="utf-8") as f:
+            _memory = json.load(f)
+        memory = _memory
+    else:
+        memory = {}        
+    return memory
+
+def get_memory(args: AutoCoderArgs):    
+    return load_memory(args)    

autocoder/common/stream_out_type.py

@@ -1,11 +1,13 @@
 from enum import Enum
 
 class AutoCommandStreamOutType(Enum):
-    COMMAND_SUGGESTION = "command_suggestion"
-
+    COMMAND_SUGGESTION = "command_suggestion"    
 class IndexFilterStreamOutType(Enum):
     FILE_NUMBER_LIST = "file_number_list"
 
+class AgenticFilterStreamOutType(Enum):
+    AGENTIC_FILTER = "agentic_filter"
+
 
 class CodeGenerateStreamOutType(Enum):
     CODE_GENERATE = "code_generate"

autocoder/common/types.py

@@ -1,6 +1,6 @@
 from enum import Enum
 import pydantic
-from typing import List, Dict, Tuple,Any
+from typing import List, Dict, Tuple,Any,Optional
 class Mode(Enum):
     MULTI_ROUND = "multi_round"
     SINGLE_ROUND = "single_round"
@@ -17,4 +17,4 @@ class CodeGenerateResult(pydantic.BaseModel):
 class MergeCodeWithoutEffect(pydantic.BaseModel):
     success_blocks: List[Tuple[str, str]]
     failed_blocks: List[Any]
-    merged_blocks: List[Any]
+    merged_blocks: Optional[Any] = None

autocoder/common/v2/code_auto_merge_editblock.py

@@ -272,7 +272,7 @@ class CodeAutoMergeEditBlock:
         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

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]:
         """
         从编辑块内容中提取代码并创建临时影子文件用于检查。