From 0549a033e1518860c8b1d2ef0b8986cba530c0c6 Mon Sep 17 00:00:00 2001 From: superobk Date: Wed, 27 Mar 2024 15:06:30 +0800 Subject: [PATCH 1/4] 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) From 229501515aa837c30168865ec9be14f112c5104f Mon Sep 17 00:00:00 2001 From: superobk Date: Wed, 27 Mar 2024 16:10:46 +0800 Subject: [PATCH 2/4] ftemp --- README.md | 2 +- main.py | 7 +++++-- src/asr/asr.py | 4 +++- src/blackbox/blackbox_factory.py | 5 ++--- src/blackbox/tts.py | 8 ++------ tts/tts_service.py | 35 +++++++++++++++++++++++++------- 6 files changed, 41 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 706cd9b..a798594 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Dev rh ```bash uvicorn main:app --reload -``` \ No newline at end of file +``` diff --git a/main.py b/main.py index f9ee155..e8e2764 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ from fastapi import FastAPI, Request, status from fastapi.responses import JSONResponse from src.blackbox.blackbox_factory import BlackboxFactory +import uvicorn app = FastAPI() @@ -11,7 +12,6 @@ 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: @@ -22,4 +22,7 @@ async def blackbox(blackbox_name: Union[str, None] = None, request: Request = No @app.post("/workflows") async def workflows(reqest: Request): - print("workflows") \ No newline at end of file + print("workflows") + +if __name__ == "__main__": + uvicorn.run("main:app", host="127.0.0.1", port=8000, log_level="info") diff --git a/src/asr/asr.py b/src/asr/asr.py index f75db00..fa879f8 100644 --- a/src/asr/asr.py +++ b/src/asr/asr.py @@ -13,7 +13,9 @@ class ASR(Blackbox): def __init__(self, *args, **kwargs) -> None: config = read_yaml(args[0]) self.paraformer = RapidParaformer(config) - super().__init__(config) + + def __call__(self, *args, **kwargs): + return self.processing(*args, **kwargs) async def processing(self, *args, **kwargs): data = args[0] diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py index 60d7db6..ff0b4ea 100644 --- a/src/blackbox/blackbox_factory.py +++ b/src/blackbox/blackbox_factory.py @@ -12,8 +12,8 @@ class BlackboxFactory: def __init__(self) -> None: self.tts = TTS() - #self.asr = ASR("./.env.yaml") - #self.sentiment = Sentiment() + self.asr = ASR(".env.yaml") + self.sentiment = Sentiment() #self.sum = SUM() #self.calculator = Calculator() #self.audio_to_text = AudioToText() @@ -24,7 +24,6 @@ class BlackboxFactory: 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 6a11657..eada390 100644 --- a/src/blackbox/tts.py +++ b/src/blackbox/tts.py @@ -1,4 +1,5 @@ import io +from ntpath import join from fastapi import Request, Response, status from fastapi.responses import JSONResponse @@ -8,12 +9,7 @@ from tts.tts_service import TTService class TTS(Blackbox): def __init__(self, *args, **kwargs) -> None: - config = { - 'paimon': ['resources/tts/models/paimon6k.json', 'resources/tts/models/paimon6k_390k.pth', 'character_paimon', 1], - 'yunfei': ['resources/tts/models/yunfeimix2.json', 'resources/tts/models/yunfeimix2_53k.pth', 'character_yunfei', 1.1], - 'catmaid': ['resources/tts/models/catmix.json', 'resources/tts/models/catmix_107k.pth', 'character_catmaid', 1.2] - } - self.tts_service = TTService(*config['catmaid']) + self.tts_service = TTService("catmaid") def __call__(self, *args, **kwargs): return self.processing(*args, **kwargs) diff --git a/tts/tts_service.py b/tts/tts_service.py index 0011315..45eff7f 100644 --- a/tts/tts_service.py +++ b/tts/tts_service.py @@ -1,10 +1,8 @@ import io import sys -import time sys.path.append('tts/vits') -import numpy as np import soundfile import os os.environ["PYTORCH_JIT"] = "0" @@ -21,20 +19,43 @@ import logging logging.getLogger().setLevel(logging.INFO) logging.basicConfig(level=logging.INFO) +dirbaspath = __file__.split("\\")[1:-1] +dirbaspath= "C://" + "/".join(dirbaspath) +config = { + 'paimon': { + 'cfg': dirbaspath + '/models/paimon6k.json', + 'model': dirbaspath + '/models/paimon6k_390k.pth', + 'char': 'character_paimon', + 'speed': 1 + }, + 'yunfei': { + 'cfg': dirbaspath + '/tts/models/yunfeimix2.json', + 'model': dirbaspath + '/models/yunfeimix2_53k.pth', + 'char': 'character_yunfei', + 'speed': 1.1 + }, + 'catmaid': { + 'cfg': dirbaspath + '/models/catmix.json', + 'model': dirbaspath + '/models/catmix_107k.pth', + 'char': 'character_catmaid', + 'speed': 1.2 + }, +} class TTService(): - def __init__(self, cfg, model, char, speed): - logging.info('Initializing TTS Service for %s...' % char) - self.hps = utils.get_hparams_from_file(cfg) - self.speed = speed + def __init__(self, model_name="catmaid"): + cfg = config[model_name] + logging.info('Initializing TTS Service for %s...' % cfg["char"]) + self.hps = utils.get_hparams_from_file(cfg["cfg"]) + self.speed = cfg["speed"] self.net_g = SynthesizerTrn( len(symbols), self.hps.data.filter_length // 2 + 1, self.hps.train.segment_size // self.hps.data.hop_length, **self.hps.model).cpu() _ = self.net_g.eval() - _ = utils.load_checkpoint(model, self.net_g, None) + _ = utils.load_checkpoint(cfg["model"], self.net_g, None) def get_text(self, text, hps): text_norm = text_to_sequence(text, hps.data.text_cleaners) From 2a0c0e047799a2caff459c58981cf24667f69559 Mon Sep 17 00:00:00 2001 From: superobk Date: Wed, 27 Mar 2024 16:20:12 +0800 Subject: [PATCH 3/4] feat --- src/blackbox/sentiment.py | 4 ++-- src/blackbox/tts.py | 2 +- .../sentiment_engine}/sentiment_engine.py | 9 +++++++-- {tts => src/tts}/tts_service.py | 12 ++++++------ {tts => src/tts}/vits/.dockerignore | 0 {tts => src/tts}/vits/.gitignore | 0 {tts => src/tts}/vits/.vs/ProjectSettings.json | 0 {tts => src/tts}/vits/.vs/VSWorkspaceState.json | 0 {tts => src/tts}/vits/.vs/slnx.sqlite | Bin {tts => src/tts}/vits/.vs/vits/v17/.suo | Bin {tts => src/tts}/vits/Dockerfile | 0 {tts => src/tts}/vits/LICENSE | 0 .../tts}/vits/Libtorch C++ Infer/VITS-LibTorch.cpp | 0 .../tts}/vits/Libtorch C++ Infer/toLibTorch.ipynb | 0 {tts => src/tts}/vits/README.md | 0 {tts => src/tts}/vits/attentions.py | 0 {tts => src/tts}/vits/colab.ipynb | 0 {tts => src/tts}/vits/commons.py | 0 {tts => src/tts}/vits/configs/chinese_base.json | 0 {tts => src/tts}/vits/configs/cjke_base.json | 0 {tts => src/tts}/vits/configs/cjks_base.json | 0 {tts => src/tts}/vits/configs/japanese_base.json | 0 {tts => src/tts}/vits/configs/japanese_base2.json | 0 .../tts}/vits/configs/japanese_ss_base2.json | 0 {tts => src/tts}/vits/configs/korean_base.json | 0 {tts => src/tts}/vits/configs/sanskrit_base.json | 0 .../tts}/vits/configs/shanghainese_base.json | 0 .../tts}/vits/configs/zero_japanese_base2.json | 0 .../tts}/vits/configs/zh_ja_mixture_base.json | 0 {tts => src/tts}/vits/data_utils.py | 0 .../tts}/vits/filelists/cjke_train_filelist.txt | 0 .../vits/filelists/cjke_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/cjke_val_filelist.txt | 0 .../vits/filelists/cjke_val_filelist.txt.cleaned | 0 .../tts}/vits/filelists/cjks_train_filelist.txt | 0 .../vits/filelists/cjks_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/cjks_val_filelist.txt | 0 .../vits/filelists/cjks_val_filelist.txt.cleaned | 0 .../tts}/vits/filelists/fox_train_filelist.txt | 0 .../vits/filelists/fox_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/fox_val_filelist.txt | 0 .../vits/filelists/fox_val_filelist.txt.cleaned | 0 .../tts}/vits/filelists/mix_train_filelist.txt | 0 .../vits/filelists/mix_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/mix_val_filelist.txt | 0 .../vits/filelists/mix_val_filelist.txt.cleaned | 0 .../tts}/vits/filelists/sanskrit_train_filelist.txt | 0 .../filelists/sanskrit_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/sanskrit_val_filelist.txt | 0 .../filelists/sanskrit_val_filelist.txt.cleaned | 0 .../filelists/zaonhe_train_filelist.txt.cleaned | 0 .../vits/filelists/zaonhe_val_filelist.txt.cleaned | 0 .../tts}/vits/filelists/zero_train_filelist.txt | 0 .../vits/filelists/zero_train_filelist.txt.cleaned | 0 .../tts}/vits/filelists/zero_val_filelist.txt | 0 .../vits/filelists/zero_val_filelist.txt.cleaned | 0 {tts => src/tts}/vits/inference.ipynb | 0 {tts => src/tts}/vits/losses.py | 0 {tts => src/tts}/vits/mel_processing.py | 0 {tts => src/tts}/vits/models.py | 0 {tts => src/tts}/vits/modules.py | 0 {tts => src/tts}/vits/monotonic_align/__init__.py | 0 {tts => src/tts}/vits/monotonic_align/core.pyx | 0 {tts => src/tts}/vits/monotonic_align/setup.py | 0 {tts => src/tts}/vits/preprocess.py | 0 {tts => src/tts}/vits/requirements.txt | 0 {tts => src/tts}/vits/resources/fig_1a.png | Bin {tts => src/tts}/vits/resources/fig_1b.png | Bin {tts => src/tts}/vits/resources/training.png | Bin {tts => src/tts}/vits/text/LICENSE | 0 {tts => src/tts}/vits/text/__init__.py | 0 {tts => src/tts}/vits/text/cantonese.py | 0 {tts => src/tts}/vits/text/cleaners.py | 0 {tts => src/tts}/vits/text/english.py | 0 {tts => src/tts}/vits/text/japanese.py | 0 {tts => src/tts}/vits/text/korean.py | 0 {tts => src/tts}/vits/text/mandarin.py | 0 {tts => src/tts}/vits/text/ngu_dialect.py | 0 {tts => src/tts}/vits/text/sanskrit.py | 0 {tts => src/tts}/vits/text/shanghainese.py | 0 {tts => src/tts}/vits/text/symbols.py | 0 {tts => src/tts}/vits/text/thai.py | 0 {tts => src/tts}/vits/train.py | 0 {tts => src/tts}/vits/train_ms.py | 0 {tts => src/tts}/vits/transforms.py | 0 {tts => src/tts}/vits/utils.py | 0 86 files changed, 16 insertions(+), 11 deletions(-) rename {sentiment_engine => src/sentiment_engine}/sentiment_engine.py (84%) rename {tts => src/tts}/tts_service.py (90%) rename {tts => src/tts}/vits/.dockerignore (100%) rename {tts => src/tts}/vits/.gitignore (100%) rename {tts => src/tts}/vits/.vs/ProjectSettings.json (100%) rename {tts => src/tts}/vits/.vs/VSWorkspaceState.json (100%) rename {tts => src/tts}/vits/.vs/slnx.sqlite (100%) rename {tts => src/tts}/vits/.vs/vits/v17/.suo (100%) rename {tts => src/tts}/vits/Dockerfile (100%) rename {tts => src/tts}/vits/LICENSE (100%) rename {tts => src/tts}/vits/Libtorch C++ Infer/VITS-LibTorch.cpp (100%) rename {tts => src/tts}/vits/Libtorch C++ Infer/toLibTorch.ipynb (100%) rename {tts => src/tts}/vits/README.md (100%) rename {tts => src/tts}/vits/attentions.py (100%) rename {tts => src/tts}/vits/colab.ipynb (100%) rename {tts => src/tts}/vits/commons.py (100%) rename {tts => src/tts}/vits/configs/chinese_base.json (100%) rename {tts => src/tts}/vits/configs/cjke_base.json (100%) rename {tts => src/tts}/vits/configs/cjks_base.json (100%) rename {tts => src/tts}/vits/configs/japanese_base.json (100%) rename {tts => src/tts}/vits/configs/japanese_base2.json (100%) rename {tts => src/tts}/vits/configs/japanese_ss_base2.json (100%) rename {tts => src/tts}/vits/configs/korean_base.json (100%) rename {tts => src/tts}/vits/configs/sanskrit_base.json (100%) rename {tts => src/tts}/vits/configs/shanghainese_base.json (100%) rename {tts => src/tts}/vits/configs/zero_japanese_base2.json (100%) rename {tts => src/tts}/vits/configs/zh_ja_mixture_base.json (100%) rename {tts => src/tts}/vits/data_utils.py (100%) rename {tts => src/tts}/vits/filelists/cjke_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/cjke_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/cjke_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/cjke_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/cjks_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/cjks_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/cjks_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/cjks_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/fox_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/fox_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/fox_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/fox_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/mix_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/mix_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/mix_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/mix_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/sanskrit_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/sanskrit_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/sanskrit_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/sanskrit_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/zaonhe_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/zaonhe_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/zero_train_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/zero_train_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/filelists/zero_val_filelist.txt (100%) rename {tts => src/tts}/vits/filelists/zero_val_filelist.txt.cleaned (100%) rename {tts => src/tts}/vits/inference.ipynb (100%) rename {tts => src/tts}/vits/losses.py (100%) rename {tts => src/tts}/vits/mel_processing.py (100%) rename {tts => src/tts}/vits/models.py (100%) rename {tts => src/tts}/vits/modules.py (100%) rename {tts => src/tts}/vits/monotonic_align/__init__.py (100%) rename {tts => src/tts}/vits/monotonic_align/core.pyx (100%) rename {tts => src/tts}/vits/monotonic_align/setup.py (100%) rename {tts => src/tts}/vits/preprocess.py (100%) rename {tts => src/tts}/vits/requirements.txt (100%) rename {tts => src/tts}/vits/resources/fig_1a.png (100%) rename {tts => src/tts}/vits/resources/fig_1b.png (100%) rename {tts => src/tts}/vits/resources/training.png (100%) rename {tts => src/tts}/vits/text/LICENSE (100%) rename {tts => src/tts}/vits/text/__init__.py (100%) rename {tts => src/tts}/vits/text/cantonese.py (100%) rename {tts => src/tts}/vits/text/cleaners.py (100%) rename {tts => src/tts}/vits/text/english.py (100%) rename {tts => src/tts}/vits/text/japanese.py (100%) rename {tts => src/tts}/vits/text/korean.py (100%) rename {tts => src/tts}/vits/text/mandarin.py (100%) rename {tts => src/tts}/vits/text/ngu_dialect.py (100%) rename {tts => src/tts}/vits/text/sanskrit.py (100%) rename {tts => src/tts}/vits/text/shanghainese.py (100%) rename {tts => src/tts}/vits/text/symbols.py (100%) rename {tts => src/tts}/vits/text/thai.py (100%) rename {tts => src/tts}/vits/train.py (100%) rename {tts => src/tts}/vits/train_ms.py (100%) rename {tts => src/tts}/vits/transforms.py (100%) rename {tts => src/tts}/vits/utils.py (100%) diff --git a/src/blackbox/sentiment.py b/src/blackbox/sentiment.py index 0981204..d17af4c 100644 --- a/src/blackbox/sentiment.py +++ b/src/blackbox/sentiment.py @@ -3,14 +3,14 @@ from typing import Any, Coroutine from fastapi import Request, Response, status from fastapi.responses import JSONResponse -from sentiment_engine.sentiment_engine import SentimentEngine +from ..sentiment_engine.sentiment_engine import SentimentEngine from .blackbox import Blackbox class Sentiment(Blackbox): def __init__(self) -> None: - self.engine = SentimentEngine('resources/sentiment_engine/models/paimon_sentiment.onnx') + self.engine = SentimentEngine() def __call__(self, *args, **kwargs): return self.processing(*args, **kwargs) diff --git a/src/blackbox/tts.py b/src/blackbox/tts.py index eada390..aea74d6 100644 --- a/src/blackbox/tts.py +++ b/src/blackbox/tts.py @@ -4,7 +4,7 @@ from ntpath import join from fastapi import Request, Response, status from fastapi.responses import JSONResponse from .blackbox import Blackbox -from tts.tts_service import TTService +from ..tts.tts_service import TTService class TTS(Blackbox): diff --git a/sentiment_engine/sentiment_engine.py b/src/sentiment_engine/sentiment_engine.py similarity index 84% rename from sentiment_engine/sentiment_engine.py rename to src/sentiment_engine/sentiment_engine.py index acb93d3..bc868fa 100644 --- a/sentiment_engine/sentiment_engine.py +++ b/src/sentiment_engine/sentiment_engine.py @@ -4,12 +4,17 @@ import onnxruntime from transformers import BertTokenizer import numpy as np +dirabspath = __file__.split("\\")[1:-1] +dirabspath= "C://" + "/".join(dirabspath) +default_path = dirabspath + "/models/paimon_sentiment.onnx" + class SentimentEngine(): - def __init__(self, model_path="resources/sentiment_engine/models/paimon_sentiment.onnx"): + def __init__(self): + logging.info('Initializing Sentiment Engine...') - onnx_model_path = model_path + onnx_model_path = default_path self.ort_session = onnxruntime.InferenceSession(onnx_model_path, providers=['CPUExecutionProvider']) self.tokenizer = BertTokenizer.from_pretrained('bert-base-chinese') diff --git a/tts/tts_service.py b/src/tts/tts_service.py similarity index 90% rename from tts/tts_service.py rename to src/tts/tts_service.py index 45eff7f..938df56 100644 --- a/tts/tts_service.py +++ b/src/tts/tts_service.py @@ -1,19 +1,19 @@ import io import sys -sys.path.append('tts/vits') +sys.path.append('src/tts/vits') import soundfile import os os.environ["PYTORCH_JIT"] = "0" import torch -import tts.vits.commons as commons -import tts.vits.utils as utils +import src.tts.vits.commons as commons +import src.tts.vits.utils as utils -from tts.vits.models import SynthesizerTrn -from tts.vits.text.symbols import symbols -from tts.vits.text import text_to_sequence +from src.tts.vits.models import SynthesizerTrn +from src.tts.vits.text.symbols import symbols +from src.tts.vits.text import text_to_sequence import logging logging.getLogger().setLevel(logging.INFO) diff --git a/tts/vits/.dockerignore b/src/tts/vits/.dockerignore similarity index 100% rename from tts/vits/.dockerignore rename to src/tts/vits/.dockerignore diff --git a/tts/vits/.gitignore b/src/tts/vits/.gitignore similarity index 100% rename from tts/vits/.gitignore rename to src/tts/vits/.gitignore diff --git a/tts/vits/.vs/ProjectSettings.json b/src/tts/vits/.vs/ProjectSettings.json similarity index 100% rename from tts/vits/.vs/ProjectSettings.json rename to src/tts/vits/.vs/ProjectSettings.json diff --git a/tts/vits/.vs/VSWorkspaceState.json b/src/tts/vits/.vs/VSWorkspaceState.json similarity index 100% rename from tts/vits/.vs/VSWorkspaceState.json rename to src/tts/vits/.vs/VSWorkspaceState.json diff --git a/tts/vits/.vs/slnx.sqlite b/src/tts/vits/.vs/slnx.sqlite similarity index 100% rename from tts/vits/.vs/slnx.sqlite rename to src/tts/vits/.vs/slnx.sqlite diff --git a/tts/vits/.vs/vits/v17/.suo b/src/tts/vits/.vs/vits/v17/.suo similarity index 100% rename from tts/vits/.vs/vits/v17/.suo rename to src/tts/vits/.vs/vits/v17/.suo diff --git a/tts/vits/Dockerfile b/src/tts/vits/Dockerfile similarity index 100% rename from tts/vits/Dockerfile rename to src/tts/vits/Dockerfile diff --git a/tts/vits/LICENSE b/src/tts/vits/LICENSE similarity index 100% rename from tts/vits/LICENSE rename to src/tts/vits/LICENSE diff --git a/tts/vits/Libtorch C++ Infer/VITS-LibTorch.cpp b/src/tts/vits/Libtorch C++ Infer/VITS-LibTorch.cpp similarity index 100% rename from tts/vits/Libtorch C++ Infer/VITS-LibTorch.cpp rename to src/tts/vits/Libtorch C++ Infer/VITS-LibTorch.cpp diff --git a/tts/vits/Libtorch C++ Infer/toLibTorch.ipynb b/src/tts/vits/Libtorch C++ Infer/toLibTorch.ipynb similarity index 100% rename from tts/vits/Libtorch C++ Infer/toLibTorch.ipynb rename to src/tts/vits/Libtorch C++ Infer/toLibTorch.ipynb diff --git a/tts/vits/README.md b/src/tts/vits/README.md similarity index 100% rename from tts/vits/README.md rename to src/tts/vits/README.md diff --git a/tts/vits/attentions.py b/src/tts/vits/attentions.py similarity index 100% rename from tts/vits/attentions.py rename to src/tts/vits/attentions.py diff --git a/tts/vits/colab.ipynb b/src/tts/vits/colab.ipynb similarity index 100% rename from tts/vits/colab.ipynb rename to src/tts/vits/colab.ipynb diff --git a/tts/vits/commons.py b/src/tts/vits/commons.py similarity index 100% rename from tts/vits/commons.py rename to src/tts/vits/commons.py diff --git a/tts/vits/configs/chinese_base.json b/src/tts/vits/configs/chinese_base.json similarity index 100% rename from tts/vits/configs/chinese_base.json rename to src/tts/vits/configs/chinese_base.json diff --git a/tts/vits/configs/cjke_base.json b/src/tts/vits/configs/cjke_base.json similarity index 100% rename from tts/vits/configs/cjke_base.json rename to src/tts/vits/configs/cjke_base.json diff --git a/tts/vits/configs/cjks_base.json b/src/tts/vits/configs/cjks_base.json similarity index 100% rename from tts/vits/configs/cjks_base.json rename to src/tts/vits/configs/cjks_base.json diff --git a/tts/vits/configs/japanese_base.json b/src/tts/vits/configs/japanese_base.json similarity index 100% rename from tts/vits/configs/japanese_base.json rename to src/tts/vits/configs/japanese_base.json diff --git a/tts/vits/configs/japanese_base2.json b/src/tts/vits/configs/japanese_base2.json similarity index 100% rename from tts/vits/configs/japanese_base2.json rename to src/tts/vits/configs/japanese_base2.json diff --git a/tts/vits/configs/japanese_ss_base2.json b/src/tts/vits/configs/japanese_ss_base2.json similarity index 100% rename from tts/vits/configs/japanese_ss_base2.json rename to src/tts/vits/configs/japanese_ss_base2.json diff --git a/tts/vits/configs/korean_base.json b/src/tts/vits/configs/korean_base.json similarity index 100% rename from tts/vits/configs/korean_base.json rename to src/tts/vits/configs/korean_base.json diff --git a/tts/vits/configs/sanskrit_base.json b/src/tts/vits/configs/sanskrit_base.json similarity index 100% rename from tts/vits/configs/sanskrit_base.json rename to src/tts/vits/configs/sanskrit_base.json diff --git a/tts/vits/configs/shanghainese_base.json b/src/tts/vits/configs/shanghainese_base.json similarity index 100% rename from tts/vits/configs/shanghainese_base.json rename to src/tts/vits/configs/shanghainese_base.json diff --git a/tts/vits/configs/zero_japanese_base2.json b/src/tts/vits/configs/zero_japanese_base2.json similarity index 100% rename from tts/vits/configs/zero_japanese_base2.json rename to src/tts/vits/configs/zero_japanese_base2.json diff --git a/tts/vits/configs/zh_ja_mixture_base.json b/src/tts/vits/configs/zh_ja_mixture_base.json similarity index 100% rename from tts/vits/configs/zh_ja_mixture_base.json rename to src/tts/vits/configs/zh_ja_mixture_base.json diff --git a/tts/vits/data_utils.py b/src/tts/vits/data_utils.py similarity index 100% rename from tts/vits/data_utils.py rename to src/tts/vits/data_utils.py diff --git a/tts/vits/filelists/cjke_train_filelist.txt b/src/tts/vits/filelists/cjke_train_filelist.txt similarity index 100% rename from tts/vits/filelists/cjke_train_filelist.txt rename to src/tts/vits/filelists/cjke_train_filelist.txt diff --git a/tts/vits/filelists/cjke_train_filelist.txt.cleaned b/src/tts/vits/filelists/cjke_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/cjke_train_filelist.txt.cleaned rename to src/tts/vits/filelists/cjke_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/cjke_val_filelist.txt b/src/tts/vits/filelists/cjke_val_filelist.txt similarity index 100% rename from tts/vits/filelists/cjke_val_filelist.txt rename to src/tts/vits/filelists/cjke_val_filelist.txt diff --git a/tts/vits/filelists/cjke_val_filelist.txt.cleaned b/src/tts/vits/filelists/cjke_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/cjke_val_filelist.txt.cleaned rename to src/tts/vits/filelists/cjke_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/cjks_train_filelist.txt b/src/tts/vits/filelists/cjks_train_filelist.txt similarity index 100% rename from tts/vits/filelists/cjks_train_filelist.txt rename to src/tts/vits/filelists/cjks_train_filelist.txt diff --git a/tts/vits/filelists/cjks_train_filelist.txt.cleaned b/src/tts/vits/filelists/cjks_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/cjks_train_filelist.txt.cleaned rename to src/tts/vits/filelists/cjks_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/cjks_val_filelist.txt b/src/tts/vits/filelists/cjks_val_filelist.txt similarity index 100% rename from tts/vits/filelists/cjks_val_filelist.txt rename to src/tts/vits/filelists/cjks_val_filelist.txt diff --git a/tts/vits/filelists/cjks_val_filelist.txt.cleaned b/src/tts/vits/filelists/cjks_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/cjks_val_filelist.txt.cleaned rename to src/tts/vits/filelists/cjks_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/fox_train_filelist.txt b/src/tts/vits/filelists/fox_train_filelist.txt similarity index 100% rename from tts/vits/filelists/fox_train_filelist.txt rename to src/tts/vits/filelists/fox_train_filelist.txt diff --git a/tts/vits/filelists/fox_train_filelist.txt.cleaned b/src/tts/vits/filelists/fox_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/fox_train_filelist.txt.cleaned rename to src/tts/vits/filelists/fox_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/fox_val_filelist.txt b/src/tts/vits/filelists/fox_val_filelist.txt similarity index 100% rename from tts/vits/filelists/fox_val_filelist.txt rename to src/tts/vits/filelists/fox_val_filelist.txt diff --git a/tts/vits/filelists/fox_val_filelist.txt.cleaned b/src/tts/vits/filelists/fox_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/fox_val_filelist.txt.cleaned rename to src/tts/vits/filelists/fox_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/mix_train_filelist.txt b/src/tts/vits/filelists/mix_train_filelist.txt similarity index 100% rename from tts/vits/filelists/mix_train_filelist.txt rename to src/tts/vits/filelists/mix_train_filelist.txt diff --git a/tts/vits/filelists/mix_train_filelist.txt.cleaned b/src/tts/vits/filelists/mix_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/mix_train_filelist.txt.cleaned rename to src/tts/vits/filelists/mix_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/mix_val_filelist.txt b/src/tts/vits/filelists/mix_val_filelist.txt similarity index 100% rename from tts/vits/filelists/mix_val_filelist.txt rename to src/tts/vits/filelists/mix_val_filelist.txt diff --git a/tts/vits/filelists/mix_val_filelist.txt.cleaned b/src/tts/vits/filelists/mix_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/mix_val_filelist.txt.cleaned rename to src/tts/vits/filelists/mix_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/sanskrit_train_filelist.txt b/src/tts/vits/filelists/sanskrit_train_filelist.txt similarity index 100% rename from tts/vits/filelists/sanskrit_train_filelist.txt rename to src/tts/vits/filelists/sanskrit_train_filelist.txt diff --git a/tts/vits/filelists/sanskrit_train_filelist.txt.cleaned b/src/tts/vits/filelists/sanskrit_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/sanskrit_train_filelist.txt.cleaned rename to src/tts/vits/filelists/sanskrit_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/sanskrit_val_filelist.txt b/src/tts/vits/filelists/sanskrit_val_filelist.txt similarity index 100% rename from tts/vits/filelists/sanskrit_val_filelist.txt rename to src/tts/vits/filelists/sanskrit_val_filelist.txt diff --git a/tts/vits/filelists/sanskrit_val_filelist.txt.cleaned b/src/tts/vits/filelists/sanskrit_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/sanskrit_val_filelist.txt.cleaned rename to src/tts/vits/filelists/sanskrit_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/zaonhe_train_filelist.txt.cleaned b/src/tts/vits/filelists/zaonhe_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/zaonhe_train_filelist.txt.cleaned rename to src/tts/vits/filelists/zaonhe_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/zaonhe_val_filelist.txt.cleaned b/src/tts/vits/filelists/zaonhe_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/zaonhe_val_filelist.txt.cleaned rename to src/tts/vits/filelists/zaonhe_val_filelist.txt.cleaned diff --git a/tts/vits/filelists/zero_train_filelist.txt b/src/tts/vits/filelists/zero_train_filelist.txt similarity index 100% rename from tts/vits/filelists/zero_train_filelist.txt rename to src/tts/vits/filelists/zero_train_filelist.txt diff --git a/tts/vits/filelists/zero_train_filelist.txt.cleaned b/src/tts/vits/filelists/zero_train_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/zero_train_filelist.txt.cleaned rename to src/tts/vits/filelists/zero_train_filelist.txt.cleaned diff --git a/tts/vits/filelists/zero_val_filelist.txt b/src/tts/vits/filelists/zero_val_filelist.txt similarity index 100% rename from tts/vits/filelists/zero_val_filelist.txt rename to src/tts/vits/filelists/zero_val_filelist.txt diff --git a/tts/vits/filelists/zero_val_filelist.txt.cleaned b/src/tts/vits/filelists/zero_val_filelist.txt.cleaned similarity index 100% rename from tts/vits/filelists/zero_val_filelist.txt.cleaned rename to src/tts/vits/filelists/zero_val_filelist.txt.cleaned diff --git a/tts/vits/inference.ipynb b/src/tts/vits/inference.ipynb similarity index 100% rename from tts/vits/inference.ipynb rename to src/tts/vits/inference.ipynb diff --git a/tts/vits/losses.py b/src/tts/vits/losses.py similarity index 100% rename from tts/vits/losses.py rename to src/tts/vits/losses.py diff --git a/tts/vits/mel_processing.py b/src/tts/vits/mel_processing.py similarity index 100% rename from tts/vits/mel_processing.py rename to src/tts/vits/mel_processing.py diff --git a/tts/vits/models.py b/src/tts/vits/models.py similarity index 100% rename from tts/vits/models.py rename to src/tts/vits/models.py diff --git a/tts/vits/modules.py b/src/tts/vits/modules.py similarity index 100% rename from tts/vits/modules.py rename to src/tts/vits/modules.py diff --git a/tts/vits/monotonic_align/__init__.py b/src/tts/vits/monotonic_align/__init__.py similarity index 100% rename from tts/vits/monotonic_align/__init__.py rename to src/tts/vits/monotonic_align/__init__.py diff --git a/tts/vits/monotonic_align/core.pyx b/src/tts/vits/monotonic_align/core.pyx similarity index 100% rename from tts/vits/monotonic_align/core.pyx rename to src/tts/vits/monotonic_align/core.pyx diff --git a/tts/vits/monotonic_align/setup.py b/src/tts/vits/monotonic_align/setup.py similarity index 100% rename from tts/vits/monotonic_align/setup.py rename to src/tts/vits/monotonic_align/setup.py diff --git a/tts/vits/preprocess.py b/src/tts/vits/preprocess.py similarity index 100% rename from tts/vits/preprocess.py rename to src/tts/vits/preprocess.py diff --git a/tts/vits/requirements.txt b/src/tts/vits/requirements.txt similarity index 100% rename from tts/vits/requirements.txt rename to src/tts/vits/requirements.txt diff --git a/tts/vits/resources/fig_1a.png b/src/tts/vits/resources/fig_1a.png similarity index 100% rename from tts/vits/resources/fig_1a.png rename to src/tts/vits/resources/fig_1a.png diff --git a/tts/vits/resources/fig_1b.png b/src/tts/vits/resources/fig_1b.png similarity index 100% rename from tts/vits/resources/fig_1b.png rename to src/tts/vits/resources/fig_1b.png diff --git a/tts/vits/resources/training.png b/src/tts/vits/resources/training.png similarity index 100% rename from tts/vits/resources/training.png rename to src/tts/vits/resources/training.png diff --git a/tts/vits/text/LICENSE b/src/tts/vits/text/LICENSE similarity index 100% rename from tts/vits/text/LICENSE rename to src/tts/vits/text/LICENSE diff --git a/tts/vits/text/__init__.py b/src/tts/vits/text/__init__.py similarity index 100% rename from tts/vits/text/__init__.py rename to src/tts/vits/text/__init__.py diff --git a/tts/vits/text/cantonese.py b/src/tts/vits/text/cantonese.py similarity index 100% rename from tts/vits/text/cantonese.py rename to src/tts/vits/text/cantonese.py diff --git a/tts/vits/text/cleaners.py b/src/tts/vits/text/cleaners.py similarity index 100% rename from tts/vits/text/cleaners.py rename to src/tts/vits/text/cleaners.py diff --git a/tts/vits/text/english.py b/src/tts/vits/text/english.py similarity index 100% rename from tts/vits/text/english.py rename to src/tts/vits/text/english.py diff --git a/tts/vits/text/japanese.py b/src/tts/vits/text/japanese.py similarity index 100% rename from tts/vits/text/japanese.py rename to src/tts/vits/text/japanese.py diff --git a/tts/vits/text/korean.py b/src/tts/vits/text/korean.py similarity index 100% rename from tts/vits/text/korean.py rename to src/tts/vits/text/korean.py diff --git a/tts/vits/text/mandarin.py b/src/tts/vits/text/mandarin.py similarity index 100% rename from tts/vits/text/mandarin.py rename to src/tts/vits/text/mandarin.py diff --git a/tts/vits/text/ngu_dialect.py b/src/tts/vits/text/ngu_dialect.py similarity index 100% rename from tts/vits/text/ngu_dialect.py rename to src/tts/vits/text/ngu_dialect.py diff --git a/tts/vits/text/sanskrit.py b/src/tts/vits/text/sanskrit.py similarity index 100% rename from tts/vits/text/sanskrit.py rename to src/tts/vits/text/sanskrit.py diff --git a/tts/vits/text/shanghainese.py b/src/tts/vits/text/shanghainese.py similarity index 100% rename from tts/vits/text/shanghainese.py rename to src/tts/vits/text/shanghainese.py diff --git a/tts/vits/text/symbols.py b/src/tts/vits/text/symbols.py similarity index 100% rename from tts/vits/text/symbols.py rename to src/tts/vits/text/symbols.py diff --git a/tts/vits/text/thai.py b/src/tts/vits/text/thai.py similarity index 100% rename from tts/vits/text/thai.py rename to src/tts/vits/text/thai.py diff --git a/tts/vits/train.py b/src/tts/vits/train.py similarity index 100% rename from tts/vits/train.py rename to src/tts/vits/train.py diff --git a/tts/vits/train_ms.py b/src/tts/vits/train_ms.py similarity index 100% rename from tts/vits/train_ms.py rename to src/tts/vits/train_ms.py diff --git a/tts/vits/transforms.py b/src/tts/vits/transforms.py similarity index 100% rename from tts/vits/transforms.py rename to src/tts/vits/transforms.py diff --git a/tts/vits/utils.py b/src/tts/vits/utils.py similarity index 100% rename from tts/vits/utils.py rename to src/tts/vits/utils.py From 5e807a7e56edd08c5d42f0fd782a4dbb6b024a99 Mon Sep 17 00:00:00 2001 From: superobk Date: Wed, 27 Mar 2024 16:36:04 +0800 Subject: [PATCH 4/4] feat: tesou --- src/blackbox/blackbox_factory.py | 10 +++++----- src/blackbox/tesou.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py index ff0b4ea..d2828ca 100644 --- a/src/blackbox/blackbox_factory.py +++ b/src/blackbox/blackbox_factory.py @@ -14,11 +14,11 @@ class BlackboxFactory: 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.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) diff --git a/src/blackbox/tesou.py b/src/blackbox/tesou.py index a81fe9b..d07d898 100755 --- a/src/blackbox/tesou.py +++ b/src/blackbox/tesou.py @@ -23,16 +23,16 @@ class Tesou(Blackbox): "user_id": id, "prompt": prompt, } - + print(message) response = requests.post(url, json=message) - return response + return response.json() async def fast_api_handler(self, request: Request) -> Response: try: data = await request.json() except: return JSONResponse(content={"error": "json parse error"}, status_code=status.HTTP_400_BAD_REQUEST) - user_id = data.get("id") + user_id = data.get("user_id") user_prompt = data.get("prompt") if user_prompt is None: return JSONResponse(content={"error": "question is required"}, status_code=status.HTTP_400_BAD_REQUEST)