From 0549a033e1518860c8b1d2ef0b8986cba530c0c6 Mon Sep 17 00:00:00 2001 From: superobk Date: Wed, 27 Mar 2024 15:06:30 +0800 Subject: [PATCH] temp --- main.py | 3 ++- src/blackbox/blackbox_factory.py | 15 ++++++++------- src/blackbox/tts.py | 3 +-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index 01c54cc..f9ee155 100644 --- a/main.py +++ b/main.py @@ -11,10 +11,11 @@ blackbox_factory = BlackboxFactory() @app.post("/") async def blackbox(blackbox_name: Union[str, None] = None, request: Request = None): + print(blackbox_name) if not blackbox_name: return await JSONResponse(content={"error": "blackbox_name is required"}, status_code=status.HTTP_400_BAD_REQUEST) try: - box = blackbox_factory.create_blackbox(blackbox_name, {}) + box = blackbox_factory.create_blackbox(blackbox_name) except ValueError: return await JSONResponse(content={"error": "value error"}, status_code=status.HTTP_400_BAD_REQUEST) return await box.fast_api_handler(request) diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py index f4a6f36..60d7db6 100644 --- a/src/blackbox/blackbox_factory.py +++ b/src/blackbox/blackbox_factory.py @@ -12,18 +12,19 @@ class BlackboxFactory: def __init__(self) -> None: self.tts = TTS() - self.asr = ASR("./.env.yaml") - self.sentiment = Sentiment() - self.sum = SUM() - self.calculator = Calculator() - self.audio_to_text = AudioToText() - self.text_to_audio = TextToAudio() - self.tesou = Tesou() + #self.asr = ASR("./.env.yaml") + #self.sentiment = Sentiment() + #self.sum = SUM() + #self.calculator = Calculator() + #self.audio_to_text = AudioToText() + #self.text_to_audio = TextToAudio() + #self.tesou = Tesou() def __call__(self, *args, **kwargs): return self.processing(*args, **kwargs) def create_blackbox(self, blackbox_name: str) -> Blackbox: + return self.tts if blackbox_name == "audio_to_text": return self.audio_to_text if blackbox_name == "text_to_audio": diff --git a/src/blackbox/tts.py b/src/blackbox/tts.py index f030692..6a11657 100644 --- a/src/blackbox/tts.py +++ b/src/blackbox/tts.py @@ -14,8 +14,7 @@ class TTS(Blackbox): 'catmaid': ['resources/tts/models/catmix.json', 'resources/tts/models/catmix_107k.pth', 'character_catmaid', 1.2] } self.tts_service = TTService(*config['catmaid']) - super().__init__(config) - + def __call__(self, *args, **kwargs): return self.processing(*args, **kwargs)