3fd6c4c8a6
* fix: 修复 asyncio 事件循环相关的问题 1. components.py: 修复异常处理结构错误 - 将 except Exception 移到正确的内部 try 块 - 确保 _download_file() 异常能被正确捕获和记录 2. session_lock.py: 修复跨事件循环 Lock 绑定问题 - 添加 _access_lock_loop_id 追踪事件循环 - 当事件循环变化时重新创建 Lock Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 根据代码审查反馈修复问题 1. components.py: 移除 asyncio.set_event_loop() 调用 - 创建临时 event loop 时不再设置为全局 - 避免干扰其他 asyncio 使用 2. session_lock.py: 简化延迟初始化逻辑 - 移除 loop-ID 追踪和 _get_lock 方法 - 使用 setdefault 简化 session lock 创建 - 保留延迟初始化行为 3. wecomai_queue_mgr.py: 使用 time.monotonic() 替代 loop.time() - 同步方法不再依赖活动的 event loop - 避免在非异步上下文中抛出 RuntimeError Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 优化 asyncio 事件循环管理,使用安全的方式创建和关闭事件循环 * fix: 根据代码审查反馈改进异常处理和事件循环使用 - main.py: 显式处理 check_dashboard_files() 返回 None 的情况 - components.py: 使用 logger.exception 保留异常堆栈信息 - star_manager.py: 添加 Future 异常回调处理 __del__ 执行异常 - bay_manager.py: 缓存事件循环引用避免重复调用 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 简化 SessionLockManager 使用 defaultdict 和 setdefault - 使用 defaultdict(asyncio.Lock) 简化锁的懒创建 - 使用 setdefault 简化 _get_loop_state 逻辑 - 减少 get + if 分支,提升可读性 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: 降低 webui_dir 检查失败时的日志级别为 warning 改为警告而非退出,允许程序在无 WebUI 的情况下继续运行 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor: 重构事件循环锁管理,简化锁状态管理逻辑 * 新增对 SessionLockManager 的多事件循环隔离测试 * fix: 修复测试中的变量声明和断言,确保事件循环管理器的正确性 * fix: 修复插件删除时异常处理逻辑,确保正确记录错误信息 * fix: 新增针对多个事件循环的 OneBot 实例的测试,确保锁对象在不同事件循环间不共享 --------- Co-authored-by: whatevertogo <whatevertogo@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
164 lines
5.5 KiB
Python
164 lines
5.5 KiB
Python
import asyncio
|
|
import base64
|
|
import logging
|
|
import os
|
|
import uuid
|
|
|
|
import aiohttp
|
|
import dashscope
|
|
from dashscope.audio.tts_v2 import AudioFormat, SpeechSynthesizer
|
|
|
|
try:
|
|
from dashscope.aigc.multimodal_conversation import MultiModalConversation
|
|
except (
|
|
ImportError
|
|
): # pragma: no cover - older dashscope versions without Qwen TTS support
|
|
MultiModalConversation = None
|
|
|
|
from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
|
|
|
|
from ..entities import ProviderType
|
|
from ..provider import TTSProvider
|
|
from ..register import register_provider_adapter
|
|
|
|
|
|
@register_provider_adapter(
|
|
"dashscope_tts",
|
|
"Dashscope TTS API",
|
|
provider_type=ProviderType.TEXT_TO_SPEECH,
|
|
)
|
|
class ProviderDashscopeTTSAPI(TTSProvider):
|
|
def __init__(
|
|
self,
|
|
provider_config: dict,
|
|
provider_settings: dict,
|
|
) -> None:
|
|
super().__init__(provider_config, provider_settings)
|
|
self.chosen_api_key: str = provider_config.get("api_key", "")
|
|
self.voice: str = provider_config.get("dashscope_tts_voice", "loongstella")
|
|
self.set_model(provider_config["model"])
|
|
self.timeout_ms = float(provider_config.get("timeout", 20)) * 1000
|
|
dashscope.api_key = self.chosen_api_key
|
|
|
|
async def get_audio(self, text: str) -> str:
|
|
model = self.get_model()
|
|
if not model:
|
|
raise RuntimeError("Dashscope TTS model is not configured.")
|
|
|
|
temp_dir = get_astrbot_temp_path()
|
|
os.makedirs(temp_dir, exist_ok=True)
|
|
|
|
if self._is_qwen_tts_model(model):
|
|
audio_bytes, ext = await self._synthesize_with_qwen_tts(model, text)
|
|
else:
|
|
audio_bytes, ext = await self._synthesize_with_cosyvoice(model, text)
|
|
|
|
if not audio_bytes:
|
|
raise RuntimeError(
|
|
"Audio synthesis failed, returned empty content. The model may not be supported or the service is unavailable.",
|
|
)
|
|
|
|
path = os.path.join(temp_dir, f"dashscope_tts_{uuid.uuid4()}{ext}")
|
|
with open(path, "wb") as f:
|
|
f.write(audio_bytes)
|
|
return path
|
|
|
|
def _call_qwen_tts(self, model: str, text: str):
|
|
if MultiModalConversation is None:
|
|
raise RuntimeError(
|
|
"dashscope SDK missing MultiModalConversation. Please upgrade the dashscope package to use Qwen TTS models.",
|
|
)
|
|
|
|
kwargs = {
|
|
"model": model,
|
|
"messages": None,
|
|
"api_key": self.chosen_api_key,
|
|
"voice": self.voice or "Cherry",
|
|
"text": text,
|
|
}
|
|
if not self.voice:
|
|
logging.warning(
|
|
"No voice specified for Qwen TTS model, using default 'Cherry'.",
|
|
)
|
|
return MultiModalConversation.call(**kwargs)
|
|
|
|
async def _synthesize_with_qwen_tts(
|
|
self,
|
|
model: str,
|
|
text: str,
|
|
) -> tuple[bytes | None, str]:
|
|
loop = asyncio.get_running_loop()
|
|
response = await loop.run_in_executor(None, self._call_qwen_tts, model, text)
|
|
audio_bytes = await self._extract_audio_from_response(response)
|
|
if not audio_bytes:
|
|
raise RuntimeError(
|
|
f"Audio synthesis failed for model '{model}'. {response}",
|
|
)
|
|
ext = ".wav"
|
|
return audio_bytes, ext
|
|
|
|
async def _extract_audio_from_response(self, response) -> bytes | None:
|
|
output = getattr(response, "output", None)
|
|
audio_obj = getattr(output, "audio", None) if output is not None else None
|
|
if not audio_obj:
|
|
return None
|
|
|
|
data_b64 = getattr(audio_obj, "data", None)
|
|
if data_b64:
|
|
try:
|
|
return base64.b64decode(data_b64)
|
|
except (ValueError, TypeError):
|
|
logging.exception("Failed to decode base64 audio data.")
|
|
return None
|
|
|
|
url = getattr(audio_obj, "url", None)
|
|
if url:
|
|
return await self._download_audio_from_url(url)
|
|
return None
|
|
|
|
async def _download_audio_from_url(self, url: str) -> bytes | None:
|
|
if not url:
|
|
return None
|
|
timeout = max(self.timeout_ms / 1000, 1) if self.timeout_ms else 20
|
|
try:
|
|
async with (
|
|
aiohttp.ClientSession() as session,
|
|
session.get(
|
|
url,
|
|
timeout=aiohttp.ClientTimeout(total=timeout),
|
|
) as response,
|
|
):
|
|
return await response.read()
|
|
except (aiohttp.ClientError, asyncio.TimeoutError, OSError) as e:
|
|
logging.exception(f"Failed to download audio from URL {url}: {e}")
|
|
return None
|
|
|
|
async def _synthesize_with_cosyvoice(
|
|
self,
|
|
model: str,
|
|
text: str,
|
|
) -> tuple[bytes | None, str]:
|
|
synthesizer = SpeechSynthesizer(
|
|
model=model,
|
|
voice=self.voice,
|
|
format=AudioFormat.WAV_24000HZ_MONO_16BIT,
|
|
)
|
|
loop = asyncio.get_running_loop()
|
|
audio_bytes = await loop.run_in_executor(
|
|
None,
|
|
synthesizer.call,
|
|
text,
|
|
self.timeout_ms,
|
|
)
|
|
if not audio_bytes:
|
|
resp = synthesizer.get_response()
|
|
if resp and isinstance(resp, dict):
|
|
raise RuntimeError(
|
|
f"Audio synthesis failed for model '{model}'. {resp}".strip(),
|
|
)
|
|
return audio_bytes, ".wav"
|
|
|
|
def _is_qwen_tts_model(self, model: str) -> bool:
|
|
model_lower = model.lower()
|
|
return "tts" in model_lower and model_lower.startswith("qwen")
|