Plugins Updated

Author: zane-perry

app.py

@@ -12,6 +12,7 @@
 from toggle_bars import toggle_bars
 
 import tempfile, os, shutil
+import traceback
 
 app = Flask(__name__)
 
@@ -27,7 +28,7 @@ def Sankey_Evaluate():
 
     ########## REPLACE THIS SECTION WITH OWN RUN CODE #################
     #uses rdf types
-    accepted_types = {'Component'}
+    accepted_types = {'Component', 'ComponentDefinition'}
 
     acceptable = rdf_type in accepted_types
 
@@ -63,13 +64,11 @@ def Sankey_Run():
         #retrieve information about the poi
         self_df, display_id, title, role, count = input_data(top_level_url, instance_url)
 
-        #print("Find role name")
         #Find the role name in the ontology of the part of interest
         role_link = find_role_name(role, plural = False)
 
         #create data for the sankey diagram and format it correctly
         df_sankey = sankey(url, top_level_url, title, instance_url)
-
         sankey_title = "Parts Co-Located with "+ title + " (a "+role_link+")"
 
         #create a temporary directory
@@ -90,7 +89,8 @@ def Sankey_Run():
 
         return result 
     except Exception as e:
-        print(e)
+        print(e, flush=True)
+        print(traceback.format_exc(), flush=True)
         abort(400)
 
 #flask run --host=0.0.0.0
@@ -106,7 +106,7 @@ def Bar_Evaluate():
 
     ########## REPLACE THIS SECTION WITH OWN RUN CODE #################
     #uses rdf types
-    accepted_types = {'Component'}
+    accepted_types = {'Component', 'ComponentDefinition'}
 
     acceptable = rdf_type in accepted_types
 
@@ -180,5 +180,6 @@ def Bar_Run():
 
         return toggle_display
     except Exception as e:
-        print(e)
+        print(e, flush=True)
+        print(traceback.format_exc(), flush=True)
         abort(400)

input_data.py

@@ -1,6 +1,6 @@
 import json
 import requests
-from pandas.io.json import json_normalize
+from pandas import json_normalize
 
 def input_data(uri, instance):
     """
@@ -10,7 +10,7 @@ def input_data(uri, instance):
     -------
     import json
     import requests
-    from pandas.io.json import json_normalize
+    from pandas import json_normalize
     Input_Query.txt
     
     Parameters

most_used_bar.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import requests
 import json
-from pandas.io.json import json_normalize
+from pandas import json_normalize
 from uri_to_url import uri_to_url
 
 def most_used_bar(uri, instance, display_id, title, role, count):

most_used_by_type_bar.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import requests
 import json
-from pandas.io.json import json_normalize
+from pandas import json_normalize
 from uri_to_url import uri_to_url
 
 def most_used_by_type_bar(uri, instance, display_id, title, role, count):

requirements.txt

@@ -1,8 +1,9 @@
 bs4==0.0.1
-Flask==2.0.1
+Flask==2.2.5
 jsonschema==3.0.1
-pandas==0.24.2
+pandas==2.2.3
 plotly==3.9.0
 requests==2.21.0
-
-
+Werkzeug==2.2.3
+waitress
+lxml

sankey.py

@@ -1,7 +1,7 @@
 import requests
 import json
 import pandas as pd
-from pandas.io.json import json_normalize
+from pandas import json_normalize
 from uri_to_url import uri_to_url
 
 def sankey(url, uri, title, instance):
@@ -16,7 +16,7 @@ def sankey(url, uri, title, instance):
     import requests
     import json
     import pandas as pd
-    from pandas.io.json import json_normalize
+    from pandas import json_normalize
     Preceding_Percent_Query.txt