Update to connect states of button to update on another tab, let's pray

callbackmanager.py

@@ -95,6 +95,13 @@ def display_form(
 def process_fhir_bundle(fhir_bundle):
     """Extract and structure patient data from FHIR bundle"""
     patients = []
+    if not isinstance(fhir_bundle, dict):
+        # Try to parse the data if it's a string
+        try:
+            fhir_bundle = json.loads(fhir_bundle)
+        except:
+            return []
+            
     for entry in fhir_bundle.get("entry", []):
         resource = entry.get("resource", {})
         if resource.get("resourceType") == "Patient":
@@ -106,7 +113,7 @@ def create_patient_stripe(patient):
     # Safely extract name components
     official_name = next(
         (n for n in patient.get("name", []) if n.get("use") == "official"),
-        {}
+        next((n for n in patient.get("name", [])), {})  # Fallback to first name if no official
     )
     given_names = " ".join(official_name.get("given", ["Unknown"]))
     family_name = official_name.get("family", "Unknown")
@@ -117,7 +124,7 @@ def create_patient_stripe(patient):
     patient_id = patient.get("id", "Unknown")
     
     # Extract address information
-    address = patient.get("address", [{}])[0]
+    address = patient.get("address", [{}])[0] if patient.get("address") else {}
     city = address.get("city", "Unknown")
     state = address.get("state", "")
     postal_code = address.get("postalCode", "")
@@ -129,7 +136,7 @@ def create_patient_stripe(patient):
             *{gender} | Born: {birth_date}*  
             {city}, {state} {postal_code}
             """)
-            gr.Textbox(patient_id, label="Patient ID", visible=False)
+            patient_id_box = gr.Textbox(patient_id, label="Patient ID", visible=False)
         
         with gr.Column(scale=1):
             status = gr.Dropdown(
@@ -142,6 +149,8 @@ def create_patient_stripe(patient):
             generate_btn = gr.Button("Generate Report", visible=False)
             probability = gr.Label("Risk Probability", visible=False)
             documents_btn = gr.Button("View Documents", visible=True)
+            
+        doc_output = gr.JSON(label="Patient Documents", visible=False)
 
     # Dynamic visibility and document handling
     def update_components(selected_status):
@@ -152,7 +161,8 @@ def create_patient_stripe(patient):
         )
 
     def show_documents(patient_id):
-        return CALLBACK_MANAGER.get_patient_documents(patient_id)
+        docs = CALLBACK_MANAGER.get_patient_documents(patient_id)
+        return gr.JSON.update(value=docs, visible=True)
 
     status.change(
         update_components,
@@ -162,12 +172,69 @@ def create_patient_stripe(patient):
     
     documents_btn.click(
         fn=show_documents,
-        inputs=patient_id,
-        outputs=gr.JSON(label="Patient Documents")
+        inputs=patient_id_box,
+        outputs=doc_output
     )
 
     return stripe
 
+def update_patient_display(patient_data_json):
+    """
+    Update the patient display with parsed FHIR data
+    
+    Args:
+        patient_data_json: JSON string of FHIR patient data
+        
+    Returns:
+        Tuple of updates for the UI components
+    """
+    try:
+        # Handle the case where patient_data_json is an error message
+        if patient_data_json.startswith("Not authenticated") or patient_data_json.startswith("Failed"):
+            return (
+                gr.Row.update(visible=False),
+                gr.Column.update([]),
+                gr.Markdown.update(value=f"Error: {patient_data_json}"),
+                None
+            )
+            
+        fhir_bundle = json.loads(patient_data_json) if isinstance(patient_data_json, str) else patient_data_json
+        patients = process_fhir_bundle(fhir_bundle)
+        
+        if not patients:
+            return (
+                gr.Row.update(visible=False),
+                gr.Column.update([]),
+                gr.Markdown.update(value="No patients found in the data"),
+                None
+            )
+        
+        # Update pagination controls
+        has_prev = any(link.get("relation") == "previous" for link in fhir_bundle.get("link", []))
+        has_next = any(link.get("relation") == "next" for link in fhir_bundle.get("link", []))
+        
+        # Create stripes
+        stripes = [create_patient_stripe(patient) for patient in patients]
+        
+        return (
+            gr.Row.update(visible=has_prev or has_next),
+            gr.Column.update(value=stripes),
+            gr.Markdown.update(value=f"""
+            **Bundle Metadata**  
+            Type: {fhir_bundle.get('type', 'Unknown')}  
+            Total Patients: {fhir_bundle.get('total', len(patients))}  
+            Last Updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
+            """),
+            {"patients": patients, "bundle": fhir_bundle}
+        )
+    except Exception as e:
+        import traceback
+        return (
+            gr.Row.update(visible=False),
+            gr.Column.update([]),
+            gr.Markdown.update(value=f"Error loading patient data: {str(e)}\n{traceback.format_exc()}"),
+            None
+        )
 
 def generate_pdf_from_form(
     first_name, last_name, middle_initial, dob, age, sex, address, city, state, zip_code,
@@ -289,6 +356,8 @@ CALLBACK_MANAGER = CallbackManager(
     client_secret=None
 )
 
+
+
 with gr.Blocks() as demo:
     gr.Markdown("# Patient Discharge Form with MeldRx Integration")
     
@@ -309,25 +378,17 @@ with gr.Blocks() as demo:
         meldrx_pdf_download = gr.File(label="Download Generated PDF")
         
         auth_submit.click(fn=CALLBACK_MANAGER.set_auth_code, inputs=auth_code_input, outputs=auth_result)
-        patient_data_button.click(fn=CALLBACK_MANAGER.get_patient_data, inputs=None, outputs=patient_data_output)
         
-        # Add functionality for PDF generation from MeldRx data
-        meldrx_pdf_button.click(
-            fn=generate_pdf_from_meldrx,
-            inputs=patient_data_output,
-            outputs=[meldrx_pdf_download, meldrx_pdf_status]
-        )
-
     with gr.Tab("Show Patients Log"):
         gr.Markdown("## Patient Dashboard")
 
         # Store patient data in a state variable
         patient_data_state = gr.State()
 
-         # Pagination controls
-        with gr.Row() as pagination_row:
-            prev_btn = gr.Button("Previous Page", visible=False)
-            next_btn = gr.Button("Next Page", visible=False)
+        # Pagination controls 
+        with gr.Row(visible=False) as pagination_row:
+            prev_btn = gr.Button("Previous Page")
+            next_btn = gr.Button("Next Page")
         
         # Patient stripes container
         patient_stripes = gr.Column()
@@ -337,51 +398,6 @@ with gr.Blocks() as demo:
         
         # Refresh button
         refresh_btn = gr.Button("Refresh Data")
-
-        def update_patient_display(patient_data_json):
-            try:
-                fhir_bundle = json.loads(patient_data_json)
-                patients = process_fhir_bundle(fhir_bundle)
-                
-                # Update pagination controls
-                has_prev = any(link["relation"] == "previous" for link in fhir_bundle.get("link", []))
-                has_next = any(link["relation"] == "next" for link in fhir_bundle.get("link", []))
-                
-                # Create stripes
-                stripes = []
-                for patient in patients:
-                    stripes.append(create_patient_stripe(patient))
-                
-                return (
-                    gr.Row.update(visible=has_prev or has_next),
-                    gr.Column.update(stripes),
-                    gr.Markdown.update(value=f"""
-                    **Bundle Metadata**  
-                    Type: {fhir_bundle.get('type', 'Unknown')}  
-                    Total Patients: {fhir_bundle.get('total', 0)}  
-                    Last Updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
-                    """),
-                    {"patients": patients, "bundle": fhir_bundle}
-                )
-            except Exception as e:
-                return (
-                    gr.Row.update(visible=False),
-                    gr.Column.update([]),
-                    gr.Markdown.update(value=f"Error loading patient data: {str(e)}"),
-                    None
-                )
-
-        # Connect data flow
-        patient_data_output.change(
-            fn=update_patient_display,
-            inputs=patient_data_output,
-            outputs=[pagination_row, patient_stripes, metadata_md, patient_data_state]
-        )
-        
-        refresh_btn.click(
-            fn=lambda: CALLBACK_MANAGER.get_patient_data(),
-            outputs=patient_data_output
-        )
     
     with gr.Tab("Discharge Form"):
         gr.Markdown("## Patient Details")
@@ -462,5 +478,41 @@ with gr.Blocks() as demo:
             ],
             outputs=pdf_output
         )
+    
+    # Define a function to handle fetching and displaying patients
+    def fetch_and_display_patients():
+        data = CALLBACK_MANAGER.get_patient_data()
+        
+        # Process the results for UI display
+        pagination_update, stripes_update, metadata_update, state_update = update_patient_display(data)
+        
+        return [
+            data,  # For the raw JSON output
+            pagination_update,
+            stripes_update,
+            metadata_update,
+            state_update
+        ]
+
+    # Connect the patient data button to both display the raw JSON and update the patient display
+    patient_data_button.click(
+        fn=fetch_and_display_patients,
+        inputs=None,
+        outputs=[patient_data_output, pagination_row, patient_stripes, metadata_md, patient_data_state]
+    )
+        
+    # Add functionality for PDF generation from MeldRx data
+    meldrx_pdf_button.click(
+        fn=generate_pdf_from_meldrx,
+        inputs=patient_data_output,
+        outputs=[meldrx_pdf_download, meldrx_pdf_status]
+    )
+        
+    # Connect refresh button in patient log tab
+    refresh_btn.click(
+        fn=fetch_and_display_patients,
+        inputs=None,
+        outputs=[patient_data_output, pagination_row, patient_stripes, metadata_md, patient_data_state]
+    )
 
 demo.launch()