exp

Author: BF667

advanced_rvc_inference/__main__.py

@@ -9,6 +9,7 @@
 """
 
 import sys
+import os
 from pathlib import Path
 
 
@@ -19,6 +20,9 @@ def main():
     if str(parent_dir) not in sys.path:
         sys.path.insert(0, str(parent_dir))
 
+    # Also add current working directory for imports
+    sys.path.append(os.getcwd())
+
     # Import and run CLI
     from advanced_rvc_inference import cli
 

advanced_rvc_inference/api/cli.py

@@ -105,7 +105,7 @@ def show_version():
             version_info.append(f"GPU Memory: {gpu_mem} GB")
             # ZLUDA / T4 detection
             try:
-                from advanced_rvc_inference.models.backends import zluda
+                from advanced_rvc_inference.engine.models.backends import zluda
                 if zluda.is_available():
                     version_info.append(f"ZLUDA: Detected (AMD GPU via CUDA compatibility)")
             except ImportError:
@@ -157,7 +157,7 @@ def show_info():
             info.append(f"  GPU Name: {gpu_name}")
             # ZLUDA detection
             try:
-                from advanced_rvc_inference.models.backends import zluda
+                from advanced_rvc_inference.engine.models.backends import zluda
                 if zluda.is_available():
                     info.append("  ZLUDA: Detected (AMD GPU via CUDA compatibility layer)")
                     info.append(f"  Backend: HIP/ROCm (via ZLUDA)")
@@ -682,6 +682,11 @@ def cmd_serve(args):
     try:
         from advanced_rvc_inference.app.gui import launch
 
+# Fix import errors by ensuring cwd is in sys.path
+import os
+if os.getcwd() not in sys.path:
+    sys.path.append(os.getcwd())
+
         launch(
             share=args.share,
             server_name=args.host,

advanced_rvc_inference/api/cli_complete.py

@@ -12,6 +12,8 @@
 import os
 import sys
 
+sys.path.append(os.getcwd())
+
 
 try:
     argv = sys.argv[1]
@@ -39,7 +41,7 @@
     "--create_index": "advanced_rvc_inference.engine.training.create_index",
     "--extract": "advanced_rvc_inference.engine.training.extract.extract",
     "--preprocess": "advanced_rvc_inference.engine.training.preprocess.preprocess",
-    "--separator_music": "advanced_rvc_inference.uvr.separate_music",
+    "--separator_music": "advanced_rvc_inference.engine.uvr.separate_music",
     "--train": "advanced_rvc_inference.engine.training.runner.train",
     "--create_reference": "advanced_rvc_inference.engine.inference.create_reference",
 }

advanced_rvc_inference/app/easy_gui.py

@@ -69,8 +69,8 @@ def create_easy_app(theme=None):
         gr_info,
         gr_warning,
     )
-    from advanced_rvc_inference.models.optimizers import get_optimizer_choices
-    from advanced_rvc_inference.models.generators import get_vocoder_choices
+    from advanced_rvc_inference.engine.models.optimizers import get_optimizer_choices
+    from advanced_rvc_inference.engine.models.generators import get_vocoder_choices
 
     # F0 methods for the easy UI (simplified subset)
     easy_f0_methods = ["rmvpe", "crepe", "crepe-full", "harvest", "fcpe"]
@@ -654,6 +654,11 @@ def easy_download(url, name):
                 # ── GPU info auto-detect ──
                 def get_gpu_info():
                     import torch
+
+# Fix import errors by ensuring cwd is in sys.path
+import os
+if os.getcwd() not in sys.path:
+    sys.path.append(os.getcwd())
                     if torch.cuda.is_available():
                         name = torch.cuda.get_device_name(0)
                         mem = torch.cuda.get_device_properties(0).total_memory / (1024**3)

advanced_rvc_inference/app/gui.py

@@ -335,6 +335,11 @@ def create_app():
 if __name__ == "__main__":
     import argparse
 
+# Fix import errors by ensuring cwd is in sys.path
+import os
+if os.getcwd() not in sys.path:
+    sys.path.append(os.getcwd())
+
     parser = argparse.ArgumentParser(description="Launch Advanced RVC Inference GUI")
     parser.add_argument("--host", default="0.0.0.0", help="Host to bind to")
     parser.add_argument("--port", type=int, default=7860, help="Port to bind to")

advanced_rvc_inference/app/tabs/training/child/training.py

@@ -7,8 +7,8 @@
 from advanced_rvc_inference.services.training import preprocess, extract, create_index, training
 from advanced_rvc_inference.utils.variables import translations, model_name, index_path, method_f0, embedders_mode, embedders_model, pretrainedD, pretrainedG, config, file_types, hybrid_f0_method, reference_list
 from advanced_rvc_inference.ui.feedback import gr_warning, visible, unlock_f0, hoplength_show, change_models_choices, get_gpu_info, change_embedders_mode, pitch_guidance_lock, vocoders_lock, unlock_ver, unlock_vocoder, change_pretrained_choices, gpu_number_str, shutil_move, change_reference_choices
-from advanced_rvc_inference.models.optimizers import get_optimizer_choices, get_optimizer_info
-from advanced_rvc_inference.models.generators import get_vocoder_choices
+from advanced_rvc_inference.engine.models.optimizers import get_optimizer_choices, get_optimizer_info
+from advanced_rvc_inference.engine.models.generators import get_vocoder_choices
 
 def training_model_tab():
     with gr.Column():

advanced_rvc_inference/configs/config.py

@@ -94,7 +94,7 @@ def is_zluda(self):
         """Lazy ZLUDA detection."""
         if self._is_zluda is None:
             try:
-                from advanced_rvc_inference.models.backends import zluda
+                from advanced_rvc_inference.engine.models.backends import zluda
                 self._is_zluda = zluda.is_available()
             except Exception:
                 self._is_zluda = False
@@ -239,14 +239,14 @@ def get_default_device(self):
 
             # Check alternative backends lazily
             try:
-                from advanced_rvc_inference.models.backends import directml
+                from advanced_rvc_inference.engine.models.backends import directml
                 if directml.is_available():
                     return "privateuseone:0"
             except Exception:
                 pass
 
             try:
-                from advanced_rvc_inference.models.backends import opencl
+                from advanced_rvc_inference.engine.models.backends import opencl
                 if opencl.is_available():
                     return "ocl:0"
             except Exception:

advanced_rvc_inference/engine/__init__.py

@@ -2,13 +2,19 @@
 Engine package for Advanced RVC Inference.
 
 This package contains the core RVC engine components:
+- models: ML model architectures, algorithms, predictors, generators, embedders
 - inference: Audio conversion and voice cloning
 - realtime: Real-time voice changing
 - training: Model training pipeline
+- uvr: Audio source separation (UVR5)
+- speaker: Speaker diarization and Whisper speech recognition
 """
 
 __all__ = [
+    "models",
     "inference",
     "realtime",
     "training",
+    "uvr",
+    "speaker",
 ]

advanced_rvc_inference/engine/inference/audio_processing.py

@@ -163,7 +163,7 @@ def spectral_subtract_denoise(audio, sr, noise_seconds=0.4, alpha=1.0, n_fft=102
     global stft
 
     if stft is None and device.startswith(("ocl", "privateuseone")):
-        from advanced_rvc_inference.models.backends.utils import STFT
+        from advanced_rvc_inference.engine.models.backends.utils import STFT
         stft = STFT(filter_length=n_fft, hop_length=hop_length, win_length=None, window="hann").to(device) 
     else: stft = None
 

advanced_rvc_inference/engine/inference/convert.py

@@ -11,6 +11,8 @@
 import soundfile as sf
 
 from tqdm import tqdm
+
+sys.path.append(os.getcwd())
 def strtobool(val):
     """Convert a string representation of truth to boolean."""
     if isinstance(val, bool):
@@ -31,7 +33,7 @@ def strtobool(val):
 from advanced_rvc_inference.engine.inference.pipeline import Pipeline
 from advanced_rvc_inference.utils.variables import config, logger, translations
 from advanced_rvc_inference.engine.inference.audio_processing import preprocess, postprocess
-from advanced_rvc_inference.models.utils import check_assets, load_audio, load_embedders_model, cut, restore, clear_gpu_cache, load_model
+from advanced_rvc_inference.engine.models.utils import check_assets, load_audio, load_embedders_model, cut, restore, clear_gpu_cache, load_model
 
 for l in ["torch", "faiss", "omegaconf", "httpx", "httpcore", "faiss.loader", "numba.core", "urllib3", "transformers", "matplotlib"]:
     logging.getLogger(l).setLevel(logging.ERROR)
@@ -376,7 +378,7 @@ def cleanup(self):
     def setup(self):
         if self.cpt is not None:
             if self.loaded_model.endswith(".pth"):
-                from advanced_rvc_inference.models.algorithms.synthesizers import Synthesizer
+                from advanced_rvc_inference.engine.models.algorithms.synthesizers import Synthesizer
 
                 self.tgt_sr = self.cpt["config"][-1]
                 self.cpt["config"][-3] = self.cpt["weight"]["emb_g.weight"].shape[0]