Update app.py

app.py

@@ -52,22 +52,31 @@ def process_file(input_path):
     return process(input_path, '')
 
 def process(audio_file, embed_html_all):
-    model = openl3.models.load_audio_embedding_model(input_repr="linear", content_type="music",embedding_size=512)
-    audio, sr = librosa.load(audio_file, mono=True)
-    emb, ts = openl3.get_audio_embedding(audio, sr, model=model)  
-    emb = np.mean(emb, axis=0)
-    print("SHAPE ", emb.shape)
+    #model = openl3.models.load_audio_embedding_model(input_repr="linear", content_type="music",embedding_size=512)
+    #audio, sr = librosa.load(audio_file, mono=True)
+    #emb, ts = openl3.get_audio_embedding(audio, sr, model=model)  
+    #emb = np.mean(emb, axis=0)
+    #print("SHAPE ", emb.shape)
+
+    emb, ts = get_embed(audio_file)
+    
+    #ind = faiss.read_index("index.index")
+    #ind_filenames = pickle.load(open('index.filenames','rb'))
+    ind, ind_filenames = load_index()
     
-    ind = faiss.read_index("index.index")
-    ind_filenames = pickle.load(open('index.filenames','rb'))
-    dict_bmg = pickle.load(open('dict_bmg.pickle','rb')) # filename to url
-    D, I = ind.search(emb.reshape((1,512)), 5) 
-
-    top1 = dict_bmg[ind_filenames[I[0][0]]]
-    top2 = dict_bmg[ind_filenames[I[0][1]]]
-    top3 = dict_bmg[ind_filenames[I[0][2]]]
-    top4 = dict_bmg[ind_filenames[I[0][3]]]
-    top5 = dict_bmg[ind_filenames[I[0][4]]]
+    #dict_bmg = pickle.load(open('dict_bmg.pickle','rb')) # filename to url
+    catalog = load_catalog()
+
+    D, I = do_search(embed, ind)
+    #D, I = ind.search(emb.reshape((1,512)), 5) 
+
+    #top1 = dict_bmg[ind_filenames[I[0][0]]]
+    #top2 = dict_bmg[ind_filenames[I[0][1]]]
+    #top3 = dict_bmg[ind_filenames[I[0][2]]]
+    #top4 = dict_bmg[ind_filenames[I[0][3]]]
+    #top5 = dict_bmg[ind_filenames[I[0][4]]]
+
+    top1, top2, top3, top4, top5 = get_top(I, ind_filenames, catalog)
     
     return top1, top2, top3, top4, top5