Merge branch 'dev' of https://github.com/MoFox-Studio/MoFox_Bot into dev
This commit is contained in:
@@ -175,10 +175,10 @@ class NoticeHandler:
|
||||
logger.warning("notice处理失败或不支持")
|
||||
return None
|
||||
|
||||
group_info: GroupInfo = None
|
||||
group_info: GroupInfo | None = None
|
||||
if group_id:
|
||||
fetched_group_info = await get_group_info(self.get_server_connection(), group_id)
|
||||
group_name: str = None
|
||||
group_name: str | None = None
|
||||
if fetched_group_info:
|
||||
group_name = fetched_group_info.get("group_name")
|
||||
else:
|
||||
|
||||
@@ -6,4 +6,4 @@ __plugin_meta__ = PluginMetadata(
|
||||
usage="在 bot_config.toml 中将 asr_provider 设置为 'local' 即可启用",
|
||||
version="0.1.0",
|
||||
author="Elysia",
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
import asyncio
|
||||
import os
|
||||
import tempfile
|
||||
from typing import Any
|
||||
from pathlib import Path
|
||||
import toml
|
||||
|
||||
import whisper
|
||||
|
||||
@@ -40,7 +35,7 @@ class LocalASRTool(BaseTool):
|
||||
model_size = plugin_config.get("whisper", {}).get("model_size", "tiny")
|
||||
device = plugin_config.get("whisper", {}).get("device", "cpu")
|
||||
logger.info(f"正在预加载 Whisper ASR 模型: {model_size} ({device})")
|
||||
|
||||
|
||||
loop = asyncio.get_running_loop()
|
||||
_whisper_model = await loop.run_in_executor(
|
||||
None, whisper.load_model, model_size, device
|
||||
@@ -61,10 +56,10 @@ class LocalASRTool(BaseTool):
|
||||
# 增强的等待逻辑:只要模型还没准备好,就一直等待后台加载任务完成
|
||||
while _is_loading:
|
||||
await asyncio.sleep(0.2)
|
||||
|
||||
|
||||
if _whisper_model is None:
|
||||
return "Whisper 模型加载失败,无法识别语音。"
|
||||
|
||||
|
||||
try:
|
||||
logger.info(f"开始使用 Whisper 识别音频: {audio_path}")
|
||||
loop = asyncio.get_running_loop()
|
||||
@@ -110,6 +105,6 @@ class STTWhisperPlugin(BasePlugin):
|
||||
), LocalASRTool)]
|
||||
except Exception as e:
|
||||
logger.error(f"检查 ASR provider 配置时出错: {e}")
|
||||
|
||||
|
||||
logger.debug("ASR provider is not 'local', whisper plugin's tool is disabled.")
|
||||
return []
|
||||
|
||||
@@ -6,9 +6,9 @@ from pathlib import Path
|
||||
|
||||
import toml
|
||||
|
||||
from src.chat.utils.self_voice_cache import register_self_voice
|
||||
from src.common.logger import get_logger
|
||||
from src.plugin_system.base.base_action import BaseAction, ChatMode
|
||||
from src.chat.utils.self_voice_cache import register_self_voice
|
||||
|
||||
from ..services.manager import get_service
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ __plugin_meta__ = PluginMetadata(
|
||||
"is_built_in": True,
|
||||
},
|
||||
# Python包依赖列表
|
||||
python_dependencies = [ # noqa: RUF012
|
||||
python_dependencies = [
|
||||
PythonDependency(package_name="asyncddgs", description="异步DuckDuckGo搜索库", optional=False),
|
||||
PythonDependency(
|
||||
package_name="exa_py",
|
||||
|
||||
Reference in New Issue
Block a user