You've already forked FrameTour-RenderWorker
feat(material-cache): 添加缓存锁机制防止并发冲突
- 实现跨进程缓存锁获取和释放功能 - 在下载过程中使用UUID生成唯一的临时文件名避免并发覆盖 - 添加超时机制和轮询间隔控制锁等待时间 - 修改清理逻辑跳过锁文件和下载中的临时文件 - 添加测试验证缓存锁功能正常工作 fix(ffmpeg): 优化FFmpeg命令执行和错误处理 - 添加默认日志级别为error减少冗余输出 - 修复subprocess运行参数传递方式 - 改进错误信息截取避免空值解码异常 refactor(system-info): 优化系统信息获取和缓存机制 - 实现FFmpeg版本、编解码器信息缓存避免重复查询 - 添加系统信息TTL缓存机制提升性能 - 实现GPU信息检查状态缓存避免重复检测 - 整合静态系统信息和动态信息分离处理 refactor(storage): 优化HTTP上传下载资源管理 - 使用上下文管理器确保请求连接正确关闭 - 修改rclone命令构建方式从字符串改为列表形式 - 改进错误处理截取stderr输出长度限制 - 优化响应处理避免资源泄露
This commit is contained in:
@@ -7,6 +7,7 @@ v2 API 客户端
|
||||
|
||||
import logging
|
||||
import subprocess
|
||||
import time
|
||||
import requests
|
||||
from typing import Dict, List, Optional, Any
|
||||
|
||||
@@ -24,6 +25,8 @@ class APIClientV2:
|
||||
负责与渲染服务端的所有 HTTP 通信。
|
||||
"""
|
||||
|
||||
SYSTEM_INFO_TTL_SECONDS = 30
|
||||
|
||||
def __init__(self, config: WorkerConfig):
|
||||
"""
|
||||
初始化 API 客户端
|
||||
@@ -37,6 +40,15 @@ class APIClientV2:
|
||||
self.worker_id = config.worker_id
|
||||
self.session = requests.Session()
|
||||
|
||||
self._ffmpeg_version: Optional[str] = None
|
||||
self._codec_info: Optional[str] = None
|
||||
self._hw_accel_info: Optional[str] = None
|
||||
self._gpu_info: Optional[str] = None
|
||||
self._gpu_info_checked = False
|
||||
self._static_system_info: Optional[Dict[str, Any]] = None
|
||||
self._system_info_cache: Optional[Dict[str, Any]] = None
|
||||
self._system_info_cache_ts = 0.0
|
||||
|
||||
# 设置默认请求头
|
||||
self.session.headers.update({
|
||||
'Content-Type': 'application/json',
|
||||
@@ -287,6 +299,8 @@ class APIClientV2:
|
||||
|
||||
def _get_ffmpeg_version(self) -> str:
|
||||
"""获取 FFmpeg 版本"""
|
||||
if self._ffmpeg_version is not None:
|
||||
return self._ffmpeg_version
|
||||
try:
|
||||
result = subprocess.run(
|
||||
['ffmpeg', '-version'],
|
||||
@@ -299,13 +313,18 @@ class APIClientV2:
|
||||
parts = first_line.split()
|
||||
for i, part in enumerate(parts):
|
||||
if part == 'version' and i + 1 < len(parts):
|
||||
return parts[i + 1]
|
||||
return 'unknown'
|
||||
self._ffmpeg_version = parts[i + 1]
|
||||
return self._ffmpeg_version
|
||||
self._ffmpeg_version = 'unknown'
|
||||
return self._ffmpeg_version
|
||||
except Exception:
|
||||
return 'unknown'
|
||||
self._ffmpeg_version = 'unknown'
|
||||
return self._ffmpeg_version
|
||||
|
||||
def _get_codec_info(self) -> str:
|
||||
"""获取支持的编解码器信息"""
|
||||
if self._codec_info is not None:
|
||||
return self._codec_info
|
||||
try:
|
||||
result = subprocess.run(
|
||||
['ffmpeg', '-codecs'],
|
||||
@@ -324,37 +343,60 @@ class APIClientV2:
|
||||
codecs.append('aac')
|
||||
if 'libfdk_aac' in output:
|
||||
codecs.append('libfdk_aac')
|
||||
return ', '.join(codecs) if codecs else 'unknown'
|
||||
self._codec_info = ', '.join(codecs) if codecs else 'unknown'
|
||||
return self._codec_info
|
||||
except Exception:
|
||||
return 'unknown'
|
||||
self._codec_info = 'unknown'
|
||||
return self._codec_info
|
||||
|
||||
def _get_system_info(self) -> Dict[str, Any]:
|
||||
"""获取系统信息"""
|
||||
try:
|
||||
now = time.monotonic()
|
||||
if (
|
||||
self._system_info_cache
|
||||
and now - self._system_info_cache_ts < self.SYSTEM_INFO_TTL_SECONDS
|
||||
):
|
||||
return self._system_info_cache
|
||||
|
||||
import platform
|
||||
import psutil
|
||||
|
||||
info = {
|
||||
'os': platform.system(),
|
||||
'cpu': f"{psutil.cpu_count()} cores",
|
||||
'memory': f"{psutil.virtual_memory().total // (1024**3)}GB",
|
||||
if self._hw_accel_info is None:
|
||||
self._hw_accel_info = get_hw_accel_info_str()
|
||||
|
||||
if self._static_system_info is None:
|
||||
self._static_system_info = {
|
||||
'os': platform.system(),
|
||||
'cpu': f"{psutil.cpu_count()} cores",
|
||||
'memory': f"{psutil.virtual_memory().total // (1024**3)}GB",
|
||||
'hwAccelConfig': self.config.hw_accel, # 当前配置的硬件加速
|
||||
'hwAccelSupport': self._hw_accel_info, # 系统支持的硬件加速
|
||||
}
|
||||
|
||||
info = dict(self._static_system_info)
|
||||
info.update({
|
||||
'cpuUsage': f"{psutil.cpu_percent()}%",
|
||||
'memoryAvailable': f"{psutil.virtual_memory().available // (1024**3)}GB",
|
||||
'hwAccelConfig': self.config.hw_accel, # 当前配置的硬件加速
|
||||
'hwAccelSupport': get_hw_accel_info_str(), # 系统支持的硬件加速
|
||||
}
|
||||
})
|
||||
|
||||
# 尝试获取 GPU 信息
|
||||
gpu_info = self._get_gpu_info()
|
||||
if gpu_info:
|
||||
info['gpu'] = gpu_info
|
||||
|
||||
self._system_info_cache = info
|
||||
self._system_info_cache_ts = now
|
||||
return info
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
def _get_gpu_info(self) -> Optional[str]:
|
||||
"""获取 GPU 信息"""
|
||||
if self._gpu_info_checked:
|
||||
return self._gpu_info
|
||||
|
||||
self._gpu_info_checked = True
|
||||
try:
|
||||
result = subprocess.run(
|
||||
['nvidia-smi', '--query-gpu=name', '--format=csv,noheader'],
|
||||
@@ -364,10 +406,11 @@ class APIClientV2:
|
||||
)
|
||||
if result.returncode == 0:
|
||||
gpu_name = result.stdout.strip().split('\n')[0]
|
||||
return gpu_name
|
||||
self._gpu_info = gpu_name
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
self._gpu_info = None
|
||||
|
||||
return self._gpu_info
|
||||
|
||||
def close(self):
|
||||
"""关闭会话"""
|
||||
|
||||
Reference in New Issue
Block a user