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

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])
+    

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])
+    

autocoder/common/code_auto_generate_strict_diff.py

@@ -337,15 +337,7 @@ class CodeAutoGenerateStrictDiff:
                 {"role": "system", "content": self.args.system_prompt})
 
         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 = []
@@ -365,6 +357,7 @@ class CodeAutoGenerateStrictDiff:
         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:
                     for _ in range(self.generate_times_same_model):
                         
@@ -373,9 +366,9 @@ class CodeAutoGenerateStrictDiff:
                         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, 
@@ -406,7 +399,7 @@ class CodeAutoGenerateStrictDiff:
                                     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)
@@ -439,105 +432,6 @@ class CodeAutoGenerateStrictDiff:
             "input_tokens_cost": input_tokens_cost,
             "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.module_name, 
-                                               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])
+    

autocoder/common/code_auto_merge_editblock.py

@@ -316,29 +316,7 @@ class CodeAutoMergeEditBlock:
                         unmerged_blocks.append(
                             (file_path, head, update, similarity))
 
-        if unmerged_blocks:
-            if self.args.request_id and not self.args.skip_events:
-                # collect unmerged blocks
-                event_data = []
-                for file_path, head, update, similarity in unmerged_blocks:
-                    event_data.append(
-                        {
-                            "file_path": file_path,
-                            "head": head,
-                            "update": update,
-                            "similarity": similarity,
-                        }
-                    )
-
-                _ = queue_communicate.send_event(
-                    request_id=self.args.request_id,
-                    event=CommunicateEvent(
-                        event_type=CommunicateEventType.CODE_UNMERGE_RESULT.value,
-                        data=json.dumps(event_data, ensure_ascii=False),
-                    ),
-                )
-                return
-            
+        if unmerged_blocks:                        
             self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
             self._print_unmerged_blocks(unmerged_blocks)
             return
@@ -361,28 +339,6 @@ class CodeAutoMergeEditBlock:
             with open(file_path, "w") as f:
                 f.write(new_content)
 
-        if self.args.request_id and not self.args.skip_events:
-            # collect modified files
-            event_data = []
-            for code in merged_blocks:
-                file_path, head, update, similarity = code
-                event_data.append(
-                    {
-                        "file_path": file_path,
-                        "head": head,
-                        "update": update,
-                        "similarity": similarity,
-                    }
-                )
-
-            _ = queue_communicate.send_event(
-                request_id=self.args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_MERGE_RESULT.value,
-                    data=json.dumps(event_data, ensure_ascii=False),
-                ),
-            )
-
         if changes_made:
             if not force_skip_git and not self.args.skip_commit:
                 try:

autocoder/common/command_templates.py

@@ -98,13 +98,7 @@ def init_command_template(source_dir:str):
     ## The model will generate the code for you
     ## 模型将为您生成代码
     execute: true
-
-    ## If you want to generate multiple files, you can enable this option to generate the code in multiple rounds
-    ## to avoid exceeding the maximum token limit of the model
-    ## 如果您想生成多个文件，可以启用此选项，以便在多个回合中生成代码
-    ## 以避免超过模型的最大令牌限制
-    enable_multi_round_generate: false
-
+    
     ## AutoCoder will merge the generated code into your project
     ## AutoCoder将合并生成的代码到您的项目中
     auto_merge: true
@@ -175,8 +169,7 @@ def base_base(source_dir:str,project_type:str)->str:
     target_file: {{ target_file }}
 
     model: v3_chat    
-    model_max_input_length: 60000
-    enable_multi_round_generate: false
+    model_max_input_length: 60000    
     index_filter_workers: 100
     index_build_workers: 100
     index_filter_level: 1

autocoder/common/stream_out_type.py

@@ -16,6 +16,9 @@ class CodeRankStreamOutType(Enum):
 class LintStreamOutType(Enum):
     LINT = "lint"
 
+class UnmergedBlocksStreamOutType(Enum):
+    UNMERGED_BLOCKS = "unmerged_blocks"
+
 class CompileStreamOutType(Enum):
     COMPILE = "compile"
 

autocoder/common/types.py

@@ -16,4 +16,5 @@ class CodeGenerateResult(pydantic.BaseModel):
 
 class MergeCodeWithoutEffect(pydantic.BaseModel):
     success_blocks: List[Tuple[str, str]]
-    failed_blocks: List[Any]
+    failed_blocks: List[Any]
+    merged_blocks: List[Any]

autocoder/common/v2/code_auto_generate.py

@@ -15,7 +15,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
-
+from loguru import logger
 
 class CodeAutoGenerate:
     def __init__(
@@ -119,6 +119,7 @@ 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) 
@@ -126,9 +127,9 @@ class CodeAutoGenerate:
                     if model_names_list:
                         model_name = model_names_list[0]                    
 
-                    for i in range(self.generate_times_same_model):
-                        model_names.append(model_name)
-                        if i==0:
+                    for _ in range(self.generate_times_same_model):
+                        model_names.append(model_name)                        
+                        if count == 0:
                             def job():
                                 stream_generator = stream_chat_with_continue(
                                     llm=llm, 
@@ -159,6 +160,7 @@ class CodeAutoGenerate:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
+                        count += 1
                 
                 temp_results = [future.result() for future in futures]
                 

autocoder/common/v2/code_auto_generate_diff.py

@@ -281,6 +281,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) 
@@ -288,9 +289,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, 
@@ -321,7 +322,7 @@ class CodeAutoGenerateDiff:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
-                
+                        count += 1
                 temp_results = [future.result() for future in futures]
                 
                 for result,model_name in zip(temp_results,model_names):

autocoder/common/v2/code_auto_generate_editblock.py

@@ -15,6 +15,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from loguru import logger
 
 
 
@@ -298,6 +299,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) 
@@ -305,9 +307,10 @@ class CodeAutoGenerateEditBlock:
                     if model_names_list:
                         model_name = model_names_list[0]                    
 
-                    for i in range(self.generate_times_same_model):
-                        model_names.append(model_name)
-                        if i==0:
+                    for _ in range(self.generate_times_same_model):
+                        model_names.append(model_name)                          
+                        if count==0:
+                            logger.info(f"code generation with model(Stream): {model_name}")
                             def job():
                                 stream_generator = stream_chat_with_continue(
                                     llm=llm, 
@@ -330,7 +333,8 @@ class CodeAutoGenerateEditBlock:
                                     generated_tokens_count=last_meta.generated_tokens_count
                                 )
                             futures.append(executor.submit(job))
-                        else:                                
+                        else:    
+                            logger.info(f"code generation with model(Non-stream): {model_name}")
                             futures.append(executor.submit(
                                 chat_with_continue, 
                                 llm=llm, 
@@ -338,6 +342,7 @@ class CodeAutoGenerateEditBlock:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
+                        count += 1
                 
                 temp_results = [future.result() for future in futures]