Merge branch 'dev'

app-full.py

@@ -149,30 +149,28 @@ def change_to_upload_mode(upload_mode):
 
 if __name__ == '__main__':
     load_hubert()
-    models = []
     categories = []
     tts_voice_list = asyncio.get_event_loop().run_until_complete(edge_tts.list_voices())
     voices = [f"{v['ShortName']}-{v['Gender']}" for v in tts_voice_list]
     with open("weights/folder_info.json", "r", encoding="utf-8") as f:
         folder_info = json.load(f)
-    for name, info in folder_info.items():
-        if not info['enable']:
+    for category_name, category_info in folder_info.items():
+        if not category_info['enable']:
             continue
-        title = info['title']
-        folder = info['folder_path']
-        description = info['description']
-        categories.append([title, folder, description])
-    for (title, folder, description) in categories:
-        with open(f"weights/{folder}/model_info.json", "r", encoding="utf-8") as f:
+        category_title = category_info['title']
+        category_folder = category_info['folder_path']
+        description = category_info['description']
+        models = []
+        with open(f"weights/{category_folder}/model_info.json", "r", encoding="utf-8") as f:
             models_info = json.load(f)
         for name, info in models_info.items():
             if not info['enable']:
                 continue
             title = info['title']
             author = info.get("author", None)
-            cover = f"weights/{folder}/{name}/{info['cover']}"
-            index = f"weights/{folder}/{name}/{info['feature_retrieval_library']}"
-            cpt = torch.load(f"weights/{folder}/{name}/{name}.pth", map_location="cpu")
+            cover = f"weights/{category_folder}/{name}/{info['cover']}"
+            index = f"weights/{category_folder}/{name}/{info['feature_retrieval_library']}"
+            cpt = torch.load(f"weights/{category_folder}/{name}/{name}.pth", map_location="cpu")
             tgt_sr = cpt["config"][-1]
             cpt["config"][-3] = cpt["weight"]["emb_g.weight"].shape[0]  # n_spk
             if_f0 = cpt.get("f0", 1)
@@ -190,6 +188,7 @@ if __name__ == '__main__':
             vc = VC(tgt_sr, config)
             print(f"Model loaded: {name}")
             models.append((name, title, author, cover, create_vc_fn(tgt_sr, net_g, vc, if_f0, index)))
+        categories.append([category_title, category_folder, description, models])
     with gr.Blocks() as app:
         gr.Markdown(
             "# <center> RVC Models [(Latest Update)](https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI/releases/tag/20230428updated)\n"
@@ -198,7 +197,7 @@ if __name__ == '__main__':
             "[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/drive/110kiMZTdP6Ri1lY9-NbQf17GVPPhHyeT?usp=sharing)\n\n"
             "[![Original Repo](https://badgen.net/badge/icon/github?icon=github&label=Original%20Repo)](https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI)"
         )
-        for (folder_title, folder, description) in categories:
+        for (folder_title, folder, description, models) in categories:
             with gr.TabItem(folder_title):
                 if description:
                     gr.Markdown(f"<center>{description}")

app.py

@@ -96,30 +96,28 @@ def change_to_tts_mode(tts_mode):
 
 if __name__ == '__main__':
     load_hubert()
-    models = []
     categories = []
     tts_voice_list = asyncio.get_event_loop().run_until_complete(edge_tts.list_voices())
     voices = [f"{v['ShortName']}-{v['Gender']}" for v in tts_voice_list]
     with open("weights/folder_info.json", "r", encoding="utf-8") as f:
         folder_info = json.load(f)
-    for name, info in folder_info.items():
-        if not info['enable']:
+    for category_name, category_info in folder_info.items():
+        if not category_info['enable']:
             continue
-        title = info['title']
-        folder = info['folder_path']
-        description = info['description']
-        categories.append([title, folder, description])
-    for (title, folder, description) in categories:
-        with open(f"weights/{folder}/model_info.json", "r", encoding="utf-8") as f:
+        category_title = category_info['title']
+        category_folder = category_info['folder_path']
+        description = category_info['description']
+        models = []
+        with open(f"weights/{category_folder}/model_info.json", "r", encoding="utf-8") as f:
             models_info = json.load(f)
         for name, info in models_info.items():
             if not info['enable']:
                 continue
             title = info['title']
             author = info.get("author", None)
-            cover = f"weights/{folder}/{name}/{info['cover']}"
-            index = f"weights/{folder}/{name}/{info['feature_retrieval_library']}"
-            cpt = torch.load(f"weights/{folder}/{name}/{name}.pth", map_location="cpu")
+            cover = f"weights/{category_folder}/{name}/{info['cover']}"
+            index = f"weights/{category_folder}/{name}/{info['feature_retrieval_library']}"
+            cpt = torch.load(f"weights/{category_folder}/{name}/{name}.pth", map_location="cpu")
             tgt_sr = cpt["config"][-1]
             cpt["config"][-3] = cpt["weight"]["emb_g.weight"].shape[0]  # n_spk
             if_f0 = cpt.get("f0", 1)
@@ -137,6 +135,7 @@ if __name__ == '__main__':
             vc = VC(tgt_sr, config)
             print(f"Model loaded: {name}")
             models.append((name, title, author, cover, create_vc_fn(tgt_sr, net_g, vc, if_f0, index)))
+        categories.append([category_title, category_folder, description, models])
     with gr.Blocks() as app:
         gr.Markdown(
             "# <center> RVC Models [(Latest Update)](https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI/releases/tag/20230428updated)\n"
@@ -145,7 +144,7 @@ if __name__ == '__main__':
             "[![image](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/drive/110kiMZTdP6Ri1lY9-NbQf17GVPPhHyeT?usp=sharing)\n\n"
             "[![Original Repo](https://badgen.net/badge/icon/github?icon=github&label=Original%20Repo)](https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI)"
         )
-        for (folder_title, folder, description) in categories:
+        for (folder_title, folder, description, models) in categories:
             with gr.TabItem(folder_title):
                 if description:
                     gr.Markdown(f"<center>{description}")