optimize(vc): apply model-style import

infer-web.py

@@ -6,7 +6,7 @@ now_dir = os.getcwd()
 sys.path.append(now_dir)
 load_dotenv()
 load_dotenv("sha256.env")
-from infer.modules.vc.modules import VC
+from infer.modules.vc import VC
 from infer.modules.uvr5.modules import uvr
 from infer.lib.train.process_ckpt import (
     change_info,

infer/modules/vc/__init__.py

@@ -0,0 +1,3 @@
+from .pipeline import Pipeline
+from .modules import VC
+from .utils import get_index_path_from_model, load_hubert

infer/modules/vc/modules.py

@@ -1,5 +1,6 @@
 import traceback
 import logging
+import os
 
 logger = logging.getLogger(__name__)
 
@@ -15,8 +16,9 @@ from infer.lib.infer_pack.models import (
     SynthesizerTrnMs768NSFsid,
     SynthesizerTrnMs768NSFsid_nono,
 )
-from infer.modules.vc.pipeline import Pipeline
-from infer.modules.vc.utils import *
+
+from .pipeline import Pipeline
+from .utils import get_index_path_from_model, load_hubert
 
 
 class VC:

infer/modules/vc/pipeline.py

@@ -144,7 +144,7 @@ class Pipeline(object):
                 from infer.lib.rmvpe import RMVPE
 
                 logger.info(
-                    "Loading rmvpe model,%s" % "%s/rmvpe.pt" % os.environ["rmvpe_root"]
+                    "Loading rmvpe model %s" % "%s/rmvpe.pt" % os.environ["rmvpe_root"]
                 )
                 self.model_rmvpe = RMVPE(
                     "%s/rmvpe.pt" % os.environ["rmvpe_root"],

tools/cmd/infer_batch_rvc.py

@@ -13,7 +13,7 @@ from dotenv import load_dotenv
 from scipy.io import wavfile
 
 from configs.config import Config
-from infer.modules.vc.modules import VC
+from infer.modules.vc import VC
 
 
 def arg_parse() -> tuple:

tools/cmd/infer_cli.py

@@ -8,7 +8,7 @@ from dotenv import load_dotenv
 from scipy.io import wavfile
 
 from configs.config import Config
-from infer.modules.vc.modules import VC
+from infer.modules.vc import VC
 
 ####
 # USAGE

tools/web/infer-only.py

@@ -7,7 +7,7 @@ from dotenv import load_dotenv
 
 from configs.config import Config
 from i18n.i18n import I18nAuto
-from infer.modules.vc.modules import VC
+from infer.modules.vc import VC
 
 logging.getLogger("numba").setLevel(logging.WARNING)
 logging.getLogger("markdown_it").setLevel(logging.WARNING)