From c60a08033777bcf25560bcb5579f98de258b98a1 Mon Sep 17 00:00:00 2001 From: SnowindMe <1945743455@qq.com> Date: Sat, 12 Apr 2025 22:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8A=E4=B8=8B=E6=96=87+?= =?UTF-8?q?=E8=A3=85=E9=A5=B0=E5=99=A8=E7=9A=84=E8=AE=A1=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reasoning_chat/reasoning_generator.py | 3 +- .../think_flow_chat/think_flow_generator.py | 8 +- src/plugins/utils/timer_calculater.py | 89 ++++++++++++------- 3 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/plugins/chat_module/reasoning_chat/reasoning_generator.py b/src/plugins/chat_module/reasoning_chat/reasoning_generator.py index 25416a1d5..6a19e1018 100644 --- a/src/plugins/chat_module/reasoning_chat/reasoning_generator.py +++ b/src/plugins/chat_module/reasoning_chat/reasoning_generator.py @@ -1,4 +1,3 @@ -import time from typing import List, Optional, Tuple, Union import random @@ -90,7 +89,7 @@ class ResponseGenerator: sender_name=sender_name, stream_id=message.chat_stream.stream_id, ) - logger.info(f"构建prompt时间: {t_build_prompt.human_readable()}") + logger.info(f"构建prompt时间: {t_build_prompt.human_readable}") try: content, reasoning_content, self.current_model_name = await model.generate_response(prompt) diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_generator.py b/src/plugins/chat_module/think_flow_chat/think_flow_generator.py index b682a4c5b..c02a81184 100644 --- a/src/plugins/chat_module/think_flow_chat/think_flow_generator.py +++ b/src/plugins/chat_module/think_flow_chat/think_flow_generator.py @@ -72,11 +72,11 @@ class ResponseGenerator: if model_response: if checked: logger.info( - f"{global_config.BOT_NICKNAME}的回复是：{model_response}，思忖后，回复是：{model_checked_response},生成回复时间: {t_generate_response.human_readable()}" + f"{global_config.BOT_NICKNAME}的回复是：{model_response}，思忖后，回复是：{model_checked_response},生成回复时间: {t_generate_response.human_readable}" ) else: logger.info( - f"{global_config.BOT_NICKNAME}的回复是：{model_response},生成回复时间: {t_generate_response.human_readable()}" + f"{global_config.BOT_NICKNAME}的回复是：{model_response},生成回复时间: {t_generate_response.human_readable}" ) model_processed_response = await self._process_response(model_checked_response) @@ -119,7 +119,7 @@ class ResponseGenerator: sender_name=sender_name, stream_id=message.chat_stream.stream_id, ) - logger.info(f"构建{mode}prompt时间: {t_build_prompt.human_readable()}") + logger.info(f"构建{mode}prompt时间: {t_build_prompt.human_readable}") try: content, reasoning_content, self.current_model_name = await model.generate_response(prompt) @@ -160,7 +160,7 @@ class ResponseGenerator: content=content, ) logger.info(f"构建check_prompt: {prompt}") - logger.info(f"构建check_prompt时间: {t_build_prompt_check.human_readable()}") + logger.info(f"构建check_prompt时间: {t_build_prompt_check.human_readable}") try: checked_content, reasoning_content, self.current_model_name = await model.generate_response(prompt) diff --git a/src/plugins/utils/timer_calculater.py b/src/plugins/utils/timer_calculater.py index 3ece1c0f7..227b817ee 100644 --- a/src/plugins/utils/timer_calculater.py +++ b/src/plugins/utils/timer_calculater.py @@ -1,56 +1,81 @@ from time import perf_counter -from typing import Dict, Optional - -""" -计时器：用于性能计时 - -感谢D指导 -""" +from functools import wraps +from typing import Optional, Dict, Callable +import asyncio class TimerTypeError(TypeError): - """自定义类型错误异常""" + """自定义类型错误""" - def __init__(self, param_name, expected_type, actual_type): - super().__init__(f"Invalid type for '{param_name}'. Expected {expected_type}, got {actual_type.__name__}") + def __init__(self, param, expected_type, actual_type): + super().__init__(f"参数 '{param}' 类型错误，期望 {expected_type}，实际得到 {actual_type.__name__}") class Timer: - def __init__(self, name: Optional[str] = None, storage: Optional[Dict[str, float]] = None): + """支持多种模式的计时器（类型安全+人类可读）""" + + def __init__(self, name: Optional[str] = None, storage: Optional[Dict[str, float]] = None, auto_unit: bool = True): self._validate_types(name, storage) - self.name = name # 计时器名称 - self.storage = storage # 计时结果存储 - self.elapsed = None # 计时结果 + self.name = name + self.storage = storage + self.elapsed = None + self.auto_unit = auto_unit + self._is_context = False def _validate_types(self, name, storage): - """类型验证核心方法""" - # 验证 name 类型 + """类型检查""" if name is not None and not isinstance(name, str): - raise TimerTypeError(param_name="name", expected_type="Optional[str]", actual_type=type(name)) + raise TimerTypeError("name", "Optional[str]", type(name)) - # 验证 storage 类型 if storage is not None and not isinstance(storage, dict): - raise TimerTypeError( - param_name="storage", expected_type="Optional[Dict[str, float]]", actual_type=type(storage) - ) + raise TimerTypeError("storage", "Optional[dict]", type(storage)) + + def __call__(self, func: Optional[Callable] = None) -> Callable: + """装饰器模式""" + if func is None: + return lambda f: Timer(name=self.name or f.__name__, storage=self.storage, auto_unit=self.auto_unit)(f) + + @wraps(func) + async def async_wrapper(*args, **kwargs): + with self: + return await func(*args, **kwargs) + + @wraps(func) + def sync_wrapper(*args, **kwargs): + with self: + return func(*args, **kwargs) + + wrapper = async_wrapper if asyncio.iscoroutinefunction(func) else sync_wrapper + wrapper.__timer__ = self # 保留计时器引用 + return wrapper def __enter__(self): + """上下文管理器入口""" + self._is_context = True self.start = perf_counter() return self def __exit__(self, *args): - self.end = perf_counter() - self.elapsed = self.end - self.start - if isinstance(self.storage, dict) and self.name: + self.elapsed = perf_counter() - self.start + self._record_time() + self._is_context = False + return False + + def _record_time(self): + """记录时间""" + if self.storage is not None and self.name: self.storage[self.name] = self.elapsed - def get_result(self) -> float: - """安全获取计时结果""" - return self.elapsed or 0.0 - + @property def human_readable(self) -> str: - """返回人类可读时间格式""" - if self.elapsed >= 1: - return f"{self.elapsed:.2f}秒" - return f"{self.elapsed * 1000:.2f}毫秒" + """人类可读时间格式""" + if self.elapsed is None: + return "未计时" + + if self.auto_unit: + return f"{self.elapsed * 1000:.2f}毫秒" if self.elapsed < 1 else f"{self.elapsed:.2f}秒" + return f"{self.elapsed:.4f}秒" + + def __str__(self): + return f""