Updated app.py

app.py

@@ -49,7 +49,7 @@ if "thread_id" not in st.session_state:
     st.session_state.user_profile = {}
     st.session_state.chat_history = []
     st.session_state.is_profile_complete = False
-    st.session_state.phase = "zip"
+    st.session_state.phase = "user-profiling"
 
 # --- Helper Functions for API Calls ---
 def get_geodata(_zip_code: str):
@@ -85,53 +85,47 @@ def send_chat_message_to_backend(user_message: str):
         st.error(f"Error communicating with the AI service: {e}")
 
 # --- UI Rendering Functions ---
-def display_zip_form():
-    st.header("Let's Start with Your Location")
+def display_form_interface():
     zip_code_input = st.text_input("Enter your 5-digit ZIP code:", max_chars=5)
-    if st.button("Confirm ZIP Code"):
-        if zip_code_input and len(zip_code_input) == 5 and zip_code_input.isdigit():
-            with st.spinner("Verifying ZIP code..."):
-                geo_data = get_geodata(zip_code_input)
-            if geo_data:
-                st.session_state.user_profile.update(geo_data)
-                st.session_state.phase = "basic_profile"
-                st.rerun()
-            else:
-                st.error("Invalid ZIP code or could not retrieve location data.")
-        else:
-            st.error("Please enter a valid 5-digit ZIP code.")
+    if zip_code_input and len(zip_code_input) == 5 and zip_code_input.isdigit():
+        with st.spinner("Verifying ZIP code..."):
+            geo_data = get_geodata(zip_code_input)
+        if geo_data:
+            st.session_state.user_profile.update(geo_data)
 
-def display_basic_profile_form():
-    st.header("Tell Us More About You")
-    st.write(f"**Location:** {st.session_state.user_profile.get('city', '')}, {st.session_state.user_profile.get('state', '')}")
-    
-    with st.form("basic_profile_form"):
-        st.subheader("Please provide some basic information:")
-        
-        age = st.number_input("Your Age", min_value=1, max_value=120, value=None, placeholder="Enter your age")
-        gender = st.selectbox("Your Gender", [None, "Male", "Female", "Non-binary", "Prefer not to say"], index=0, format_func=lambda x: "Select an option" if x is None else x)
-        household_size = st.number_input("Household Size (including yourself)", min_value=1, value=None, placeholder="e.g., 1")
-        income = st.number_input("Estimated Annual Household Income ($)", min_value=0, step=1000, value=None, placeholder="e.g., 55000")
-        employment_status = st.selectbox("Your Employment Status", [None, "Employed with employer coverage", "Employed without coverage", "Unemployed", "Retired", "Student", "Self-employed"], index=0, format_func=lambda x: "Select an option" if x is None else x)
-        citizenship = st.selectbox("Your Citizenship Status", [None, "US Citizen", "Lawful Permanent Resident", "Other legal resident", "Non-resident"], index=0, format_func=lambda x: "Select an option" if x is None else x)
-        
-        submitted = st.form_submit_button("Start My Personalized Session")
-        
-        if submitted:
-            if not all([age, gender, household_size, income is not None, employment_status, citizenship]):
-                st.error("Please fill out all the fields to continue.")
+            st.write(f"**Location:** {st.session_state.user_profile.get('county', '')} County, {st.session_state.user_profile.get('city', '')}, {st.session_state.user_profile.get('state', '')}")
+
+            with st.form("user_profile_form"):
+                
+                age = st.number_input("Your Age", min_value=1, max_value=120, value=None, placeholder="Enter your age")
+                gender = st.selectbox("Your Gender", [None, "Male", "Female", "Non-binary", "Prefer not to say"], index=0, format_func=lambda x: "Select an option" if x is None else x)
+                household_size = st.number_input("Household Size (including yourself)", min_value=1, value=None, placeholder="e.g., 1")
+                income = st.number_input("Estimated Annual Household Income ($)", min_value=0, step=1000, value=None, placeholder="e.g., 55000")
+                employment_status = st.selectbox("Your Employment Status", [None, "Employed with employer coverage", "Employed without coverage", "Unemployed", "Retired", "Student", "Self-employed"], index=0, format_func=lambda x: "Select an option" if x is None else x)
+                citizenship = st.selectbox("Your Citizenship Status", [None, "US Citizen", "Lawful Permanent Resident", "Other legal resident", "Non-resident"], index=0, format_func=lambda x: "Select an option" if x is None else x)
                 
-            else:
-                st.session_state.user_profile.update({
-                    "age": age, "gender": gender, "household_size": household_size,
-                    "income": income, "employment_status": employment_status,
-                    "citizenship": citizenship,
-                    "medical_history": None, "medications": None, "special_cases": None
-                })
-                st.session_state.phase = "chat"
-                with st.spinner("Starting your personalized profile conversation..."):
-                    send_chat_message_to_backend("START_PROFILE_BUILDING")
-                st.rerun()
+                submitted = st.form_submit_button("Start My Personalized Session")
+                
+                if submitted:
+                    if not all([age, gender, household_size, income is not None, employment_status, citizenship]):
+                        st.error("Please fill out all the fields to continue.")
+                        
+                    else:
+                        st.session_state.user_profile.update({
+                            "age": age, "gender": gender, "household_size": household_size,
+                            "income": income, "employment_status": employment_status,
+                            "citizenship": citizenship,
+                            "medical_history": None, "medications": None, "special_cases": None
+                        })
+                        st.session_state.phase = "chat"
+                        with st.spinner("Starting your personalized profile conversation..."):
+                            send_chat_message_to_backend("START_PROFILE_BUILDING")
+                        st.rerun()
+
+        else:
+            st.error("Invalid ZIP code or could not retrieve location data.")
+    else:
+        st.info("Please enter a valid 5-digit ZIP code.")
 
 def display_chat_interface():
     # Display chat history from session state
@@ -149,10 +143,9 @@ def display_chat_interface():
         st.rerun()
 
 # --- Main Application Flow Control ---
-if st.session_state.phase == "zip":
-    display_zip_form()
-elif st.session_state.phase == "basic_profile":
-    display_basic_profile_form()
+if st.session_state.phase == "user-profiling":
+    display_form_interface()
+
 else: # 'chat' phase
     display_chat_interface()