auto-coder 0.1.302__py3-none-any.whl → 0.1.303__py3-none-any.whl

autocoder/index/entry.py

@@ -10,6 +10,7 @@ from rich.table import Table
 from rich.panel import Panel
 
 from autocoder.common.printer import Printer
+from autocoder.events.event_types import EventMetadata
 from autocoder.utils.queue_communicate import (
     queue_communicate,
     CommunicateEvent,
@@ -27,10 +28,14 @@ from autocoder.common import SourceCodeList
 from autocoder.common.context_pruner import PruneContext
 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
+
+
 def build_index_and_filter_files(
     llm, args: AutoCoderArgs, sources: List[SourceCode]
 ) -> SourceCodeList:
-    
+
     action_yml_file_manager = ActionYmlFileManager(args.source_dir)
     # Initialize timing and statistics
     total_start_time = time.monotonic()
@@ -61,11 +66,11 @@ def build_index_and_filter_files(
             return file_path.strip()[2:]
         return file_path
 
-    # 文件路径 -> TargetFile 
+    # 文件路径 -> TargetFile
     final_files: Dict[str, TargetFile] = {}
 
     # 文件路径 -> 文件在文件列表中的位置（越前面表示越相关）
-    file_positions:Dict[str,int] = {}
+    file_positions: Dict[str, int] = {}
 
     # Phase 1: Process REST/RAG/Search sources
     printer = Printer()
@@ -78,7 +83,7 @@ def build_index_and_filter_files(
             )
     phase_end = time.monotonic()
     stats["timings"]["process_tagged_sources"] = phase_end - phase_start
-        
+
     if not args.skip_build_index and llm:
         # Phase 2: Build index
         if args.request_id and not args.skip_events:
@@ -109,31 +114,34 @@ def build_index_and_filter_files(
                     })
                 )
             )
-        
-        
+
         if not args.skip_filter_index and args.index_filter_model:
-            model_name = getattr(index_manager.index_filter_llm, 'default_model_name', None)
+            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)            
-            
+                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 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)
             if not model_name:
-                model_name = "unknown(without default model name)" 
-            printer.print_in_terminal("normal_filter_start", style="blue",model_name=model_name)
-            normal_filter = NormalFilter(index_manager,stats,sources)
-            normal_filter_result = normal_filter.filter(index_manager.read_index(),args.query)
+                model_name = "unknown(without default model name)"
+            printer.print_in_terminal(
+                "normal_filter_start", style="blue", model_name=model_name)
+            normal_filter = NormalFilter(index_manager, stats, sources)
+            normal_filter_result = normal_filter.filter(
+                index_manager.read_index(), args.query)
             # Merge normal filter results into final_files
             final_files.update(normal_filter_result.files)
-        
 
     def display_table_and_get_selections(data):
         from prompt_toolkit.shortcuts import checkboxlist_dialog
@@ -173,7 +181,7 @@ def build_index_and_filter_files(
 
     def print_selected(data):
         console = Console()
-        
+
         # 获取终端宽度
         console_width = console.width
 
@@ -185,18 +193,19 @@ def build_index_and_filter_files(
             width=min(console_width - 10, 120),
             expand=True
         )
-        
+
         # 优化列配置
-        table.add_column("File Path", 
-                        style="cyan", 
-                        width=int((console_width - 10) * 0.6),  # 分配 60% 宽度给文件路径
-                        overflow="fold",  # 自动折叠过长的路径
-                        no_wrap=False)  # 允许换行
-        
-        table.add_column("Reason", 
-                        style="green", 
-                        width=int((console_width - 10) * 0.4),  # 分配 40% 宽度给原因
-                        no_wrap=False)
+        table.add_column("File Path",
+                         style="cyan",
+                         # 分配 60% 宽度给文件路径
+                         width=int((console_width - 10) * 0.6),
+                         overflow="fold",  # 自动折叠过长的路径
+                         no_wrap=False)  # 允许换行
+
+        table.add_column("Reason",
+                         style="green",
+                         width=int((console_width - 10) * 0.4),  # 分配 40% 宽度给原因
+                         no_wrap=False)
 
         # 添加处理过的文件路径
         for file, reason in data:
@@ -215,7 +224,7 @@ def build_index_and_filter_files(
 
     # Phase 6: File selection and limitation
     printer.print_in_terminal("phase6_file_selection")
-    phase_start = time.monotonic()    
+    phase_start = time.monotonic()
 
     if args.index_filter_file_num > 0:
         logger.info(
@@ -246,7 +255,7 @@ def build_index_and_filter_files(
 
     # Phase 7: Display results and prepare output
     printer.print_in_terminal("phase7_preparing_output")
-    phase_start = time.monotonic()    
+    phase_start = time.monotonic()
     try:
         print_selected(
             [
@@ -263,11 +272,11 @@ def build_index_and_filter_files(
         for file in final_filenames:
             print(f"{file} - {final_files[file].reason}")
 
-    # source_code = ""  
+    # source_code = ""
     source_code_list = SourceCodeList(sources=[])
     depulicated_sources = set()
-    
-    ## 先去重
+
+    # 先去重
     temp_sources = []
     for file in sources:
         if file.module_name in final_filenames:
@@ -278,27 +287,31 @@ def build_index_and_filter_files(
             # source_code += f"{file.source_code}\n\n"
             temp_sources.append(file)
 
-    ## 开启了裁剪，则需要做裁剪，不过目前只针对 quick filter 生效
+    # 开启了裁剪，则需要做裁剪，不过目前只针对 quick filter 生效
     if args.context_prune:
-        context_pruner = PruneContext(max_tokens=args.conversation_prune_safe_zone_tokens, args=args, llm=llm)
+        context_pruner = PruneContext(
+            max_tokens=args.conversation_prune_safe_zone_tokens, args=args, llm=llm)
         # 如果 file_positions 不为空，则通过 file_positions 来获取文件
         if file_positions:
-            ## 拿到位置列表，然后根据位置排序 得到 [(pos,file_path)]
-            ## 将 [(pos,file_path)] 转换为 [file_path]
-            ## 通过 [file_path] 顺序调整 temp_sources 的顺序             
-            ## MARK 
-             # 将 file_positions 转换为 [(pos, file_path)] 的列表
-            position_file_pairs = [(pos, file_path) for file_path, pos in file_positions.items()]
+            # 拿到位置列表，然后根据位置排序 得到 [(pos,file_path)]
+            # 将 [(pos,file_path)] 转换为 [file_path]
+            # 通过 [file_path] 顺序调整 temp_sources 的顺序
+            # MARK
+            # 将 file_positions 转换为 [(pos, file_path)] 的列表
+            position_file_pairs = [(pos, file_path)
+                                   for file_path, pos in file_positions.items()]
             # 按位置排序
             position_file_pairs.sort(key=lambda x: x[0])
             # 提取排序后的文件路径列表
-            sorted_file_paths = [file_path for _, file_path in position_file_pairs]
+            sorted_file_paths = [file_path for _,
+                                 file_path in position_file_pairs]
             # 根据 sorted_file_paths 重新排序 temp_sources
-            temp_sources.sort(key=lambda x: sorted_file_paths.index(x.module_name) if x.module_name in sorted_file_paths else len(sorted_file_paths))                       
-            
-        pruned_files = context_pruner.handle_overflow(temp_sources, [{"role":"user","content":args.query}], args.context_prune_strategy)        
-        source_code_list.sources = pruned_files
+            temp_sources.sort(key=lambda x: sorted_file_paths.index(
+                x.module_name) if x.module_name in sorted_file_paths else len(sorted_file_paths))
 
+        pruned_files = context_pruner.handle_overflow(
+            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(
@@ -309,7 +322,7 @@ def build_index_and_filter_files(
                     (file.module_name, "") for file in source_code_list.sources
                 ])
             )
-        )        
+        )
 
     stats["final_files"] = len(source_code_list.sources)
     phase_end = time.monotonic()
@@ -319,7 +332,7 @@ def build_index_and_filter_files(
     total_end_time = time.monotonic()
     total_time = total_end_time - total_start_time
     stats["timings"]["total"] = total_time
-    
+
     # Calculate total filter time
     total_filter_time = (
         stats["timings"]["quick_filter"] +
@@ -354,7 +367,7 @@ def build_index_and_filter_files(
     #     summary,
     #     text_options={"justify": "left", "style": "bold white"},
     #     panel_options={
-    #         "title": "Indexing and Filtering Summary", 
+    #         "title": "Indexing and Filtering Summary",
     #         "border_style": "bold blue",
     #         "padding": (1, 2),
     #         "expand": False
@@ -372,19 +385,34 @@ def build_index_and_filter_files(
                 })
             )
         )
-    
+
+    get_event_manager(args.event_file).write_result(
+        EventContentCreator.create_result(
+            content=EventContentCreator.ResultContextUsedContent(
+                files=final_filenames,
+                title="Files Used as Context",
+                description=""
+            ).to_dict()
+        ),
+        metadata=EventMetadata(
+            action_file=args.file            
+        ).to_dict()
+    )
+
     if args.file:
         action_file_name = os.path.basename(args.file)
         dynamic_urls = []
-        
+
         for file in source_code_list.sources:
             dynamic_urls.append(file.module_name)
-        
+
         args.dynamic_urls = dynamic_urls
 
-        update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "dynamic_urls", args.dynamic_urls)    
-        if not update_yaml_success:        
+        update_yaml_success = action_yml_file_manager.update_yaml_field(
+            action_file_name, "dynamic_urls", args.dynamic_urls)
+        if not update_yaml_success:
             printer = Printer()
-            printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
-    
-    return source_code_list
+            printer.print_in_terminal(
+                "yaml_save_error", style="red", yaml_file=action_file_name)
+
+    return source_code_list

autocoder/index/filter/quick_filter.py

@@ -1,5 +1,6 @@
 from typing import List, Union, Dict, Any, Optional
 from pydantic import BaseModel
+from autocoder.common.stream_out_type import IndexFilterStreamOutType
 from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
 from byzerllm.utils.str2model import to_model
@@ -24,6 +25,9 @@ from byzerllm.utils.client.code_utils import extract_code
 import json
 from autocoder.index.symbols_utils import extract_symbols
 import os.path
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.events import event_content as EventContentCreator
+from autocoder.events.event_types import EventMetadata
 
 
 def get_file_path(file_path):
@@ -123,7 +127,10 @@ class QuickFilter():
                         model_name=model_name,
                         title=self.printer.get_message_from_key_with_format(
                             "quick_filter_title", model_name=model_name),
-                        args=self.args
+                        args=self.args,
+                        extra_meta={
+                            "stream_out_type": IndexFilterStreamOutType.FILE_NUMBER_LIST.value
+                        }   
                     )
                     file_number_list = to_model(full_response, FileNumberList)
 
@@ -153,6 +160,17 @@ class QuickFilter():
                         output_cost=total_output_cost,
                         model_names=model_name
                     )
+
+                    get_event_manager(self.args.event_file).write_result(
+                        EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                            model_name=model_name,
+                            elapsed_time=0,
+                            first_token_time=0,
+                            input_tokens=last_meta.input_tokens_count,
+                            output_tokens=last_meta.generated_tokens_count,
+                            input_cost=total_input_cost,
+                            output_cost=total_output_cost
+                        ).to_dict()))
                 else:
                     # 其他chunks直接使用with_llm
                     meta_holder = MetaHolder()
@@ -178,6 +196,16 @@ class QuickFilter():
                         model_names=model_name,
                         elapsed_time=f"{end_time - start_time:.2f}"
                     )
+                    get_event_manager(self.args.event_file).write_result(
+                        EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                            model_name=model_name,
+                            elapsed_time=end_time - start_time,
+                            first_token_time=0,
+                            input_tokens=meta_dict.get("input_tokens_count", 0),
+                            output_tokens=meta_dict.get("generated_tokens_count", 0),
+                            input_cost=total_input_cost,
+                            output_cost=total_output_cost
+                        ).to_dict()))
 
                 if file_number_list:
                     for index,file_number in enumerate(file_number_list.file_list):
@@ -475,7 +503,10 @@ class QuickFilter():
                 title=self.printer.get_message_from_key_with_format(
                     "quick_filter_title", model_name=model_name),
                 args=self.args,
-                display_func=extract_file_number_list
+                display_func=extract_file_number_list,
+                extra_meta={
+                    "stream_out_type": IndexFilterStreamOutType.FILE_NUMBER_LIST.value
+                }
             )
             # 解析结果
             file_number_list = to_model(full_response, FileNumberList)
@@ -510,6 +541,16 @@ class QuickFilter():
                 model_names=model_name,
                 speed=f"{speed:.2f}"
             )
+            get_event_manager(self.args.event_file).write_result(
+                EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                    model_name=model_name,
+                    elapsed_time=end_time - start_time,
+                    input_tokens=last_meta.input_tokens_count,
+                    output_tokens=last_meta.generated_tokens_count,
+                    input_cost=total_input_cost,
+                    output_cost=total_output_cost,
+                    speed=speed
+                ).to_dict()))
 
         except Exception as e:
             self.printer.print_in_terminal(
@@ -737,7 +778,10 @@ class QuickFilter():
                     title=self.printer.get_message_from_key_with_format(
                         "super_big_filter_title", model_name=model_name),
                     args=self.args,
-                    display_func=extract_file_number_list
+                    display_func=extract_file_number_list,
+                    extra_meta={
+                        "stream_out_type": IndexFilterStreamOutType.FILE_NUMBER_LIST.value
+                    }
                 )
                 
                 # 解析结果
@@ -773,6 +817,18 @@ class QuickFilter():
                     speed=f"{speed:.2f}",
                     chunk_index=chunk_index
                 )
+
+                get_event_manager(self.args.event_file).write_result(
+                    EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                        model_name=model_name,
+                        elapsed_time=end_time - start_time,
+                        input_tokens=last_meta.input_tokens_count,
+                        output_tokens=last_meta.generated_tokens_count,
+                        input_cost=total_input_cost,
+                        output_cost=total_output_cost,
+                        speed=speed
+                    ).to_dict()))
+                
             else:
                 # 非UI模式，直接使用LLM处理
                 meta_holder = MetaHolder()
@@ -797,6 +853,18 @@ class QuickFilter():
                         elapsed_time=f"{end_time - start_time:.2f}",
                         chunk_index=chunk_index
                     )
+
+                    get_event_manager(self.args.event_file).write_result(
+                        EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                            model_name=model_name,
+                            elapsed_time=end_time - start_time,
+                            input_tokens=meta_dict.get("input_tokens_count", 0),
+                            output_tokens=meta_dict.get("generated_tokens_count", 0),
+                            input_cost=total_input_cost,
+                            output_cost=total_output_cost,
+                            speed=speed
+                        ).to_dict()))
+                    
             
             # 构建返回结果
             files = {}

autocoder/run_context.py

@@ -0,0 +1,62 @@
+"""
+Module providing a singleton class to track run context (terminal or web mode).
+"""
+from enum import Enum, auto
+from typing import Optional
+
+
+class RunMode(Enum):
+    """Enum representing different run modes for Auto-Coder."""
+    TERMINAL = auto()
+    WEB = auto()
+
+
+class RunContext:
+    """
+    Singleton class to track whether Auto-Coder is running in terminal or web mode.
+    
+    Usage:
+        from autocoder.run_context import get_run_context
+        
+        # Get current mode
+        context = get_run_context()
+        if context.mode == RunMode.WEB:
+            # Do web-specific things
+        
+        # Set mode
+        context.set_mode(RunMode.WEB)
+    """
+    _instance: Optional['RunContext'] = None
+    
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(RunContext, cls).__new__(cls)
+            cls._instance._mode = RunMode.TERMINAL  # Default to terminal mode
+        return cls._instance
+    
+    @property
+    def mode(self) -> RunMode:
+        """Get the current run mode."""
+        return self._mode
+    
+    def set_mode(self, mode: RunMode) -> None:
+        """Set the current run mode."""
+        self._mode = mode
+    
+    def is_terminal(self) -> bool:
+        """Check if running in terminal mode."""
+        return self._mode == RunMode.TERMINAL
+    
+    def is_web(self) -> bool:
+        """Check if running in web mode."""
+        return self._mode == RunMode.WEB
+
+
+def get_run_context() -> RunContext:
+    """
+    Get the singleton RunContext instance.
+    
+    Returns:
+        RunContext: The singleton instance of RunContext
+    """
+    return RunContext() 

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -7,12 +7,16 @@ from rich.layout import Layout
 from threading import Thread, Lock
 from queue import Queue, Empty
 from typing import Generator, List, Dict, Any, Optional, Tuple, Callable
+from autocoder.events.event_types import EventType
 from autocoder.utils.request_queue import RequestValue, RequestOption, StreamValue
 from autocoder.utils.request_queue import request_queue
 import time
 from byzerllm.utils.types import SingleOutputMeta
 from autocoder.common import AutoCoderArgs
 from autocoder.common.global_cancel import global_cancel
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.events import event_content as EventContentCreator
+from autocoder.events.event_types import EventMetadata
 
 MAX_HISTORY_LINES = 40  # 最大保留历史行数
 
@@ -150,7 +154,8 @@ def stream_out(
     title: Optional[str] = None,
     final_title: Optional[str] = None,
     args: Optional[AutoCoderArgs] = None,
-    display_func: Optional[Callable] = None
+    display_func: Optional[Callable] = None,
+    extra_meta: Dict[str, Any] = {}
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -184,6 +189,7 @@ def stream_out(
     final_panel_title = final_title if final_title is not None else title
     first_token_time = 0.0
     first_token_time_start = time.time()
+    sequence = 0
     try:        
         with Live(
             Panel("", title=panel_title, border_style="green"),
@@ -246,6 +252,21 @@ def stream_out(
                 # 构建显示内容 = 历史行 + 当前行
                 display_content = "\n".join(lines_buffer[-MAX_HISTORY_LINES:] + [current_line])
                 
+                
+                content = EventContentCreator.create_stream_thinking(
+                    content=display_delta,
+                    sequence=sequence
+                )
+                get_event_manager(args.event_file).write_stream(content.to_dict(),  
+                    metadata=EventMetadata(
+                        stream_out_type=extra_meta.get("stream_out_type", ""),
+                        is_streaming=True,
+                        output="delta",
+                        action_file=args.file
+                    ).to_dict()
+                )
+                sequence += 1
+                
                 if request_id and request_queue:
                     request_queue.add_request(
                         request_id,
@@ -273,6 +294,16 @@ def stream_out(
             if display_func:
                 final_display_content = display_func(assistant_response)
 
+            content = EventContentCreator.create_markdown_result(
+                content=final_display_content                
+            )
+            get_event_manager(args.event_file).write_result(content.to_dict(), metadata=EventMetadata(
+                stream_out_type=extra_meta.get("stream_out_type", ""),
+                is_streaming=True,
+                output="result",
+                action_file=args.file
+            ).to_dict())
+
             live.update(
                 Panel(
                     Markdown(final_display_content),

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.302"
+__version__ = "0.1.303"