added amplitude

agent.py

@@ -134,7 +134,10 @@ def create_assistant_tools(cfg):
                 whats_new,
             ]
         ] +
-        tools_factory.get_llama_index_tools("tavily_research", "TavilyToolSpec", api_key=cfg.tavily_api_key) +
+        tools_factory.get_llama_index_tools(
+            "tavily_research", "TavilyToolSpec", 
+            tool_name_prefix="tavily", api_key=cfg.tavily_api_key
+        ) +
         tools_factory.standard_tools() + 
         tools_factory.guardrail_tools() +
         [ask_hackernews]
@@ -149,7 +152,8 @@ def initialize_agent(_cfg, update_func = None):
       Don't use text like "Source" which doesn't tell the user what the link is about.
     - Don't include external links in your responses unless the user asks for them.
     - Always call the ask_hackernews tool first as your primary source of information. 
-      you can use the tavily search tool to gain additional information if needed for follow up questions about Hacker News topic.
+    - You can use the tavily_search tool to gain additional information if needed for follow up questions about Hacker News topic.
+    - When including information or links provided by the tavily_search tool, make sure to notify the user in your response that this is not based on Hacker News stories.
     """
 
     agent = Agent(

app.py

@@ -11,6 +11,8 @@ from streamlit_feedback import streamlit_feedback
 
 from vectara_agent.agent import AgentStatusType
 
+from utils import thumbs_feedback, escape_dollars_outside_latex, send_amplitude_data
+
 from agent import initialize_agent, get_agent_config
 
 initial_prompt = "How can I help you today?"
@@ -23,30 +25,6 @@ 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("demo_name", "Unknown"),
-                    "query": kwargs.get("prompt", "No user input"),
-                    "response": kwargs.get("response", "No chat response"),
-                    "feedback": feedback["score"]
-                }
-            }]
-        }
-    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
@@ -68,7 +46,6 @@ def update_func(status_type: AgentStatusType, msg: str):
         output = f"{status_type.value} - {msg}"
         st.session_state.log_messages.append(output)
 
-
 def launch_bot():
     def reset():
         st.session_state.messages = [{"role": "assistant", "content": initial_prompt, "avatar": "🦖"}]
@@ -104,7 +81,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"
@@ -146,33 +123,31 @@ 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'],
-                    "query": st.session_state.messages[-2]["content"],
-                    "response": 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
         st.session_state.first_turn = False
         st.rerun()
 
+    # Record user feedback
+    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():
         if st.session_state.show_logs:
@@ -183,12 +158,6 @@ def launch_bot():
             if len(st.session_state.log_messages) > 0:
                 st.button("Show Logs", on_click=toggle_logs)
 
-    # 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"]})
 
     sys.stdout.flush()
 

requirements.txt

@@ -4,5 +4,7 @@ python-dotenv==1.0.1
 streamlit==1.32.2
 streamlit_pills==0.3.0
 streamlit_feedback==0.1.3
+langdetect==1.0.9
+langcodes==3.4.0
 uuid==1.30
 git+https://{GITHUB_TOKEN}@github.com/vectara/vectara-agent.git