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>
129 lines
4.1 KiB
Python
129 lines
4.1 KiB
Python
import asyncio
|
|
import os
|
|
import uuid
|
|
|
|
from astrbot.core import logger
|
|
from astrbot.core.provider.entities import ProviderType
|
|
from astrbot.core.provider.provider import TTSProvider
|
|
from astrbot.core.provider.register import register_provider_adapter
|
|
from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
|
|
|
|
try:
|
|
import genie_tts as genie # type: ignore
|
|
except ImportError:
|
|
genie = None
|
|
|
|
|
|
@register_provider_adapter(
|
|
"genie_tts",
|
|
"Genie TTS",
|
|
provider_type=ProviderType.TEXT_TO_SPEECH,
|
|
)
|
|
class GenieTTSProvider(TTSProvider):
|
|
def __init__(
|
|
self,
|
|
provider_config: dict,
|
|
provider_settings: dict,
|
|
) -> None:
|
|
super().__init__(provider_config, provider_settings)
|
|
if not genie:
|
|
raise ImportError("Please install genie_tts first.")
|
|
|
|
self.character_name = provider_config.get("genie_character_name", "mika")
|
|
language = provider_config.get("genie_language", "Japanese")
|
|
model_dir = provider_config.get("genie_onnx_model_dir", "")
|
|
refer_audio_path = provider_config.get("genie_refer_audio_path", "")
|
|
refer_text = provider_config.get("genie_refer_text", "")
|
|
|
|
try:
|
|
genie.load_character(
|
|
character_name=self.character_name,
|
|
language=language,
|
|
onnx_model_dir=model_dir,
|
|
)
|
|
genie.set_reference_audio(
|
|
character_name=self.character_name,
|
|
audio_path=refer_audio_path,
|
|
audio_text=refer_text,
|
|
language=language,
|
|
)
|
|
except Exception as e:
|
|
raise RuntimeError(f"Failed to load character {self.character_name}: {e}")
|
|
|
|
def support_stream(self) -> bool:
|
|
return True
|
|
|
|
async def get_audio(self, text: str) -> str:
|
|
temp_dir = get_astrbot_temp_path()
|
|
os.makedirs(temp_dir, exist_ok=True)
|
|
filename = f"genie_tts_{uuid.uuid4()}.wav"
|
|
path = os.path.join(temp_dir, filename)
|
|
|
|
loop = asyncio.get_running_loop()
|
|
|
|
def _generate(save_path: str) -> None:
|
|
assert genie is not None
|
|
genie.tts(
|
|
character_name=self.character_name,
|
|
text=text,
|
|
save_path=save_path,
|
|
)
|
|
|
|
try:
|
|
await loop.run_in_executor(None, _generate, path)
|
|
|
|
if os.path.exists(path):
|
|
return path
|
|
|
|
raise RuntimeError("Genie TTS did not save to file.")
|
|
|
|
except Exception as e:
|
|
raise RuntimeError(f"Genie TTS generation failed: {e}")
|
|
|
|
async def get_audio_stream(
|
|
self,
|
|
text_queue: asyncio.Queue[str | None],
|
|
audio_queue: "asyncio.Queue[bytes | tuple[str, bytes] | None]",
|
|
) -> None:
|
|
loop = asyncio.get_running_loop()
|
|
|
|
while True:
|
|
text = await text_queue.get()
|
|
if text is None:
|
|
await audio_queue.put(None)
|
|
break
|
|
|
|
try:
|
|
temp_dir = get_astrbot_temp_path()
|
|
os.makedirs(temp_dir, exist_ok=True)
|
|
filename = f"genie_tts_{uuid.uuid4()}.wav"
|
|
path = os.path.join(temp_dir, filename)
|
|
|
|
def _generate(save_path: str, t: str) -> None:
|
|
assert genie is not None
|
|
genie.tts(
|
|
character_name=self.character_name,
|
|
text=t,
|
|
save_path=save_path,
|
|
)
|
|
|
|
await loop.run_in_executor(None, _generate, path, text)
|
|
|
|
if os.path.exists(path):
|
|
with open(path, "rb") as f:
|
|
audio_data = f.read()
|
|
|
|
# Put (text, bytes) into queue so frontend can display text
|
|
await audio_queue.put((text, audio_data))
|
|
|
|
# Clean up
|
|
try:
|
|
os.remove(path)
|
|
except OSError:
|
|
pass
|
|
else:
|
|
logger.error(f"Genie TTS failed to generate audio for: {text}")
|
|
|
|
except Exception as e:
|
|
logger.error(f"Genie TTS stream error: {e}")
|