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

autocoder/common/v2/code_auto_merge_editblock.py

@@ -269,10 +269,12 @@ class CodeAutoMergeEditBlock:
         codes = self.get_edits(content)
         file_content_mapping = {}
         failed_blocks = []
+        merged_blocks = []
 
         for block in codes:
             file_path, head, update = block
             if not os.path.exists(file_path):
+                merged_blocks.append((file_path, "", update))
                 file_content_mapping[file_path] = update
             else:
                 if file_path not in file_content_mapping:
@@ -286,7 +288,7 @@ class CodeAutoMergeEditBlock:
                     else existing_content + "\n" + update
                 )
 
-                # If exact match fails, try similarity match
+                # If exact match fails, try similarity match                
                 if new_content == existing_content and head:
                     similarity, best_window = TextSimilarity(
                         head, existing_content
@@ -297,6 +299,7 @@ class CodeAutoMergeEditBlock:
                         )
 
                 if new_content != existing_content:
+                    merged_blocks.append((file_path, head, update))
                     file_content_mapping[file_path] = new_content
                 else:
                     failed_blocks.append((file_path, head, update))
@@ -304,7 +307,8 @@ class CodeAutoMergeEditBlock:
         return MergeCodeWithoutEffect(
             success_blocks=[(path, content)
                             for path, content in file_content_mapping.items()],
-            failed_blocks=failed_blocks
+            failed_blocks=failed_blocks,
+            merged_blocks=merged_blocks
         )
     
 
@@ -363,35 +367,12 @@ class CodeAutoMergeEditBlock:
                     else:
                         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,
-                        }
-                    )
-                return
             
-            self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
-            self._print_unmerged_blocks(unmerged_blocks)
-            return
-
-        # lint check
-        for file_path, new_content in file_content_mapping.items():
-            if file_path.endswith(".py"):
-                pylint_passed, error_message = self.run_pylint(new_content)
-                if not pylint_passed:
-                    self.printer.print_in_terminal("pylint_file_check_failed", 
-                                                  file_path=file_path, 
-                                                  error_message=error_message)
-
+            if unmerged_blocks:
+                self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
+                self._print_unmerged_blocks(unmerged_blocks)
+                return
+        
         if changes_made and not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(
@@ -410,20 +391,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,
-                    }
-                )
-
 
         if changes_made:
             if not force_skip_git and not self.args.skip_commit:

autocoder/common/v2/code_auto_merge_strict_diff.py

@@ -1,14 +1,18 @@
 import os
 import difflib
 import diff_match_patch as dmp_module
-from pathlib import Path
-from typing import List, Dict, Tuple
+from autocoder.common import AutoCoderArgs, git_utils
+from typing import List,Tuple
 import pydantic
 import byzerllm
-from autocoder.common import AutoCoderArgs, git_utils
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+from autocoder.common.printer import Printer
+import hashlib
+from pathlib import Path
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
-from autocoder.common.v2.code_auto_merge import CodeAutoMerge
-from autocoder.common import files as FileUtils
+from autocoder.common.code_modification_ranker import CodeModificationRanker
+from autocoder.common import files as  FileUtils
+from autocoder.memory.active_context_manager import ActiveContextManager
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -49,6 +53,7 @@ def apply_hunk(content, hunk):
 
     return "\n".join(content_out)
 
+
 def hunk_to_before_after(hunk, lines=False):
     before = []
     after = []
@@ -77,7 +82,14 @@ def hunk_to_before_after(hunk, lines=False):
 
     return before, after
 
-class CodeAutoMergeStrictDiff(CodeAutoMerge):
+
+class CodeAutoMergeStrictDiff:
+    def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
+        self.llm = llm
+        self.args = args
+        self.printer = Printer()
+
+
     def parse_diff_block(self,text: str) -> List[PathAndCode]:
         lines = text.split('\n')
         lines_len = len(lines)    
@@ -121,6 +133,46 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
 
         return path_and_code_list
 
+    def merge_code(self, generate_result: CodeGenerateResult, force_skip_git: bool = False):
+        result = self.choose_best_choice(generate_result)
+        self._merge_code(result.contents[0], force_skip_git)
+        return result
+
+    def choose_best_choice(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
+        if len(generate_result.contents) == 1:
+            return generate_result
+        
+        merge_results = []
+        for content,conversations in zip(generate_result.contents,generate_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            merge_results.append(merge_result)
+
+        # If all merge results are None, return first one
+        if all(len(result.failed_blocks) != 0 for result in merge_results):
+            self.printer.print_in_terminal("all_merge_results_failed")
+            return CodeGenerateResult(contents=[generate_result.contents[0]], conversations=[generate_result.conversations[0]])
+        
+        # If only one merge result is not None, return that one
+        not_none_indices = [i for i, result in enumerate(merge_results) if len(result.failed_blocks) == 0]
+        if len(not_none_indices) == 1:
+            idx = not_none_indices[0]
+            self.printer.print_in_terminal("only_one_merge_result_success")
+            return CodeGenerateResult(contents=[generate_result.contents[idx]], conversations=[generate_result.conversations[idx]])        
+
+        # 最后，如果有多个，那么根据质量排序再返回
+        ranker = CodeModificationRanker(self.llm, self.args)
+        ranked_result = ranker.rank_modifications(generate_result,merge_results)        
+         
+        ## 得到的结果，再做一次合并，第一个通过的返回 , 返回做合并有点重复低效，未来修改。
+        for content,conversations in zip(ranked_result.contents,ranked_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            if not merge_result.failed_blocks:
+                return CodeGenerateResult(contents=[content], conversations=[conversations])
+
+        # 最后保底，但实际不会出现
+        return CodeGenerateResult(contents=[ranked_result.contents[0]], conversations=[ranked_result.conversations[0]])
+    
+
     def abs_root_path(self, path):
         if path.startswith(self.args.source_dir):
             return safe_abs_path(Path(path))
@@ -207,6 +259,7 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
         
         file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode('utf-8')).hexdigest()
+        # get the file name 
         file_name = os.path.basename(self.args.file)
         
         if not force_skip_git and not self.args.skip_commit:
@@ -256,4 +309,20 @@ class CodeAutoMergeStrictDiff(CodeAutoMerge):
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print diff blocks for review
-            self.print_diff_blocks(diff_blocks) 
+            self.print_diff_blocks(diff_blocks)    
+
+    @byzerllm.prompt(render="jinja2")
+    def git_require_msg(self, source_dir: str, error: str) -> str:
+        '''
+        auto_merge only works for git repositories.
+         
+        Try to use git init in the source directory. 
+        
+        ```shell
+        cd {{ source_dir }}
+        git init .
+        ```
+
+        Then try to run auto-coder again.
+        Error: {{ error }}
+        '''

autocoder/common/v2/code_editblock_manager.py

@@ -14,7 +14,7 @@ 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 LintStreamOutType, CompileStreamOutType
+from autocoder.common.stream_out_type import LintStreamOutType, CompileStreamOutType, UnmergedBlocksStreamOutType
 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
@@ -103,6 +103,27 @@ class CodeEditBlockManager:
         修复上述问题，请确保代码质量问题被解决，同时保持代码的原有功能。
         请严格遵守*SEARCH/REPLACE block*的格式。
         """
+    @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>
+
+        请根据反馈，回顾之前的格式要求，重新生成一份修改代码，确保所有代码块都能够正确合并。
+        """
 
     def _create_shadow_files_from_edits(self, generation_result: CodeGenerateResult) -> Dict[str, str]:
         """
@@ -219,6 +240,119 @@ class CodeEditBlockManager:
             self.printer.print_in_terminal("generation_failed", style="red")
             return generation_result
 
+        result = self.code_merger.choose_best_choice(generation_result)
+        merge = self.code_merger._merge_code_without_effect(result.contents[0])
+
+        if self.args.enable_auto_fix_merge and merge.failed_blocks:
+            def _format_blocks(merge: MergeCodeWithoutEffect) -> Tuple[str, str]:
+                unmerged_formatted_text = ""
+                for file_path, head, update in merge.failed_blocks:
+                    unmerged_formatted_text += "```lang"
+                    unmerged_formatted_text += f"##File: {file_path}\n"
+                    unmerged_formatted_text += "<<<<<<< SEARCH\n"
+                    unmerged_formatted_text += head
+                    unmerged_formatted_text += "=======\n"
+                    unmerged_formatted_text += update
+                    unmerged_formatted_text += ">>>>>>> REPLACE\n"
+                    unmerged_formatted_text += "```"
+                    unmerged_formatted_text += "\n"
+
+                merged_formatted_text = ""
+                for file_path, head, update in merge.merged_blocks:
+                    merged_formatted_text += "```lang"
+                    merged_formatted_text += f"##File: {file_path}\n"
+                    merged_formatted_text += head
+                    merged_formatted_text += "=======\n"
+                    merged_formatted_text += update
+                    merged_formatted_text += "```"
+                    merged_formatted_text += "\n"
+
+                get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
+                    content=EventContentCreator.ResultContent(content=f"Unmerged blocks:\\n {unmerged_formatted_text}",
+                                                              metadata={
+                                                                  "merged_blocks": merge.success_blocks,
+                                                                  "failed_blocks": merge.failed_blocks
+                                                              }
+                                                              ).to_dict(),
+                    metadata={
+                        "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
+                        "action_file": self.args.file
+                    }
+                ))
+                return (unmerged_formatted_text, merged_formatted_text)
+
+            for attempt in range(self.args.auto_fix_merge_max_attempts):
+                global_cancel.check_and_raise()
+                unmerged_formatted_text, merged_formatted_text = _format_blocks(
+                    merge)
+                fix_prompt = self.fix_unmerged_blocks.prompt(
+                    query=query,
+                    original_code=result.contents[0],
+                    unmerged_blocks=unmerged_formatted_text
+                )
+
+                logger.info(f"fix_prompt: {fix_prompt}")
+
+                # 打印当前修复尝试状态
+                self.printer.print_in_terminal(
+                    "unmerged_blocks_attempt_status",
+                    style="yellow",
+                    attempt=(attempt + 1),
+                    max_correction_attempts=self.args.auto_fix_merge_max_attempts
+                )
+
+                get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
+                    content=EventContentCreator.ResultContent(content=f"Unmerged blocks attempt {attempt + 1}/{self.args.auto_fix_merge_max_attempts}: {unmerged_formatted_text}",
+                                                              metadata={}
+                                                              ).to_dict(),
+                    metadata={
+                        "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
+                        "action_file": self.args.file
+                    }
+                ))
+
+                # 使用修复提示重新生成代码
+                start_time = time.time()
+                generation_result = self.code_generator.single_round_run(
+                    fix_prompt, source_code_list)
+
+                # 计算这次修复未合并块花费的token情况
+                token_cost_calculator = TokenCostCalculator(args=self.args)
+                token_cost_calculator.track_token_usage_by_generate(
+                    llm=self.llm,
+                    generate=generation_result,
+                    operation_name="code_generation_complete",
+                    start_time=start_time,
+                    end_time=time.time()
+                )
+
+                # 检查修复后的代码是否仍有未合并块
+                result = self.code_merger.choose_best_choice(generation_result)
+                merge = self.code_merger._merge_code_without_effect(
+                    result.contents[0])
+
+                # 如果没有失败的块，则修复成功，退出循环
+                if not merge.failed_blocks:
+                    self.printer.print_in_terminal(
+                        "unmerged_blocks_fixed", style="green")
+                    break
+
+                # 如果是最后一次尝试仍未成功，打印警告
+                if attempt == self.args.auto_fix_merge_max_attempts - 1:
+                    self.printer.print_in_terminal(
+                        "max_unmerged_blocks_attempts_reached", style="yellow")
+                    get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
+                        content=EventContentCreator.ResultContent(content=self.printer.get_message_from_key("max_unmerged_blocks_attempts_reached"),
+                                                                  metadata={}
+                                                                  ).to_dict(),
+                        metadata={
+                            "stream_out_type": UnmergedBlocksStreamOutType.UNMERGED_BLOCKS.value,
+                            "action_file": self.args.file
+                        }
+                    ))
+                    raise Exception(self.printer.get_message_from_key(
+                        "max_unmerged_blocks_attempts_reached"))
+
         # 最多尝试修复5次
         for attempt in range(self.auto_fix_lint_max_attempts):
             global_cancel.check_and_raise()
@@ -298,23 +432,24 @@ class CodeEditBlockManager:
                 start_time=start_time,
                 end_time=time.time()
             )
-        
+
         # 如果开启了自动修复compile问题，则进行compile修复
         if self.args.enable_auto_fix_compile:
             for attempt in range(self.auto_fix_compile_max_attempts):
                 global_cancel.check_and_raise()
                 # 先更新增量影子系统的文件
-                shadow_files = self._create_shadow_files_from_edits(generation_result)
+                shadow_files = self._create_shadow_files_from_edits(
+                    generation_result)
 
                 # 在影子系统生成完整的项目，然后编译
                 compile_result = self.shadow_compiler.compile_all_shadow_files()
-                
+
                 # 如果编译成功，则退出，继续往后走
                 if compile_result.success or compile_result.total_errors == 0:
                     self.printer.print_in_terminal(
                         "compile_success", style="green")
                     break
-                
+
                 # 如果有错误，则把compile结果记录到事件系统
                 get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
                     content=EventContentCreator.ResultContent(content=f"Compile attempt {attempt + 1}/{self.auto_fix_compile_max_attempts}: Found {compile_result.total_errors} errors:\n {compile_result.to_str()}",
@@ -357,7 +492,7 @@ class CodeEditBlockManager:
                     operation_name="code_generation_complete",
                     start_time=start_time,
                     end_time=time.time()
-                ) 
+                )
 
         # 清理临时影子文件
         self.shadow_manager.clean_shadows()

autocoder/dispacher/actions/action.py

@@ -115,7 +115,7 @@ class ActionTSProject(BaseAction):
 
         global_cancel.check_and_raise()
 
-        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+        if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
             code_merge_manager.run(query=args.query, source_code_list=source_code_list)
             return
@@ -138,15 +138,10 @@ class ActionTSProject(BaseAction):
             else:
                 generate = CodeAutoGenerate(
                     llm=self.llm, args=self.args, action=self)
-
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
+            
+            generate_result = generate.single_round_run(
+                query=args.query, source_code_list=source_code_list
+            )
             elapsed_time = time.time() - start_time
             speed = generate_result.metadata.get(
                 'generated_tokens_count', 0) / elapsed_time if elapsed_time > 0 else 0
@@ -274,7 +269,7 @@ class ActionPyProject(BaseAction):
 
         global_cancel.check_and_raise()
 
-        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+        if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
             code_merge_manager.run(query=args.query, source_code_list=source_code_list)
             return
@@ -297,15 +292,11 @@ class ActionPyProject(BaseAction):
             else:
                 generate = CodeAutoGenerate(
                     llm=self.llm, args=self.args, action=self)
+            
+            generate_result = generate.single_round_run(
+                query=args.query, source_code_list=source_code_list
+            )
 
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
             elapsed_time = time.time() - start_time
             speed = generate_result.metadata.get(
                 'generated_tokens_count', 0) / elapsed_time if elapsed_time > 0 else 0
@@ -426,7 +417,7 @@ class ActionSuffixProject(BaseAction):
 
         global_cancel.check_and_raise()
 
-        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+        if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
             code_merge_manager.run(query=args.query, source_code_list=source_code_list)
             return
@@ -449,14 +440,10 @@ class ActionSuffixProject(BaseAction):
             else:
                 generate = CodeAutoGenerate(
                     llm=self.llm, args=self.args, action=self)
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
+            
+            generate_result = generate.single_round_run(
+                query=args.query, source_code_list=source_code_list
+            )
 
         elapsed_time = time.time() - start_time
         speed = generate_result.metadata.get(

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -69,7 +69,7 @@ class ActionRegexProject:
         
         global_cancel.check_and_raise()
 
-        if args.enable_auto_fix_lint and args.execute and args.auto_merge=="editblock":
+        if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
             code_merge_manager.run(query=args.query, source_code_list=source_code_list)
             return
@@ -91,14 +91,10 @@ class ActionRegexProject:
                 )
             else:
                 generate = CodeAutoGenerate(llm=self.llm, args=self.args, action=self)
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
+            
+            generate_result = generate.single_round_run(
+                query=args.query, source_code_list=source_code_list
+            )
 
             elapsed_time = time.time() - start_time
             speed = generate_result.metadata.get('generated_tokens_count', 0) / elapsed_time if elapsed_time > 0 else 0

autocoder/helper/project_creator.py

@@ -505,7 +505,6 @@ index_build_workers: 100
 
 skip_build_index: false
 execute: true
-enable_multi_round_generate: false
 auto_merge: editblock
 human_as_model: false
 """

autocoder/index/entry.py

@@ -86,15 +86,6 @@ def build_index_and_filter_files(
 
     if not args.skip_build_index and llm:
         # Phase 2: Build index
-        if args.request_id and not args.skip_events:
-            queue_communicate.send_event(
-                request_id=args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_INDEX_BUILD_START.value,
-                    data=json.dumps({"total_files": len(sources)})
-                )
-            )
-
         printer.print_in_terminal("phase2_building_index")
         phase_start = time.monotonic()
         index_manager = IndexManager(llm=llm, sources=sources, args=args)
@@ -103,17 +94,6 @@ def build_index_and_filter_files(
         phase_end = time.monotonic()
         stats["timings"]["build_index"] = phase_end - phase_start
 
-        if args.request_id and not args.skip_events:
-            queue_communicate.send_event(
-                request_id=args.request_id,
-                event=CommunicateEvent(
-                    event_type=CommunicateEventType.CODE_INDEX_BUILD_END.value,
-                    data=json.dumps({
-                        "indexed_files": stats["indexed_files"],
-                        "build_index_time": stats["timings"]["build_index"],
-                    })
-                )
-            )
 
         if not args.skip_filter_index and args.index_filter_model:
             model_name = getattr(
@@ -313,17 +293,6 @@ def build_index_and_filter_files(
             temp_sources, [{"role": "user", "content": args.query}], args.context_prune_strategy)
         source_code_list.sources = pruned_files
 
-    if args.request_id and not args.skip_events:
-        queue_communicate.send_event(
-            request_id=args.request_id,
-            event=CommunicateEvent(
-                event_type=CommunicateEventType.CODE_INDEX_FILTER_FILE_SELECTED.value,
-                data=json.dumps([
-                    (file.module_name, "") for file in source_code_list.sources
-                ])
-            )
-        )
-
     stats["final_files"] = len(source_code_list.sources)
     phase_end = time.monotonic()
     stats["timings"]["prepare_output"] = phase_end - phase_start
@@ -374,18 +343,6 @@ def build_index_and_filter_files(
     #     }
     # )
 
-    if args.request_id and not args.skip_events:
-        queue_communicate.send_event(
-            request_id=args.request_id,
-            event=CommunicateEvent(
-                event_type=CommunicateEventType.CODE_INDEX_FILTER_END.value,
-                data=json.dumps({
-                    "filtered_files": stats["final_files"],
-                    "filter_time": total_filter_time
-                })
-            )
-        )
-
     get_event_manager(args.event_file).write_result(
         EventContentCreator.create_result(
             content=EventContentCreator.ResultContextUsedContent(

autocoder/index/filter/normal_filter.py

@@ -44,14 +44,6 @@ class NormalFilter():
         
         final_files: Dict[str, TargetFile] = {}
         if not self.args.skip_filter_index:
-            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_INDEX_FILTER_START.value,
-                        data=json.dumps({})
-                    )
-                )
             # Phase 3: Level 1 filtering - Query-based
             logger.info(
                 "Phase 3: Performing Level 1 filtering (query-based)...")
@@ -71,14 +63,6 @@ class NormalFilter():
             if target_files is not None and self.args.index_filter_level >= 2:
                 logger.info(
                     "Phase 4: Performing Level 2 filtering (related files)...")
-                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_INDEX_FILTER_START.value,
-                            data=json.dumps({})
-                        )
-                    )
                 phase_start = time.monotonic()
                 related_files = self.index_manager.get_related_files(
                     [file.file_path for file in target_files.file_list]

autocoder/lang.py

@@ -48,8 +48,7 @@ lang_desc = {
         "urls_use_model":"Whether to use model to processing content in urls. Default is False",
         "ray_address": "The address of the Ray cluster to connect to. Default is 'auto'",
         "enable_rag_search":"Whether to enable retrieval augmented generation using search. Default is False",
-        "enable_rag_context":"Whether to enable retrieval augmented generation using context. Default is False",
-        "enable_multi_round_generate":"Whether to enable multi-round conversation for generation. Default is False",
+        "enable_rag_context":"Whether to enable retrieval augmented generation using context. Default is False",        
         "index_model_max_length":"The maximum length of the generated code by the index model. Default is 0, which means using the value of model_max_length",
         "index_model_max_input_length":"The maximum length of the input to the index model. Default is 0, which means using the value of model_max_input_length",
         "index_model_anti_quota_limit":"Time to wait in seconds after each API request for the index model. Default is 0, which means using the value of anti_quota_limit",
@@ -132,8 +131,7 @@ lang_desc = {
         "urls_use_model":"是否使用模型处理urls中的内容。默认为False",
         "ray_address": "要连接的Ray集群的地址。默认为'auto'",
         "enable_rag_search":"是否开启使用搜索的检索增强生成。默认为False",  
-        "enable_rag_context":"是否开启使用上下文的检索增强生成。默认为False",
-        "enable_multi_round_generate":"是否开启多轮对话生成。默认为False",
+        "enable_rag_context":"是否开启使用上下文的检索增强生成。默认为False",        
         "index_model_max_length":"索引模型生成代码的最大长度。默认为0,表示使用model_max_length的值",
         "index_model_max_input_length":"索引模型的最大输入长度。默认为0,表示使用model_max_input_length的值",
         "index_model_anti_quota_limit": "每次索引模型API请求后等待的秒数。默认为0,表示使用anti_quota_limit的值",