Update dashboard.py

dashboard.py

@@ -48,14 +48,23 @@ def read_freq_map(filename):
     freqmap = dict(zip(df[column_0], df[column_1]))
     return freqmap
 
+def read_ont_freq_dataframe(filename):
+    df = pd.read_csv(os.path.join(data,filename), sep='	')
+    print(df)
+    if 'Unnamed: 0' in df.columns:
+        df = df.drop('Unnamed: 0', axis=1)
+    column_0 = df.columns[0]
+    column_1 = df.columns[1]
+    freqmap = dict(zip(df[column_0], df[column_1]))
+    return freqmap
 
 
 entityTypesFreqMap = read_freq_map('entityTypes.tsv')
 relationTypesFreqMap = read_freq_map('relationTypes.tsv')
 topDrugEntities = read_freq_map('topDrugs.tsv')
 topConditionEntities = read_freq_map('topConditions.tsv')
-topDrugOnts = read_freq_map('topDrugOntologies.tsv')
-topConditionOnts = read_freq_map('topConditionOntologies.tsv')
+topDrugOnts_df = pd.read_csv(os.path.join(data,'topDrugOntologies.tsv'), sep='	')
+topConditionOnts_df = pd.read_csv(os.path.join(data,'topConditionOntologies.tsv'), sep='    ')
 
 
 grouping_filtered = pd.read_csv(os.path.join(data, 'drugReviewsCausal_relations.tsv'), sep="	")
@@ -82,16 +91,14 @@ def create_ent_bar_charts(ents, **kwargs):
 
 def create_ontology_bar_charts(ents, **kwargs):
   if ents=='Drug':
-    dictionary = topDrugOnts
     df = pd.DataFrame({
-        'full_key': list(dictionary.keys()),
-        'Drug_Ontologies': [k.split('/')[-1] for k in dictionary.keys()],
-        'Frequency': list(dictionary.values()),
-        'url': list(dictionary.keys())  # using full keys as hyperlinks
+        'Drug_Ontologies': [ont.split('/')[-1] for ont in topDrugOnts_df['ontology']],
+        'Frequency': list(topDrugOnts_df['count']),
+        'url': list(topDrugOnts_df['ontology_url'])  # using full keys as hyperlinks
     })
     # Create bar chart with label as x-axis
     bars = hv.Bars(df, kdims=['Drug_Ontologies'], vdims=['Frequency'])
-    bars = bars.opts(
+    bars.opts(
         framewise=True,
         tools=['hover'],
         width=1200,
@@ -102,46 +109,39 @@ def create_ontology_bar_charts(ents, **kwargs):
         ylabel='Frequency',
         hover_tooltips=[
             ("Drug_Ontologies", "@Drug_Ontologies"),
-            ("Frequency", "@Frequency"),
-            ("Link", "@url")
+            ("Frequency", "@Frequency")
         ]
     )
     links_panel = pn.Column(
         *[pn.pane.Markdown(f"[{row.Drug_Ontologies}]({row.url})", width=400) for _, row in df.iterrows()],
         name='Links'
     )
-    layout = pn.Row(bars, pn.pane.Markdown("### Full URLs:"), links_panel)
+    layout = pn.Row(bars, links_panel)
     return layout
   elif ents=='Condition':
-    dictionary = topConditionOnts
     df = pd.DataFrame({
-        'full_key': list(dictionary.keys()),
-        'Condition_Ontologies': [k.split('/')[-1] for k in dictionary.keys()],
-        'Frequency': list(dictionary.values()),
-        'url': list(dictionary.keys())  # using full keys as hyperlinks
-    })
+          'Condition_Ontologies': [ont.split('/')[-1] for ont in topConditionOnts_df['ontology']],
+          'Frequency': list(topConditionOnts_df['count']),
+          'url': list(topConditionOnts_df['ontology_url'])  # using full keys as hyperlinks
+      })
     # Create bar chart with label as x-axis
     bars = hv.Bars(df, kdims=['Condition_Ontologies'], vdims=['Frequency'])
-    bars = bars.opts(
-        framewise=True,
-        tools=['hover'],
-        width=1200,
-        height=600,
-        show_legend=True,
-        xrotation=45,
-        xlabel='Condition_Ontologies',
-        ylabel='Frequency',
-        hover_tooltips=[
-            ("Condition Ontologies", "@Condition Ontologies"),
-            ("Frequency", "@Frequency"),
-            ("Link", "@url")
-        ]
-    )
+    bars.opts(
+    framewise=True,
+    tools=['hover'],
+    width=1200,
+    height=600,
+    show_legend=True,
+    xrotation=45,
+    xlabel='Condition_Ontologies',
+    ylabel='Frequency',
+    hover_tooltips=[
+        ("Condition Ontologies", "@Condition Ontologies"),
+        ("Frequency", "@Frequency") ]) 
     links_panel = pn.Column(
-        *[pn.pane.Markdown(f"[{row.Condition_Ontologies}]({row.url})", width=400) for _, row in df.iterrows()],
-        name='Links'
-    )
-    layout = pn.Row(bars, pn.pane.Markdown("### Full URLs:"), links_panel)
+    *[pn.pane.Markdown(f"[{row.Condition_Ontologies}]({row.url})", width=400) for _, row in df.iterrows()],
+    name='Links')
+    layout = pn.Row(bars, links_panel)
     return layout
 
 ############################# WIDGETS & CALLBACK ###########################################