auto-coder 0.1.311__py3-none-any.whl → 0.1.312__py3-none-any.whl

{auto_coder-0.1.311.dist-info → auto_coder-0.1.312.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.311
+Version: 0.1.312
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.311.dist-info → auto_coder-0.1.312.dist-info}/RECORD

@@ -4,7 +4,7 @@ autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,
 autocoder/auto_coder_rag.py,sha256=vOqwBHdK_KwMNUUc8ji_tlZ5DoALAG1rDjWAic3rM-4,34561
 autocoder/auto_coder_rag_client_mcp.py,sha256=QRxUbjc6A8UmDMQ8lXgZkjgqtq3lgKYeatJbDY6rSo0,6270
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
-autocoder/auto_coder_runner.py,sha256=bvd1UXYzVT2L-I2ZCkdxy9Ap8P2Q6F2JD-F7QLvaIPc,106545
+autocoder/auto_coder_runner.py,sha256=ic8ZRGpyuhFNOl4tUVLhSmibOKHNXJudGwsiSjyW--Q,107324
 autocoder/auto_coder_server.py,sha256=E3Z829TPSooRSNhuh3_x9yaZi0f5G0Lm0ntoZhjGaoQ,20576
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
 autocoder/chat_auto_coder.py,sha256=Cp5_m3pCxEDcRrVG1uojTfD8xecdl9FvYtD948TvLsg,25223
@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=AyoZ-Pzy0oyYUmWCxOIRiOImsqboSfRET7LO9-UOuxI,11172
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=kDx3aXxx7AO1nCfGSzsRo6Bz2Ha_vopiOcGfjEgOWis,23
+autocoder/version.py,sha256=L0rufFyCm-NN1zcTnCIxTextGczJMaYraoueff8zemY,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_demand_organizer.py,sha256=URAq0gSEiHeV_W4zwhOI_83kHz0Ryfj1gcfh5jwCv_w,6501
 autocoder/agent/auto_filegroup.py,sha256=pBsAkBcpFTff-9L5OwI8xhf2xPKpl-aZwz-skF2B6dc,6296
@@ -86,6 +86,7 @@ autocoder/common/stats_panel.py,sha256=wGl9O45pjVVDxhNumLv4_NfLYSlUP_18Tw4hcJSjw
 autocoder/common/stream_out_type.py,sha256=uNHRg-1my6CxcPzQM6pACrYpTZbxOenVT8aLxnruv2w,333
 autocoder/common/sys_prompt.py,sha256=JlexfjZt554faqbgkCmzOJqYUzDHfbnxly5ugFfHfEE,26403
 autocoder/common/text.py,sha256=KGRQq314GHBmY4MWG8ossRoQi1_DTotvhxchpn78c-k,1003
+autocoder/common/token_cost_caculate.py,sha256=5IoaFtcXrHMW-xDWoO5a1UQ8rSZqTeQRLXrgNGXE5NY,7626
 autocoder/common/types.py,sha256=PXTETrsTvhLE49jqAeUKGySvxBN9pjeyCgRHLDYdd9U,664
 autocoder/common/utils_code_auto_generate.py,sha256=Tvb3Mqxedj0Jhi0faKyWvILuNCty9fZi341fyIs33tA,4550
 autocoder/common/mcp_servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -118,8 +119,8 @@ autocoder/index/filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 autocoder/index/filter/normal_filter.py,sha256=MI-8xdXCrniaxYCHVTLkq5tafvcUiauD3LN0b3ymRXI,8361
 autocoder/index/filter/quick_filter.py,sha256=ozESEgy506FQ5ecjOumyo4D_KMrterB1QLmnVtiyOiM,43264
 autocoder/memory/__init__.py,sha256=5FeGvsesRViYL4BkFiHw9SdlyHeWlqALpTyqOpfnBRw,179
-autocoder/memory/active_context_manager.py,sha256=7f7DznnLXbXH6yptN8rOSSJcre0bSJ2dU9mM9L6bvno,27106
-autocoder/memory/active_package.py,sha256=CyfqZSgNucE5mGQH5JGHTE8lTU0KjFGkW2YN8vl9SoI,17480
+autocoder/memory/active_context_manager.py,sha256=zeBOhOrlSeUU2-qaJPDCEGryJ5IorTrdsDoRJ3FHOac,33238
+autocoder/memory/active_package.py,sha256=ccTs5BTrbno0Ji2YHdNfA4j1JbBTuTCvpW5bLl5xfiY,25336
 autocoder/memory/async_processor.py,sha256=htHzLGupw9IHQAEdLe2AEaALZSItPi3AltDt8FMTRHk,4643
 autocoder/memory/directory_mapper.py,sha256=BXHblOdRpeZb7URDECALp9uN5oi91KmkW9g_UaWFuZY,2513
 autocoder/plugins/__init__.py,sha256=uc8UNSAVb9uQvr5zUSS-Xu_RhrdbO2i3w2NhkrVtODM,43023
@@ -199,9 +200,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=xuBeWD0YOckqRo8JB1WkVIMOYH6c24m7JfV4svBfPDo,15113
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.311.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.311.dist-info/METADATA,sha256=uq838XUS-zoqEjGBAsnn8Le2qP29MYnffnCX01gUTeU,2747
-auto_coder-0.1.311.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.311.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.311.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.311.dist-info/RECORD,,
+auto_coder-0.1.312.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.312.dist-info/METADATA,sha256=gH2LE277ri7M4pw622UTxMm4c63pMk0H6RyiO3h4MBM,2747
+auto_coder-0.1.312.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.312.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.312.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.312.dist-info/RECORD,,

autocoder/auto_coder_runner.py

@@ -1854,12 +1854,14 @@ def active_context(query: str):
             return
         
         # 创建表格
-        table = Table(title="活动上下文任务列表")
-        table.add_column("任务ID", style="cyan")
-        table.add_column("状态", style="green")
-        table.add_column("开始时间", style="yellow")
-        table.add_column("完成时间", style="yellow")
-        table.add_column("文件", style="blue")
+        table = Table(title="活动上下文任务列表", show_lines=True, expand=True)
+        table.add_column("任务ID", style="cyan", no_wrap=False)
+        table.add_column("状态", style="green", no_wrap=False)
+        table.add_column("开始时间", style="yellow", no_wrap=False)
+        table.add_column("完成时间", style="yellow", no_wrap=False)
+        table.add_column("文件", style="blue", no_wrap=False)
+        table.add_column("Token统计", style="magenta", no_wrap=False)
+        table.add_column("费用", style="red", no_wrap=False)
         
         # 添加任务数据
         for task in all_tasks:
@@ -1887,17 +1889,29 @@ def active_context(query: str):
             # 获取文件名
             file_name = task.get("file_name", "未知")
             
+            # 获取token信息
+            total_tokens = task.get("total_tokens", 0)
+            input_tokens = task.get("input_tokens", 0)
+            output_tokens = task.get("output_tokens", 0)
+            token_info = f"总计: {total_tokens:,}\n输入: {input_tokens:,}\n输出: {output_tokens:,}"
+            
+            # 获取费用信息
+            cost = task.get("cost", 0.0)
+            cost_info = f"${cost:.6f}"
+            
             # 添加到表格
             table.add_row(
                 task.get("task_id", "未知"),
                 status_display,
                 start_time_str,
                 completion_time_str,
-                file_name
+                file_name,
+                token_info,
+                cost_info
             )
         
         # 显示表格
-        console = Console()
+        console = Console(width=120)  # 设置更宽的显示宽度
         console.print(table)
 
 

autocoder/common/token_cost_caculate.py

@@ -0,0 +1,200 @@
+from typing import Dict, Any, Optional, Tuple, List
+import time
+from loguru import logger
+import byzerllm
+from byzerllm import MetaHolder
+from autocoder.utils import llms
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.events import event_content as EventContentCreator
+from pydantic import BaseModel, Field
+
+
+class TokenUsageStats(BaseModel):
+    """Token使用统计数据模型"""
+    input_tokens: int = Field(default=0, description="输入的token数量")
+    output_tokens: int = Field(default=0, description="输出的token数量")
+    input_cost: float = Field(default=0.0, description="输入token的成本")
+    output_cost: float = Field(default=0.0, description="输出token的成本")
+    
+    @property
+    def total_tokens(self) -> int:
+        """总token数"""
+        return self.input_tokens + self.output_tokens
+    
+    @property
+    def total_cost(self) -> float:
+        """总成本"""
+        return self.input_cost + self.output_cost
+
+
+class TokenCostCalculator:
+    """
+    Token计费计算器 - 提供获取模型信息、计算token成本和记录token统计信息的公共功能
+    """
+
+    def __init__(self, logger_name: str = "TokenCostCalculator"):
+        """
+        初始化Token计费计算器
+
+        Args:
+            logger_name: logger名称，默认为TokenCostCalculator            
+        """
+        self.logger = logger.bind(name=logger_name)
+
+    def get_model_info(self, llm: byzerllm.ByzerLLM,product_mode:str="lite") -> Tuple[str, Dict[str, Dict[str, float]]]:
+        """
+        获取模型名称和价格信息
+
+        Args:
+            llm: ByzerLLM实例
+
+        Returns:
+            Tuple[str, Dict]: 模型名称字符串和价格信息字典
+        """
+        # 获取模型名称列表
+        model_names = llms.get_llm_names(llm)
+        model_name = ",".join(model_names)
+
+        # 获取模型价格信息
+        model_info_map = {}
+        for name in model_names:
+            info = llms.get_model_info(name, product_mode)
+            if info:
+                model_info_map[name] = {
+                    "input_price": info.get("input_price", 0.0),
+                    "output_price": info.get("output_price", 0.0)
+                }
+
+        return model_name, model_info_map
+
+    def calculate_token_costs(self, meta_holder: MetaHolder,
+                              model_info_map: Dict[str, Dict[str, float]]) -> TokenUsageStats:
+        """
+        计算token统计和成本
+
+        Args:
+            meta_holder: MetaHolder实例
+            model_info_map: 模型价格信息字典
+
+        Returns:
+            TokenUsageStats: Token使用统计数据对象
+        """
+        stats = TokenUsageStats()
+
+        if meta_holder.get_meta():
+            meta_dict = meta_holder.get_meta()
+            stats.input_tokens = meta_dict.get("input_tokens_count", 0)
+            stats.output_tokens = meta_dict.get("generated_tokens_count", 0)
+
+            for name, info in model_info_map.items():
+                stats.input_cost += (stats.input_tokens *
+                                     info.get("input_price", 0.0)) / 1000000
+                stats.output_cost += (stats.output_tokens *
+                                      info.get("output_price", 0.0)) / 1000000
+
+        return stats
+
+    def log_event(self,
+                  model_name: str,
+                  operation_name: str,
+                  start_time: float,
+                  end_time: float,
+                  stats: TokenUsageStats,
+                  event_file: Optional[str] = None):
+        """
+        记录token统计信息到日志和事件系统
+
+        Args:
+            model_name: 模型名称
+            operation_name: 操作名称，用于日志记录
+            start_time: 开始时间
+            end_time: 结束时间
+            stats: Token使用统计数据
+            event_file: 事件文件路径，如果提供则写入事件
+        """
+        elapsed_time = end_time - start_time
+
+        # 计算token生成速度（每秒生成的token数）
+        speed = stats.output_tokens / elapsed_time if elapsed_time > 0 else 0
+
+        # 记录日志
+        self.logger.info(f"{operation_name} Stats - Model: {model_name}, "
+                    f"Input Tokens: {stats.input_tokens}, "
+                    f"Output Tokens: {stats.output_tokens}, "
+                    f"Total Tokens: {stats.total_tokens}, "
+                    f"Time: {elapsed_time:.2f}s, "
+                    f"Speed: {speed:.2f}tokens/s, "
+                    f"Total Cost: ${stats.total_cost:.6f}")
+
+        # 记录事件（如果提供了event_file）
+        try:
+            if event_file:
+                get_event_manager(event_file).write_result(
+                    EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                        model_name=model_name,
+                        elapsed_time=elapsed_time,
+                        first_token_time=0,  # 不跟踪首个token时间
+                        input_tokens=stats.input_tokens,
+                        output_tokens=stats.output_tokens,
+                        input_cost=stats.input_cost,
+                        output_cost=stats.output_cost,
+                        speed=speed
+                    ).to_dict()))
+            else:
+                # 尝试使用默认事件管理器
+                get_event_manager().write_result(
+                    EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                        model_name=model_name,
+                        elapsed_time=elapsed_time,
+                        input_tokens=stats.input_tokens,
+                        output_tokens=stats.output_tokens,
+                        input_cost=stats.input_cost,
+                        output_cost=stats.output_cost,
+                        speed=speed
+                    ).to_dict()))
+        except Exception as e:
+            self.logger.error(f"Error writing event for {operation_name}: {e}")
+
+    def track_token_usage(self,
+                          llm: byzerllm.ByzerLLM,
+                          meta_holder: MetaHolder,
+                          operation_name: str,
+                          start_time: float,
+                          end_time: float,
+                          product_mode: Optional[str] = None,
+                          event_file: Optional[str] = None) -> TokenUsageStats:
+        """
+        跟踪token使用情况的便捷方法，整合了获取模型信息、计算成本和记录统计的功能
+
+        Args:
+            llm: ByzerLLM实例
+            meta_holder: MetaHolder实例
+            operation_name: 操作名称
+            start_time: 开始时间
+            end_time: 结束时间
+            product_mode: 产品模式，如果不提供则使用实例的product_mode
+            event_file: 事件文件路径
+
+        Returns:
+            TokenUsageStats: Token使用统计数据对象
+        """
+        # 使用传入的product_mode或实例的product_mode
+        actual_product_mode = product_mode
+        
+        # 获取模型信息
+        model_name, model_info_map = self.get_model_info(llm,actual_product_mode)
+
+        # 计算token统计和成本
+        stats = self.calculate_token_costs(meta_holder, model_info_map)
+
+        # 记录事件
+        self.log_event(
+            model_name=model_name,
+            operation_name=operation_name,
+            start_time=start_time,
+            end_time=end_time,
+            stats=stats,
+            event_file=event_file
+        )
+
+        return stats