Sync updates from source repository

app.py

@@ -1,18 +1,18 @@
 from omegaconf import OmegaConf
 from query import VectaraQuery
 import os
-import requests
-import json
+from PIL import Image
 import uuid
 
 import streamlit as st
 from streamlit_pills import pills
 from streamlit_feedback import streamlit_feedback
 
-from PIL import Image
+from utils import thumbs_feedback, send_amplitude_data, escape_dollars_outside_latex
+
 
 max_examples = 6
-languages = {'English': 'eng', 'Spanish': 'spa', 'French': 'frs', 'Chinese': 'zho', 'German': 'deu', 'Hindi': 'hin', 'Arabic': 'ara',
+languages = {'English': 'eng', 'Spanish': 'spa', 'French': 'fra', 'Chinese': 'zho', 'German': 'deu', 'Hindi': 'hin', 'Arabic': 'ara',
              'Portuguese': 'por', 'Italian': 'ita', 'Japanese': 'jpn', 'Korean': 'kor', 'Russian': 'rus', 'Turkish': 'tur', 'Persian (Farsi)': 'fas',
              'Vietnamese': 'vie', 'Thai': 'tha', 'Hebrew': 'heb', 'Dutch': 'nld', 'Indonesian': 'ind', 'Polish': 'pol', 'Ukrainian': 'ukr',
              'Romanian': 'ron', 'Swedish': 'swe', 'Czech': 'ces', 'Greek': 'ell', 'Bengali': 'ben', 'Malay (or Malaysian)': 'msa', 'Urdu': 'urd'}
@@ -21,36 +21,6 @@ languages = {'English': 'eng', 'Spanish': 'spa', 'French': 'frs', 'Chinese': 'zh
 if 'device_id' not in st.session_state:
     st.session_state.device_id = str(uuid.uuid4())
 
-headers = {
-    'Content-Type': 'application/json',
-    'Accept': '*/*'
-}
-amp_api_key = os.getenv('AMPLITUDE_TOKEN')
-
-def thumbs_feedback(feedback, **kwargs):
-    """
-    Sends feedback to Amplitude Analytics
-    """
-    data = {
-            "api_key": amp_api_key,
-            "events": [{
-                "device_id": st.session_state.device_id,
-                "event_type": "provided_feedback",
-                "event_properties": {
-                    "Space Name": kwargs.get("title", "Unknown Space Name"),
-                    "Demo Type": "chatbot",
-                    "query": kwargs.get("prompt", "No user input"),
-                    "response": kwargs.get("response", "No chat response"),
-                    "feedback": feedback["score"],
-                    "Response Language": st.session_state.language
-                }
-            }]
-        }
-    response = requests.post('https://api2.amplitude.com/2/httpapi', headers=headers, data=json.dumps(data))
-    if response.status_code != 200:
-        print(f"Request failed with status code {response.status_code}. Response Text: {response.text}")
-    
-    st.session_state.feedback_key += 1
 
 if "feedback_key" not in st.session_state:
         st.session_state.feedback_key = 0
@@ -61,6 +31,12 @@ def isTrue(x) -> bool:
     return x.strip().lower() == 'true'
 
 def launch_bot():
+    def reset():
+        st.session_state.messages = [{"role": "assistant", "content": "How may I help you?"}]
+        st.session_state.ex_prompt = None
+        st.session_state.first_turn = True
+
+
     def generate_response(question):
         response = vq.submit_query(question, languages[st.session_state.language])
         return response
@@ -113,9 +89,16 @@ def launch_bot():
         cfg.language = st.selectbox('Language:', languages.keys())
         if st.session_state.language != cfg.language:
             st.session_state.language = cfg.language
-            print(f"DEBUG: Language changed to {st.session_state.language}")
+            reset()
             st.rerun()
 
+        st.markdown("\n")
+        bc1, _ = st.columns([1, 1])
+        with bc1:
+            if st.button('Start Over'):
+                reset()
+                st.rerun()
+
         st.markdown("---")
         st.markdown(
             "## How this works?\n"
@@ -129,7 +112,7 @@ def launch_bot():
     st.markdown(f"<center> <h2> Vectara AI Assistant: {cfg.title} </h2> </center>", unsafe_allow_html=True)
 
     if "messages" not in st.session_state.keys():
-        st.session_state.messages = [{"role": "assistant", "content": "How may I help you?"}]
+        reset()
                 
     # Display chat messages
     for message in st.session_state.messages:
@@ -157,40 +140,32 @@ def launch_bot():
     if st.session_state.messages[-1]["role"] != "assistant":
         with st.chat_message("assistant"):
             if cfg.streaming:
-                stream = generate_streaming_response(prompt) 
-                response = st.write_stream(stream) 
+                stream = generate_streaming_response(prompt)
+                response = st.write_stream(stream)
             else:
                 with st.spinner("Thinking..."):
                     response = generate_response(prompt)
                     st.write(response)
+
+            response = escape_dollars_outside_latex(response)
             message = {"role": "assistant", "content": response}
             st.session_state.messages.append(message)
 
             # Send query and response to Amplitude Analytics
-            data = {
-                "api_key": amp_api_key,
-                "events": [{
-                    "device_id": st.session_state.device_id,
-                    "event_type": "submitted_query",
-                    "event_properties": {
-                        "Space Name": cfg["title"],
-                        "Demo Type": "chatbot",
-                        "query": st.session_state.messages[-2]["content"],
-                        "response": st.session_state.messages[-1]["content"],
-                        "Response Language": st.session_state.language
-                    }
-                }]
-            }
-            response = requests.post('https://api2.amplitude.com/2/httpapi', headers=headers, data=json.dumps(data))
-            if response.status_code != 200:
-                print(f"Amplitude request failed with status code {response.status_code}. Response Text: {response.text}")
+            send_amplitude_data(
+                user_query=st.session_state.messages[-2]["content"],
+                chat_response=st.session_state.messages[-1]["content"],
+                demo_name=cfg["title"],
+                language=st.session_state.language
+            )
             st.rerun()
 
     if (st.session_state.messages[-1]["role"] == "assistant") & (st.session_state.messages[-1]["content"] != "How may I help you?"):
         streamlit_feedback(feedback_type="thumbs", on_submit = thumbs_feedback, key = st.session_state.feedback_key,
-                                      kwargs = {"prompt": st.session_state.messages[-2]["content"],
-                                                "response": st.session_state.messages[-1]["content"],
-                                                "title": cfg["title"]})
+                                      kwargs = {"user_query": st.session_state.messages[-2]["content"],
+                                                "chat_response": st.session_state.messages[-1]["content"],
+                                                "demo_name": cfg["title"],
+                                                "response_language": st.session_state.language})
     
 if __name__ == "__main__":
     launch_bot()

utils.py

@@ -0,0 +1,68 @@
+import os
+import requests
+import json
+import re
+
+import streamlit as st
+
+headers = {
+    'Content-Type': 'application/json',
+    'Accept': '*/*'
+}
+
+def thumbs_feedback(feedback, **kwargs):
+    """
+    Sends feedback to Amplitude Analytics
+    """
+    
+    send_amplitude_data(
+        user_query=kwargs.get("user_query", "No user input"),
+        chat_response=kwargs.get("chat_response", "No bot response"),
+        demo_name=kwargs.get("demo_name", "Unknown"),
+        language = kwargs.get("response_language", "Unknown"),
+        feedback=feedback["score"],
+    )    
+    st.session_state.feedback_key += 1
+
+def send_amplitude_data(user_query, chat_response, demo_name, language, feedback=None):
+    # Send query and response to Amplitude Analytics
+    data = {
+        "api_key": os.getenv('AMPLITUDE_TOKEN'),
+        "events": [{
+            "device_id": st.session_state.device_id,
+            "event_type": "submitted_query",
+            "event_properties": {
+                "Space Name": demo_name,
+                "Demo Type": "chatbot",
+                "query": user_query,
+                "response": chat_response,
+                "Response Language": language
+            }
+        }]
+    }
+    if feedback:
+        data["events"][0]["event_properties"]["feedback"] = feedback
+
+    response = requests.post('https://api2.amplitude.com/2/httpapi', headers=headers, data=json.dumps(data))
+    if response.status_code != 200:
+        print(f"Amplitude request failed with status code {response.status_code}. Response Text: {response.text}")
+
+def escape_dollars_outside_latex(text):
+    # Define a regex pattern to find LaTeX equations (either single $ or double $$)
+    pattern = re.compile(r'(\$\$.*?\$\$|\$.*?\$)')
+    latex_matches = pattern.findall(text)
+    
+    # Placeholder to temporarily store LaTeX equations
+    placeholders = {}
+    for i, match in enumerate(latex_matches):
+        placeholder = f'__LATEX_PLACEHOLDER_{i}__'
+        placeholders[placeholder] = match
+        text = text.replace(match, placeholder)
+    
+    # Escape dollar signs in the rest of the text
+    text = text.replace('$', '\\$')
+    
+    # Replace placeholders with the original LaTeX equations
+    for placeholder, original in placeholders.items():
+        text = text.replace(placeholder, original)
+    return text