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