Add event type filtering to listener command

src/blueapi/cli/cli.py

@@ -4,7 +4,7 @@
 from functools import wraps
 from pathlib import Path
 from pprint import pprint
-from typing import Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union
 
 import click
 from requests.exceptions import ConnectionError
@@ -27,6 +27,12 @@
 
 from .rest import BlueapiRestClient
 
+EVENT_TYPE_MAPPINGS = {
+    "worker": WorkerEvent,
+    "progress": ProgressEvent,
+    "data": DataEvent,
+}
+
 
 @click.group(invoke_without_command=True)
 @click.version_option(version=__version__, prog_name="blueapi")
@@ -50,7 +56,7 @@ def main(ctx: click.Context, config: Union[Optional[Path], Tuple[Path, ...]]) ->
     loaded_config: ApplicationConfig = config_loader.load()
 
     ctx.obj["config"] = loaded_config
-    logging.basicConfig(level=loaded_config.logging.level)
+    logging.basicConfig(level=loaded_config.logging.level.cli)
 
     if ctx.invoked_subcommand is None:
         print("Please invoke subcommand!")
@@ -131,18 +137,41 @@ def get_devices(obj: dict) -> None:
 
 @controller.command(name="listen")
 @check_connection
+@click.option(
+    "-t",
+    "--event-type",
+    type=click.Choice(
+        list(EVENT_TYPE_MAPPINGS.keys()),
+        case_sensitive=False,
+    ),
+    help="The type of events to filter for, defaults to all",
+    multiple=True,
+)
 @click.pass_obj
-def listen_to_events(obj: dict) -> None:
+def listen_to_events(obj: dict, event_type: List[str]) -> None:
     """Listen to events output by blueapi"""
     config: ApplicationConfig = obj["config"]
     amq_client = AmqClient(StompMessagingTemplate.autoconfigured(config.stomp))
+    event_type = event_type or list(EVENT_TYPE_MAPPINGS.keys())
+
+    def is_allowed(event: Union[WorkerEvent, ProgressEvent, DataEvent]) -> bool:
+        return any(
+            map(
+                lambda allowed_type: isinstance(
+                    event,
+                    EVENT_TYPE_MAPPINGS[allowed_type],
+                ),
+                event_type or [],
+            )
+        )
 
     def on_event(
         context: MessageContext,
         event: Union[WorkerEvent, ProgressEvent, DataEvent],
     ) -> None:
-        converted = json.dumps(event.dict(), indent=2)
-        print(converted)
+        if is_allowed(event):
+            converted = json.dumps(event.dict(), indent=2)
+            print(converted)
 
     print(
         "Subscribing to all bluesky events from "

src/blueapi/config.py

@@ -71,8 +71,21 @@ class EnvironmentConfig(BlueapiBaseModel):
     events: WorkerEventConfig = Field(default_factory=WorkerEventConfig)
 
 
+class LoggingLevelConfig(BlueapiBaseModel):
+    """
+    Log levels of blueapi applications and components
+    """
+
+    service: LogLevel = "INFO"
+    cli: LogLevel = "ERROR"
+
+
 class LoggingConfig(BlueapiBaseModel):
-    level: LogLevel = "INFO"
+    """
+    Config for how blueapi logs behave
+    """
+
+    level: LoggingLevelConfig = Field(default_factory=LoggingLevelConfig)
 
 
 class RestConfig(BlueapiBaseModel):