Update app.py

app.py

@@ -101,13 +101,8 @@ def page1():
             metadata={'session_id': st.session_state.session_id}
         )
 
-    # User input and submission
     prompt = st.text_input("Wie kann ich dir helfen?")
     if st.button("Submit"):
-        # Display user's message immediately
-        with st.chat_message('user'):
-            st.markdown(prompt)
-
         # Add message to the thread
         st.session_state.messages = client.beta.threads.messages.create(
             thread_id=st.session_state.thread.id,
@@ -121,13 +116,13 @@ def page1():
             assistant_id=st.session_state.assistant.id,
         )
 
-        # Check run status
         if st.session_state.retry_error < 3:
-            time.sleep(1) # Wait before checking run status
+            time.sleep(1)  # Wait before checking run status
             st.rerun()
 
-    # Handle different run statuses
+    # Check if 'run' object has 'status' attribute
     if hasattr(st.session_state.run, 'status'):
+        # Handle the 'running' status
         if st.session_state.run.status == "running":
             with st.chat_message('assistant'):
                 st.write("Thinking ......")
@@ -135,6 +130,7 @@ def page1():
                 time.sleep(1)  # Short delay to prevent immediate rerun
                 st.rerun()
 
+        # Handle the 'failed' status
         elif st.session_state.run.status == "failed":
             st.session_state.retry_error += 1
             with st.chat_message('assistant'):
@@ -145,6 +141,7 @@ def page1():
                 else:
                     st.error("FAILED: The OpenAI API is currently processing too many requests. Please try again later ......")
 
+        # Handle any status that is not 'completed'
         elif st.session_state.run.status != "completed":
             st.session_state.run = client.beta.threads.runs.retrieve(
                 thread_id=st.session_state.thread.id,
@@ -154,26 +151,26 @@ def page1():
                 time.sleep(3)
                 st.rerun()
 
-        # Display the final assistant message
-        elif st.session_state.run.status == "completed":
+        # If the run is completed, display the messages
+        elif hasattr(st.session_state.run, 'status') and st.session_state.run.status == "completed":
             # Retrieve the list of messages
             st.session_state.messages = client.beta.threads.messages.list(
                 thread_id=st.session_state.thread.id
             )
-    
-            # Find the final assistant message
-            final_assistant_message = next((m for m in reversed(st.session_state.messages.data) if m.role == "assistant"), None)
-    
-            if final_assistant_message:
-                with st.chat_message('assistant'):
-                    for content_part in final_assistant_message.content:
-                        if content_part.type == 'text':  # For text responses
-                            message_text = content_part.text.value
-                            st.markdown(message_text)
-                        elif hasattr(content_part, 'image_file') and content_part.image_file:  
-                            image = handle_and_display_image(content_part.image_file.file_id)
-                            if image:
-                                st.image(image, caption="Generated Image")
+
+            # Display messages
+            for message in reversed(st.session_state.messages.data):
+                if message.role in ["user", "assistant"]:
+                    with st.chat_message(message.role):
+                        for content_part in message.content:
+                            if content_part.type == 'text':  # For text responses
+                                message_text = content_part.text.value
+                                st.markdown(message_text)
+                            elif hasattr(content_part, 'image_file') and content_part.image_file:  
+                                image = handle_and_display_image(content_part.image_file.file_id)
+                                if image:
+                                    st.image(image, caption="Generated Image")
+