added amplitude analytics and other bug fixes

agent.py

@@ -72,6 +72,7 @@ def create_assistant_tools(cfg):
     return (tools_factory.standard_tools() + 
             tools_factory.guardrail_tools() +
             tools_factory.database_tools(
+                tool_name_prefix = "ev",
                 content_description = 'Electric Vehicles in the state of Washington',
                 sql_database = SQLDatabase(create_engine('sqlite:///ev_database.db')),
             ) +
@@ -85,9 +86,10 @@ def initialize_agent(_cfg, update_func=None):
     - For a query with multiple sub-questions, break down the query into the sub-questions, 
       and make separate calls to the ask_vehicles or ask_policies tool to answer each sub-question,
       then combine the answers to provide a complete response.
-    - Use the database tools to answer analytical questions.
-    - IMPORTANT: When using database tools, always query SELECT * FROM (table_name) LIMIT 25; first to figure out the format of the columns and
-      then call the tool again to try to answer the user's question.
+    - Use the database tools (ev_load_data, ev_describe_tables and ev_list_tables) to answer analytical queries.
+    - IMPORTANT: When using database tools, always "query SELECT * FROM (table_name) LIMIT 25;" first to figure out the format of the columns and
+      then call the tool again to try to answer the user's query.
+    - Avoid "SELECT *" queries on tables, as they can be slow, instead craft the correct query to get the required information.
     - When providing links, try to put the name of the website or source of information for the displayed text. Don't just say 'Source'.
     - Never discuss politics, and always respond politely.
     """

app.py

@@ -1,19 +1,15 @@
 from PIL import Image
 import sys
 import os
-import requests
-import json
 import uuid
 
 import streamlit as st
 from streamlit_pills import pills
 from streamlit_feedback import streamlit_feedback
 
-from langdetect import detect_langs
-from langcodes import Language
+from utils import thumbs_feedback, escape_dollars_outside_latex, send_amplitude_data
 
 import sqlite3
-import pandas as pd
 from datasets import load_dataset
 
 from vectara_agent.agent import AgentStatusType
@@ -26,40 +22,6 @@ initial_prompt = "How can I help you today?"
 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 identifyLanguage(response):
-    lang_code = detect_langs(response)[0].lang
-    return Language.make(language=lang_code).display_name()
-
-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("demo_name", "Unknown"),
-                    "Demo Type": "Agent",
-                    "query": kwargs.get("prompt", "No user input"),
-                    "response": kwargs.get("response", "No chat response"),
-                    "feedback": feedback["score"],
-                    "Response Language": kwargs.get("language", "Unknown 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
@@ -117,7 +79,7 @@ def launch_bot():
                 reset()
                 st.rerun()
 
-        st.markdown("---")
+        st.divider()
         st.markdown(
             "## How this works?\n"
             "This app was built with [Vectara](https://vectara.com).\n\n"
@@ -159,29 +121,16 @@ def launch_bot():
         with st.chat_message("assistant", avatar='🤖'):
             with st.spinner(st.session_state.thinking_message):
                 res = st.session_state.agent.chat(st.session_state.prompt)
-                res = res.replace('$', '\\$')  # escape dollar sign for markdown
+                res = escape_dollars_outside_latex(res)
             message = {"role": "assistant", "content": res, "avatar": '🤖'}
             st.session_state.messages.append(message)
             st.markdown(res)
 
-        # 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['demo_name'],
-                    "Demo Type": "Agent",
-                    "query": st.session_state.messages[-2]["content"],
-                    "response": st.session_state.messages[-1]["content"],
-                    "Response Language": identifyLanguage(st.session_state.messages[-1]["content"])
-                }
-            }]
-        }
-        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}")
+        send_amplitude_data(
+            user_query=st.session_state.messages[-2]["content"], 
+            bot_response=st.session_state.messages[-1]["content"],
+            demo_name=cfg['demo_name']
+        )
 
         st.session_state.ex_prompt = None
         st.session_state.prompt = None
@@ -189,12 +138,13 @@ def launch_bot():
         st.rerun()
 
     # Record user feedback
-    if (st.session_state.messages[-1]["role"] == "assistant") & (st.session_state.messages[-1]["content"] != "How can I help you today?"):
-        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"],
-                                                "demo_name": cfg["demo_name"],
-                                                "language": identifyLanguage(st.session_state.messages[-1]["content"])})
+    if (st.session_state.messages[-1]["role"] == "assistant") & (st.session_state.messages[-1]["content"] != initial_prompt):
+        streamlit_feedback(
+            feedback_type="thumbs", on_submit = thumbs_feedback, key = st.session_state.feedback_key,
+            kwargs = {"user_query": st.session_state.messages[-2]["content"],
+                      "bot_response": st.session_state.messages[-1]["content"],
+                      "demo_name": cfg["demo_name"]}
+        )
         
     log_placeholder = st.empty()
     with log_placeholder.container():

utils.py

@@ -0,0 +1,74 @@
+import os
+import requests
+import json
+import re
+
+import streamlit as st
+
+from langdetect import detect_langs
+from langcodes import Language
+
+headers = {
+    'Content-Type': 'application/json',
+    'Accept': '*/*'
+}
+
+def identify_language(response):
+    lang_code = detect_langs(response)[0].lang
+    return Language.make(language=lang_code).display_name()
+
+def thumbs_feedback(feedback, **kwargs):
+    """
+    Sends feedback to Amplitude Analytics
+    """
+    send_amplitude_data(
+        user_query=kwargs.get("user_query", "No user input"),
+        bot_response=kwargs.get("bot_response", "No bot response"),
+        demo_name=kwargs.get("demo_name", "Unknown"),
+        feedback=feedback['score'],
+    )    
+    st.session_state.feedback_key += 1
+
+def send_amplitude_data(user_query, bot_response, demo_name, 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": "Agent",
+                "query": user_query,
+                "response": bot_response,
+                "Response Language": identify_language(bot_response)
+            }
+        }]
+    }
+    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
+