bug fixes

interface.py

@@ -255,24 +255,24 @@ def create_demo(agent, tools_dict):
                     with gr.Tabs():
                         with gr.Tab(label="Image section"):
                             image_display = gr.Image(
-                                label="Image", type="filepath", height=650, container=True
+                                label="Image", type="filepath", height=685, container=True
                             )
+                            # with gr.Row():
+                            #     upload_button = gr.UploadButton(
+                            #         "📎 Upload X-Ray",
+                            #         file_types=["image"],
+                            #     )
+                            #     dicom_upload = gr.UploadButton(
+                            #         "📄 Upload DICOM",
+                            #         file_types=["file"],
+                            #     )
                             with gr.Row():
-                                upload_button = gr.UploadButton(
-                                    "📎 Upload X-Ray",
-                                    file_types=["image"],
-                                )
-                                dicom_upload = gr.UploadButton(
-                                    "📄 Upload DICOM",
-                                    file_types=["file"],
-                                )
-                            with gr.Row():
-                                analyze_btn = gr.Button("Analyze", interactive=False)
-                                # ground_btn = gr.Button("Ground", interactive=False)
-                                segment_btn = gr.Button("Segment", interactive=False)
+                                analyze_btn = gr.Button("Analyze 1")
+                                analyze2_btn = gr.Button("Analyze 2")
+                                segment_btn = gr.Button("Segment")
                             with gr.Row():
                                 clear_btn = gr.Button("Clear Chat")
-                                new_thread_btn = gr.Button("New Thread")
+                                new_thread_btn = gr.Button("New Patient")
                         
                         with gr.Tab(label="Report section"):                               
                             generate_report_btn = gr.Button("Generate Report")
@@ -280,24 +280,24 @@ def create_demo(agent, tools_dict):
                             #                         headers=["Disease", "Info"],
                             #                         datatype=["str", "str"],
                             #                         interactive=False, visible=False, max_height=220)
-                            conclusion_tb = gr.Textbox(label="Conclusion", interactive=False, visible=False)
+                            conclusion_tb = gr.Textbox(label="Conclusion", interactive=False)
                             with gr.Row():
                                 approve_btn = gr.Button("Approve", visible=False)
-                                reject_btn = gr.Button("Reject", visible=False)
+                                # reject_btn = gr.Button("Reject", visible=False)
                             download_pdf_btn  = gr.DownloadButton(label="📥 Download PDF", visible=False)
                             # pdf_preview  = gr.HTML(visible=False)
                             # pdf_preview  = gr.File(visible=False)
                             pdf_preview  = PDF(visible=False)
-                            rejection_text   = gr.Textbox(
-                                show_label=False,
-                                visible=False,
-                                placeholder="Tell us what is wrong with the report",
-                                container=False,
-                                interactive=True
-                            )
-                            with gr.Row():
-                                submit_reject_btn = gr.Button("Submit", visible=False)
-                                cancel_reject_btn = gr.Button("Cancel", visible=False)
+                            # rejection_text   = gr.Textbox(
+                            #     show_label=False,
+                            #     visible=False,
+                            #     placeholder="Tell us what is wrong with the report",
+                            #     container=False,
+                            #     interactive=True
+                            # )
+                            # with gr.Row():
+                            #     submit_reject_btn = gr.Button("Submit", visible=False)
+                            #     cancel_reject_btn = gr.Button("Cancel", visible=False)
 
         # Event handlers
         def authenticate(username, password):
@@ -318,19 +318,25 @@ def create_demo(agent, tools_dict):
 
         def new_thread():
             interface.current_thread_id = str(time.time())
-            return [], interface.display_file_path
+            return (
+                [], 
+                interface.display_file_path, 
+                gr.update(value=None, interactive=False), 
+                gr.update(visible=False), 
+                # gr.update(visible=False),
+                gr.update(value=None, visible=False),
+                gr.update(value=None, visible=False) 
+                )
 
         def handle_file_upload(file):
             return interface.handle_upload(file.name)
         
         def generate_report():
             result = interface.agent.summarize_message(interface.current_thread_id)
-            # table = [[d["name"], d["info"]] for d in result["Disease"]]
             return (
-                # gr.update(value=table, interactive=True, visible=True), 
-                gr.update(value=result["Conclusion"], lines=4, interactive=True, visible=True),
-                gr.update(visible=True),
+                gr.update(value=result["Conclusion"], lines=4, interactive=True),
                 gr.update(visible=True),
+                # gr.update(visible=True),
                 )
         
         # def records_to_pdf(table, conclusion) -> Path:
@@ -407,15 +413,15 @@ def create_demo(agent, tools_dict):
             outputs=[chatbot, image_display, txt],
         ).then(lambda: gr.Textbox(interactive=True), None, [txt])
         
-        # ground_btn.click(
-        #     lambda: gr.update(value="Ground the main disease in this CXR"), None, txt
-        # ).then(
-        #     interface.add_message, inputs=[txt, image_display, chatbot], outputs=[chatbot, txt]  
-        # ).then(
-        #     interface.process_message,
-        #     inputs=[txt, image_display, chatbot],
-        #     outputs=[chatbot, image_display, txt],
-        # ).then(lambda: gr.Textbox(interactive=True), None, [txt])
+        analyze2_btn.click(
+            lambda: gr.update(value="Analyze this xray and give me a detailed response. Use the chest_xray_expert tool"), None, txt
+        ).then(
+            interface.add_message, inputs=[txt, image_display, chatbot], outputs=[chatbot, txt]  
+        ).then(
+            interface.process_message,
+            inputs=[txt, image_display, chatbot],
+            outputs=[chatbot, image_display, txt],
+        ).then(lambda: gr.Textbox(interactive=True), None, [txt])
 
         segment_btn.click(
             lambda: gr.update(value="Segment the major affected lung"), None, txt
@@ -427,21 +433,21 @@ def create_demo(agent, tools_dict):
             outputs=[chatbot, image_display, txt],
         ).then(lambda: gr.Textbox(interactive=True), None, [txt])
 
-        upload_button.upload(handle_file_upload, inputs=upload_button, outputs=[image_display, analyze_btn, segment_btn])
+        # upload_button.upload(handle_file_upload, inputs=upload_button, outputs=[image_display])
 
-        dicom_upload.upload(handle_file_upload, inputs=dicom_upload, outputs=[image_display, analyze_btn, segment_btn])
+        # dicom_upload.upload(handle_file_upload, inputs=dicom_upload, outputs=[image_display])
 
         clear_btn.click(clear_chat, outputs=[chatbot, image_display])
-        new_thread_btn.click(new_thread, outputs=[chatbot, image_display])
+        new_thread_btn.click(new_thread, outputs=[chatbot, image_display, conclusion_tb, approve_btn, download_pdf_btn, pdf_preview])
         # generate_report_btn.click(generate_report, outputs=[diseases_df, conclusion_tb, approve_btn, reject_btn])
-        generate_report_btn.click(generate_report, outputs=[conclusion_tb, approve_btn, reject_btn])
+        generate_report_btn.click(generate_report, outputs=[conclusion_tb, approve_btn])
         approve_btn.click(
             build_pdf_and_preview,
             # inputs=[diseases_df, conclusion_tb],
             inputs=[conclusion_tb],
             outputs=[download_pdf_btn, pdf_preview],
         )
-        reject_btn.click(show_reject_ui, outputs=[rejection_text, submit_reject_btn, cancel_reject_btn])
-        cancel_reject_btn.click(hide_reject_ui, outputs=[rejection_text, submit_reject_btn, cancel_reject_btn])
+        # reject_btn.click(show_reject_ui, outputs=[rejection_text, submit_reject_btn, cancel_reject_btn])
+        # cancel_reject_btn.click(hide_reject_ui, outputs=[rejection_text, submit_reject_btn, cancel_reject_btn])
 
     return demo