Update app.py

app.py

@@ -43,8 +43,8 @@ st.divider()
 if "thread_id" not in st.session_state:
     st.session_state["thread_id"] = None
 
-if "chat_input" not in st.session_state:
-    st.session_state["chat_input"] = ""
+if "pending_user_message" not in st.session_state:
+    st.session_state["pending_user_message"] = None
 
 input_col, clear_col = st.columns([8, 1])
 with input_col:
@@ -56,72 +56,71 @@ with clear_col:
         st.success("Chat cleared.")
         st.rerun()
 
-if openai_key and assistant_id:
-    client = OpenAI(api_key=openai_key)
-
-    if user_input:
-        # Clear input after submitting
-        st.session_state["chat_input"] = ""
+if user_input:
+    st.session_state["pending_user_message"] = user_input
+    st.session_state["chat_input"] = ""
+    st.experimental_rerun()
 
-        # Create thread if not exists
-        if not st.session_state["thread_id"]:
-            thread = client.beta.threads.create()
-            st.session_state["thread_id"] = thread.id
+if openai_key and assistant_id and st.session_state["pending_user_message"]:
+    client = OpenAI(api_key=openai_key)
+    user_message = st.session_state["pending_user_message"]
+    st.session_state["pending_user_message"] = None
+
+    if not st.session_state["thread_id"]:
+        thread = client.beta.threads.create()
+        st.session_state["thread_id"] = thread.id
+
+    client.beta.threads.messages.create(
+        thread_id=st.session_state["thread_id"], role="user", content=user_message
+    )
+    append_to_transcript(st.session_state["thread_id"], "user", user_message)
+
+    try:
+        with st.spinner("Thinking and typing... 💭"):
+            run = client.beta.threads.runs.create(
+                thread_id=st.session_state["thread_id"], assistant_id=assistant_id
+            )
+            while True:
+                run_status = client.beta.threads.runs.retrieve(
+                    thread_id=st.session_state["thread_id"], run_id=run.id
+                )
+                if run_status.status == "completed":
+                    break
+                time.sleep(1)
 
-        # Add user message
-        client.beta.threads.messages.create(
-            thread_id=st.session_state["thread_id"], role="user", content=user_input
+        messages_response = client.beta.threads.messages.list(
+            thread_id=st.session_state["thread_id"]
         )
-        append_to_transcript(st.session_state["thread_id"], "user", user_input)
 
-        try:
-            with st.spinner("Thinking and typing... 💭"):
-                run = client.beta.threads.runs.create(
-                    thread_id=st.session_state["thread_id"], assistant_id=assistant_id
+        assistant_icon_html = "<img src='https://www.carfind.co.za/images/Carfind-Icon.svg' width='22' style='vertical-align:middle;'/>"
+
+        messages_sorted = sorted(messages_response.data, key=lambda x: x.created_at, reverse=True)
+        for msg in messages_sorted:
+            if msg.role == "user":
+                st.markdown(
+                    f"<div style='background-color:#f0f0f0; color:#000000; padding:10px; border-radius:8px; margin:5px 0;'>"
+                    f"👤 <strong>You:</strong> {msg.content[0].text.value}"
+                    f"</div>",
+                    unsafe_allow_html=True
                 )
-                while True:
-                    run_status = client.beta.threads.runs.retrieve(
-                        thread_id=st.session_state["thread_id"], run_id=run.id
-                    )
-                    if run_status.status == "completed":
-                        break
-                    time.sleep(1)
-
-            # Get full conversation
-            messages_response = client.beta.threads.messages.list(
-                thread_id=st.session_state["thread_id"]
-            )
+            else:
+                response_text = msg.content[0].text.value
+                append_to_transcript(st.session_state["thread_id"], "assistant", response_text)
+                st.markdown(
+                    f"<div style='background-color:#D6E9FE; color:#000000; padding:10px; border-radius:8px; margin:5px 0;'>"
+                    f"{assistant_icon_html} <strong>Carfind Assistant:</strong> {response_text}"
+                    f"</div>",
+                    unsafe_allow_html=True
+                )
+
+        st.markdown("""
+            <script>
+                window.scrollTo(0, 0);
+            </script>
+        """, unsafe_allow_html=True)
+
+    except Exception as e:
+        st.error(f"An error occurred: {str(e)}")
 
-            assistant_icon_html = "<img src='https://www.carfind.co.za/images/Carfind-Icon.svg' width='22' style='vertical-align:middle;'/>"
-
-            # Display newest-first
-            messages_sorted = sorted(messages_response.data, key=lambda x: x.created_at, reverse=True)
-            for msg in messages_sorted:
-                if msg.role == "user":
-                    st.markdown(
-                        f"<div style='background-color:#f0f0f0; color:#000000; padding:10px; border-radius:8px; margin:5px 0;'>"
-                        f"👤 <strong>You:</strong> {msg.content[0].text.value}"
-                        f"</div>", 
-                        unsafe_allow_html=True
-                    )
-                else:
-                    response_text = msg.content[0].text.value
-                    append_to_transcript(st.session_state["thread_id"], "assistant", response_text)
-                    st.markdown(
-                        f"<div style='background-color:#D6E9FE; color:#000000; padding:10px; border-radius:8px; margin:5px 0;'>"
-                        f"{assistant_icon_html} <strong>Carfind Assistant:</strong> {response_text}"
-                        f"</div>", 
-                        unsafe_allow_html=True
-                    )
-
-            # Scroll to top automatically
-            st.markdown("""
-                <script>
-                    window.scrollTo(0, 0);
-                </script>
-            """, unsafe_allow_html=True)
-
-        except Exception as e:
-            st.error(f"An error occurred: {str(e)}")
-else:
+elif not openai_key or not assistant_id:
     st.error("⚠️ OpenAI key or Assistant ID not found. Please ensure both are set as Hugging Face secrets.")