Add Model #2

app.py

@@ -49,38 +49,18 @@ def create_vc_fn(model, sid):
 def get_speakers():
   speakers = []
 
-  for _,dirs,_ in os.walk(CUSTOM_MODELS_DIR):
+  for _,dirs,_ in os.walk("/models"):
     for folder in dirs:
       cur_speaker = {}
       # Look for G_****.pth
-      g = glob.glob(os.path.join(CUSTOM_MODELS_DIR,folder,'G_*.pth'))
+      g = glob.glob(os.path.join("/models",folder,'G_*.pth'))
       if not len(g):
         continue
       cur_speaker["model_path"] = g[0]
       cur_speaker["model_folder"] = folder
+      cur_speaker["name"] = folder
 
-      # Look for *.pt (clustering model)
-      clst = glob.glob(os.path.join(CUSTOM_MODELS_DIR,folder,'*.pt'))
-      if not len(clst):
-        cur_speaker["cluster_path"] = ""
-      else:
-        cur_speaker["cluster_path"] = clst[0]
-
-      # Look for config.json
-      cfg = glob.glob(os.path.join(CUSTOM_MODELS_DIR,folder,'*.json'))
-      if not len(cfg):
-        continue
-      cur_speaker["cfg_path"] = cfg[0]
-      with open(cur_speaker["cfg_path"]) as f:
-        try:
-          cfg_json = json.loads(f.read())
-        except Exception as e:
-          print("Malformed config json in "+folder)
-        for name, i in cfg_json["spk"].items():
-          cur_speaker["name"] = name
-          cur_speaker["id"] = i
-          if not name.startswith('.'):
-            speakers.append(copy.copy(cur_speaker))
+      speakers.append(copy.copy(cur_speaker))
 
   return sorted(speakers, key=lambda x:x["name"].lower())