auto-coder 0.1.330__py3-none-any.whl → 0.1.332__py3-none-any.whl

autocoder/agent/project_reader.py

@@ -185,20 +185,7 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
         返回值是 用户对你问题的回答。
 
         注意，尽量不要询问用户，除非你感受到你无法回答用户的问题。
-        '''
-
-        if args.request_id and not args.silence and not args.skip_events:
-            event_data = {
-                "question": question                
-            }
-            response_json = queue_communicate.send_event(
-                request_id=args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.ASK_HUMAN.value,
-                    data=json.dumps(event_data, ensure_ascii=False),
-                ),
-            )
-            return response_json
+        '''        
 
         console = Console()
 

autocoder/auto_coder.py

@@ -475,30 +475,7 @@ def main(input_args: Optional[List[str]] = None):
                             border_style="blue",
                             expand=False,
                         )
-                    )
-
-                if args.request_id and not args.silence and not args.skip_events:
-                    event_data = {
-                        "instruction": final_ins,
-                        "model": model,
-                        "request_id": args.request_id,
-                    }
-                    response_json = queue_communicate.send_event(
-                        request_id=args.request_id,
-                        event=CommunicateEvent(
-                            event_type=CommunicateEventType.CODE_HUMAN_AS_MODEL.value,
-                            data=json.dumps(event_data, ensure_ascii=False),
-                        ),
-                    )
-                    response = json.loads(response_json)
-                    v = [
-                        {
-                            "predict": response["value"],
-                            "input": input_value[0]["instruction"],
-                            "metadata": {},
-                        }
-                    ]
-                    return False, v
+                    )                
 
                 lines = []
                 while True:
@@ -1220,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:
@@ -1267,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"],
@@ -1334,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/command_args.py

@@ -195,12 +195,7 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
     parser.add_argument(
         "--image_max_iter", type=int, default=1, help=desc["image_max_iter"]
     )
-
-    parser.add_argument(
-        "--enable_multi_round_generate",
-        action="store_true",
-        help=desc["enable_multi_round_generate"],
-    )
+    
     parser.add_argument(
         "--skip_confirm", action="store_true", help=desc["skip_confirm"]
     )

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
@@ -105,19 +105,6 @@ class AutoCommandTools:
         注意，尽量不要询问用户，除非你感受到你无法回答用户的问题。
         '''
 
-        if self.args.request_id and not self.args.silence and not self.args.skip_events:
-            event_data = {
-                "question": question
-            }
-            response_json = queue_communicate.send_event(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.ASK_HUMAN.value,
-                    data=json.dumps(event_data, ensure_ascii=False),
-                ),
-            )
-            return response_json
-
         # 如果是在web模式下，则使用event_manager事件来询问用户
         if get_run_context().is_web():
             answer = get_event_manager(
@@ -160,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(
@@ -206,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:
         """
@@ -703,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": {
@@ -744,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

@@ -244,7 +244,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     execute: Optional[bool] = None
     package_name: Optional[str] = ""
     script_path: Optional[str] = ""
-    
+        
     model: Optional[str] = ""
     chat_model: Optional[str] = ""
     model_max_length: Optional[int] = 2000
@@ -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
@@ -326,13 +328,14 @@ class AutoCoderArgs(pydantic.BaseModel):
     image_max_iter: Optional[int] = 1
     
     urls: Optional[Union[str, List[str]]] = ""
-    urls_use_model: Optional[bool] = False
-    enable_multi_round_generate: Optional[bool] = False
+    urls_use_model: Optional[bool] = False    
     command: Optional[str] = None
     doc_command: Optional[str] = None
     required_exts: Optional[str] = None
     hybrid_index_max_output_tokens: Optional[int] = 1000000
 
+    enable_multi_round_generate: Optional[bool] = False
+
     monitor_mode: bool = False
     enable_hybrid_index: bool = False
     rag_build_name: Optional[str] = None
@@ -420,9 +423,11 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     enable_auto_fix_lint: Optional[bool] = False
     enable_auto_fix_compile: Optional[bool] = False
+    enable_auto_fix_merge: Optional[bool] = False
 
     auto_fix_lint_max_attempts: Optional[int] = 5
     auto_fix_compile_max_attempts: Optional[int] = 5
+    auto_fix_merge_max_attempts: Optional[int] = 5
     
     ignore_clean_shadows: Optional[bool] = False
 

autocoder/common/auto_coder_lang.py

@@ -773,7 +773,27 @@ MESSAGES = {
     "max_compile_attempts_reached": {
         "en": "Maximum compilation attempts reached",
         "zh": "已达到最大编译尝试次数"
-    }
+    },
+    "unmerged_blocks_fixed": {
+        "en": "Unmerged blocks fixed successfully",
+        "zh": "未合并代码块已成功修复"
+    },
+    "unmerged_blocks_attempt_status": {
+        "en": "Fixing unmerged blocks attempt {{attempt}}/{{max_correction_attempts}}",
+        "zh": "正在尝试修复未合并代码块 {{attempt}}/{{max_correction_attempts}}"
+    },
+    "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_auto_generate.py

@@ -51,69 +51,7 @@ class CodeAutoGenerate:
         {{ instruction }}
 
         """
-
-    @byzerllm.prompt(llm=lambda self: self.llm)
-    def multi_round_instruction(
-        self, instruction: str, content: str, context: str = "", package_context: str = ""
-    ) -> str:
-        """
-        {%- if structure %}
-        {{ structure }}
-        {%- endif %}
-
-        {%- if content %}
-        下面是一些文件路径以及每个文件对应的源码：
-        <files>
-        {{ content }}
-        </files>
-        {%- endif %}
-
-        {%- if package_context %}
-        下面是上面文件的一些信息（包括最近的变更情况）：
-        <package_context>
-        {{ package_context }}
-        </package_context>
-        {%- endif %}
-
-        {%- if context %}
-        <extra_context>
-        {{ context }}
-        </extra_context>
-        {%- endif %}
-
-        下面是用户的需求：
-
-        {{ instruction }}
-
-        如果你需要生成代码，你生成的代码要符合这个格式：
-
-        ```{lang}
-        ##File: {FILE_PATH}
-        {CODE}
-        ```
-
-        ```{lang}
-        ##File: {FILE_PATH}
-        {CODE}
-        ```
-
-        其中，{lang}是代码的语言，{CODE}是代码的内容, {FILE_PATH} 是文件的路径(请尽量使用绝对路径)，他们都在代码块中，请严格按上面的格式进行内容生成。
-        每次生成一个文件的代码，然后询问我是否继续，当我回复继续，继续生成下一个文件的代码。当没有后续任务时，请回复 "__完成__" 或者 "__EOF__"。
-        请确保每份代码的完整性，而不要只生成修改部分。
-        """
-        
-        if not self.args.include_project_structure:
-            return {
-                "structure": "",                
-            }
-
-        return {
-            "structure": (
-                self.action.pp.get_tree_like_directory_structure()
-                if self.action
-                else ""
-            )
-        }
+    
 
     @byzerllm.prompt(llm=lambda self: self.llm)
     def single_round_instruction(
@@ -197,15 +135,6 @@ class CodeAutoGenerate:
         source_code_list = SourceCodeList(filtered_sources)
         source_content = source_code_list.to_str()
 
-        if self.args.request_id and not self.args.skip_events:
-            queue_communicate.send_event_no_wait(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
-                    data=query,
-                ),
-            )
-
         # 获取包上下文信息
         package_context = ""
         
@@ -264,15 +193,16 @@ class CodeAutoGenerate:
         if not self.args.human_as_model:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
+                count = 0
                 for llm in self.llms:
                     model_names_list = llm_utils.get_llm_names(llm) 
                     model_name = None
                     if model_names_list:
                         model_name = model_names_list[0]  
 
-                    for i in range(self.generate_times_same_model):
+                    for _ in range(self.generate_times_same_model):
                         model_names.append(model_name)
-                        if i==0:
+                        if count == 0:
                             def job():
                                 stream_generator = stream_chat_with_continue(
                                     llm=llm, 
@@ -303,7 +233,7 @@ class CodeAutoGenerate:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
-                            
+                        count += 1
                 temp_results = [future.result() for future in futures]
                 for result in temp_results:
                     results.append(result.content)
@@ -338,90 +268,6 @@ class CodeAutoGenerate:
             "generated_tokens_cost": generated_tokens_cost
         }        
     
-        if self.args.request_id and not self.args.skip_events:
-            queue_communicate.send_event_no_wait(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_GENERATE_END.value,
-                    data=json.dumps(statistics, ensure_ascii=False),
-                ),
-            )
-
         return CodeGenerateResult(contents=results, conversations=conversations_list, metadata=statistics)
 
-    def multi_round_run(
-        self, query: str, source_code_list: SourceCodeList, max_steps: int = 10
-    ) -> Tuple[List[str], List[Dict[str, str]]]:
-        llm_config = {"human_as_model": self.args.human_as_model}
-        result = []
-        source_content = source_code_list.to_str()
-
-        # 获取包上下文信息
-        package_context = ""
-        
-        if self.args.enable_active_context:
-            # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
-            # 获取活动上下文信息
-            result = active_context_manager.load_active_contexts_for_files(
-                [source.module_name for source in source_code_list.sources]
-            )
-            # 将活动上下文信息格式化为文本
-            if result.contexts:
-                package_context_parts = []
-                for dir_path, context in result.contexts.items():
-                    package_context_parts.append(f"<package_info>{context.content}</package_info>")
-                
-                package_context = "\n".join(package_context_parts)
-
-        if self.args.template == "common":
-            init_prompt = self.multi_round_instruction.prompt(
-                instruction=query, content=source_content, context=self.args.context,
-                package_context=package_context
-            )
-        elif self.args.template == "auto_implement":
-            init_prompt = self.auto_implement_function.prompt(
-                instruction=query, content=source_content
-            )
-
-        conversations = [{"role": "user", "content": init_prompt}]
-
-        with open(self.args.target_file, "w",encoding="utf-8") as file:
-            file.write(init_prompt)
-
-        t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
-
-        result.append(t[0].output)
-
-        conversations.append({"role": "assistant", "content": t[0].output})
-
-        if (
-            "__完成__" in t[0].output
-            or "/done" in t[0].output
-            or "__EOF__" in t[0].output
-        ):
-            return result, conversations
-
-        current_step = 0
-
-        while current_step < max_steps:
-
-            conversations.append({"role": "user", "content": "继续"})
-
-            with open(self.args.target_file, "w",encoding="utf-8") as file:
-                file.write("继续")
-
-            t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
-
-            result.append(t[0].output)
-            conversations.append({"role": "assistant", "content": t[0].output})
-            current_step += 1
-
-            if (
-                "__完成__" in t[0].output
-                or "/done" in t[0].output
-                or "__EOF__" in t[0].output
-            ):
-                return CodeGenerateResult(contents=["\n\n".join(result)], conversations=[conversations])
-
-        return CodeGenerateResult(contents=["\n\n".join(result)], conversations=[conversations])
+