Update app.py

app.py

@@ -144,17 +144,13 @@ for q, message in enumerate(st.session_state.messages):
         with st.chat_message(message["role"]):
             tab1, tab2 = st.tabs(["Answer", "Sources"])
             with tab1:
+                st.markdown(message["content"])
+    
+            with tab2:
                 for i, source in enumerate(message["sources"]):
                     name = f'{source}'
                     with st.expander(name):
                         st.markdown(f'{message["context"][i]}')
-                # st.markdown(message["content"])
-    
-            # with tab2:
-            #     for i, source in enumerate(message["sources"]):
-            #         name = f'{source}'
-            #         with st.expander(name):
-            #             st.markdown(f'{message["context"][i]}')
             
     else:
         question = message["content"]
@@ -171,21 +167,17 @@ if prompt := st.chat_input("How may I assist you today?"):
         query=st.session_state.messages[-1]['content']
         tab1, tab2 = st.tabs(["Answer", "Sources"])
         with tab1:
+            with st.spinner("Generating answer..."):
+                Generate the full answer at once
+                full_answer = chain.invoke({"question": query, "chat_history": st.session_state.messages})
+            
+            # Display the full answer
+            st.markdown(full_answer, unsafe_allow_html=True)
+        with tab2:
             for i, source in enumerate(st.session_state.context_sources):
                 name = f'{source}'
                 with st.expander(name):
                     st.markdown(f'{st.session_state.context_content[i]}')
-            # with st.spinner("Generating answer..."):
-                # Generate the full answer at once
-                # full_answer = chain.invoke({"question": query, "chat_history": st.session_state.messages})
-            
-            # Display the full answer
-            st.markdown(full_answer, unsafe_allow_html=True)
-        # with tab2:
-        #     for i, source in enumerate(st.session_state.context_sources):
-        #         name = f'{source}'
-        #         with st.expander(name):
-        #             st.markdown(f'{st.session_state.context_content[i]}')