Update app.py

app.py

@@ -18,7 +18,6 @@ import yt_dlp
 import ffmpeg
 import subprocess
 import sys
-import pickle
 import io
 import wave
 from datetime import datetime
@@ -175,79 +174,43 @@ def infer(name, path, index, vc_input, vc_upload, tts_text, tts_voice, f0_up_key
         info = traceback.format_exc()
         print(info)
         return info, (None, None)
+
 def load_model():
     categories = []
-    try:
-        # folder_info.jsonの読み込み
-        with open("/weights/folder_info.json", "r", encoding="utf-8") as f:
-            folder_info = json.load(f)
-    except Exception as e:
-        raise RuntimeError(f"Failed to load folder_info.json: {e}")
-    
-    # カテゴリの処理
+    with open("/weights/folder_info.json", "r", encoding="utf-8") as f:
+        folder_info = json.load(f)
     for category_name, category_info in folder_info.items():
-        if not category_info.get('enable', False):
+        if not category_info['enable']:
             continue
-        
-        category_title = category_info.get('title', 'Unknown Category')
-        category_folder = category_info.get('folder_path', '')
+        category_title = category_info['title']
+        category_folder = category_info['folder_path']
         models = []
-
         print(f"Creating category {category_title}...")
-        model_info_path = f"/weights/{category_folder}/model_info.json"
-        
-        # model_info.jsonの読み込み
-        try:
-            with open(model_info_path, "r", encoding="utf-8") as f:
-                models_info = json.load(f)
-        except Exception as e:
-            print(f"Failed to load model_info.json for category {category_title}: {e}")
-            continue
-        
-        # モデルの処理
+        with open(f"/weights/{category_folder}/model_info.json", "r", encoding="utf-8") as f:
+            models_info = json.load(f)
         for character_name, info in models_info.items():
-            if not info.get('enable', False):
+            if not info['enable']:
                 continue
-            
-            model_title = info.get('title', 'Unknown Model')
-            model_name = info.get('model_path', '')
-            model_author = info.get("author", "Unknown Author")
-            model_cover = f"/weights/{category_folder}/{character_name}/{info.get('cover', '')}"
-            model_index = f"/weights/{category_folder}/{character_name}/{info.get('feature_retrieval_library', '')}"
-            
-            # モデルインデックスの存在確認
-            if info.get('feature_retrieval_library', '') == "None":
+            model_title = info['title']
+            model_name = info['model_path']
+            model_author = info.get("author", None)
+            model_cover = f"/weights/{category_folder}/{character_name}/{info['cover']}"
+            model_index = f"/weights/{category_folder}/{character_name}/{info['feature_retrieval_library']}"
+            if info['feature_retrieval_library'] == "None":
                 model_index = None
-            elif model_index and not os.path.exists(model_index):
-                print(f"Warning: Model index file not found for {model_title}. Skipping...")
-                continue
-            
-            # 作者情報の処理
-            if model_author not in authors and not ("/" in model_author or "&" in model_author):
+            if model_index:
+               assert os.path.exists(model_index), f"Model {model_title} failed to load index."
+            if not (model_author in authors or "/" in model_author or "&" in model_author):
                 authors.append(model_author)
-            
-            model_path = f"/weights/{category_folder}/{character_name}/{model_name}"
-            
-            # モデルファイルの存在確認
-            if not os.path.exists(model_path):
-                print(f"Error: Model file not found for {model_title} at {model_path}. Skipping...")
-                continue
-            
-            # モデルのロード
-            try:
-                cpt = torch.load(model_path, map_location=torch.device('cpu'))
-                model_version = cpt.get("version", "v1")
-                print(f"Indexed model {model_title} by {model_author} ({model_version})")
-                models.append((character_name, model_title, model_author, model_cover, model_version, model_path, model_index))
-                del cpt
-            except Exception as e:
-                print(f"Error loading model {model_title} from {model_path}: {e}")
-                continue
-        
-        # カテゴリにモデルを追加
+            model_path =  f"/weights/{category_folder}/{character_name}/{model_name}"
+            cpt = torch.load(f"/weights/{category_folder}/{character_name}/{model_name}", map_location="cpu")
+            model_version = cpt.get("version", "v1")
+            print(f"Indexed model {model_title} by {model_author} ({model_version})")
+            models.append((character_name, model_title, model_author, model_cover, model_version, model_path, model_index))
+            del cpt
         categories.append([category_title, category_folder, models])
-    
     return categories
+
 def cut_vocal_and_inst(url, audio_provider, split_model):
     if url != "":
         if not os.path.exists("dl_audio"):
@@ -474,7 +437,8 @@ if __name__ == '__main__':
             "#### <center>Model creators:\n"
             f"<center>{authStr}\n"
         )
+
 if limitation is True:
-    app.queue(max_size=20, api_open=config.api).launch(server_name="0.0.0.0", allowed_paths=["/"])
+    app.queue(max_size=20, api_open=config.api).launch(allowed_paths=["/"], )
 else:
-    app.queue(max_size=20, api_open=config.api).launch(server_name="0.0.0.0", allowed_paths=["/"], share=False)
+    app.queue(max_size=20, api_open=config.api).launch(allowed_paths=["/"], share=False)