From af5b2fa2c9b2ddf06c16fa2f73bbcfdf12c193e6 Mon Sep 17 00:00:00 2001 From: zzh Date: Tue, 15 Jul 2025 15:44:55 +0900 Subject: [PATCH] Clean up TTS module dependencies - Remove references to deleted tts_config.py - Simplify tts_routes.py to directly return TTSGeminiChatService - Update __init__.py imports - Prepare for multi-speaker TTS testing --- app/service/tts/multi_speaker/__init__.py | 5 +---- app/service/tts/multi_speaker/tts_routes.py | 25 ++++----------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/app/service/tts/multi_speaker/__init__.py b/app/service/tts/multi_speaker/__init__.py index 591329f..18daf45 100644 --- a/app/service/tts/multi_speaker/__init__.py +++ b/app/service/tts/multi_speaker/__init__.py @@ -4,17 +4,14 @@ Multi-speaker TTS functionality for conversation scenarios """ from .tts_chat_service import TTSGeminiChatService -from .tts_config import TTSConfig, create_chat_service from .tts_models import TTSGenerationConfig, MultiSpeakerVoiceConfig, SpeechConfig, TTSRequest from .tts_response_handler import TTSResponseHandler from .tts_routes import get_tts_chat_service __all__ = [ "TTSGeminiChatService", - "TTSConfig", - "create_chat_service", "TTSGenerationConfig", - "MultiSpeakerVoiceConfig", + "MultiSpeakerVoiceConfig", "SpeechConfig", "TTSRequest", "TTSResponseHandler", diff --git a/app/service/tts/multi_speaker/tts_routes.py b/app/service/tts/multi_speaker/tts_routes.py index a42cef7..ea55f95 100644 --- a/app/service/tts/multi_speaker/tts_routes.py +++ b/app/service/tts/multi_speaker/tts_routes.py @@ -1,17 +1,13 @@ """ TTS路由扩展 -可选的路由覆盖,用于启用TTS功能 -使用时可以替换原始路由的依赖注入 +提供多人TTS增强服务 """ from fastapi import Depends -from typing import Union from app.config.config import settings from app.service.key.key_manager import KeyManager, get_key_manager_instance -from app.service.chat.gemini_chat_service import GeminiChatService from app.service.tts.multi_speaker.tts_chat_service import TTSGeminiChatService -from app.service.tts.multi_speaker.tts_config import TTSConfig async def get_key_manager(): @@ -19,23 +15,10 @@ async def get_key_manager(): return get_key_manager_instance() -async def get_tts_chat_service(key_manager: KeyManager = Depends(get_key_manager)) -> Union[GeminiChatService, TTSGeminiChatService]: +async def get_tts_chat_service(key_manager: KeyManager = Depends(get_key_manager)) -> TTSGeminiChatService: """ - 获取聊天服务实例(支持TTS) - 根据配置返回原始服务或TTS增强服务 + 获取多人TTS增强聊天服务实例 """ - return TTSConfig.get_chat_service(settings.BASE_URL, key_manager) + return TTSGeminiChatService(settings.BASE_URL, key_manager) -# 使用说明: -# 要启用TTS功能,需要: -# 1. 设置环境变量 ENABLE_TTS=true -# 2. 在路由中使用 get_tts_chat_service 替换 get_chat_service -# -# 例如在 gemini_routes.py 中: -# from app.service.tts.multi_speaker.tts_routes import get_tts_chat_service -# -# async def generate_content( -# chat_service = Depends(get_tts_chat_service) # 替换原来的依赖 -# ): -# ...