Support backwards compatability

Author: abbiemery

src/blueapi/cli/cli.py

@@ -66,36 +66,63 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
     return wrapper
 
 
-def _load_config(ctx: click.Context, config: Path | None | tuple[Path, ...]) -> None:
+def _default_config(ctx: click.Context) -> None:
+    ctx.ensure_object(dict)
+    config_loader = ConfigLoader(ApplicationConfig)
+
+    loaded_config: ApplicationConfig = config_loader.load()
+
+    set_up_logging(loaded_config.logging)
+
+    ctx.obj["config"] = loaded_config
+
+
+def _load_config(
+    ctx: click.Context,
+    config: Path | None | tuple[Path, ...],
+) -> None:
+    ctx.ensure_object(dict)
+
     config_loader = ConfigLoader(ApplicationConfig)
+    ctx.obj["custom_config"] = False
 
     if config is not None:
+        ctx.obj["custom_config"] = True
         configs = (config,) if isinstance(config, Path) else config
         for path in configs:
             if path.exists():
                 config_loader.use_values_from_yaml(path)
             else:
                 raise FileNotFoundError(f"Cannot find file: {path}")
 
-    ctx.ensure_object(dict)
     loaded_config: ApplicationConfig = config_loader.load()
-
     set_up_logging(loaded_config.logging)
-
     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.option(
+    "-c",
+    "--config",
+    type=Path,
+    help="Path to configuration YAML file",
+    multiple=True,
+)
 @click.pass_context
-def main(ctx: click.Context) -> None:
+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)
 
+    if config == ():
+        config = None
+
+    _load_config(ctx, config)
+
     if ctx.invoked_subcommand is None:
         print("Please invoke subcommand!")
 
@@ -157,14 +184,10 @@ def config_schema(output: Path | None = None, update: bool = False) -> None:
 
 
 @main.command(name="serve")
-@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, ...]):
+def start_application(ctx: click.Context):
     """Run a worker that accepts plans to run"""
-    _load_config(ctx, config)
-    loaded_config: ApplicationConfig = ctx.obj["config"]
+    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.
@@ -176,7 +199,7 @@ def start_application(ctx: click.Context, config: Path | None | tuple[Path, ...]
     observability context.
     """
     setup_tracing("BlueAPI", OTLP_EXPORT_ENABLED)
-    start(loaded_config)
+    start(config)
 
 
 @main.command(name="login")
@@ -195,9 +218,16 @@ def login(
     """
     Authenticate with the blueapi using the OIDC (OpenID Connect) flow.
     """
-    config: ApplicationConfig = ConfigLoader(ApplicationConfig).load()
+    config: ApplicationConfig = obj["config"]
+
     if url is not None:
-        config.api.url = HttpUrl(url)
+        if obj["custom_config"] is True:
+            logging.warning(
+                "Custom config has been used. This will take precidence "
+                "over a provided url"
+            )
+        else:
+            config.api.url = HttpUrl(url)
     try:
         auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
         access_token = auth.get_valid_access_token()
@@ -230,9 +260,16 @@ def logout(
     """
     Logs out from the OIDC provider and removes the cached access token.
     """
-    config: ApplicationConfig = ConfigLoader(ApplicationConfig).load()
+    config: ApplicationConfig = obj["config"]
+
     if url is not None:
-        config.api.url = HttpUrl(url)
+        if obj["custom_config"] is True:
+            logging.warning(
+                "Custom config has been used. This will take precidence "
+                "over a provided url"
+            )
+        else:
+            config.api.url = HttpUrl(url)
     try:
         auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
         auth.logout()
@@ -276,15 +313,21 @@ def controller(
     ctx.ensure_object(dict)
     ctx.obj["fmt"] = OutputFormat(output)
 
-    config: ApplicationConfig = ConfigLoader(ApplicationConfig).load()
+    config: ApplicationConfig = ctx.obj["config"]
 
     if url is not None:
-        config.api.url = HttpUrl(url)
+        if ctx.obj["custom_config"] is True:
+            logging.warning(
+                "Custom config has been used. This will take precidence "
+                "over a provided url"
+            )
+        else:
+            config.api.url = HttpUrl(url)
 
-    tmp_client = BlueapiClient.from_config(config)
-    config.stomp = tmp_client.get_stomp_config()
+            tmp_client = BlueapiClient.from_config(config)
+            config.stomp = tmp_client.get_stomp_config()
+            ctx.obj["config"] = config
 
-    ctx.obj["config"] = config
     set_up_logging(config.logging)
     ctx.obj["client"] = BlueapiClient.from_config(config)