Update app.py

app.py

@@ -23,31 +23,49 @@ sf = Salesforce(username=sf_username, password=sf_password, security_token=sf_se
 twilio_client = twilio.rest.Client(twilio_sid, twilio_auth_token)
 
 def get_patient_data(patient_id):
-    query = f"SELECT Name, Phone__c, Email__c, DateOfBirth__c, ConsentGiven__c, Height__c, Weight__c, EmergencyContactName__c, EmergencyContactNumber__c FROM Patient__c WHERE Id = '{patient_id}' LIMIT 1"
-    result = sf.query(query)
-    return result['records'][0] if result['totalSize'] > 0 else {}
+    try:
+        query = f"SELECT Name, Phone__c, Email__c, DateOfBirth__c, ConsentGiven__c, Height__c, Weight__c, EmergencyContactName__c, EmergencyContactNumber__c FROM Patient__c WHERE Id = '{patient_id}' LIMIT 1"
+        result = sf.query(query)
+        return result['records'][0] if result['totalSize'] > 0 else {}
+    except Exception as e:
+        return {"error": str(e)}
 
 def get_appointments(patient_id):
-    query = f"SELECT Name, DateTime__c, Status__c, Provider__c FROM Appointment__c WHERE Patient__c = '{patient_id}' AND Status__c = 'Confirmed'"
-    result = sf.query(query)
-    return result['records'] if result['totalSize'] > 0 else []
+    try:
+        query = f"SELECT Name, DateTime__c, Status__c, Provider__c FROM Appointment__c WHERE Patient__c = '{patient_id}' AND Status__c = 'Confirmed'"
+        result = sf.query(query)
+        return result['records'] if result['totalSize'] > 0 else []
+    except Exception as e:
+        return [{"error": str(e)}]
 
 def get_doctors():
-    query = "SELECT Name, Doctor_Name__c, AvailableTimings__c FROM Doctor__c"
-    result = sf.query(query)
-    return result['records'] if result['totalSize'] > 0 else []
+    try:
+        query = "SELECT Name, Doctor_Name__c, AvailabilitySchedule__c FROM Doctor__c"
+        result = sf.query(query)
+        return result['records'] if result['totalSize'] > 0 else []
+    except Exception as e:
+        return [{"error": str(e)}]
 
 def send_followup_message(phone, message):
     if phone and message:
-        twilio_client.messages.create(
-            body=message,
-            from_=twilio_phone,
-            to=f"+{phone}"
-        )
+        try:
+            twilio_client.messages.create(
+                body=message,
+                from_=twilio_phone,
+                to=f"+{phone}"
+            )
+        except Exception as e:
+            return f"Failed to send message: {str(e)}"
+    return "Message sent successfully"
 
 def dashboard_tab(patient_id):
     patient = get_patient_data(patient_id)
+    if "error" in patient:
+        return gr.Markdown(f"# Error\n{patient['error']}\nPlease log in again or contact support.")
+    
     appointments = get_appointments(patient_id)
+    if any("error" in appt for appt in appointments):
+        return gr.Markdown(f"# Error\n{next(appt['error'] for appt in appointments if 'error' in appt)}\nPlease try again later.")
     
     welcome_text = f"Welcome back, {patient.get('Name', 'Guest')}!"
     next_appointment = appointments[0]['DateTime__c'] if appointments else "None scheduled"
@@ -71,23 +89,31 @@ def dashboard_tab(patient_id):
 
     return gr.Column([
         gr.Markdown(f"# {welcome_text}\nHere's an overview of your healthcare journey"),
-        gr.Row([gr.Column([gr.Markdown("### Next Appointment"), gr.Markdown(f"Dec 15, 2024\n2:30 PM - Dr. Smith")]), 
+        gr.Row([gr.Column([gr.Markdown("### Next Appointment"), gr.Markdown(f"{next_appointment}")]), 
                 gr.Column([gr.Markdown("### Pending Forms"), gr.Markdown(f"{len(pending_forms)} - {', '.join(pending_forms)}")]),
-                gr.Column([gr.Markdown("### Health Score"), gr.Markdown("85/100\nExcellent progress")]),
+                gr.Column([gr.Markdown("### Health Score"), gr.Markdown(f"{health_score}/100\nExcellent progress")]),
                 gr.Column([gr.Markdown("### Notifications"), gr.Markdown("\n".join(notifications))])]),
         gr.Row([gr.Column(tasks), gr.Column(recent_activity)])
     ])
 
 def appointments_tab(patient_id):
     patient = get_patient_data(patient_id)
+    if "error" in patient:
+        return gr.Markdown(f"# Error\n{patient['error']}\nPlease log in again or contact support.")
+    
     appointments = get_appointments(patient_id)
+    if any("error" in appt for appt in appointments):
+        return gr.Markdown(f"# Error\n{next(appt['error'] for appt in appointments if 'error' in appt)}\nPlease try again later.")
+    
     doctors = get_doctors()
+    if any("error" in doc for doc in doctors):
+        return gr.Markdown(f"# Error\n{next(doc['error'] for doc in doctors if 'error' in doc)}\nPlease try again later.")
 
     def schedule_appointment(provider, appt_type, date, time_slot, reason, instructions):
         if not provider or not appt_type or not date or not time_slot:
             return "Please fill all required fields."
         doctor = next((d for d in doctors if d['Doctor_Name__c'] == provider), None)
-        if not doctor or not check_availability(doctor['AvailableTimings__c'], date, time_slot):
+        if not doctor or not check_availability(doctor.get('AvailabilitySchedule__c', ''), date, time_slot):
             return "Selected doctor or time slot unavailable."
         appt_data = {
             'Name': f"Appointment_{datetime.now().strftime('%Y%m%d%H%M%S')}",
@@ -98,19 +124,22 @@ def appointments_tab(patient_id):
             'Reason__c': reason,
             'SpecialInstructions__c': instructions
         }
-        sf.Appointment__c.create(appt_data)
-        send_followup_message(patient.get('Phone__c'), f"Appointment booked: {date} {time_slot} with {provider}")
-        return "Appointment scheduled successfully!"
+        try:
+            sf.Appointment__c.create(appt_data)
+            send_followup_message(patient.get('Phone__c'), f"Appointment booked: {date} {time_slot} with {provider}")
+            return "Appointment scheduled successfully!"
+        except Exception as e:
+            return f"Failed to schedule appointment: {str(e)}"
 
     def check_availability(timings, date, time_slot):
         # Placeholder: Parse timings to check availability
-        return True  # Implement real logic based on AvailableTimings__c
+        return True  # Implement real logic based on AvailabilitySchedule__c
 
     with gr.Column():
         gr.Markdown("# Appointments\nManage your healthcare appointments and schedule new visits")
         gr.Markdown("### Upcoming Appointments")
         for appt in appointments:
-            gr.Markdown(f"- {appt['Name']}\n  {appt['DateTime__c']}\n  Status: Confirmed")
+            gr.Markdown(f"- {appt.get('Name', 'N/A')}\n  {appt.get('DateTime__c', 'N/A')}\n  Status: {appt.get('Status__c', 'N/A')}")
         with gr.Row():
             with gr.Column():
                 gr.Markdown("### Quick Actions")
@@ -123,7 +152,7 @@ def appointments_tab(patient_id):
                 gr.Markdown("- Initial Consultation\n  Dr. Michael Johnson\n  Oct 15, 2024 2:00 PM\n  [Complete] [View Notes]")
         with gr.Row():
             with gr.Column():
-                provider = gr.Dropdown(choices=[d['Doctor_Name__c'] for d in doctors] or ["None"], label="Select Provider")
+                provider = gr.Dropdown(choices=[d['Doctor_Name__c'] for d in doctors if 'Doctor_Name__c' in d] or ["None"], label="Select Provider")
                 appt_type = gr.Dropdown(choices=["Routine Check-up", "Follow-up", "Consultation", "Urgent Care"], label="Appointment Type")
                 date = gr.DatePicker(label="Preferred Date")
                 time_slot = gr.Dropdown(choices=["9:00 AM", "9:30 AM", "10:00 AM", "10:30 AM", "11:00 AM", "11:30 AM", "2:00 PM", "2:30 PM", "3:00 PM", "3:30 PM", "4:00 PM", "4:30 PM"], label="Available Time Slots")
@@ -136,6 +165,9 @@ def appointments_tab(patient_id):
 
 def health_records_tab(patient_id):
     patient = get_patient_data(patient_id)
+    if "error" in patient:
+        return gr.Markdown(f"# Error\n{patient['error']}\nPlease log in again or contact support.")
+    
     return gr.Column([
         gr.Markdown("# Health Records"),
         gr.Markdown(f"- Name: {patient.get('Name', 'N/A')}\n- Date of Birth: {patient.get('DateOfBirth__c', 'N/A')}\n- Height: {patient.get('Height__c', 'Not filled')}\n- Weight: {patient.get('Weight__c', 'Not filled')}\n- Emergency Contact: {patient.get('EmergencyContactName__c', 'Not filled')}"),
@@ -144,23 +176,33 @@ def health_records_tab(patient_id):
 
 def follow_up_tab(patient_id):
     patient = get_patient_data(patient_id)
+    if "error" in patient:
+        return gr.Markdown(f"# Error\n{patient['error']}\nPlease log in again or contact support.")
+    
     if patient.get('ConsentGiven__c'):
-        send_followup_message(patient.get('Phone__c'), f"Thank you for registering, {patient.get('Name')}! Daily follow-up will begin tomorrow.")
+        send_followup_message(patient.get('Phone__c'), f"Thank you for registering, {patient.get('Name', 'Patient')}! Daily follow-up will begin tomorrow.")
     return gr.Column([
         gr.Markdown("# Follow-up"),
         gr.Markdown("Automated follow-up messages will be sent daily.")
     ])
 
 with gr.Blocks(title="HealthPortal - Patient Care System") as demo:
+    # Get patient_id from URL parameter
+    patient_id = gr.State(value=None)
+    demo.load(
+        fn=lambda: gr.update(value=gr.inputs.Textbox(default="a0b1c2d3-e4f5-4g6h-7i8j-9k0l1m2n3o4p")),  # Default placeholder
+        inputs=None,
+        outputs=patient_id
+    )
     gr.Markdown("# HealthPortal\nPatient Care System")
     with gr.Tabs():
         with gr.TabItem("Dashboard"):
-            dashboard_tab(gr.State(value="a0b1c2d3-e4f5-4g6h-7i8j-9k0l1m2n3o4p"))  # Placeholder patient_id
+            dashboard_tab(patient_id)
         with gr.TabItem("Appointments"):
-            appointments_tab(gr.State(value="a0b1c2d3-e4f5-4g6h-7i8j-9k0l1m2n3o4p"))
+            appointments_tab(patient_id)
         with gr.TabItem("Health Records"):
-            health_records_tab(gr.State(value="a0b1c2d3-e4f5-4g6h-7i8j-9k0l1m2n3o4p"))
+            health_records_tab(patient_id)
         with gr.TabItem("Follow-up"):
-            follow_up_tab(gr.State(value="a0b1c2d3-e4f5-4g6h-7i8j-9k0l1m2n3o4p"))
+            follow_up_tab(patient_id)
 
 demo.launch()