6.5.16.44 updated the ui and added backend loading.

app.py

@@ -9,19 +9,20 @@ import gradio as gr
 
 from cloud_db import *
 from supplier import *
-from ui_device import *
-from ui_equivalent import *
-from ui_study import *
 from utility import *
 
+from ui_study import *
+from ui_studies import *
+
+
 examples = []
 # app_theme = gr.themes.Base(neutral_hue="blue")
 
 demo = gr.TabbedInterface(
     # [device_page,study_page,equivalent_page], 
     # ["Device","Clinical Study Report","Equivalent Comparators"],
-    [study_page],
-    ["Clinical Study"],
+    [study_page,studies_page],
+    ["Clinical Study","Studies"],
     theme = gr.themes.Soft(primary_hue="sky",secondary_hue="orange"),
     css = "footer {visibility: hidden}",
     title="AMRA AI Medi Reader")

application.py

@@ -65,22 +65,19 @@ data_structure = {
         "fields":[
             "domain",
             "name",
-            "s3_path",
-            "vector",
-            "meta",
-            "content"
+            "content",
+            "upload_time"
         ]
     },
     "outputs":{
         "key":[
             "domain",
-            "article",
-            "outcomes"
+            "article"
         ],
         "fields":[
             "domain",
             "article",
-            "output"
+            "outcomes"
         ]
     }
 }
@@ -90,6 +87,7 @@ application default data
 '''
 app_data = {
     "current_article":{},
+    "articles":[],
     "terms":[],
     "prompts":[],
     "outputs":[]

cloud_storage.py

@@ -27,11 +27,11 @@ def upload_file(path, bucket, object_name=None):
 
     try:
 
-        s3.upload_file(path, bucket, object_name)
+        res = s3.upload_file(path, bucket, object_name)
     except Exception as e:
         print(e)
         return False
-    return 
+    return res
 
 def upload_fileobj(file_obj, bucket, object_name=None):
     '''

features.py

@@ -39,19 +39,15 @@ def process_study(
     app_data["current_article"] = article
     selected_prompts = select_prompts(article["content"],terms=app_data["terms"],prompts=app_data["prompts"])
     
+    res = process_prompts(article["content"],selected_prompts)
     output = {
         "domain":article["domain"],
         "article":article["name"],
-        "outcomes":defaultdict(str)
+        "outcomes":res
     }
-
-    res = process_prompts(article["content"],selected_prompts)
-    output["outcomes"] = res
-        
-    # overview = create_overview(output["output"]["Overview"])
-    views = create_views(res)
-
+    
     add_output(output)
+    views = create_views(res)
 
     return views
     # return ""
@@ -63,16 +59,17 @@ def refresh():
     init_app_data()
 
     article = app_data["current_article"]
-    selected_prompts = select_prompts(article["content"],terms=app_data["terms"],prompts=app_data["prompts"])
-    
+    if not article:
+        return "No file or content provided"
+    selected_prompts = select_prompts(article["content"],terms=app_data["terms"],prompts=app_data["prompts"])    
+
+    res = process_prompts(article["content"],selected_prompts)
+
     output = {
         "domain":article["domain"],
         "article":article["name"],
-        "outcomes":defaultdict(str)
+        "outcomes":res
     }
-
-    res = process_prompts(article["content"],selected_prompts)
-    output["outcomes"] = res
     views = create_views(res)
     add_output(output)
 
@@ -84,11 +81,11 @@ def create_views(output):
     overview = [v for _,v in output.items() if v["assessment"] == "overview"][0]
     safety = [v for _,v in output.items() if v["assessment"] == "safety"][0]
     # add overview
-    md_text += f"<details>\n<summary><h2>Overivew</h2></summary>\n\n"
+    md_text += f"<details><summary><b>Overivew</b></summary>\n\n"
     md_text += overview["content"] + "\n</details>\n\n"
     
     # add performance
-    md_text += f"<details>\n<summary><h2>Performance</h2></summary>\n\n"
+    md_text += f"<details><summary><b>Performance</b></summary>\n\n"
     for title,content in output.items():
         if content["assessment"] not in  ["overview","safety"]:
             md_text += f"#### {content['assessment']} - {title}\n\n"
@@ -96,12 +93,11 @@ def create_views(output):
     md_text += "</details>\n\n"
 
     # add safety
-    md_text += f"<details>\n<summary><h2>Safety</h2></summary>\n\n"
+    md_text += f"<details><summary><b>Safety</b></summary>\n\n"
     md_text += safety["content"] + "\n\n" + "</details>\n\n"
 
     return gr.update(value=md_text)
 
-
 def extract_key_content(text,start,end,before = None,case_sensitive=False):
     '''
     this function extract the content between start and end
@@ -227,8 +223,7 @@ def add_article(domain,file,add_to_s3=True, add_to_local=True, file_object=True)
     }
     
     if add_to_s3 and file_object:
-        s3_path = upload_fileobj(file,domain,filename)
-        article["s3_path"] = s3_path
+        upload_fileobj(file,domain,filename)
 
     if add_to_local:
         app_data["articles"].append(article)
@@ -290,8 +285,7 @@ def update_article(article,file_obj=None,update_local=True):
         article object
         '''
     if file_obj:
-        s3_path = upload_fileobj(file_obj,article["domain"],article["name"])
-        article["s3_path"] = s3_path
+        upload_fileobj(file_obj,article["domain"],article["name"])
 
     if update_local:
         app_data["articles"].append(article)
@@ -315,10 +309,11 @@ def add_output(output):
         True if success
     '''
     res = post_item("outputs",output)
+
     if "Error" in res:
         print(res)
         return False
-    return True
+    return res
 
 def get_output(domain,name):
     res = output = get_item("outputs",{"domain":domain,"name":name})
@@ -404,7 +399,7 @@ def process_prompts(text,prompts):
     dict
         processed extraction results from openai api
     '''
-    res = defaultdict(dict)
+    res = {}
     for p in prompts:
         inst = [
             p["prompt"]+", ".join(p["fields"]),

ui_device.py

@@ -3,7 +3,7 @@ import gradio as gr
 from utility import *
 from application import *
 from features import init_app_data, add_device
-from ui_list import render_list
+# from ui_list import render_list
 
 def refresh_ui_device():
     # init_app_data()

ui_list.py

@@ -1,57 +0,0 @@
-import gradio as gr
-
-from cloud_db import *
-
-def render_list(items,title="Item List"):
-    with gr.Blocks() as item_list:
-        # title of the file list
-        gr.HTML(f"<h2>{title}</h2>")
-
-        with gr.Row():
-            with gr.Column(scale=2):
-                with gr.Row():
-                    gr.HTML("<h3>Device</h3>")
-                    gr.HTML("<h3>Article Name</h3>")
-                    gr.HTML("<h3>Upload Time</h3>")
-                    gr.HTML("<h3>File Link</h3>")
-            # with gr.Column():
-            #     pass                
-        
-        gr.HTML("<hr />")
-
-        for i in items:
-            with gr.Row() as this_row:
-                with gr.Column(scale=2):
-                    with gr.Row():
-                        gr.HTML(i["domain"])
-                        gr.HTML(i["name"])
-                        gr.HTML(i["upload_time"])
-                        if "s3_path" in i:
-                            gr.HTML(f"<a href='{i['s3_path']}' target='_blank'>link</a>")
-                # with gr.Column():
-                #     with gr.Row():
-                #         btn_view = gr.Button("view",variant="primary")
-                #         btn_delete = gr.Button("Delete",variant="danger")
-
-            gr.HTML("<hr />")
-            # btn_delete.click(fn=delete)
-        
-    return item_list
-
-if __name__ == "__main__":
-    file_list = [
-        {
-            "domain":"Device",
-            "name":"Device 1",
-            "s3_path":"https://www.google.com",
-            "upload_time":"2021-01-01"
-        },
-        {
-            "domain":"Device",
-            "name":"Device 2",
-            "s3_path":"https://www.google.com",
-            "upload_time":"2021-01-01"
-        },
-    ]
-    interface = render_file_list(file_list)
-    interface.launch()