Update app.py

app.py

@@ -85,31 +85,46 @@ def visualize_isnad(taraf_num, yaxis):
     
     #hadith_cleaned = isnad_info['Hadiths Cleaned'].apply(lambda x: any(i in x for i in taraf_hadith_split) )
     hadith_cleaned = isnad_info['Tarafs Cleaned'].apply(lambda x: taraf_num in x)
-    isnad_hadith = isnad_info[hadith_cleaned][['Source', 'Destination']]
-    narrators = isnad_hadith.applymap(lambda x: narrator_bios[narrator_bios['Rawi ID'] == int(x)]['Famous Name'].to_list()).rename(columns={"Source": "Teacher", "Destination": "Student"})
-    isnad_hadith["Student"] = narrators['Student']
-    isnad_hadith["Teacher"] = narrators['Teacher']
-    filtered = isnad_hadith[(isnad_hadith['Teacher'].apply(lambda x: len(x)) == 1) & (isnad_hadith['Student'].apply(lambda x: len(x)) == 1)]
-    filtered['Student'] = filtered['Student'].apply(lambda x: x[0])
-    filtered['Teacher'] = filtered['Teacher'].apply(lambda x: x[0])
+    isnad_hadith = isnad_info[hadith_cleaned]
+    isnad_hadith['Teacher'] = isnad_hadith['Source'].apply(lambda x: narrator_bios[narrator_bios['Rawi ID'].astype(int) == int(x)]['Famous Name'].to_list())
+    isnad_hadith['Student'] = isnad_hadith['Destination'].apply(lambda x: narrator_bios[narrator_bios['Rawi ID'].astype(int) == int(x)]['Famous Name'].to_list())
+    isnad_hadith['Teacher'] = isnad_hadith['Teacher'].apply(lambda x: x[0] if len(x)==1 else 'فلان')
+    isnad_hadith['Student'] = isnad_hadith['Student'].apply(lambda x: x[0] if len(x)==1 else 'فلان')
     net = Network(directed =True)
-    for _, row in filtered.iterrows():
-        source = row['Teacher']
-        target = row['Student']
+    for _, row in isnad_hadith.iterrows():
+        source = row['Source']
+        target = row['Destination']
         teacher_info = narrator_bios[narrator_bios['Rawi ID'] == int(row['Source'])]
         student_info = narrator_bios[narrator_bios['Rawi ID'] == int(row['Destination'])]
-        isnad = isnad_info[(isnad_info['Source'] == row['Source']) & (isnad_info['Destination'] == row['Destination'])]
-        teacher_narrations = teacher_info['Number of Narrations'].to_list()[0]
-        student_narrations = student_info['Number of Narrations'].to_list()[0]
+        
+        teacher_narrations = teacher_info['Number of Narrations'].to_list()
+        if len(teacher_narrations):
+            teacher_narrations = teacher_narrations[0]
+        else:
+            teacher_narrations = row['Hadith Count']
+        student_narrations = student_info['Number of Narrations'].to_list()
+        if len(student_narrations):
+            student_narrations = teacher_narrations[0]
+        else:
+            student_narrations = row['Hadith Count']
 
-        teacher_gen = teacher_info['Generation'].to_list()[0]
+        teacher_gen = teacher_info['Generation'].to_list()
+        if len(teacher_gen):
+            teacher_gen = teacher_gen[0]
+        else:
+            teacher_gen = -1
         student_gen = student_info['Generation'].to_list()[0]
+        if len(student_gen):
+            student_gen = student_gen[0]
+        else:
+            student_gen = -1
+            
         if row['Source'] == '99999':
-            net.add_node(source, font = {'size':50, 'color': 'Black'}, color = '#000000')
+            net.add_node(source, font = {'size':50, 'color': 'Black'}, color = '#000000', label = f'{row['Teacher']}')
         else:
-            net.add_node(source, font = {'size':30, 'color': 'red'}, color = value_to_hex(teacher_narrations), label = f'{source} \n {teacher_info["Narrator Rank"].to_list()[0]} \n ID: {row["Source"]} - Gen {teacher_gen}')
+            net.add_node(source, font = {'size':30, 'color': 'red'}, color = value_to_hex(teacher_narrations), label = f'{row['Teacher']} \n {teacher_info["Narrator Rank"].to_list()[0]} \n ID: {row["Source"]} - Gen {teacher_gen}')
         net.add_node(target, font = {'size': 30, 'color': 'red'}, color = value_to_hex(student_narrations), label = f'{target} \n{student_info["Narrator Rank"].to_list()[0]} \n ID: {row["Destination"]} - Gen {student_gen}')
-        net.add_edge(source, target, color = value_to_hex(int(isnad[f'{yaxis} Count'].to_list()[0])), label = f"{isnad[f'{yaxis} Count'].to_list()[0]}")
+        net.add_edge(source, target, color = value_to_hex(int(row[f'{yaxis} Count'].to_list()[0])), label = f"{row[f'{yaxis} Count'].to_list()[0]}")
     net.barnes_hut(gravity=-5000, central_gravity=0.3, spring_length=200)
     html = net.generate_html()
     html = html.replace("'", "\"")