Update app.py

app.py

@@ -966,6 +966,7 @@ elif st.session_state.step == 2:
 
     st.markdown('<div class="label-soft">Speak (optional)</div>', unsafe_allow_html=True)
 
+    # Mic recorder
     audio_bytes = audio_recorder(
         text="Tap to record",
         recording_color="#ef4444",
@@ -974,6 +975,7 @@ elif st.session_state.step == 2:
         icon_size="1.3x",
     )
 
+    # If new audio, send to Whisper + fill textarea
     if audio_bytes:
         st.session_state.audio_bytes = audio_bytes
         if st.session_state.last_audio != audio_bytes:
@@ -983,6 +985,7 @@ elif st.session_state.step == 2:
                 st.session_state.user_text = transcript
             st.session_state.last_audio = audio_bytes
 
+    # Text area (shows transcript or manual input)
     user_text = st.text_area(
         "Or type / edit your description here",
         value=st.session_state.user_text,
@@ -996,57 +999,73 @@ elif st.session_state.step == 2:
         unsafe_allow_html=True,
     )
 
+    # Buttons: defined once
     col1, col2 = st.columns(2)
     with col1:
-        if st.button("Back", use_container_width=True):
-            go_to_step(1)
-            st.rerun()
+        back_clicked = st.button(
+            "Back",
+            use_container_width=True,
+            key="step2_back",
+        )
     with col2:
-        if st.button("Get my recommendation", use_container_width=True):
-            with st.spinner("Analyzing your photo, your description, and local options..."):
-                image_bytes = st.session_state.image_bytes
-                city_label = (st.session_state.city_label or "").strip()
+        go_clicked = st.button(
+            "Get my recommendation",
+            use_container_width=True,
+            key="step2_go",
+        )
 
-                vision_summary = call_vision_summarizer(image_bytes) if image_bytes else ""
-                narrative_text = st.session_state.user_text.strip()
+    # Handle Back
+    if back_clicked:
+        go_to_step(1)
+        st.rerun()
 
-                combined_for_drugs = " ".join(
-                    x for x in [narrative_text, vision_summary] if x
-                )
+    # Handle Get my recommendation
+    if go_clicked:
+        spinner_placeholder = st.empty()
+        with spinner_placeholder, st.spinner("Analyzing your photo, your description, and local options..."):
+            image_bytes = st.session_state.image_bytes
+            city_label = (st.session_state.city_label or "").strip()
 
-                dpd_context = (
-                    tool_lookup_drug_products(combined_for_drugs)
-                    if combined_for_drugs
-                    else "No medication context."
-                )
-                recalls_context = tool_get_recent_recalls_snippet()
-                wait_awareness_context = tool_get_wait_times_awareness()
-
-                if city_label:
-                    facilities_context = tool_list_facilities_places(city_label)
-                    region_context = tool_region_context_city(city_label)
-                    hqontario_context = tool_hqontario_context_city(city_label)
-                else:
-                    facilities_context = "No city selected; cannot list local facilities."
-                    region_context = "No city selected; use Canada-wide guidance."
-                    hqontario_context = ""
-
-                final_answer = call_reasoning_agent(
-                    narrative=narrative_text,
-                    vision_summary=vision_summary,
-                    city_label=city_label,
-                    dpd_context=dpd_context,
-                    recalls_context=recalls_context,
-                    wait_awareness_context=wait_awareness_context,
-                    region_context=region_context,
-                    facilities_context=facilities_context,
-                    hqontario_context=hqontario_context,
-                )
+            vision_summary = call_vision_summarizer(image_bytes) if image_bytes else ""
+            narrative_text = st.session_state.user_text.strip()
 
-                st.session_state.final_answer = final_answer
+            combined_for_drugs = " ".join(
+                x for x in [narrative_text, vision_summary] if x
+            )
 
-            go_to_step(3)
-            st.rerun()
+            dpd_context = (
+                tool_lookup_drug_products(combined_for_drugs)
+                if combined_for_drugs
+                else "No medication context."
+            )
+            recalls_context = tool_get_recent_recalls_snippet()
+            wait_awareness_context = tool_get_wait_times_awareness()
+
+            if city_label:
+                facilities_context = tool_list_facilities_places(city_label)
+                region_context = tool_region_context_city(city_label)
+                hqontario_context = tool_hqontario_context_city(city_label)
+            else:
+                facilities_context = "No city selected; cannot list local facilities."
+                region_context = "No city selected; use Canada-wide guidance."
+                hqontario_context = ""
+
+            final_answer = call_reasoning_agent(
+                narrative=narrative_text,
+                vision_summary=vision_summary,
+                city_label=city_label,
+                dpd_context=dpd_context,
+                recalls_context=recalls_context,
+                wait_awareness_context=wait_awareness_context,
+                region_context=region_context,
+                facilities_context=facilities_context,
+                hqontario_context=hqontario_context,
+            )
+
+            st.session_state.final_answer = final_answer
+
+        go_to_step(3)
+        st.rerun()
 
     st.markdown("</div>", unsafe_allow_html=True)