Update app.py

app.py

@@ -27,9 +27,9 @@ questions = [
 
 # Oral Health Assessment Form
 oral_health_assessment_form = [
-    "Doctor’s Name",
+    "Doctor's Name",
     "Location",
-    "Patient’s Name",
+    "Patient's Name",
     "Age",
     "Gender",
     "Chief complaint",
@@ -84,18 +84,15 @@ def fill_textboxes(context: str) -> list:
     
     # Map answers to form fields in the correct order and return as a list
     return [
-        answers[0] if len(answers) > 0 else "",
-        answers[1] if len(answers) > 1 else "",
-        answers[2] if len(answers) > 2 else "",
-        answers[3] if len(answers) > 3 else "",
-        answers[4] if len(answers) > 4 else "",
-        answers[5] if len(answers) > 5 else "",
+        answers[0] if len(answers) > 0 else "",  # Age
+        answers[1] if len(answers) > 1 else "",  # Gender
+        answers[2] if len(answers) > 2 else "",  # Chief complaint
+        answers[3] if len(answers) > 3 else "",  # Medical history
+        answers[4] if len(answers) > 4 else "",  # Dental history
+        answers[5] if len(answers) > 5 else "",  # Clinical Findings
         "",  # Referred to
-        "",  # Treatment plan
         "",  # Calculus
         "",  # Stains
-        "",  # Doctor’s Name
-        "",  # Location
     ]
 
 # Supabase configuration
@@ -105,22 +102,19 @@ def handle_transcription(audio: str, doctor_name: str, location: str) -> list:
     context = transcribe_audio(audio)
     if "Error" in context:
         # Fill all fields with the error message
-        return [context] * len(textboxes_left + textboxes_right + [doctor_name_display, location_display])
+        return [context] * (len(textboxes_left) + len(textboxes_right) + 3)  # +3 for doctor_name, location, and treatment_plan
     
     answers = fill_textboxes(context)
     
-    # Insert Doctor’s Name and Location in the appropriate fields
-    answers[-2] = doctor_name
-    answers[-1] = location
-    
-    return answers + [""] * (14 - len(answers))
+    # Insert Doctor's Name and Location in the appropriate fields
+    return [doctor_name, location] + answers + [""]  # Empty string for treatment_plan dropdown
 
 def save_answers(doctor_name: str, location: str, patient_name: str, age: str, gender: str, chief_complaint: str, medical_history: str, dental_history: str, clinical_findings: str, treatment_plan: str, referred_to: str, calculus: str, stains: str) -> str:
     current_datetime = datetime.now().isoformat()
     answers_dict = {
-        "Doctor’s Name": doctor_name,
+        "Doctor's Name": doctor_name,
         "Location": location,
-        "Patient’s Name": patient_name,
+        "Patient's Name": patient_name,
         "Age": age,
         "Gender": gender,
         "Chief complaint": chief_complaint,
@@ -202,17 +196,17 @@ with gr.Blocks() as demo:
 
             with gr.Row(elem_id="textboxes_row"):
                 with gr.Column():
-                    doctor_name_display = gr.Textbox(label="Doctor’s Name", value="", interactive=False)
+                    doctor_name_display = gr.Textbox(label="Doctor's Name", value="", interactive=False)
                     location_display = gr.Textbox(label="Location", value="", interactive=False)
-                    patient_name_input = gr.Textbox(label="Patient’s Name", value="", interactive=True)
-                    textboxes_left = [gr.Textbox(label=oral_health_assessment_form[i], value="", interactive=True) for i in range(3, len(oral_health_assessment_form)//2)]
+                    patient_name_input = gr.Textbox(label="Patient's Name", value="", interactive=True)
+                    textboxes_left = [gr.Textbox(label=oral_health_assessment_form[i], value="", interactive=True) for i in range(3, 9)]  # Age, Gender, Chief complaint, Medical history, Dental history, Clinical Findings
                 with gr.Column():
-                    textboxes_right = [gr.Textbox(label=oral_health_assessment_form[i], value="", interactive=True) for i in range(len(oral_health_assessment_form)//2, len(oral_health_assessment_form)-3)]
-                    textboxes_right.append(gr.Textbox(label="Clinical Findings", interactive=True))
-                    textboxes_right.append(gr.Dropdown(choices=["NONE", "ORAL MEDICINE & RADIOLOGY", "PERIODONTICS", "ORAL SURGERY", "CONSERVATIVE AND ENDODONTICS", "PROSTHODONTICS", "PEDODONTICS", "ORTHODONTICS"], value="NONE", label="Referred to", interactive=True))
-                    textboxes_right.append(gr.Dropdown(choices=["+", "++", "+++"], label="Calculus", interactive=True))
-                    textboxes_right.append(gr.Dropdown(choices=["-", "+", "++", "+++"], label="Stains", interactive=True))
-                    textboxes_right.append(gr.Dropdown(choices=["Scaling", "Filling", "Pulp therapy/RCT", "Extraction", "Medication", "Referral"], label="Treatment plan", interactive=True))
+                    textboxes_right = [
+                        gr.Dropdown(choices=["NONE", "ORAL MEDICINE & RADIOLOGY", "PERIODONTICS", "ORAL SURGERY", "CONSERVATIVE AND ENDODONTICS", "PROSTHODONTICS", "PEDODONTICS", "ORTHODONTICS"], value="NONE", label="Referred to", interactive=True),
+                        gr.Dropdown(choices=["+", "++", "+++"], label="Calculus", interactive=True),
+                        gr.Dropdown(choices=["-", "+", "++", "+++"], label="Stains", interactive=True),
+                    ]
+                    treatment_plan_dropdown = gr.Dropdown(choices=["Scaling", "Filling", "Pulp therapy/RCT", "Extraction", "Medication", "Referral"], label="Treatment plan", interactive=True)
 
             oha_output = gr.Textbox(label="OHA Output", value="", interactive=False)
             save_button = gr.Button("Save to Supabase", elem_id="save_button", interactive=True)
@@ -221,13 +215,13 @@ with gr.Blocks() as demo:
             transcribe_button.click(
                 fn=handle_transcription, 
                 inputs=[audio_input, doctor_name_input, location_input], 
-                outputs=textboxes_left + textboxes_right + [doctor_name_display, location_display]
+                outputs=[doctor_name_display, location_display] + textboxes_left + textboxes_right + [treatment_plan_dropdown]
             )
             
             # Save the form data to Supabase when the save button is clicked
             save_button.click(
                 fn=save_answers, 
-                inputs=[doctor_name_input, location_input] + [patient_name_input] + textboxes_left + textboxes_right, 
+                inputs=[doctor_name_display, location_display, patient_name_input] + textboxes_left + [treatment_plan_dropdown] + textboxes_right, 
                 outputs=[oha_output]
             )
         
@@ -238,4 +232,4 @@ with gr.Blocks() as demo:
             download_button.click(fn=gradio_download, inputs=[], outputs=download_output)
 
 # Launch the Gradio app
-demo.launch(share=True)
+demo.launch(share=True)