Update app.py

app.py

@@ -240,13 +240,35 @@ calendly_client = CalendlyClient(CALENDLY_API_TOKEN)
 # State to store patient phone number
 patient_phone_state = gr.State(value=None)
 
-def register_patient(phone, email, language, consent_status):
-    if not phone or not email or not language or not consent_status:
+def register_patient(name_first, name_last, dob, sex, height, weight, marital, phone, email, 
+                    address_street1, address_street2, address_city, address_state, postal, 
+                    med_yes_no, med_list, emergency_first, emergency_last, emergency_relation, 
+                    emergency_number, language, consent_status):
+    if not all([name_first, name_last, dob, sex, height, weight, marital, phone, email, 
+                address_street1, address_city, address_state, postal, language, consent_status]) or \
+       (med_yes_no == "Yes" and not med_list):
         return "All fields are required.", gr.State(value=None)
     try:
         patient_data = {
+            "First_Name__c": name_first,
+            "Last_Name__c": name_last,
+            "Date_of_Birth__c": dob,
+            "Sex__c": sex,
+            "Height__c": height,
+            "Weight__c": weight,
+            "Marital_Status__c": marital,
             "Phone__c": phone,
             "Email__c": email,
+            "Address_Street1__c": address_street1,
+            "Address_Street2__c": address_street2 or "",
+            "City__c": address_city,
+            "State__c": address_state,
+            "Postal_Code__c": postal,
+            "Medications__c": med_list if med_yes_no == "Yes" else "",
+            "Emergency_First_Name__c": emergency_first or "",
+            "Emergency_Last_Name__c": emergency_last or "",
+            "Emergency_Relation__c": emergency_relation or "",
+            "Emergency_Number__c": emergency_number or "",
             "Language__c": language,
             "ConsentGiven__c": consent_status
         }
@@ -445,110 +467,64 @@ def escalate_case(patient_id, response_text):
 with gr.Blocks(theme=gr.themes.Soft(), title="AI-Powered Patient Follow-up Agent") as demo:
     gr.Markdown("# AI-Powered Patient Follow-up Agent for Clinics")
     
-   with gr.Tab("Patient Registration"):
-    with gr.Row():
-        with gr.Column():
-            name_first = gr.Textbox(label="First Name", placeholder="First Name")
-            name_last = gr.Textbox(label="Last Name", placeholder="Last Name")
-        with gr.Column():
-            dob_input = gr.Textbox(label="Date of Birth", placeholder="MM-DD-YYYY")
-            sex_input = gr.Dropdown(label="Sex", choices=["Please Select", "Male", "Female", "Other"], value="Please Select")
-    with gr.Row():
-        height_input = gr.Textbox(label="Height (inches)", placeholder="e.g., 65")
-        weight_input = gr.Textbox(label="Weight (pounds)", placeholder="e.g., 150")
-    marital_input = gr.Dropdown(label="Marital Status", choices=["Please Select", "Single", "Married", "Divorced", "Widowed"], value="Please Select")
-    with gr.Row():
-        phone_input = gr.Textbox(label="Contact Number", placeholder="(000) 000-0000")
-        email_input = gr.Textbox(label="Email", placeholder="patient@example.com")
-    with gr.Row():
-        with gr.Column():
-            address_street1 = gr.Textbox(label="Street Address", placeholder="Street Address")
-            address_street2 = gr.Textbox(label="Street Address Line 2", placeholder="Apt, Suite, etc.")
-        with gr.Column():
-            address_city = gr.Textbox(label="City", placeholder="City")
-            address_state = gr.Textbox(label="State/Province", placeholder="State/Province")
-    postal_input = gr.Textbox(label="Postal/Zip Code", placeholder="Postal/Zip Code")
-    with gr.Row():
-        med_yes_no = gr.Radio(label="Taking any medications, currently?", choices=["Yes", "No"], value="No")
-        med_list = gr.Textbox(label="Please list it here", placeholder="List medications here", lines=2, visible=False)
-    with gr.Accordion("In case of emergency", open=False):
-        with gr.Row():
-            with gr.Column():
-                emergency_first = gr.Textbox(label="First Name", placeholder="First Name")
-                emergency_last = gr.Textbox(label="Last Name", placeholder="Last Name")
-            with gr.Column():
-                emergency_relation = gr.Textbox(label="Relationship", placeholder="e.g., Spouse")
-                emergency_number = gr.Textbox(label="Contact Number", placeholder="(000) 000-0000")
-    language_input = gr.Dropdown(["English", "Telugu", "Hindi"], label="Language")
-    consent_input = gr.Dropdown(["SMS", "WhatsApp", "Awaiting"], label="Consent Method")
-    register_button = gr.Button("Submit")
-    register_output = gr.Textbox(label="Result")
-
-    # Update visibility of medication list based on radio selection
-    def toggle_med_list(med_choice):
-        return gr.update(visible=med_choice == "Yes")
-
-    med_yes_no.change(
-        fn=toggle_med_list,
-        inputs=med_yes_no,
-        outputs=med_list
-    )
-
-    # Update the registration function to handle new fields
-    def register_patient(name_first, name_last, dob, sex, height, weight, marital, phone, email, 
-                        address_street1, address_street2, address_city, address_state, postal, 
-                        med_yes_no, med_list, emergency_first, emergency_last, emergency_relation, 
-                        emergency_number, language, consent_status):
-        if not all([name_first, name_last, dob, sex, height, weight, marital, phone, email, 
-                    address_street1, address_city, address_state, postal, language, consent_status]) or \
-           (med_yes_no == "Yes" and not med_list):
-            return "All fields are required.", gr.State(value=None)
-        try:
-            patient_data = {
-                "First_Name__c": name_first,
-                "Last_Name__c": name_last,
-                "Date_of_Birth__c": dob,
-                "Sex__c": sex,
-                "Height__c": height,
-                "Weight__c": weight,
-                "Marital_Status__c": marital,
-                "Phone__c": phone,
-                "Email__c": email,
-                "Address_Street1__c": address_street1,
-                "Address_Street2__c": address_street2 or "",
-                "City__c": address_city,
-                "State__c": address_state,
-                "Postal_Code__c": postal,
-                "Medications__c": med_list if med_yes_no == "Yes" else "",
-                "Emergency_First_Name__c": emergency_first or "",
-                "Emergency_Last_Name__c": emergency_last or "",
-                "Emergency_Relation__c": emergency_relation or "",
-                "Emergency_Number__c": emergency_number or "",
-                "Language__c": language,
-                "ConsentGiven__c": consent_status
-            }
-            result = sf_client.create_record("Patient__c", patient_data)
-            if isinstance(result, str):  # Error message returned
-                return result, gr.State(value=None)
-            if result:
-                logging.info(f"Registered patient: {result}")
-                message = f"Welcome! You are registered. Your patient ID is {result}."
-                if consent_status in ["Approved", "Awaiting"]:
-                    twilio_client.send_message(phone, message, method=consent_status.lower().replace(" ", "")[:3] if consent_status == "Awaiting" else "sms")
-                return f"Patient registered successfully! Your patient ID is {result}. You can use this ID for future actions.", gr.State(value=phone)
-            return "Failed to register patient. Please try again or contact support.", gr.State(value=None)
-        except Exception as e:
-            logging.error(f"Error registering patient: {str(e)}")
-            return f"Error registering patient: {str(e)}. Please try again or contact support.", gr.State(value=None)
-
-    register_button.click(
-        fn=register_patient,
-        inputs=[name_first, name_last, dob_input, sex_input, height_input, weight_input, marital_input, 
-                phone_input, email_input, address_street1, address_street2, address_city, address_state, 
-                postal_input, med_yes_no, med_list, emergency_first, emergency_last, emergency_relation, 
-                emergency_number, language_input, consent_input],
-        outputs=[register_output, patient_phone_state]
-    )
+    with gr.Tabs():
+        with gr.Tab("Patient Registration"):
+            with gr.Row():
+                with gr.Column():
+                    name_first = gr.Textbox(label="First Name", placeholder="First Name")
+                    name_last = gr.Textbox(label="Last Name", placeholder="Last Name")
+                with gr.Column():
+                    dob_input = gr.Textbox(label="Date of Birth", placeholder="MM-DD-YYYY")
+                    sex_input = gr.Dropdown(label="Sex", choices=["Please Select", "Male", "Female", "Other"], value="Please Select")
+            with gr.Row():
+                height_input = gr.Textbox(label="Height (inches)", placeholder="e.g., 65")
+                weight_input = gr.Textbox(label="Weight (pounds)", placeholder="e.g., 150")
+            marital_input = gr.Dropdown(label="Marital Status", choices=["Please Select", "Single", "Married", "Divorced", "Widowed"], value="Please Select")
+            with gr.Row():
+                phone_input = gr.Textbox(label="Contact Number", placeholder="(000) 000-0000")
+                email_input = gr.Textbox(label="Email", placeholder="patient@example.com")
+            with gr.Row():
+                with gr.Column():
+                    address_street1 = gr.Textbox(label="Street Address", placeholder="Street Address")
+                    address_street2 = gr.Textbox(label="Street Address Line 2", placeholder="Apt, Suite, etc.")
+                with gr.Column():
+                    address_city = gr.Textbox(label="City", placeholder="City")
+                    address_state = gr.Textbox(label="State/Province", placeholder="State/Province")
+            postal_input = gr.Textbox(label="Postal/Zip Code", placeholder="Postal/Zip Code")
+            with gr.Row():
+                med_yes_no = gr.Radio(label="Taking any medications, currently?", choices=["Yes", "No"], value="No")
+                med_list = gr.Textbox(label="Please list it here", placeholder="List medications here", lines=2, visible=False)
+            with gr.Accordion("In case of emergency", open=False):
+                with gr.Row():
+                    with gr.Column():
+                        emergency_first = gr.Textbox(label="First Name", placeholder="First Name")
+                        emergency_last = gr.Textbox(label="Last Name", placeholder="Last Name")
+                    with gr.Column():
+                        emergency_relation = gr.Textbox(label="Relationship", placeholder="e.g., Spouse")
+                        emergency_number = gr.Textbox(label="Contact Number", placeholder="(000) 000-0000")
+            language_input = gr.Dropdown(["English", "Telugu", "Hindi"], label="Language")
+            consent_input = gr.Dropdown(["SMS", "WhatsApp", "Awaiting"], label="Consent Method")
+            register_button = gr.Button("Submit")
+            register_output = gr.Textbox(label="Result")
+
+            # Update visibility of medication list based on radio selection
+            def toggle_med_list(med_choice):
+                return gr.update(visible=med_choice == "Yes")
+
+            med_yes_no.change(
+                fn=toggle_med_list,
+                inputs=med_yes_no,
+                outputs=med_list
+            )
+
+            register_button.click(
+                fn=register_patient,
+                inputs=[name_first, name_last, dob_input, sex_input, height_input, weight_input, marital_input, 
+                        phone_input, email_input, address_street1, address_street2, address_city, address_state, 
+                        postal_input, med_yes_no, med_list, emergency_first, emergency_last, emergency_relation, 
+                        emergency_number, language_input, consent_input],
+                outputs=[register_output, patient_phone_state]
+            )
 
         with gr.Tab("Consent Form"):
             consent_phone_input = gr.Textbox(label="Patient Phone Number", value=lambda x: x, interactive=False) if patient_phone_state.value else gr.Textbox(label="Patient Phone Number", placeholder="+1234567890")