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

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

@@ -30,6 +30,7 @@ from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
+from autocoder.agent.agentic_filter import AgenticFilter
 
 
 def build_index_and_filter_files(
@@ -86,15 +87,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,33 +95,46 @@ 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(
                 index_manager.index_filter_llm, 'default_model_name', None)
             if not model_name:
                 model_name = "unknown(without default model name)"
-            printer.print_in_terminal(
-                "quick_filter_start", style="blue", model_name=model_name)
-            quick_filter = QuickFilter(index_manager, stats, sources)
-            quick_filter_result = quick_filter.filter(
-                index_manager.read_index(), args.query)
 
-            final_files.update(quick_filter_result.files)
+            if args.enable_agentic_filter:
+                from autocoder.agent.agentic_filter import AgenticFilterRequest, AgenticFilter, CommandConfig, MemoryConfig
+                from autocoder.common.conf_utils import load_memory
+
+                _memory = load_memory(args)
+
+                def save_memory_func():
+                    pass
 
-            if quick_filter_result.file_positions:
-                file_positions.update(quick_filter_result.file_positions)
+                tuner = AgenticFilter(index_manager.index_filter_llm,
+                                      args=args,
+                                      conversation_history=[],
+                                      memory_config=MemoryConfig(
+                                          memory=_memory, save_memory_func=save_memory_func),
+                                      command_config=None)
+                response = tuner.analyze(
+                    AgenticFilterRequest(user_input=args.query))
+                if response:
+                    for file in response.files:
+                        final_files[file.path] = TargetFile(
+                            file_path=file.path, reason="Agentic Filter")
+            else:
+                printer.print_in_terminal(
+                    "quick_filter_start", style="blue", model_name=model_name)
+
+                quick_filter = QuickFilter(index_manager, stats, sources)
+                quick_filter_result = quick_filter.filter(
+                    index_manager.read_index(), args.query)
+
+                final_files.update(quick_filter_result.files)
+
+                if quick_filter_result.file_positions:
+                    file_positions.update(quick_filter_result.file_positions)
 
         if not args.skip_filter_index and not args.index_filter_model:
             model_name = getattr(index_manager.llm, 'default_model_name', None)
@@ -313,17 +318,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 +368,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(
@@ -395,7 +377,7 @@ def build_index_and_filter_files(
             ).to_dict()
         ),
         metadata=EventMetadata(
-            action_file=args.file            
+            action_file=args.file
         ).to_dict()
     )
 

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的值",

autocoder/linters/shadow_linter.py

@@ -16,6 +16,7 @@ from autocoder.linters.models import (
     IssuePosition, 
     IssueSeverity
 )
+from loguru import logger as global_logger
 
 class ShadowLinter:
     """
@@ -32,6 +33,7 @@ class ShadowLinter:
         """
         self.shadow_manager = shadow_manager
         self.verbose = verbose
+        self.logger = global_logger.bind(name="ShadowLinter")
         
     def lint_shadow_file(self, shadow_path: str, fix: bool = False) -> FileLintResult:
         """
@@ -117,8 +119,10 @@ class ShadowLinter:
         
         # 处理每个影子文件
         for shadow_path in shadow_files:
+            self.logger.info(f"正在检查文件: {shadow_path}")
             try:
                 file_result = self.lint_shadow_file(shadow_path, fix=fix)
+                self.logger.info(f"检查完成: {shadow_path}")
                 # lint_shadow_file现在总是返回有效的FileLintResult，不再需要检查None
                 project_path = self.shadow_manager.from_shadow_path(shadow_path)
                 

autocoder/pyproject/__init__.py

@@ -233,15 +233,7 @@ class PyProject:
     def get_rag_source_codes(self):
         if not self.args.enable_rag_search and not self.args.enable_rag_context:
             return []
-            
-        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_RAG_SEARCH_START.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
+                    
         else:
             console = Console()
             console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
@@ -250,16 +242,7 @@ class PyProject:
         rag = RAGFactory.get_rag(self.llm, self.args, "")
         docs = rag.search(self.args.query)
         for doc in docs:
-            doc.tag = "RAG"
-            
-        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_RAG_SEARCH_END.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
+            doc.tag = "RAG"                    
         else:
             console = Console()
             console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")

autocoder/rag/cache/simple_cache.py

@@ -45,7 +45,7 @@ def generate_content_md5(content: Union[str, bytes]) -> str:
 
 
 class AutoCoderRAGAsyncUpdateQueue(BaseCacheManager):
-    def __init__(self, path: str, ignore_spec, required_exts: list):
+    def __init__(self, path: str, ignore_spec, required_exts: list, update_interval: int = 5):
         """
         初始化异步更新队列，用于管理代码文件的缓存。
         
@@ -53,6 +53,7 @@ class AutoCoderRAGAsyncUpdateQueue(BaseCacheManager):
             path: 需要索引的代码库根目录
             ignore_spec: 指定哪些文件/目录应被忽略的规则
             required_exts: 需要处理的文件扩展名列表
+            update_interval: 自动触发更新的时间间隔（秒），默认为5秒
             
         缓存结构 (self.cache):
             self.cache 是一个字典，其结构如下:
@@ -90,13 +91,22 @@ class AutoCoderRAGAsyncUpdateQueue(BaseCacheManager):
         self.path = path
         self.ignore_spec = ignore_spec
         self.required_exts = required_exts
+        self.update_interval = update_interval
         self.queue = []
         self.cache = {}  # 初始化为空字典，稍后通过 read_cache() 填充
         self.lock = threading.Lock()
         self.stop_event = threading.Event()
-        self.thread = threading.Thread(target=self._process_queue)
-        self.thread.daemon = True
-        self.thread.start()
+        
+        # 启动处理队列的线程
+        self.queue_thread = threading.Thread(target=self._process_queue)
+        self.queue_thread.daemon = True
+        self.queue_thread.start()
+        
+        # 启动定时触发更新的线程
+        self.update_thread = threading.Thread(target=self._periodic_update)
+        self.update_thread.daemon = True
+        self.update_thread.start()
+        
         self.cache = self.read_cache()
 
     def _process_queue(self):
@@ -106,10 +116,25 @@ class AutoCoderRAGAsyncUpdateQueue(BaseCacheManager):
             except Exception as e:
                 logger.error(f"Error in process_queue: {e}")
             time.sleep(1)  # 避免过于频繁的检查
+            
+    def _periodic_update(self):
+        """定时触发文件更新检查"""
+        while not self.stop_event.is_set():            
+            try:
+                logger.debug(f"Periodic update triggered (every {self.update_interval}s)")
+                # 如果没有被初始化过，不会增量触发
+                if not self.cache:
+                    time.sleep(self.update_interval)
+                    continue
+                self.trigger_update()
+            except Exception as e:
+                logger.error(f"Error in periodic update: {e}")
+            time.sleep(self.update_interval)
 
     def stop(self):
         self.stop_event.set()
-        self.thread.join()
+        self.queue_thread.join()
+        self.update_thread.join()
 
     def fileinfo_to_tuple(self, file_info: FileInfo) -> Tuple[str, str, float, str]:
         return (file_info.file_path, file_info.relative_path, file_info.modify_time, file_info.file_md5)    
@@ -285,7 +310,7 @@ class AutoCoderRAGAsyncUpdateQueue(BaseCacheManager):
 
     def get_cache(self, options: Optional[Dict[str, Any]] = None):
         self.load_first()
-        self.trigger_update()
+        # 不再在这里触发更新，因为已经有定时线程在处理
         return self.cache
 
     def get_all_files(self) -> List[Tuple[str, str, float]]:

autocoder/regexproject/__init__.py

@@ -121,17 +121,8 @@ class RegexProject:
         if not self.args.enable_rag_search and not self.args.enable_rag_context:
             return []
             
-        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_RAG_SEARCH_START.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
+        console = Console()
+        console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
             
         from autocoder.rag.rag_entry import RAGFactory
         rag = RAGFactory.get_rag(self.llm, self.args, "")
@@ -139,17 +130,8 @@ class RegexProject:
         for doc in docs:
             doc.tag = "RAG"
             
-        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_RAG_SEARCH_END.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
+        console = Console()
+        console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
             
         return docs
 

autocoder/suffixproject/__init__.py

@@ -162,36 +162,18 @@ class SuffixProject:
     def get_rag_source_codes(self):
         if not self.args.enable_rag_search and not self.args.enable_rag_context:
             return []
-            
-        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_RAG_SEARCH_START.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
+                
+        console = Console()
+        console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
             
         from autocoder.rag.rag_entry import RAGFactory
         rag = RAGFactory.get_rag(self.llm, self.args, "")
         docs = rag.search(self.args.query)
         for doc in docs:
             doc.tag = "RAG"
-            
-        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_RAG_SEARCH_END.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
+ 
+        console = Console()
+        console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
             
         return docs
 

autocoder/tsproject/__init__.py

@@ -198,17 +198,8 @@ class TSProject:
         if not self.args.enable_rag_search and not self.args.enable_rag_context:
             return []
             
-        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_RAG_SEARCH_START.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
+        console = Console()
+        console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
             
         from autocoder.rag.rag_entry import RAGFactory
         rag = RAGFactory.get_rag(self.llm, self.args, "")
@@ -216,17 +207,9 @@ class TSProject:
         for doc in docs:
             doc.tag = "RAG"
             
-        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_RAG_SEARCH_END.value,
-                    data=json.dumps({},ensure_ascii=False)
-                )
-            )
-        else:
-            console = Console()
-            console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
+
+        console = Console()
+        console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
             
         return docs
 

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.330"
+__version__ = "0.1.332"