Update webUI.py

webUI.py

@@ -6,7 +6,7 @@ import soundfile
 import numpy as np
 
 import gradio as gr
-from UVR_interface import root, UVRInterface, VR_MODELS_DIR, MDX_MODELS_DIR, DEMUCS_MODELS_DIR
+from UVR_interface import root, UVRInterface, VR_MODELS_DIR, MDX_MODELS_DIR
 from gui_data.constants import *
 from typing import List, Dict, Callable, Union
 
@@ -28,14 +28,12 @@ class UVRWebUI:
         models_url = {}
         for arch, download_list_key in zip([VR_ARCH_TYPE, MDX_ARCH_TYPE], ["vr_download_list", "mdx_download_list"]):
             models_url[arch] = {model: NORMAL_REPO+model_path for model, model_path in online_data[download_list_key].items()}
-        models_url[DEMUCS_ARCH_TYPE] = online_data["demucs_download_list"]
         return models_url
 
     def get_local_models(self, arch: str) -> List[str]:
         model_config = {
             VR_ARCH_TYPE: (VR_MODELS_DIR, ".pth"),
             MDX_ARCH_TYPE: (MDX_MODELS_DIR, ".onnx"),
-            DEMUCS_ARCH_TYPE: (DEMUCS_MODELS_DIR, ".yaml"),
         }
         try:
             model_dir, suffix = model_config[arch]
@@ -50,8 +48,6 @@ class UVRWebUI:
         elif arch == MDX_ARCH_TYPE:
             root.mdx_batch_size_var.set(setting1)
             root.compensate_var.set(setting2)
-        elif arch == DEMUCS_ARCH_TYPE:
-            pass
 
     def arch_select_update(self, arch: str) -> List[Dict]:
         choices = self.get_local_models(arch)
@@ -63,10 +59,6 @@ class UVRWebUI:
             model_update = self.model_choice.update(choices=choices, value=CHOOSE_MODEL, label=CHOOSE_MDX_MODEL_MAIN_LABEL)
             setting1_update = self.arch_setting1.update(choices=BATCH_SIZE, label=BATCHES_MDX_MAIN_LABEL, value=root.mdx_batch_size_var.get())
             setting2_update = self.arch_setting2.update(choices=VOL_COMPENSATION, label=VOL_COMP_MDX_MAIN_LABEL, value=root.compensate_var.get())
-        elif arch == DEMUCS_ARCH_TYPE:
-            model_update = self.model_choice.update(choices=choices, value=CHOOSE_MODEL, label=CHOOSE_DEMUCS_MODEL_MAIN_LABEL)
-            setting1_update = self.arch_setting1.update(choices=VR_WINDOW, label=WINDOW_SIZE_MAIN_LABEL, value=root.window_size_var.get())
-            setting2_update = self.arch_setting2.update(choices=VR_AGGRESSION, label=AGGRESSION_SETTING_MAIN_LABEL, value=root.aggression_setting_var.get())
         else:
             raise gr.Error(f"Unkown arch type: {arch}")
         return [model_update, setting1_update, setting2_update]
@@ -160,7 +152,7 @@ class UVRWebUI:
                 with gr.TabItem("process"):
                     with gr.Row():
                         self.arch_choice = gr.Dropdown(
-                            choices=[VR_ARCH_TYPE, MDX_ARCH_TYPE, DEMUCS_ARCH_TYPE], value=VR_ARCH_TYPE, # choices=[VR_ARCH_TYPE, MDX_ARCH_TYPE, DEMUCS_ARCH_TYPE], value=VR_ARCH_TYPE,
+                            choices=[VR_ARCH_TYPE, MDX_ARCH_TYPE], value=VR_ARCH_TYPE, # choices=[VR_ARCH_TYPE, MDX_ARCH_TYPE, DEMUCS_ARCH_TYPE], value=VR_ARCH_TYPE,
                             label=CHOOSE_PROC_METHOD_MAIN_LABEL, interactive=True)
                         self.model_choice = gr.Dropdown(
                             choices=self.get_local_models(VR_ARCH_TYPE), value=CHOOSE_MODEL,
@@ -197,39 +189,10 @@ class UVRWebUI:
 
                 with gr.TabItem("settings"):
                     with gr.Tabs():
-                        with gr.TabItem("Settings Guide"):
-                            pass
                         with gr.TabItem("Additional Settigns"):
                             self.wav_type = gr.Dropdown(choices=WAV_TYPE, label="Wav Type", value="PCM_16", interactive=True)
                             self.mp3_rate = gr.Dropdown(choices=MP3_BIT_RATES, label="MP3 Bitrate", value="320k",interactive=True)
-                        with gr.TabItem("Download models"):
-
-                            def md_url(url, text=None):
-                                if text is None:
-                                    text = url
-                                return f"[{url}]({url})"
-
-                            with gr.Row():
-                                vr_models = self.models_url[VR_ARCH_TYPE]
-                                self.vr_download_choice = gr.Dropdown(choices=list(vr_models.keys()), label=f"Select {VR_ARCH_TYPE} Model", interactive=True)
-                                self.vr_download_url = gr.Markdown()
-                                self.vr_download_choice.change(lambda model: md_url(vr_models[model]), inputs=self.vr_download_choice, outputs=self.vr_download_url)
-                            with gr.Row(variant="panel"):
-                                mdx_models = self.models_url[MDX_ARCH_TYPE]
-                                self.mdx_download_choice = gr.Dropdown(choices=list(mdx_models.keys()), label=f"Select {MDX_ARCH_TYPE} Model", interactive=True)
-                                self.mdx_download_url = gr.Markdown()
-                                self.mdx_download_choice.change(lambda model: md_url(mdx_models[model]), inputs=self.mdx_download_choice, outputs=self.mdx_download_url)
-                            with gr.Row(variant="panel"):
-                                demucs_models: Dict[str, Dict] = self.models_url[DEMUCS_ARCH_TYPE]
-                                self.demucs_download_choice = gr.Dropdown(choices=list(demucs_models.keys()), label=f"Select {DEMUCS_ARCH_TYPE} Model", interactive=True)
-                                self.demucs_download_url = gr.Markdown()
-
-                                self.demucs_download_choice.change(
-                                    lambda model: "\n".join([
-                                        "- " + md_url(url, text=filename) for filename, url in demucs_models[model].items()]),
-                                    inputs=self.demucs_download_choice,
-                                    outputs=self.demucs_download_url)
-
+                            
             self.arch_choice.change(
                 self.arch_select_update, inputs=self.arch_choice,
                 outputs=[self.model_choice, self.arch_setting1, self.arch_setting2])
@@ -270,8 +233,6 @@ for category, models in model_dict.items():
             model_path = 'models/VR_Models'
         elif category == 'MDX-Net':
             model_path = 'models/MDX_Net_Models'
-        elif category == 'Demucs':
-            model_path = 'models/Demucs_Models'
         for model_name, model_url in models.items():
             cmd = f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {model_path} -Z {model_url}"
             os.system(cmd)