attempt to generate discharge paper with auth

app.py

@@ -71,68 +71,6 @@ CALLBACK_MANAGER = CallbackManager(
 )
 
 
-# class CallbackManager:
-#     def __init__(self, redirect_uri: str, client_secret: str = None):
-#         client_id = os.getenv("APPID")
-#         if not client_id:
-#             raise ValueError("APPID environment variable not set.")
-#         workspace_id = os.getenv("WORKSPACE_URL")
-#         if not workspace_id:
-#             raise ValueError("WORKSPACE_URL environment variable not set.")
-#         self.api = MeldRxAPI(client_id, client_secret, workspace_id, redirect_uri)
-#         self.auth_code = None
-#         self.access_token = None
-
-#     def handle_callback(self, callback_url: str) -> str:
-#         """Handles the callback URL and extracts the code automatically."""
-#         self.auth_code = extract_code_from_url(callback_url)
-#         if not self.auth_code:
-#             return "No authentication code found in URL."
-
-#         if self.api.authenticate_with_code(self.auth_code):
-#             self.access_token = self.api.access_token
-#             return f"Authentication successful! Access Token: {self.access_token[:10]}... (truncated)"
-#         return "Authentication failed. Please check the authorization code."
-    
-# def generate_discharge_paper_one_click():
-#     """One-click function to fetch patient data and generate discharge paper with AI Content."""
-#     patient_data_str = CALLBACK_MANAGER.get_patient_data()
-#     if (
-#         patient_data_str.startswith("Not authenticated")
-#         or patient_data_str.startswith("Failed")
-#         or patient_data_str.startswith("Error")
-#     ):
-#         return None, patient_data_str  # Return error message if authentication or data fetch fails
-
-#     try:
-#         patient_data = json.loads(patient_data_str)
-
-#         # --- AI Content Generation for Discharge Summary ---
-#         # This is a placeholder - Replace with actual AI call using InferenceClient and patient_data to generate content
-#         ai_generated_content = generate_ai_discharge_content(
-#             patient_data
-#         )  # Placeholder AI function
-
-#         if not ai_generated_content:
-#             return None, "Error: AI content generation failed."
-
-#         # --- PDF Generation with AI Content ---
-#         pdf_path, status_message = generate_pdf_from_meldrx_with_ai_content(
-#             patient_data, ai_generated_content
-#         )  # Function to generate PDF with AI content
-
-#         if pdf_path:
-#             return pdf_path, status_message
-#         else:
-#             return None, status_message  # Return status message if PDF generation fails
-
-#     except json.JSONDecodeError:
-#         return None, "Error: Patient data is not in valid JSON format."
-#     except Exception as e:
-#         return None, f"Error during discharge paper generation: {str(e)}"
-
-
-
 # Define the cyberpunk theme - using a dark base and neon accents
 cyberpunk_theme = gr.themes.Monochrome(
     primary_hue="cyan",
@@ -395,33 +333,38 @@ with gr.Blocks(theme=cyberpunk_theme) as demo: # Apply the theme here
             analyze_csv_file_with_ai, inputs=csv_file, outputs=csv_ai_output
         )
 
-    with gr.Tab("One-Click Discharge Paper (AI)", elem_classes="cyberpunk-tab"):
-        gr.Markdown("<h2 style='color:#00FFFF; text-shadow: 0 0 3px #00FFFF;'>One-Click Medical Discharge Summary with AI Content</h2>")
-        with gr.Row():
-            patient_id_input = gr.Textbox(label="Patient ID (Optional)", placeholder="Enter Patient ID")
-            first_name_input = gr.Textbox(label="First Name (Optional)", placeholder="Enter First Name")
-            last_name_input = gr.Textbox(label="Last Name (Optional)", placeholder="Enter Last Name")
-        one_click_ai_button = gr.Button("Generate Discharge Summary with AI (One-Click)", elem_classes="cyberpunk-button")
-        one_click_ai_output = gr.Textbox(label="AI-Generated Discharge Summary", lines=20, placeholder="Discharge summary will appear here...")
-
-        # Initialize MeldRxAPI (ensure client_id, client_secret, workspace_id are set in environment variables)
-        client_id = os.getenv("APPID")
-        client_secret = os.getenv("CLIENT_SECRET") 
-        workspace_id = os.getenv("WORKSPACE_URL")
-        redirect_uri = "https://multitransformer-discharge-guard.hf.space/callback"
-        meldrx_api = MeldRxAPI(client_id, client_secret, workspace_id, redirect_uri)
-
-        one_click_ai_button.click(
-            fn=lambda pid, fname, lname: generate_discharge_paper_one_click(meldrx_api, pid, fname, lname),
-            inputs=[patient_id_input, first_name_input, last_name_input],
-            outputs=one_click_ai_output,
-        )
+with gr.Tab("One-Click Discharge Paper (AI)", elem_classes="cyberpunk-tab"):
+    gr.Markdown("<h2 style='color:#00FFFF; text-shadow: 0 0 3px #00FFFF;'>One-Click Medical Discharge Summary with AI Content</h2>")
+    with gr.Row():
+        patient_id_input = gr.Textbox(label="Patient ID (Optional)", placeholder="Enter Patient ID")
+        first_name_input = gr.Textbox(label="First Name (Optional)", placeholder="Enter First Name")
+        last_name_input = gr.Textbox(label="Last Name (Optional)", placeholder="Enter Last Name")
+    one_click_ai_button = gr.Button("Generate Discharge Summary with AI (One-Click)", elem_classes="cyberpunk-button")
+    one_click_ai_output = gr.File(label="Download AI-Generated Discharge PDF")  # Changed to File output for PDF
+    one_click_ai_status = gr.Textbox(label="Generation Status", lines=2, placeholder="Status will appear here...")
+
+    # Use the global CALLBACK_MANAGER instead of creating a new MeldRxAPI instance
+    def one_click_handler(patient_id, first_name, last_name):
+        try:
+            # Check if CALLBACK_MANAGER is authenticated
+            if not CALLBACK_MANAGER.access_token:
+                return None, "Error: Not authenticated. Please authenticate in the 'Authenticate with MeldRx' tab first."
+            
+            # Call the one-click function with the existing authenticated CALLBACK_MANAGER.api
+            pdf_path, status = generate_discharge_paper_one_click(
+                CALLBACK_MANAGER.api, patient_id, first_name, last_name
+            )
+            return pdf_path, status
+        except Exception as e:
+            logger.error(f"One-click handler error: {str(e)}")
+            return None, f"Error: {str(e)}"
+
+    one_click_ai_button.click(
+        fn=one_click_handler,
+        inputs=[patient_id_input, first_name_input, last_name_input],
+        outputs=[one_click_ai_output, one_click_ai_status],
+    )
 
-    # one_click_ai_button.click(
-    #     fn=lambda pid, fname, lname: generate_discharge_paper_one_click(meldrx_api, pid, fname, lname),
-    #     inputs=[patient_id_input, first_name_input, last_name_input],
-    #     outputs=one_click_ai_output,
-    # )
 
     # Connect the patient data buttons
     patient_data_button.click(

utils/oneclick.py

@@ -111,7 +111,7 @@ def generate_discharge_paper_one_click(
     Generate a discharge paper with AI content in one click.
 
     Args:
-        meldrx_api (MeldRxAPI): Initialized MeldRxAPI instance.
+        meldrx_api (MeldRxAPI): Initialized and authenticated MeldRxAPI instance.
         patient_id (str, optional): Patient ID to fetch specific patient data.
         first_name (str, optional): First name for patient lookup if patient_id is not provided.
         last_name (str, optional): Last name for patient lookup if patient_id is not provided.
@@ -120,14 +120,13 @@ def generate_discharge_paper_one_click(
         tuple[Optional[str], str]: (PDF file path, Status message)
     """
     try:
-        # Authenticate if not already authenticated
-        if not meldrx_api.access_token and not meldrx_api.authenticate():
-            return None, "Error: Authentication failed. Please authenticate first."
+        # Check if already authenticated
+        if not meldrx_api.access_token:
+            return None, "Error: Not authenticated. Please authenticate first in the 'Authenticate with MeldRx' tab."
 
         # Fetch patient data
         if patient_id:
-            # Fetch specific patient by ID (assuming FHIR Patient resource endpoint supports this)
-            patient_data = meldrx_api.get_patients()  # Simplified; assumes ID filtering in real API
+            patient_data = meldrx_api.get_patients()
             if not patient_data or "entry" not in patient_data:
                 return None, "Error: Failed to fetch patient data by ID."
             patients = [entry["resource"] for entry in patient_data.get("entry", [])]
@@ -135,7 +134,6 @@ def generate_discharge_paper_one_click(
             if not patient:
                 return None, f"Error: Patient with ID {patient_id} not found."
         else:
-            # Fetch all patients and filter by name if provided
             patient_data = meldrx_api.get_patients()
             if not patient_data or "entry" not in patient_data:
                 return None, "Error: Failed to fetch patient data."
@@ -150,7 +148,6 @@ def generate_discharge_paper_one_click(
                 if not patient:
                     return None, f"Error: Patient with name {first_name} {last_name} not found."
             else:
-                # Default to first patient if no specific ID or name provided
                 patient = patients[0] if patients else None
                 if not patient:
                     return None, "Error: No patients found in the workspace."
@@ -174,4 +171,4 @@ def generate_discharge_paper_one_click(
 
     except Exception as e:
         logger.error(f"Error in one-click discharge generation: {str(e)}")
-        return None, f"Error: {str(e)}"
+        return None, f"Error: {str(e)}"