An assortment of Pbench Ops fixes and fun

lib/pbench/cli/server/__init__.py

@@ -1,7 +1,7 @@
 import datetime
 from threading import Thread
 import time
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 import click
 from click import Context, Parameter, ParamType
@@ -11,6 +11,27 @@
 from pbench.server.database import init_db
 
 
+class DateParser(ParamType):
+    """The DateParser type converts date strings into `datetime` objects.
+
+    This is a variant of click's built-in DateTime parser, but uses the
+    more flexible dateutil.parser
+    """
+
+    name = "dateparser"
+
+    def convert(
+        self, value: Any, param: Optional[Parameter], ctx: Optional[Context]
+    ) -> Any:
+        if isinstance(value, datetime.datetime):
+            return value
+
+        try:
+            return parser.parse(value)
+        except Exception as e:
+            self.fail(f"{value!r} cannot be converted to a datetime: {str(e)!r}")
+
+
 class Detail:
     """Encapsulate generation of additional diagnostics"""
 
@@ -63,29 +84,32 @@ def warning(self, message: str):
 class Verify:
     """Encapsulate -v status messages."""
 
-    def __init__(self, verify: bool):
+    def __init__(self, verify: Union[bool, int]):
         """Initialize the object.
 
         Args:
             verify: True to write status messages.
         """
-        self.verify = verify
+        if isinstance(verify, int):
+            self.verify = verify
+        else:
+            self.verify = 1 if verify else 0
 
     def __bool__(self) -> bool:
         """Report whether verification is enabled.
 
         Returns:
             True if verification is enabled.
         """
-        return self.verify
+        return bool(self.verify)
 
-    def status(self, message: str):
+    def status(self, message: str, level: int = 1):
         """Write a message if verification is enabled.
 
         Args:
             message: status string
         """
-        if self.verify:
+        if self.verify >= level:
             ts = datetime.datetime.now().astimezone()
             click.secho(f"({ts:%H:%M:%S}) {message}", fg="green", err=True)
 
@@ -138,27 +162,6 @@ def watcher(self):
             )
 
 
-class DateParser(ParamType):
-    """The DateParser type converts date strings into `datetime` objects.
-
-    This is a variant of click's built-in DateTime parser, but uses the
-    more flexible dateutil.parser
-    """
-
-    name = "dateparser"
-
-    def convert(
-        self, value: Any, param: Optional[Parameter], ctx: Optional[Context]
-    ) -> Any:
-        if isinstance(value, datetime.datetime):
-            return value
-
-        try:
-            return parser.parse(value)
-        except Exception as e:
-            self.fail(f"{value!r} cannot be converted to a datetime: {str(e)!r}")
-
-
 def config_setup(context: object) -> PbenchServerConfig:
     config = PbenchServerConfig.create(context.config)
     # We're going to need the DB to track dataset state, so setup DB access.

lib/pbench/cli/server/audit.py

@@ -5,7 +5,7 @@
 import click
 
 from pbench.cli import pass_cli_context
-from pbench.cli.server import config_setup, Verify
+from pbench.cli.server import config_setup, DateParser, Verify
 from pbench.cli.server.options import common_options
 from pbench.server import BadConfig, OperationCode
 from pbench.server.database.database import Database
@@ -110,6 +110,7 @@ def auditor(kwargs) -> Iterator[str]:
 
 @click.command(name="pbench-audit")
 @pass_cli_context
+@click.option("--id", type=int, help="Select by audit event ID")
 @click.option(
     "--ids",
     default=False,
@@ -130,6 +131,7 @@ def auditor(kwargs) -> Iterator[str]:
 @click.option("--object-id", type=str, help="Select by object ID")
 @click.option("--object-name", type=str, help="Select by object name")
 @click.option("--page", default=False, is_flag=True, help="Paginate the output")
+@click.option("--root-id", type=int, help="Select by audit event root ID")
 @click.option("--user-id", type=str, help="Select by user ID")
 @click.option("--user-name", type=str, help="Select by username")
 @click.option(
@@ -142,12 +144,12 @@ def auditor(kwargs) -> Iterator[str]:
 )
 @click.option(
     "--since",
-    type=click.DateTime(),
+    type=DateParser(),
     help="Select entries on or after specified date/time",
 )
 @click.option(
     "--until",
-    type=click.DateTime(),
+    type=DateParser(),
     help="Select entries on or before specified date/time",
 )
 @click.option(