First pass for cli config changes

Author: abbiemery

src/blueapi/cli/cli.py

@@ -32,7 +32,6 @@
 from blueapi.config import (
     ApplicationConfig,
     ConfigLoader,
-    StompConfig,
 )
 from blueapi.core import OTLP_EXPORT_ENABLED, DataEvent
 from blueapi.log import set_up_logging
@@ -44,21 +43,9 @@
 from .updates import CliEventRenderer
 
 
-@click.group(
-    invoke_without_command=True, context_settings={"auto_envvar_prefix": "BLUEAPI"}
-)
-@click.version_option(version=__version__, prog_name="blueapi")
-@click.option(
-    "-c", "--config", type=Path, help="Path to configuration YAML file", multiple=True
-)
-@click.pass_context
-def main(ctx: click.Context, config: Path | None | tuple[Path, ...]) -> None:
-    # if no command is supplied, run with the options passed
-
-    # Set umask to DLS standard
-    os.umask(stat.S_IWOTH)
-
+def _load_config(ctx: click.Context, config: Path | None | tuple[Path, ...]) -> None:
     config_loader = ConfigLoader(ApplicationConfig)
+
     if config is not None:
         configs = (config,) if isinstance(config, Path) else config
         for path in configs:
@@ -74,6 +61,18 @@ def main(ctx: click.Context, config: Path | None | tuple[Path, ...]) -> None:
 
     ctx.obj["config"] = loaded_config
 
+
+@click.group(
+    invoke_without_command=True, context_settings={"auto_envvar_prefix": "BLUEAPI"}
+)
+@click.version_option(version=__version__, prog_name="blueapi")
+@click.pass_context
+def main(ctx: click.Context) -> None:
+    # if no command is supplied, run with the options passed
+
+    # Set umask to DLS standard
+    os.umask(stat.S_IWOTH)
+
     if ctx.invoked_subcommand is None:
         print("Please invoke subcommand!")
 
@@ -135,10 +134,14 @@ def config_schema(output: Path | None = None, update: bool = False) -> None:
 
 
 @main.command(name="serve")
-@click.pass_obj
-def start_application(obj: dict):
+@click.option(
+    "-c", "--config", type=Path, help="Path to configuration YAML file", multiple=True
+)
+@click.pass_context
+def start_application(ctx: click.Context, config: Path | None | tuple[Path, ...]):
     """Run a worker that accepts plans to run"""
-    config: ApplicationConfig = obj["config"]
+    _load_config(ctx, config)
+    loaded_config: ApplicationConfig = ctx.obj["config"]
 
     """Only import the service functions when starting the service or generating
     the schema, not the controller as a new FastAPI app will be started each time.
@@ -150,7 +153,7 @@ def start_application(obj: dict):
     observability context.
     """
     setup_tracing("BlueAPI", OTLP_EXPORT_ENABLED)
-    start(config)
+    start(loaded_config)
 
 
 @main.group()
@@ -180,17 +183,17 @@ def controller(
         return
 
     ctx.ensure_object(dict)
+    ctx.obj["fmt"] = OutputFormat(output)
+
+    _load_config(ctx, None)
     config: ApplicationConfig = ctx.obj["config"]
 
     if url is not None:
         config.api.url = HttpUrl(url)
 
-    ctx.obj["fmt"] = OutputFormat(output)
-    ctx.obj["client"] = BlueapiClient.from_config(config)
+    tmp_client = BlueapiClient.from_config(config)
+    config.stomp = tmp_client.get_stomp_config()
 
-    client: BlueapiClient = ctx.obj["client"]
-    stomp_config: StompConfig = client.get_stomp_config()
-    config.stomp = stomp_config
     ctx.obj["client"] = BlueapiClient.from_config(config)