fix huggingface_hub install and bark model loader

rsxdalv · Oct 16, 2024 · 0697b69 · 0697b69
1 parent 1676db5
commit 0697b69
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/installer_scripts/js/initializeApp.js b/installer_scripts/js/initializeApp.js
@@ -193,6 +193,8 @@ async function pip_install_all() {
   // reinstall hydra-core==1.3.2 because of fairseq
   pip_install("hydra-core==1.3.2", "hydra-core fix due to fairseq");
   pip_install("nvidia-ml-py", "nvidia-ml-py");
+  // huggingface_hub==0.25.2 for gradio
+  pip_install("huggingface_hub==0.25.2", "huggingface_hub fix");
   savePipPackagesVersion(newPipPackagesVersion);
   displayMessage("");
 }

diff --git a/installer_scripts/versions.json b/installer_scripts/versions.json
@@ -1,6 +1,6 @@
 {
     "version": "0.2.0",
-    "pip_packages": 5,
+    "pip_packages": 6,
     "npm_packages": 4,
     "react_ui": 4
 }
diff --git a/tts_webui/bark/BarkModelManager.py b/tts_webui/bark/BarkModelManager.py
@@ -1,11 +1,10 @@
-from bark.generation import preload_models, clean_models
-
-
 class BarkModelManager:
     def __init__(self):
         self.models_loaded = False
 
     def reload_models(self, config):
+        from bark.generation import preload_models
+
         self.models_loaded = True
         c = config["model"]
 
@@ -23,15 +22,29 @@ def _yes_or_no(x: bool):
         _print_prop("Coarse-to-Fine", c["fine_use_gpu"], c["fine_use_small"])
         _print_prop("Encodec", c["codec_use_gpu"], False)
 
-        preload_models(**c, force_reload=True)
+        # preload_models(**c, force_reload=True)
+        preload_models(
+            coarse_use_gpu=c["coarse_use_gpu"],
+            coarse_use_small=c["coarse_use_small"],
+            fine_use_gpu=c["fine_use_gpu"],
+            fine_use_small=c["fine_use_small"],
+            text_use_gpu=c["text_use_gpu"],
+            text_use_small=c["text_use_small"],
+            codec_use_gpu=c["codec_use_gpu"],
+            force_reload=True,
+        )
 
     def unload_models(self):
+        from bark.generation import clean_models
+
         print("Unloading Bark models...")
         self.models_loaded = False
         clean_models()
         print("Unloaded Bark models")
 
     def unload_model(self, model_key):
+        from bark.generation import clean_models
+
         print(f"Unloading Bark model {model_key}")
         clean_models(model_key=model_key)
         print(f"Unloaded Bark model {model_key}")

diff --git a/tts_webui/config/load_config.py b/tts_webui/config/load_config.py
@@ -10,7 +10,6 @@
         "fine_use_gpu": True,
         "fine_use_small": True,
         "codec_use_gpu": True,
-        "load_models_on_startup": False,
     },
     "gradio_interface_options": {
         "inline": False,
@@ -39,7 +38,6 @@
         "file_directories": None,
         "_frontend": True,
     },
-    "load_models_on_startup": False,
     "extensions": {
         "disabled": [],
     },