refactor: 合并 action_tracker.py 到 action_logger.py
action_tracker.py 只有 28 行,仅定义 track_action 装饰器, 该装饰器内部依赖 ActionLogger 和 PerformanceTracker, 合并到 action_logger.py 更内聚。 douyin/logging/ 模块数:10 -> 9 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
a065c12d0c
commit
996990be31
4 files changed
+37
-35
No files matched your search
@@ -14,7 +14,7 @@ from __future__ import annotations
|
||||
import time
|
||||
import subprocess
|
||||
from typing import Any
|
||||
from douyin.logging.action_tracker import track_action
|
||||
from douyin.logging.action_logger import track_action
|
||||
|
||||
from douyin.handlers import douyin_swipe_ops
|
||||
|
||||
|
||||
@@ -28,11 +28,8 @@ from .performance_tracker import PerformanceTracker
|
||||
# 错误与调试日志(合并到 internal_loggers)
|
||||
from .internal_loggers import ErrorLogger, DebugLogger, _get_debug_logger
|
||||
|
||||
# 行为日志模块
|
||||
from .action_logger import ActionLogger
|
||||
|
||||
# 操作追踪装饰器
|
||||
from .action_tracker import track_action
|
||||
# 行为日志模块(含 track_action 装饰器)
|
||||
from .action_logger import ActionLogger, track_action
|
||||
|
||||
# 日志包装器
|
||||
from .douyin_logging_wrapper import LoggingWrapper
|
||||
|
||||
@@ -107,4 +107,37 @@ class ActionLogger:
|
||||
def log_step(self, name: str, elapsed: Optional[float] = None) -> None:
|
||||
self.log_operation("Step", name, elapsed=elapsed)
|
||||
|
||||
__all__ = ["ActionLogger"]
|
||||
|
||||
# ============================================================
|
||||
# track_action 装饰器(合并自 action_tracker.py)
|
||||
# ============================================================
|
||||
from functools import wraps as _wraps # noqa: E402
|
||||
|
||||
|
||||
_action_logger_singleton = ActionLogger()
|
||||
|
||||
|
||||
def track_action(name: str = ""):
|
||||
"""函数装饰器:自动记录函数耗时与操作信息。"""
|
||||
|
||||
def decorator(func):
|
||||
@_wraps(func)
|
||||
def wrapper(*args, **kwargs):
|
||||
timer = _perf.start_timer(name or func.__name__)
|
||||
t0 = time.time()
|
||||
try:
|
||||
return func(*args, **kwargs)
|
||||
finally:
|
||||
elapsed = _perf.end_timer(timer)
|
||||
if elapsed is None:
|
||||
elapsed = time.time() - t0
|
||||
_action_logger_singleton.log_step(
|
||||
name or func.__name__, elapsed=elapsed
|
||||
)
|
||||
|
||||
return wrapper
|
||||
|
||||
return decorator
|
||||
|
||||
|
||||
__all__ = ["ActionLogger", "track_action"]
|
||||
@@ -1,28 +0,0 @@
|
||||
"""操作追踪装饰器:自动记录函数耗时与操作信息"""
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
from functools import wraps
|
||||
|
||||
from .performance_tracker import PerformanceTracker
|
||||
from .action_logger import ActionLogger
|
||||
_perf = PerformanceTracker()
|
||||
_logger = ActionLogger()
|
||||
|
||||
def track_action(name: str = ""):
|
||||
def decorator(func):
|
||||
@wraps(func)
|
||||
def wrapper(*args, **kwargs):
|
||||
timer = _perf.start_timer(name or func.__name__)
|
||||
t0 = time.time()
|
||||
try:
|
||||
result = func(*args, **kwargs)
|
||||
return result
|
||||
finally:
|
||||
elapsed = _perf.end_timer(timer)
|
||||
elapsed = elapsed if elapsed is not None else time.time() - t0
|
||||
_logger.log_step(name or func.__name__, elapsed=elapsed)
|
||||
return wrapper
|
||||
return decorator
|
||||
|
||||
__all__ = ["track_action"]
|
||||
Reference in new issue
Block a user