Update app.py

app.py

@@ -9,7 +9,7 @@ from langchain.chains import ConversationalRetrievalChain
 from ctransformers import AutoModelForCausalLM
 from langchain_g4f import G4FLLM
 from g4f import Provider, models
-import spacy
+# import spacy
 import requests
 # Define the path for generated embeddings
 DB_FAISS_PATH = 'vectorstore/db_faiss'
@@ -88,52 +88,83 @@ nlp = spacy.load("ja_core_news_sm")
 
 # Function for conversational chat
 def conversational_chat(query):
-    result = None
-    similarity_score = 0
-    # Set a threshold for similarity (you can adjust this)
-    similarity_threshold = 0.8
-    while similarity_score <= similarity_threshold:
-        result = chain({"question": query, "chat_history": st.session_state['history']})
-        doc = nlp(result["answer"])
+    # result = None
+    # similarity_score = 0
+    # # Set a threshold for similarity (you can adjust this)
+    # similarity_threshold = 0.8
+    # while similarity_score <= similarity_threshold:
+    #     result = chain({"question": query, "chat_history": st.session_state['history']})
+    #     doc = nlp(result["answer"])
     
-        # Define the Japanese phrase to match
-        target_phrase = query  # Replace with your desired Japanese phrase
+    #     # Define the Japanese phrase to match
+    #     target_phrase = query  # Replace with your desired Japanese phrase
     
-        # Check for similarity
-        similarity_score = doc.similarity(nlp(target_phrase))
-        
+    #     # Check for similarity
+    #     similarity_score = doc.similarity(nlp(target_phrase))
+    result = chain({"question": query, "chat_history": st.session_state['history']})
     st.session_state['history'].append((query, result["answer"]))   
     return result["answer"]
-
-# Initialize chat history
-if 'history' not in st.session_state:
-    st.session_state['history'] = []
-
-# Initialize messages
-if 'generated' not in st.session_state:
-    st.session_state['generated'] = ["こんにちは！zendo美女です。何かお探しですか？... 🤗"]
-
+    
+# Initialize session state if not already done
 if 'past' not in st.session_state:
-    st.session_state['past'] = ["チャットはここから"]
+    st.session_state['past'] = []
+    st.session_state['generated'] = []
 
-# Create containers for chat history and user input
-response_container = st.container()
-container = st.container()
+# Create a container for the chat history
+chat_history_container = st.container()
 
-# User input form
-with container:
-    with st.form(key='my_form', clear_on_submit=True):
-        user_input = st.text_input("ChatBox", placeholder="質問をご記入ください...  ", key='input')
-        submit_button = st.form_submit_button(label='Send')
+# Create a form for user input
+with st.form(key='my_form', clear_on_submit=True):
+    user_input = st.text_input("ChatBox", placeholder="Ask anything...", key='input')
+    submit_button = st.form_submit_button(label='Send')
 
-    if submit_button and user_input:
-        output = conversational_chat(user_input)
-        st.session_state['past'].append(user_input)
-        st.session_state['generated'].append(output)
+# Process user input and update chat history
+if submit_button and user_input:
+    output = conversational_chat(user_input)
+    st.session_state['past'].append(user_input)
+    st.session_state['generated'].append(output)
 
-# Display chat history
+# Display chat history within the container
 if st.session_state['generated']:
-    with response_container:
+    with chat_history_container:
         for i in range(len(st.session_state['generated'])):
-            message(st.session_state["past"][i], is_user=True, key=str(i) + '_user', avatar_style="big-smile")
-            message(st.session_state["generated"][i], key=str(i), avatar_style="thumbs")
+            st.text(st.session_state["past"][i], key=str(i) + '_user')
+            st.text(st.session_state["generated"][i], key=str(i))
+
+# Ensure chat history is always scrollable
+st.markdown("""<style>
+    .stText { overflow-y: auto; }
+</style>""", unsafe_allow_html=True)
+
+# Initialize chat history
+# if 'history' not in st.session_state:
+#     st.session_state['history'] = []
+
+# # Initialize messages
+# if 'generated' not in st.session_state:
+#     st.session_state['generated'] = ["こんにちは！zendo美女です。何かお探しですか？... 🤗"]
+
+# if 'past' not in st.session_state:
+#     st.session_state['past'] = ["チャットはここから"]
+
+# # Create containers for chat history and user input
+# response_container = st.container()
+# container = st.container()
+
+# # User input form
+# with container:
+#     with st.form(key='my_form', clear_on_submit=True):
+#         user_input = st.text_input("ChatBox", placeholder="質問をご記入ください...  ", key='input')
+#         submit_button = st.form_submit_button(label='Send')
+
+#     if submit_button and user_input:
+#         output = conversational_chat(user_input)
+#         st.session_state['past'].append(user_input)
+#         st.session_state['generated'].append(output)
+
+# # Display chat history
+# if st.session_state['generated']:
+#     with response_container:
+#         for i in range(len(st.session_state['generated'])):
+#             message(st.session_state["past"][i], is_user=True, key=str(i) + '_user', avatar_style="big-smile")
+#             message(st.session_state["generated"][i], key=str(i), avatar_style="thumbs")