fix: remove unnecessary functions in query class Keep feature parity

with aw-client

Author: 0xbrayo

aw-client-rust/src/lib.rs

@@ -36,7 +36,7 @@ impl std::fmt::Debug for AwClient {
 }
 
 fn get_hostname() -> String {
-    return gethostname::gethostname().to_string_lossy().to_string();
+    gethostname::gethostname().to_string_lossy().to_string()
 }
 
 impl AwClient {

aw-client-rust/src/queries.rs

@@ -36,7 +36,6 @@
 //! ```
 
 use crate::classes::{CategoryId, CategorySpec};
-use crate::AwClient;
 use serde::{Deserialize, Serialize};
 
 /// Browser application names mapped by browser type
@@ -286,169 +285,26 @@ browser_events = sort_by_timestamp(browser_events)",
 
 /// Build a full desktop query using default localhost:5600 configuration
 pub fn full_desktop_query(params: &DesktopQueryParams) -> String {
-    let mut query = QueryParams::Desktop(params.clone()).canonical_events_with_classes();
+    let mut query = QueryParams::Desktop(params.clone()).canonical_events();
 
     // Add basic event aggregations
-    query.push_str(&format!(
-        "
-        title_events = sort_by_duration(merge_events_by_keys(events, [\"app\", \"title\"]));
-        app_events = sort_by_duration(merge_events_by_keys(title_events, [\"app\"]));
-        cat_events = sort_by_duration(merge_events_by_keys(events, [\"$category\"]));
-        duration = sum_durations(events);
-        ",
-    ));
-
-    // Add browser-specific query parts if browser buckets exist
-    if !params.base.bid_browsers.is_empty() {
-        query.push_str(&format!(
-            "
-            browser_events = split_url_events(browser_events);
-            browser_urls = merge_events_by_keys(browser_events, [\"url\"]);
-            browser_urls = sort_by_duration(browser_urls);
-            browser_domains = merge_events_by_keys(browser_events, [\"$domain\"]);
-            browser_domains = sort_by_duration(browser_domains);
-            browser_duration = sum_durations(browser_events);
-            ",
-        ));
-    } else {
-        query.push_str(
-            "
-            browser_events = [];
-            browser_urls = [];
-            browser_domains = [];
-            browser_duration = 0;
-            ",
-        );
-    }
-
-    // Add return statement
-    query.push_str(
-        "
-        RETURN = {
-            \"events\": events,
-            \"window\": {
-                \"app_events\": app_events,
-                \"title_events\": title_events,
-                \"cat_events\": cat_events,
-                \"active_events\": not_afk,
-                \"duration\": duration
-            },
-            \"browser\": {
-                \"domains\": browser_domains,
-                \"urls\": browser_urls,
-                \"duration\": browser_duration
-            }
-        };
-        ",
-    );
-
-    query
-}
-
-/// Build a full desktop query using client configuration
-pub fn full_desktop_query_from_client(
-    params: &DesktopQueryParams,
-    client: &crate::AwClient,
-) -> String {
-    let mut query =
-        QueryParams::Desktop(params.clone()).canonical_events_with_classes_from_client(client);
-
-    // Add basic event aggregations
-    query.push_str(&format!(
-        "
-        title_events = sort_by_duration(merge_events_by_keys(events, [\"app\", \"title\"]));
-        app_events = sort_by_duration(merge_events_by_keys(title_events, [\"app\"]));
-        cat_events = sort_by_duration(merge_events_by_keys(events, [\"$category\"]));
-        app_events = limit_events(app_events, {});
-        title_events = limit_events(title_events, {});
-        duration = sum_durations(events);
-        ",
-        DEFAULT_LIMIT, DEFAULT_LIMIT
-    ));
-
-    // Add browser-specific query parts if browser buckets exist
-    if !params.base.bid_browsers.is_empty() {
-        query.push_str(&format!(
-            "
-            browser_events = split_url_events(browser_events);
-            browser_urls = merge_events_by_keys(browser_events, [\"url\"]);
-            browser_urls = sort_by_duration(browser_urls);
-            browser_domains = merge_events_by_keys(browser_events, [\"$domain\"]);
-            browser_domains = sort_by_duration(browser_domains);
-            browser_duration = sum_durations(browser_events);
-            "
-        ));
-    } else {
-        query.push_str(
-            "
-            browser_events = [];
-            browser_urls = [];
-            browser_domains = [];
-            browser_duration = 0;
-            ",
-        );
-    }
-
-    // Add return statement
-    query.push_str(
-        "
-        RETURN = {
-            \"events\": events,
-            \"window\": {
-                \"app_events\": app_events,
-                \"title_events\": title_events,
-                \"cat_events\": cat_events,
-                \"active_events\": not_afk,
-                \"duration\": duration
-            },
-            \"browser\": {
-                \"domains\": browser_domains,
-                \"urls\": browser_urls,
-                \"duration\": browser_duration
-            }
-        };
-        ",
-    );
-
-    query
-}
-
-/// Build a full desktop query using blocking client configuration
-pub fn full_desktop_query_from_blocking_client(
-    params: &DesktopQueryParams,
-    client: &crate::blocking::AwClient,
-) -> String {
-    let mut query = QueryParams::Desktop(params.clone())
-        .canonical_events_with_classes_from_blocking_client(client);
-
-    // Add basic event aggregations
-    query.push_str(&format!(
-        "
+    query.push_str(&"
         title_events = sort_by_duration(merge_events_by_keys(events, [\"app\", \"title\"]));
         app_events = sort_by_duration(merge_events_by_keys(title_events, [\"app\"]));
         cat_events = sort_by_duration(merge_events_by_keys(events, [\"$category\"]));
-        app_events = limit_events(app_events, {});
-        title_events = limit_events(title_events, {});
         duration = sum_durations(events);
-        ",
-        DEFAULT_LIMIT, DEFAULT_LIMIT
-    ));
+        ".to_string());
 
     // Add browser-specific query parts if browser buckets exist
     if !params.base.bid_browsers.is_empty() {
-        query.push_str(&format!(
-            "
+        query.push_str(&"
             browser_events = split_url_events(browser_events);
             browser_urls = merge_events_by_keys(browser_events, [\"url\"]);
             browser_urls = sort_by_duration(browser_urls);
-            browser_urls = limit_events(browser_urls, {});
             browser_domains = merge_events_by_keys(browser_events, [\"$domain\"]);
             browser_domains = sort_by_duration(browser_domains);
-            browser_domains = limit_events(browser_domains, {});
             browser_duration = sum_durations(browser_events);
-            ",
-            DEFAULT_LIMIT, DEFAULT_LIMIT
-        ));
+            ".to_string());
     } else {
         query.push_str(
             "