Re-order cli methods

Author: abbiemery

src/blueapi/cli/cli.py

@@ -42,6 +42,29 @@
 from .scratch import setup_scratch
 from .updates import CliEventRenderer
 
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def check_connection(func: Callable[P, T]) -> Callable[P, T]:
+    @wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+        try:
+            return func(*args, **kwargs)
+        except ConnectionError as ce:
+            raise ClickException(
+                "Failed to establish connection to blueapi server."
+            ) from ce
+        except BlueskyRemoteControlError as e:
+            if str(e) == "<Response [401]>":
+                raise ClickException(
+                    "Access denied. Please check your login status and try again."
+                ) from e
+            else:
+                raise e
+
+    return wrapper
+
 
 def _load_config(ctx: click.Context, config: Path | None | tuple[Path, ...]) -> None:
     config_loader = ConfigLoader(ApplicationConfig)
@@ -156,6 +179,52 @@ def start_application(ctx: click.Context, config: Path | None | tuple[Path, ...]
     start(loaded_config)
 
 
+@main.command(name="login")
+@click.pass_obj
+@check_connection
+def login(obj: dict) -> None:
+    """
+    Authenticate with the blueapi using the OIDC (OpenID Connect) flow.
+    """
+    config: ApplicationConfig = obj["config"]
+    try:
+        auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
+        access_token = auth.get_valid_access_token()
+        assert access_token
+        print("Logged in")
+    except Exception:
+        client = BlueapiClient.from_config(config)
+        oidc_config = client.get_oidc_config()
+        if oidc_config is None:
+            print("Server is not configured to use authentication!")
+            return
+        auth = SessionManager(
+            oidc_config, cache_manager=SessionCacheManager(config.auth_token_path)
+        )
+        auth.start_device_flow()
+
+
+@main.command(name="logout")
+@click.pass_obj
+def logout(obj: dict) -> None:
+    """
+    Logs out from the OIDC provider and removes the cached access token.
+    """
+    config: ApplicationConfig = obj["config"]
+    try:
+        auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
+        auth.logout()
+    except FileNotFoundError:
+        print("Logged out")
+    except ValueError as e:
+        logging.debug("Invalid login token: %s", e)
+        raise ClickException(
+            "Login token is not valid - remove before trying again"
+        ) from e
+    except Exception as e:
+        raise ClickException(f"Error logging out: {e}") from e
+
+
 @main.group()
 @click.option(
     "-o",
@@ -197,30 +266,6 @@ def controller(
     ctx.obj["client"] = BlueapiClient.from_config(config)
 
 
-P = ParamSpec("P")
-T = TypeVar("T")
-
-
-def check_connection(func: Callable[P, T]) -> Callable[P, T]:
-    @wraps(func)
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-        try:
-            return func(*args, **kwargs)
-        except ConnectionError as ce:
-            raise ClickException(
-                "Failed to establish connection to blueapi server."
-            ) from ce
-        except BlueskyRemoteControlError as e:
-            if str(e) == "<Response [401]>":
-                raise ClickException(
-                    "Access denied. Please check your login status and try again."
-                ) from e
-            else:
-                raise e
-
-    return wrapper
-
-
 @controller.command(name="plans")
 @click.pass_obj
 @check_connection
@@ -476,49 +521,3 @@ def get_python_env(obj: dict, name: str, source: SourceInfo) -> None:
     """
     client: BlueapiClient = obj["client"]
     obj["fmt"].display(client.get_python_env(name=name, source=source))
-
-
-@main.command(name="login")
-@click.pass_obj
-@check_connection
-def login(obj: dict) -> None:
-    """
-    Authenticate with the blueapi using the OIDC (OpenID Connect) flow.
-    """
-    config: ApplicationConfig = obj["config"]
-    try:
-        auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
-        access_token = auth.get_valid_access_token()
-        assert access_token
-        print("Logged in")
-    except Exception:
-        client = BlueapiClient.from_config(config)
-        oidc_config = client.get_oidc_config()
-        if oidc_config is None:
-            print("Server is not configured to use authentication!")
-            return
-        auth = SessionManager(
-            oidc_config, cache_manager=SessionCacheManager(config.auth_token_path)
-        )
-        auth.start_device_flow()
-
-
-@main.command(name="logout")
-@click.pass_obj
-def logout(obj: dict) -> None:
-    """
-    Logs out from the OIDC provider and removes the cached access token.
-    """
-    config: ApplicationConfig = obj["config"]
-    try:
-        auth: SessionManager = SessionManager.from_cache(config.auth_token_path)
-        auth.logout()
-    except FileNotFoundError:
-        print("Logged out")
-    except ValueError as e:
-        logging.debug("Invalid login token: %s", e)
-        raise ClickException(
-            "Login token is not valid - remove before trying again"
-        ) from e
-    except Exception as e:
-        raise ClickException(f"Error logging out: {e}") from e