33
44Most of these are from: https://github.com/ActivityWatch/aw-webui/blob/master/src/queries.ts
55"""
6+
67import dataclasses
78import json
89import re
@@ -104,23 +105,23 @@ def canonicalEvents(params: Union[DesktopQueryParams, AndroidQueryParams]) -> st
104105 # Fetch window/app events
105106 f'events = flood(query_bucket(find_bucket("{ bid_window } ")));' ,
106107 # On Android, merge events to avoid overload of events
107- 'events = merge_events_by_keys(events, ["app"]);'
108- if isAndroidParams (params )
109- else "" ,
108+ (
109+ 'events = merge_events_by_keys(events, ["app"]);'
110+ if isAndroidParams (params )
111+ else ""
112+ ),
110113 # Fetch not-afk events
111- f"""
114+ (
115+ f"""
112116 not_afk = flood(query_bucket(find_bucket("{ params .bid_afk } ")));
113117 not_afk = filter_keyvals(not_afk, "status", ["not-afk"]);
114118 """
115- if isDesktopParams (params )
116- else "" ,
119+ if isDesktopParams (params )
120+ else ""
121+ ),
117122 # Fetch browser events
118123 (
119- (
120- browserEvents (params )
121- if isDesktopParams (params )
122- else ""
123- )
124+ (browserEvents (params ) if isDesktopParams (params ) else "" )
124125 + ( # Include focused and audible browser events as indications of not-afk
125126 """
126127 audible_events = filter_keyvals(browser_events, "audible", [true]);
@@ -133,15 +134,19 @@ def canonicalEvents(params: Union[DesktopQueryParams, AndroidQueryParams]) -> st
133134 else ""
134135 ),
135136 # Filter out window events when the user was afk
136- "events = filter_period_intersect(events, not_afk);"
137- if isDesktopParams (params ) and params .filter_afk
138- else "" ,
137+ (
138+ "events = filter_period_intersect(events, not_afk);"
139+ if isDesktopParams (params ) and params .filter_afk
140+ else ""
141+ ),
139142 # Categorize
140143 f"events = categorize(events, { classes_str } );" if params .classes else "" ,
141144 # Filter out selected categories
142- f'events = filter_keyvals(events, "$category", { cat_filter_str } );'
143- if params .filter_classes
144- else "" ,
145+ (
146+ f'events = filter_keyvals(events, "$category", { cat_filter_str } );'
147+ if params .filter_classes
148+ else ""
149+ ),
145150 ]
146151 )
147152
0 commit comments