feature: refactor status to be a list of all important events

cdxker · skeptrunedev · commit 3bdb7025739d · 2025-04-10T11:43:34.000-07:00
diff --git a/clients/trieve-shopify-extension/app/components/analytics/AdvancedTableComponent.tsx b/clients/trieve-shopify-extension/app/components/analytics/AdvancedTableComponent.tsx
@@ -29,8 +29,10 @@ export interface Filter {
   pinned?: boolean;
 }
 
+// Either component or content is required
 export interface AdvancedTableCell {
-  content: string;
+  component?: React.ReactNode;
+  content?: string;
   url?: string;
 }
 
@@ -105,7 +107,7 @@ export const AdvancedTableComponent = ({
                 }))}
                 queryValue={query}
                 cancelAction={{
-                  onAction: () => {},
+                  onAction: () => { },
                   disabled: false,
                   loading: false,
                 }}
@@ -152,7 +154,7 @@ export const AdvancedTableComponent = ({
                         {heading.sortCol && (
                           <span className="ml-1">
                             {sortSelected[0].split(" ")[0] ===
-                            heading.sortCol ? (
+                              heading.sortCol ? (
                               sortSelected[0].split(" ")[1] === "asc" ? (
                                 <Icon source={ChevronUpIcon} tone="base" />
                               ) : (
@@ -188,25 +190,26 @@ export const AdvancedTableComponent = ({
                   id={index.toString()}
                   position={index}
                 >
-                  {row.map((cell, innerIndex) => (
-                    <IndexTable.Cell
-                      key={innerIndex}
-                      className="max-w-[200px] truncate"
-                    >
-                      {cell.url ? (
-                        <Link to={cell.url}>
-                          <InlineStack wrap={false}>
-                            <ViewIcon width={20} />
-                            <Text as="span" variant="bodyMd" truncate={true}>
-                              {cell.content}
-                            </Text>
-                          </InlineStack>
-                        </Link>
-                      ) : (
-                        cell.content
-                      )}
-                    </IndexTable.Cell>
-                  ))}
+                  {row.map((cell, innerIndex) => {
+                    const innerCell = cell.component ? cell.component : <Text as="span" variant="bodyMd" truncate={true}>{cell.content}</Text>;
+                    return (
+                      <IndexTable.Cell
+                        key={innerIndex}
+                        className="max-w-[250px] truncate"
+                      >
+                        {cell.url ? (
+                          <Link to={cell.url}>
+                            <InlineStack wrap={false}>
+                              <ViewIcon width={20} />
+                              {innerCell}
+                            </InlineStack>
+                          </Link>
+                        ) : (
+                          innerCell
+                        )}
+                      </IndexTable.Cell>
+                    );
+                  })}
                 </IndexTable.Row>
               );
             })}
diff --git a/clients/trieve-shopify-extension/app/components/analytics/chat/ChatEventsFilter.tsx b/clients/trieve-shopify-extension/app/components/analytics/chat/ChatEventsFilter.tsx
@@ -7,7 +7,7 @@ interface EventFiltersProps {
   setEventsFilter: Dispatch<SetStateAction<TopicEventFilter>>;
 }
 
-const AVAILABLE_EVENT_TYPES: { label: string; value: EventNamesFilter }[] = [
+export const AVAILABLE_EVENT_TYPES: { label: string; value: EventNamesFilter }[] = [
   { label: "Followup Clicked", value: "site-followup_query" },
   { label: "Click", value: "Click" },
   { label: "Add to Cart", value: "site-add_to_cart" },
diff --git a/clients/trieve-shopify-extension/app/routes/app._dashboard.chats.tsx b/clients/trieve-shopify-extension/app/routes/app._dashboard.chats.tsx
@@ -19,11 +19,11 @@ import {
   AdvancedTableComponent,
   Filter,
 } from "../components/analytics/AdvancedTableComponent";
-import { ChoiceList, IndexFiltersProps, RangeSlider } from "@shopify/polaris";
+import { Text, Badge, ChoiceList, IndexFiltersProps, RangeSlider } from "@shopify/polaris";
 import { DateRangePicker } from "../components/analytics/DateRangePicker";
 import { ComponentNameSelect } from "../components/analytics/ComponentNameSelect";
 import { allChatsQuery } from "app/queries/analytics/chat";
-import { EventFilters } from "app/components/analytics/chat/ChatEventsFilter";
+import { AVAILABLE_EVENT_TYPES, EventFilters } from "app/components/analytics/chat/ChatEventsFilter";
 
 export default function ChatsPage() {
   const { trieve } = useTrieve();
@@ -69,17 +69,44 @@ export default function ChatsPage() {
       return previousData;
     }
 
-    console.log("getting data", data)
     if (!data?.topics) {
       return [];
     }
 
     // TODO: Create badge with "highest ranking event"
     let newData: AdvancedTableCell[][] =
       data?.topics.map((topic) => {
+        let event_names_counts: Record<string, number> = {
+          "site-add_to_cart": 0,
+          "site-checkout": 0,
+          "Click": 0,
+        };
+        for (const event of topic.event_names) {
+          if (event == "View") continue;
+
+          event_names_counts[event] =
+            (event_names_counts[event] ?? 0) + 1;
+        }
         return [
           { content: topic.name, url: `/app/chatview/${topic.topic_id}` },
-          { content: topic.status },
+          // Make a badge with count and name
+          {
+            component: (
+              <div className="flex gap-2">
+                {Object.entries(event_names_counts).map(([event_name, count]) => {
+                  const eventLabel = AVAILABLE_EVENT_TYPES.find((e) => e.value === event_name)?.label ?? event_name
+
+                  if (count == 0) return null
+
+                  return (
+                    <div className="flex items-center gap-1">
+                      <Badge>{`${count.toLocaleString()} ${eventLabel}(s)`}</Badge>
+                    </div>
+                  );
+                })}
+              </div>
+            )
+          },
           { content: topic.message_count.toLocaleString() },
           {
             content: topic.avg_top_score?.toLocaleString("en-US", {
@@ -436,8 +463,6 @@ export default function ChatsPage() {
     }
   }, [query]);
 
-  console.log("I am here data", mappedData);
-
   return (
     <AdvancedTableComponent
       additionalControls={
diff --git a/clients/trieve-shopify-extension/package.json b/clients/trieve-shopify-extension/package.json
@@ -52,9 +52,9 @@
     "react-dom": "^18.2.0",
     "tailwind-merge": "^3.1.0",
     "tailwindcss": "^3.4.17",
-    "trieve-search-component": "0.4.55",
-    "trieve-ts-sdk": "*",
-    "vite-tsconfig-paths": "^5.0.1"
+    "trieve-ts-sdk": "0.0.83",
+    "vite-tsconfig-paths": "^5.0.1",
+    "trieve-search-component": "0.4.55"
   },
   "devDependencies": {
     "@remix-run/eslint-config": "^2.7.1",
diff --git a/clients/trieve-shopify-extension/yarn.lock b/clients/trieve-shopify-extension/yarn.lock
@@ -9352,16 +9352,16 @@ trieve-search-component@0.4.55:
     tailwind-merge "^3.0.2"
     trieve-ts-sdk "0.0.73"
 
-trieve-ts-sdk@*:
-  version "0.0.83"
-  resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.83.tgz#a9bd0bbd71e09f3f9017844d91894fde95c5edb9"
-  integrity sha512-EPDy342dDTNVmzzALMtk9JExCn5yt1oyp9moiS4VLyN52hFaKY4MxoSsEp9/Bp7PRNXS2Z8u1H+PTn+joovhbw==
-
 trieve-ts-sdk@0.0.73:
   version "0.0.73"
   resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.73.tgz#9de17428ddb4b1f6d68709695f371d185c4bda79"
   integrity sha512-68iG/OlmKSGmnmI/J33S6VKleEAfq4txzARhvKv1g+CYSaG7HOH76n0cFDMtUUEEKn1PD4nV82uh5ZFtfIxD0A==
 
+trieve-ts-sdk@0.0.83:
+  version "0.0.83"
+  resolved "https://registry.yarnpkg.com/trieve-ts-sdk/-/trieve-ts-sdk-0.0.83.tgz#a9bd0bbd71e09f3f9017844d91894fde95c5edb9"
+  integrity sha512-EPDy342dDTNVmzzALMtk9JExCn5yt1oyp9moiS4VLyN52hFaKY4MxoSsEp9/Bp7PRNXS2Z8u1H+PTn+joovhbw==
+
 trim-lines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
diff --git a/clients/ts-sdk/openapi.json b/clients/ts-sdk/openapi.json
@@ -9093,7 +9093,7 @@
           "message_count",
           "avg_top_score",
           "avg_hallucination_score",
-          "status"
+          "event_names"
         ],
         "properties": {
           "avg_hallucination_score": {
@@ -9112,6 +9112,13 @@
           "created_at": {
             "type": "string"
           },
+          "event_names": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "All event_names that are  associated with the topic, may contain duplicate names"
+          },
           "id": {
             "type": "string",
             "format": "uuid"
@@ -9127,9 +9134,6 @@
           "owner_id": {
             "type": "string"
           },
-          "status": {
-            "type": "string"
-          },
           "topic_id": {
             "type": "string",
             "format": "uuid"
diff --git a/clients/ts-sdk/src/types.gen.ts b/clients/ts-sdk/src/types.gen.ts
@@ -557,11 +557,14 @@ export type ClickhouseTopicAnalyticsSummary = {
     avg_query_rating?: (number) | null;
     avg_top_score: number;
     created_at: string;
+    /**
+     * All event_names that are  associated with the topic, may contain duplicate names
+     */
+    event_names: Array<(string)>;
     id: string;
     message_count: number;
     name: string;
     owner_id: string;
-    status: string;
     topic_id: string;
     updated_at: string;
 };
diff --git a/server/src/data/models.rs b/server/src/data/models.rs
@@ -8125,7 +8125,8 @@ pub struct TopicAnalyticsSummaryClickhouse {
     pub avg_top_score: f64,
     pub avg_hallucination_score: f64,
     pub avg_query_rating: Option<f64>,
-    pub status: String,
+    /// All event_names that are  associated with the topic, may contain duplicate names
+    pub event_names: Vec<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
@@ -8140,7 +8141,8 @@ pub struct ClickhouseTopicAnalyticsSummary {
     pub avg_top_score: f64,
     pub avg_hallucination_score: f64,
     pub avg_query_rating: Option<f64>,
-    pub status: String,
+    /// All event_names that are  associated with the topic, may contain duplicate names
+    pub event_names: Vec<String>,
 }
 
 impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {
@@ -8156,7 +8158,7 @@ impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {
             avg_top_score: value.avg_top_score,
             avg_hallucination_score: value.avg_hallucination_score,
             avg_query_rating: value.avg_query_rating,
-            status: value.status,
+            event_names: value.event_names,
         }
     }
 }
diff --git a/server/src/operators/analytics_operator.rs b/server/src/operators/analytics_operator.rs
@@ -4,8 +4,8 @@ use crate::{
         ChatRevenueResponse, ClusterAnalyticsFilter, ClusterTopicsClickhouse,
         ComponentAnalyticsFilter, ComponentInteractionTimeResponse, ComponentNamesResponse,
         DatasetAnalytics, EventAnalyticsFilter, EventData, EventDataClickhouse, EventNameAndCounts,
-        EventNamesFilter, FloatTimePoint, FloatTimePointClickhouse, FollowupQueriesResponse,
-        FollowupQuery, GetEventsResponseBody, Granularity, HeadQueries, IntegerTimePoint,
+        FloatTimePoint, FloatTimePointClickhouse, FollowupQueriesResponse, FollowupQuery,
+        GetEventsResponseBody, Granularity, HeadQueries, IntegerTimePoint,
         IntegerTimePointClickhouse, MessagesPerUserResponse, Pool, PopularChat,
         PopularChatsResponse, PopularFilters, PopularFiltersClickhouse, RAGAnalyticsFilter,
         RAGSortBy, RAGUsageGraphResponse, RAGUsageResponse, RagQueryEvent, RagQueryEventClickhouse,
@@ -1858,9 +1858,10 @@ pub async fn get_topic_queries_query(
             AVG(rag_queries.top_score) as top_score,
             AVG(rag_queries.hallucination_score) as hallucination_score,
             AVG(JSONExtract(query_rating, 'rating', 'Nullable(Float64)')) as query_rating,
-            'View' as status
+            groupArray(topic_events.event_name) as event_names
         FROM topics 
         JOIN rag_queries ON topics.topic_id = rag_queries.topic_id
+        JOIN events as topic_events ON rag_queries.id = toUUID(topic_events.request_id)
         ",
     );
 
@@ -1924,7 +1925,7 @@ pub async fn get_topic_queries_query(
         (page.unwrap_or(1) - 1) * 10
     ));
 
-    let mut topics = clickhouse_client
+    let topics = clickhouse_client
         .query(query_string.as_str())
         .bind(dataset_id)
         .fetch_all::<TopicAnalyticsSummaryClickhouse>()
@@ -1934,37 +1935,6 @@ pub async fn get_topic_queries_query(
             ServiceError::InternalServerError("Error fetching topics".to_string())
         })?;
 
-    let topic_ids: Vec<uuid::Uuid> = topics.iter().map(|topic| topic.topic_id).collect();
-
-    let topic_events: Vec<TopicIdEventTypePair> = clickhouse_client
-        .query(
-            "SELECT rag_queries.topic_id as topic_id, events.event_name as event_name
-            FROM events 
-            JOIN rag_queries ON rag_queries.id = toUUIDOrNull(events.request_id)
-            WHERE rag_queries.dataset_id = ? AND rag_queries.topic_id in ?",
-        )
-        .bind(dataset_id)
-        .bind(topic_ids)
-        .fetch_all::<TopicIdEventTypePair>()
-        .await
-        .map_err(|e| {
-            log::error!("Error fetching query: {:?}", e);
-            ServiceError::InternalServerError("Error fetching query".to_string())
-        })?;
-
-    for topic_pair in topic_events {
-        if let Some(topic) = topics
-            .iter_mut()
-            .find(|t| t.topic_id == topic_pair.topic_id)
-        {
-            let current_status = EventNamesFilter::from_string(&topic.status);
-            let topic_status = EventNamesFilter::from_string(&topic_pair.event_name);
-
-            if topic_status > current_status {
-                topic.status = topic_pair.event_name.clone();
-            }
-        }
-    }
     Ok(TopicQueriesResponse {
         topics: topics.into_iter().map(|t| t.into()).collect(),
     })

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ interface EventFiltersProps {`
`7`	`7`	`setEventsFilter: Dispatch<SetStateAction<TopicEventFilter>>;`
`8`	`8`	`}`
`9`	`9`
`10`		`-const AVAILABLE_EVENT_TYPES: { label: string; value: EventNamesFilter }[] = [`
	`10`	`+export const AVAILABLE_EVENT_TYPES: { label: string; value: EventNamesFilter }[] = [`
`11`	`11`	`{ label: "Followup Clicked", value: "site-followup_query" },`
`12`	`12`	`{ label: "Click", value: "Click" },`
`13`	`13`	`{ label: "Add to Cart", value: "site-add_to_cart" },`
Original file line number	Diff line number	Diff line change
`@@ -8125,7 +8125,8 @@ pub struct TopicAnalyticsSummaryClickhouse {`
`8125`	`8125`	`pub avg_top_score: f64,`
`8126`	`8126`	`pub avg_hallucination_score: f64,`
`8127`	`8127`	`pub avg_query_rating: Option<f64>,`
`8128`		`- pub status: String,`
	`8128`	`+ /// All event_names that are associated with the topic, may contain duplicate names`
	`8129`	`+ pub event_names: Vec<String>,`
`8129`	`8130`	`}`
`8130`	`8131`
`8131`	`8132`	`#[derive(Debug, Serialize, Deserialize, ToSchema)]`
`@@ -8140,7 +8141,8 @@ pub struct ClickhouseTopicAnalyticsSummary {`
`8140`	`8141`	`pub avg_top_score: f64,`
`8141`	`8142`	`pub avg_hallucination_score: f64,`
`8142`	`8143`	`pub avg_query_rating: Option<f64>,`
`8143`		`- pub status: String,`
	`8144`	`+ /// All event_names that are associated with the topic, may contain duplicate names`
	`8145`	`+ pub event_names: Vec<String>,`
`8144`	`8146`	`}`
`8145`	`8147`
`8146`	`8148`	`impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {`
`@@ -8156,7 +8158,7 @@ impl From<TopicAnalyticsSummaryClickhouse> for ClickhouseTopicAnalyticsSummary {`
`8156`	`8158`	`avg_top_score: value.avg_top_score,`
`8157`	`8159`	`avg_hallucination_score: value.avg_hallucination_score,`
`8158`	`8160`	`avg_query_rating: value.avg_query_rating,`
`8159`		`- status: value.status,`
	`8161`	`+ event_names: value.event_names,`
`8160`	`8162`	`}`
`8161`	`8163`	`}`
`8162`	`8164`	`}`