auto-coder 0.1.330__tar.gz → 0.1.331__tar.gz

{auto_coder-0.1.330 → auto_coder-0.1.331}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.330
+Version: 0.1.331
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.330
+Version: 0.1.331
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/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()
 

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/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:

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/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"]
     )

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/autocoder/commands/tools.py

@@ -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(

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/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
@@ -326,13 +326,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 +421,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
 

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/autocoder/common/auto_coder_lang.py

@@ -773,6 +773,18 @@ 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": "已达到最大未合并代码块修复尝试次数"
     }
 }
 

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/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])
+    

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/autocoder/common/code_auto_generate_diff.py

@@ -365,15 +365,6 @@ class CodeAutoGenerateDiff:
 
         conversations.append({"role": "user", "content": init_prompt})
 
-        if self.args.request_id and not self.args.skip_events:
-            _ = queue_communicate.send_event(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
-                    data=json.dumps({}, ensure_ascii=False),
-                ),
-            )
-
         conversations_list = []
         results = []
         input_tokens_count = 0
@@ -392,6 +383,7 @@ class CodeAutoGenerateDiff:
         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)
@@ -399,9 +391,9 @@ class CodeAutoGenerateDiff:
                     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, 
@@ -432,7 +424,7 @@ class CodeAutoGenerateDiff:
                                 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)
@@ -468,104 +460,6 @@ class CodeAutoGenerateDiff:
             "generated_tokens_cost": generated_tokens_cost
         }        
     
-        if self.args.request_id and not self.args.skip_events:
-            _ = queue_communicate.send_event(
-                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
-    ) -> CodeGenerateResult:
-        
-        # Apply model filter for code_llm
-        printer = Printer()
-        for llm in self.llms:
-            model_filter = ModelPathFilter.from_model_object(llm, self.args)
-            filtered_sources = []
-            for source in source_code_list.sources:
-                if model_filter.is_accessible(source.module_name):
-                    filtered_sources.append(source)
-                else:
-                    printer.print_in_terminal("index_file_filtered", 
-                                               style="yellow",
-                                               file_path=source.path, 
-                                               model_name=",".join(llm_utils.get_llm_names(llm)))
-            
-        source_code_list = SourceCodeList(filtered_sources)
-        
-        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 = []
-        # conversations.append({"role": "system", "content": sys_prompt.prompt()})
-        conversations.append({"role": "user", "content": init_prompt})
-
-        with open(self.args.target_file, "w",encoding="utf-8") as file:
-            file.write(init_prompt)
-
-        code_llm = self.llms[0]
-        t = code_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 CodeGenerateResult(contents=["\n\n".join(result)], conversations=[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 = code_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])
+    

{auto_coder-0.1.330 → auto_coder-0.1.331}/src/autocoder/common/code_auto_generate_editblock.py

@@ -474,15 +474,6 @@ class CodeAutoGenerateEditBlock:
 
         conversations.append({"role": "user", "content": init_prompt})
 
-        if self.args.request_id and not self.args.skip_events:
-            _ = queue_communicate.send_event(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
-                    data=json.dumps({}, ensure_ascii=False),
-                ),
-            )
-
         conversations_list = []
         results = []
         input_tokens_count = 0
@@ -505,6 +496,7 @@ class CodeAutoGenerateEditBlock:
         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) 
@@ -512,9 +504,9 @@ class CodeAutoGenerateEditBlock:
                     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, 
@@ -545,6 +537,7 @@ class CodeAutoGenerateEditBlock:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
+                        count += 1
                 
                 temp_results = [future.result() for future in futures]
                 
@@ -582,88 +575,5 @@ class CodeAutoGenerateEditBlock:
             "generated_tokens_cost": generated_tokens_cost
         }
 
-        if self.args.request_id and not self.args.skip_events:
-            _ = queue_communicate.send_event(
-                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
-    ) -> CodeGenerateResult:
-        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 = []
-        # conversations.append({"role": "system", "content": sys_prompt.prompt()})
-        conversations.append({"role": "user", "content": init_prompt})
-
-        with open(self.args.target_file, "w",encoding="utf-8") as file:
-            file.write(init_prompt)
-
-        code_llm = self.llms[0]
-        t = code_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 CodeGenerateResult(contents=["\n\n".join(result)], conversations=[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 = code_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])
+