cleanup: use click event for followup query + remove initial question tracking

Author: vid277

clients/search-component/src/TrieveModal/Chat/FollowupQueries.tsx

@@ -26,7 +26,7 @@ export const FollowupQueries = () => {
 
     await trieveSDK.sendAnalyticsEvent({
       event_name: `site-followup_query`,
-      event_type: "followup_query",
+      event_type: "click",
       user_id: fingerprint,
       location: window.location.href,
       metadata: {

clients/search-component/src/TrieveModal/Chat/SuggestedQuestions.tsx

@@ -16,7 +16,7 @@ export const SuggestedQuestions = ({
   const { suggestedQuestions, isLoadingSuggestedQueries, getQuestions } =
     useSuggestedQuestions();
 
-  const { props, trieveSDK, fingerprint } = useModalState();
+  const { props } = useModalState();
   const [parent] = useAutoAnimate({ duration: 100 });
 
   if (messages.length) {
@@ -25,31 +25,7 @@ export const SuggestedQuestions = ({
 
   const handleSuggestedQuestion = async (q: string) => {
     setCurrentQuestion(q);
-
-    const lastMessage = JSON.parse(
-      window.localStorage.getItem("lastMessage") ?? "{}",
-    );
-
-    const requestId =
-      Object.keys(lastMessage)[0] || "00000000-0000-0000-0000-000000000000";
-
-    await trieveSDK.sendAnalyticsEvent({
-      event_name: `site-followup_query`,
-      event_type: "followup_query",
-      user_id: fingerprint,
-      location: window.location.href,
-      metadata: {
-        followup_query: q,
-        component_props: props,
-      },
-      request: {
-        request_id: requestId,
-        request_type: "rag",
-      },
-    });
-
     askQuestion(q);
-
     if (onMessageSend) {
       onMessageSend();
     }

clients/trieve-shopify-extension/app/components/analytics/chat/PopularSuggestedQueries.tsx

@@ -21,7 +21,7 @@ export const PopularSuggestedQueries = ({
     client.prefetchQuery(
       popularSuggestedQueriesQuery(trieve, filters, page + 1),
     );
-  }, [page]);
+  }, [page, filters]);
 
   const mappedData = data
     ? data.top_queries.map((query: { query: string; count: number }) => [

clients/ts-sdk/openapi.json

@@ -11582,48 +11582,6 @@
               }
             }
           },
-          {
-            "type": "object",
-            "title": "FollowupQuery",
-            "required": [
-              "event_name",
-              "event_type"
-            ],
-            "properties": {
-              "event_name": {
-                "type": "string",
-                "description": "The name of the event"
-              },
-              "event_type": {
-                "type": "string",
-                "enum": [
-                  "followup_query"
-                ]
-              },
-              "location": {
-                "type": "string",
-                "description": "The location of the event",
-                "nullable": true
-              },
-              "metadata": {
-                "description": "Any other metadata associated with the event",
-                "nullable": true
-              },
-              "request": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/RequestInfo"
-                  }
-                ],
-                "nullable": true
-              },
-              "user_id": {
-                "type": "string",
-                "description": "The user id of the user who made the followup query",
-                "nullable": true
-              }
-            }
-          },
           {
             "type": "object",
             "title": "FilterClicked",
@@ -11931,7 +11889,6 @@
           "add_to_cart",
           "purchase",
           "view",
-          "followup_query",
           "click",
           "filter_clicked"
         ]

clients/ts-sdk/src/types.gen.ts

@@ -1549,25 +1549,6 @@ export type EventTypes = {
      * The user id of the user who purchased the items
      */
     user_id?: (string) | null;
-} | {
-    /**
-     * The name of the event
-     */
-    event_name: string;
-    event_type: 'followup_query';
-    /**
-     * The location of the event
-     */
-    location?: (string) | null;
-    /**
-     * Any other metadata associated with the event
-     */
-    metadata?: unknown;
-    request?: ((RequestInfo) | null);
-    /**
-     * The user id of the user who made the followup query
-     */
-    user_id?: (string) | null;
 } | {
     /**
      * The name of the event
@@ -1716,7 +1697,7 @@ export type EventTypes = {
 
 export type event_type = 'view';
 
-export type EventTypesFilter = 'add_to_cart' | 'purchase' | 'view' | 'followup_query' | 'click' | 'filter_clicked';
+export type EventTypesFilter = 'add_to_cart' | 'purchase' | 'view' | 'click' | 'filter_clicked';
 
 export type EventsForTopicResponse = {
     events: Array<EventData>;

server/src/data/models.rs

@@ -6977,27 +6977,6 @@ impl EventTypes {
                 created_at: OffsetDateTime::now_utc(),
                 updated_at: OffsetDateTime::now_utc(),
             }),
-            EventTypes::FollowupQuery {
-                event_name,
-                request,
-                user_id,
-                metadata,
-                location,
-            } => EventDataTypes::EventDataClickhouse(EventDataClickhouse {
-                id: uuid::Uuid::new_v4(),
-                event_type: "followup_query".to_string(),
-                event_name,
-                request_id: request.clone().unwrap_or_default().request_id.to_string(),
-                request_type: request.unwrap_or_default().request_type.to_string(),
-                items: vec![],
-                user_id: user_id.unwrap_or_default(),
-                metadata: serde_json::to_string(&metadata.unwrap_or_default()).unwrap_or_default(),
-                is_conversion: false,
-                location: location.unwrap_or_default(),
-                dataset_id,
-                created_at: OffsetDateTime::now_utc(),
-                updated_at: OffsetDateTime::now_utc(),
-            }),
             EventTypes::Purchase {
                 event_name,
                 request,
@@ -7288,8 +7267,6 @@ pub enum EventTypesFilter {
     Purchase,
     #[display(fmt = "view")]
     View,
-    #[display(fmt = "followup_query")]
-    FollowupQuery,
     #[display(fmt = "click")]
     Click,
     #[display(fmt = "filter_clicked")]
@@ -8536,20 +8513,6 @@ pub enum EventTypes {
         /// The location of the event
         location: Option<String>,
     },
-    #[display(fmt = "followup_query")]
-    #[schema(title = "FollowupQuery")]
-    FollowupQuery {
-        /// The name of the event
-        event_name: String,
-        /// The request id of the event to associate it with a request
-        request: Option<RequestInfo>,
-        /// The user id of the user who made the followup query
-        user_id: Option<String>,
-        /// Any other metadata associated with the event
-        metadata: Option<serde_json::Value>,
-        /// The location of the event
-        location: Option<String>,
-    },
     #[display(fmt = "filter_clicked")]
     #[schema(title = "FilterClicked")]
     FilterClicked {

server/src/operators/analytics_operator.rs

@@ -3288,7 +3288,7 @@ pub async fn get_top_followup_queries_query(
 ) -> Result<FollowupQueriesResponse, ServiceError> {
     let mut query_string = String::from(
         "SELECT
-            JSONExtractString(metadata, 'followup_query') as query,
+            DISTINCT JSONExtractString(metadata, 'followup_query') as query,
             COUNT(*) AS count
         FROM
             events

yarn.lock

@@ -7094,11 +7094,6 @@ trieve-ts-sdk@^0.0.50:
   resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.50.tgz#8b16f7a0f7f77d81811aa0e3a7ed7050b5938379"
   integrity sha512-AbV41cEzxNSJ+gXUAOFK5OoMl4Kgu/DGkIU/fRS+k8rH+s0ePwBK6CYSPKBxGvNajbZ9hoqiUgN9/qZJX+k0yA==
 
-trieve-ts-sdk@^0.0.69:
-  version "0.0.69"
-  resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.69.tgz#837f21890faf7658157a65fdf9069246ee59d81a"
-  integrity sha512-I1QOndfsCBcNwPEi7gtO8SNHdt8LZvEAWPNmY38HhEE1Dnxx5lmMmVfjqGogirVaOdS0ZS4JxZ1vlfIjAPgGZg==
-
 trim-lines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"