Update app.py

app.py

@@ -58,11 +58,6 @@ narrator_bios['Generation'] = narrator_bios['Generation'].astype(int)
 edge_info = dataset.to_pandas()
 
 
-
-# def subsetEdges(fstyear, lstyear):
-#     info = taraf_info[(taraf_info['Year'] >= fstyear)& (taraf_info['Year'] <= lstyear)]
-#     narrators = edge_info[edge_info['Edge_ID'].isin(info['ID'].unique())]
-#     return narrators
 def splitIsnad(dataframe):
     teacher_student =dataframe['Edge_Name'].str.split(' TO ')
     dataframe['Teacher'] = teacher_student.apply(lambda x: x[0])
@@ -71,18 +66,17 @@ def splitIsnad(dataframe):
 
 
 def network_narrator(narrator_id):
-    # edges = subsetEdges(fst_year, lst_year)
-    # edges_single = edges[(edges['Teacher_ID']==narrator_id) | (edges['Student_ID']==narrator_id)]
-    # edges_prepped = splitIsnad(edges_single)
     edge_narrator = edge_info[(edge_info['Teacher_ID'] == narrator_id) | (edge_info['Student_ID'] == narrator_id)]
     edge_full = splitIsnad(edge_narrator[['Tarafs', 'Hadiths', 'Isnads', 'Edge_Name', 'Books']]).drop(['Edge_Name'], axis=1)
     return edge_full
 
 def narrator_retriever(name):
-        return narrator_bios[(narrator_bios['Official Name'].apply(lambda x: araby.strip_diacritics(x)).str.contains(araby.strip_diacritics(name))) | (narrator_bios['Famous Name'].apply(lambda x: araby.strip_diacritics(x)).str.contains(araby.strip_diacritics(name))) | (narrator_bios['Rawi ID'].astype(str) == name)]
+        full_names = name.split(',')
+        full_names =[i.strip() for i in full_names]
+        return narrator_bios[(narrator_bios['Official Name'].apply(lambda x: araby.strip_diacritics(x)).isin([araby.strip_diacritics(n) for n in full_names])) | (narrator_bios['Famous Name'].apply(lambda x: araby.strip_diacritics(x)).isin([araby.strip_diacritics(n) for n in full_names])) | (narrator_bios['Rawi ID'].astype(str).isin([n for n in full_names])]
+        #return narrator_bios[(narrator_bios['Official Name'].apply(lambda x: araby.strip_diacritics(x)).str.contains(araby.strip_diacritics(name))) | (narrator_bios['Famous Name'].apply(lambda x: araby.strip_diacritics(x)).str.contains(araby.strip_diacritics(name))) | (narrator_bios['Rawi ID'].astype(str) == name)]
     
 
-
 with gr.Blocks() as demo:
     gr.Markdown("Search Narrators using this tool or Retrieve Transmissions involving Narrator")
     with gr.Tab("Search Narrator"):
@@ -91,7 +85,7 @@ with gr.Blocks() as demo:
         text_button = gr.Button("Search")
         text_button.click(narrator_retriever, inputs=text_input, outputs=text_output)
 
-    with gr.Tab("Visualize Network"):
+    with gr.Tab("View Network"):
         image_input = gr.Number()
         image_button = gr.Button("Retrieve!")
         image_button.click(network_narrator, inputs=[image_input], outputs=[gr.DataFrame(wrap=True)])