feature: add ability to filter out collapsed queries for count queries

Author: densumesh

clients/ts-sdk/openapi.json

@@ -17727,6 +17727,10 @@
               "type"
             ],
             "properties": {
+              "count_collapsed_queries": {
+                "type": "boolean",
+                "nullable": true
+              },
               "filter": {
                 "allOf": [
                   {

clients/ts-sdk/package.json

@@ -17,7 +17,7 @@
   "files": [
     "dist"
   ],
-  "version": "0.0.92",
+  "version": "0.0.93",
   "license": "MIT",
   "scripts": {
     "lint": "eslint 'src/**/*.ts'",

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

@@ -3376,6 +3376,7 @@ export type SearchAnalytics = {
     sort_order?: ((SortOrder) | null);
     type: 'search_queries';
 } | {
+    count_collapsed_queries?: (boolean) | null;
     filter?: ((SearchAnalyticsFilter) | null);
     type: 'count_queries';
 } | {

server/src/data/models.rs

@@ -7695,6 +7695,7 @@ pub enum SearchAnalytics {
     #[schema(title = "CountQueries")]
     CountQueries {
         filter: Option<SearchAnalyticsFilter>,
+        count_collapsed_queries: Option<bool>,
     },
     #[schema(title = "QueryDetails")]
     QueryDetails { request_id: uuid::Uuid },

server/src/handlers/analytics_handler.rs

@@ -284,10 +284,14 @@ pub async fn get_search_analytics(
 
             SearchAnalyticsResponse::QueryDetails(query)
         }
-        SearchAnalytics::CountQueries { filter } => {
+        SearchAnalytics::CountQueries {
+            filter,
+            count_collapsed_queries,
+        } => {
             let count_queries = get_query_counts_query(
                 dataset_org_plan_sub.dataset.id,
                 filter,
+                count_collapsed_queries,
                 clickhouse_client.get_ref(),
             )
             .await?;

server/src/operators/analytics_operator.rs

@@ -432,16 +432,22 @@ pub struct QueryCountResponse {
 pub async fn get_query_counts_query(
     dataset_id: uuid::Uuid,
     filter: Option<SearchAnalyticsFilter>,
+    count_collapsed_queries: Option<bool>,
     clickhouse_client: &clickhouse::Client,
 ) -> Result<QueryCountResponse, ServiceError> {
-    let mut query_string = String::from(
+    let mut query_string = format!(
         "SELECT 
             search_type,
             JSONExtractString(request_params, 'search_type') as search_method, 
             COUNT(*) as search_count
         FROM 
             search_queries
-        WHERE dataset_id = ?",
+        WHERE dataset_id = ? {}",
+        if count_collapsed_queries.unwrap_or(false) {
+            "AND is_duplicate = 0"
+        } else {
+            ""
+        },
     );
 
     if let Some(filter) = filter {