From 1cfb8de3a09979344d44e499a17d0e7a17794ca0 Mon Sep 17 00:00:00 2001 From: FAN-yeB <1442100690@qq.com> Date: Thu, 14 Aug 2025 10:31:31 +0800 Subject: [PATCH] =?UTF-8?q?up=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B7=A5=E5=85=B7=E8=AF=BB=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance_text/performance_tester.py | 11 +++++++++-- .../performance_text/performance_tester_vllm.py | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/main/xiaozhi-server/performance_text/performance_tester.py b/main/xiaozhi-server/performance_text/performance_tester.py index 5d6af469..5c79e5f5 100644 --- a/main/xiaozhi-server/performance_text/performance_tester.py +++ b/main/xiaozhi-server/performance_text/performance_tester.py @@ -4,11 +4,11 @@ import os import statistics import time from typing import Dict +import yaml import aiohttp from tabulate import tabulate -from config.settings import load_config from core.utils.asr import create_instance as create_stt_instance from core.utils.llm import create_instance as create_llm_instance from core.utils.tts import create_instance as create_tts_instance @@ -19,7 +19,14 @@ description = "基础性能测试工具" class AsyncPerformanceTester: def __init__(self): - self.config = load_config() + # 从data/.config.yaml读取配置 + config_path = os.path.join("data", ".config.yaml") + if not os.path.exists(config_path): + raise FileNotFoundError(f"配置文件 {config_path} 不存在") + + with open(config_path, "r", encoding="utf-8") as f: + self.config = yaml.safe_load(f) or {} + self.test_sentences = self.config.get("module_test", {}).get( "test_sentences", [ diff --git a/main/xiaozhi-server/performance_text/performance_tester_vllm.py b/main/xiaozhi-server/performance_text/performance_tester_vllm.py index 469569b5..0f801e37 100644 --- a/main/xiaozhi-server/performance_text/performance_tester_vllm.py +++ b/main/xiaozhi-server/performance_text/performance_tester_vllm.py @@ -3,18 +3,25 @@ import asyncio import logging import statistics import base64 +import yaml from typing import Dict from tabulate import tabulate -from config.settings import load_config from core.utils.vllm import create_instance # 设置全局日志级别为WARNING,抑制INFO级别日志 logging.basicConfig(level=logging.WARNING) -description = "视觉识别模型性能测试" +description = "视觉识别模型性能测试" class AsyncVisionPerformanceTester: def __init__(self): - self.config = load_config() + # 从data/.config.yaml读取配置 + config_path = os.path.join("data", ".config.yaml") + if not os.path.exists(config_path): + raise FileNotFoundError(f"配置文件 {config_path} 不存在") + + with open(config_path, "r", encoding="utf-8") as f: + self.config = yaml.safe_load(f) or {} + self.test_images = [ "../../docs/images/demo1.png", "../../docs/images/demo2.png",