Update app.py

app.py

@@ -105,67 +105,73 @@ with tab1:
             st.session_state.messages.append({"role": "user", "content": st.session_state.pending_prompt})
             st.session_state.pending_prompt = None
 
+        # Only trigger assistant if last message is from user
         if st.session_state.messages and st.session_state.messages[-1]["role"] == "user":
             try:
-                if not st.session_state.thread_id:
-                    st.session_state.thread_id = client.beta.threads.create().id
+                with st.spinner("🔬 Analyzing..."):
+                    if not st.session_state.thread_id:
+                        st.session_state.thread_id = client.beta.threads.create().id
 
-                client.beta.threads.messages.create(
-                    thread_id=st.session_state.thread_id,
-                    role="user",
-                    content=st.session_state.messages[-1]["content"]
-                )
+                    client.beta.threads.messages.create(
+                        thread_id=st.session_state.thread_id,
+                        role="user",
+                        content=st.session_state.messages[-1]["content"]
+                    )
 
-                run = client.beta.threads.runs.create(
-                    thread_id=st.session_state.thread_id,
-                    assistant_id=ASSISTANT_ID
-                )
+                    run = client.beta.threads.runs.create(
+                        thread_id=st.session_state.thread_id,
+                        assistant_id=ASSISTANT_ID
+                    )
 
-                with st.spinner("🔬 Analyzing..."):
+                    # Wait for run to complete
                     while True:
                         status = client.beta.threads.runs.retrieve(
-                            thread_id=st.session_state.thread_id, run_id=run.id
+                            thread_id=st.session_state.thread_id,
+                            run_id=run.id
                         )
                         if status.status in ("completed", "failed", "cancelled"):
                             break
                         time.sleep(1)
 
-                if status.status == "completed":
-                    responses = client.beta.threads.messages.list(
-                        thread_id=st.session_state.thread_id
-                    ).data
-                    for m in reversed(responses):
-                        if m.role == "assistant":
-                            reply = m.content[0].text.value.strip()
-                            if not any(reply in msg["content"] or msg["content"] in reply
-                                       for msg in st.session_state.messages if msg["role"] == "assistant"):
-                                st.session_state.messages.append({"role": "assistant", "content": reply})
-
-                                # Extract image URLs from response
-                                images = re.findall(
-                                    r'https://raw\.githubusercontent\.com/AndrewLORTech/witspathologai/main/[^\s\n"]+\.png',
-                                    reply
-                                )
-                                st.session_state.image_urls = images
-                            break
-                else:
-                    st.error("❌ Assistant failed to complete.")
+                    if status.status == "completed":
+                        responses = client.beta.threads.messages.list(
+                            thread_id=st.session_state.thread_id
+                        ).data
+
+                        # Only take the last assistant message
+                        for m in responses:
+                            if m.role == "assistant":
+                                reply = m.content[0].text.value.strip()
+                                if not any(
+                                    reply in msg["content"] or msg["content"] in reply
+                                    for msg in st.session_state.messages if msg["role"] == "assistant"
+                                ):
+                                    st.session_state.messages.append({"role": "assistant", "content": reply})
+
+                                    # Extract image URLs
+                                    images = re.findall(
+                                        r'https://raw\.githubusercontent\.com/AndrewLORTech/witspathologai/main/[^\s\n"]+\.png',
+                                        reply
+                                    )
+                                    st.session_state.image_urls = images
+                                break
+                    else:
+                        st.error("❌ Assistant failed to complete.")
                 st.rerun()
             except Exception as e:
                 st.error(f"❌ Error: {e}")
 
-        # Display messages
+        # Display all messages
         for msg in st.session_state.messages:
             with st.chat_message(msg["role"]):
                 st.markdown(msg["content"], unsafe_allow_html=True)
 
-        # Display follow-up questions
+        # Follow-up Questions
         if st.session_state.messages and st.session_state.messages[-1]["role"] == "assistant":
             last = st.session_state.messages[-1]["content"]
             if "Some Possible Questions:" in last:
-                # Filter only lines that are actual questions
-                all_lines = re.findall(r"[-•]\s*(.*)", last)
-                questions = [line for line in all_lines if line.strip().endswith("?")]
+                suggestions = re.findall(r"[-•]\s*(.*)", last)
+                questions = [q.strip() for q in suggestions if q.strip().endswith("?")]
 
                 if questions:
                     st.markdown("#### 💡 Follow-Up Suggestions")
@@ -186,6 +192,7 @@ with tab1:
                 except Exception:
                     st.warning(f"⚠️ Failed to load image: {url}")
 
+
 # ------------------ Tab 2: Visual Reference Search ------------------
 import urllib.parse
 import requests