auto-coder 0.1.259__py3-none-any.whl → 0.1.260__py3-none-any.whl

autocoder/common/result_manager.py

@@ -0,0 +1,115 @@
+import os
+import json
+import time
+from typing import List, Dict, Any, Optional
+from pydantic import BaseModel, Field
+
+class ResultItem(BaseModel):
+    """单条结果记录的数据模型"""
+    content: str = Field(..., description="结果内容")
+    meta: Dict[str, Any] = Field(default_factory=dict, description="元数据信息")
+    time: int = Field(default_factory=lambda: int(time.time()), description="记录时间戳")
+
+    class Config:
+        arbitrary_types_allowed = True
+
+class ResultManager:
+    """结果管理器，用于维护一个追加写入的jsonl文件"""
+    
+    def __init__(self, source_dir: Optional[str] = None):
+        """
+        初始化结果管理器
+        
+        Args:
+            source_dir: 可选的源目录，如果不提供则使用当前目录
+        """
+        self.source_dir = source_dir or os.getcwd()
+        self.result_dir = os.path.join(self.source_dir, ".auto-coder", "results")
+        self.result_file = os.path.join(self.result_dir, "results.jsonl")
+        os.makedirs(self.result_dir, exist_ok=True)
+
+    def append(self, content: str, meta: Optional[Dict[str, Any]] = None) -> ResultItem:
+        """
+        追加一条新的结果记录
+        
+        Args:
+            content: 结果内容
+            meta: 可选的元数据信息
+            
+        Returns:
+            ResultItem: 新创建的结果记录
+        """
+        result_item = ResultItem(
+            content=content,
+            meta=meta or {},
+        )
+        
+        with open(self.result_file, "a", encoding="utf-8") as f:
+            f.write(result_item.model_dump_json() + "\n")
+            
+        return result_item
+    
+    def add_result(self, content: str, meta: Optional[Dict[str, Any]] = None) -> ResultItem:
+        return self.append(content, meta)
+        
+    def get_last(self) -> Optional[ResultItem]:
+        """
+        获取最后一条记录
+        
+        Returns:
+            Optional[ResultItem]: 最后一条记录，如果文件为空则返回None
+        """
+        if not os.path.exists(self.result_file):
+            return None
+            
+        with open(self.result_file, "r", encoding="utf-8") as f:
+            lines = f.readlines()
+            if not lines:
+                return None
+            last_line = lines[-1].strip()
+            return ResultItem.model_validate_json(last_line)
+
+    def get_all(self) -> List[ResultItem]:
+        """
+        获取所有记录
+        
+        Returns:
+            List[ResultItem]: 所有记录的列表
+        """
+        if not os.path.exists(self.result_file):
+            return []
+            
+        results = []
+        with open(self.result_file, "r", encoding="utf-8") as f:
+            for line in f:
+                line = line.strip()
+                if line:  # 跳过空行
+                    results.append(ResultItem.model_validate_json(line))
+        return results
+
+    def get_by_time_range(self, 
+                         start_time: Optional[int] = None, 
+                         end_time: Optional[int] = None) -> List[ResultItem]:
+        """
+        获取指定时间范围内的记录
+        
+        Args:
+            start_time: 开始时间戳
+            end_time: 结束时间戳
+            
+        Returns:
+            List[ResultItem]: 符合时间范围的记录列表
+        """
+        results = []
+        for item in self.get_all():
+            if start_time and item.time < start_time:
+                continue
+            if end_time and item.time > end_time:
+                continue
+            results.append(item)
+        return results
+
+    def clear(self) -> None:
+        """清空所有记录"""
+        if os.path.exists(self.result_file):
+            os.remove(self.result_file)

autocoder/common/utils_code_auto_generate.py

@@ -1,5 +1,5 @@
 from byzerllm import ByzerLLM,SimpleByzerLLM
-from typing import Generator, List, Any, Union
+from typing import Generator, List, Any, Union, Optional, Callable
 from pydantic import BaseModel
 from loguru import logger
 
@@ -41,7 +41,7 @@ def chat_with_continue(llm: Union[ByzerLLM,SimpleByzerLLM], conversations: List[
 def stream_chat_with_continue(
     llm: Union[ByzerLLM, SimpleByzerLLM], 
     conversations: List[dict], 
-    llm_config: dict
+    llm_config: dict    
 ) -> Generator[Any, None, None]:
     """
     流式处理并继续生成内容，直到完成。

autocoder/dispacher/actions/action.py

@@ -145,7 +145,8 @@ class ActionTSProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
             merge_result = None
             if args.execute and args.auto_merge:
@@ -245,7 +246,8 @@ class ActionPyScriptProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
             merge_result = None
             if args.execute and args.auto_merge:
@@ -370,7 +372,8 @@ class ActionPyProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
             merge_result = None
             if args.execute and args.auto_merge:
@@ -485,7 +488,8 @@ class ActionSuffixProject(BaseAction):
             input_cost=input_tokens_cost,
             output_cost=generated_tokens_cost,
             speed=round(speed, 2),
-            model_names=model_names
+            model_names=model_names,
+            sampling_count=len(generate_result.contents)
         )
         merge_result = None
         if args.execute and args.auto_merge:

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -100,7 +100,8 @@ class ActionRegexProject:
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
             merge_result = None
             if args.execute and args.auto_merge:

autocoder/index/filter/quick_filter.py

@@ -19,6 +19,7 @@ from concurrent.futures import ThreadPoolExecutor
 from byzerllm import MetaHolder
 
 from autocoder.utils.llms import get_llm_names, get_model_info
+from loguru import logger
 
 
 def get_file_path(file_path):
@@ -308,13 +309,22 @@ class QuickFilter():
                 {}
             )
 
+            def extract_file_number_list(content: str) -> str:
+                try:
+                    v = to_model(content, FileNumberList)
+                    return "\n".join([index_items[file_number].module_name for file_number in v.file_list])
+                except Exception as e:
+                    logger.error(f"Error extracting file number list: {e}")
+                    return content
+
             # 获取完整响应
             full_response, last_meta = stream_out(
                 stream_generator,
                 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,
+                display_func=extract_file_number_list
             )
             # 解析结果
             file_number_list = to_model(full_response, FileNumberList)
@@ -335,6 +345,7 @@ class QuickFilter():
             # 四舍五入到4位小数
             total_input_cost = round(total_input_cost, 4)
             total_output_cost = round(total_output_cost, 4)
+            speed = last_meta.generated_tokens_count / (end_time - start_time)
 
             # 打印 token 统计信息和成本
             self.printer.print_in_terminal(
@@ -345,7 +356,8 @@ class QuickFilter():
                 output_tokens=last_meta.generated_tokens_count,
                 input_cost=total_input_cost,
                 output_cost=total_output_cost,
-                model_names=model_name
+                model_names=model_name,
+                speed=f"{speed:.2f}"
             )
 
         except Exception as e:

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -6,7 +6,7 @@ from rich.markdown import Markdown
 from rich.layout import Layout
 from threading import Thread, Lock
 from queue import Queue, Empty
-from typing import Generator, List, Dict, Any, Optional, Tuple, Literal
+from typing import Generator, List, Dict, Any, Optional, Tuple, Callable
 from autocoder.utils.request_queue import RequestValue, RequestOption, StreamValue
 from autocoder.utils.request_queue import request_queue
 import time
@@ -148,7 +148,9 @@ def stream_out(
     console: Optional[Console] = None,
     model_name: Optional[str] = None,
     title: Optional[str] = None,
-    args: Optional[AutoCoderArgs] = None
+    final_title: Optional[str] = None,
+    args: Optional[AutoCoderArgs] = None,
+    display_func: Optional[Callable] = None
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -179,6 +181,7 @@ def stream_out(
     assistant_response = ""
     last_meta = None
     panel_title = title if title is not None else f"Response[ {model_name} ]"  
+    final_panel_title = final_title if final_title is not None else title
     first_token_time = 0.0
     first_token_time_start = time.time()
     try:        
@@ -250,8 +253,8 @@ def stream_out(
                             value=StreamValue(value=[content]),
                             status=RequestOption.RUNNING,
                         ),
-                    )
-                    
+                    )                
+                
                 live.update(
                     Panel(
                         Markdown(display_content),
@@ -266,10 +269,14 @@ def stream_out(
                 lines_buffer.append(current_line)
             
             # 最终显示结果
+            final_display_content = assistant_response
+            if display_func:
+                final_display_content = display_func(assistant_response)
+
             live.update(
                 Panel(
-                    Markdown(assistant_response),
-                    title=f"Final {panel_title}",
+                    Markdown(final_display_content),
+                    title=f"{final_panel_title}",
                     border_style="blue"
                 )
             )            

autocoder/utils/thread_utils.py

@@ -176,6 +176,7 @@ def run_in_raw_thread():
             exception = []            
             def worker():            
                 try:
+                    # global_cancel.reset()
                     ret = func(*args, **kwargs)
                     result.append(ret)
                     global_cancel.reset()                
@@ -196,6 +197,9 @@ def run_in_raw_thread():
             except KeyboardInterrupt:  
                 global_cancel.set()                              
                 raise KeyboardInterrupt("Task was cancelled by user")
+            except Exception as e:
+                global_cancel.reset()
+                raise
                 
         return wrapper
     return decorator    

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.259"
+__version__ = "0.1.260"