flwr 1.23.0__py3-none-any.whl → 1.24.0__py3-none-any.whl

flwr/cli/stop.py

@@ -18,7 +18,7 @@
 import io
 import json
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from rich.console import Console
@@ -51,11 +51,11 @@ def stop(  # pylint: disable=R0914
         typer.Argument(help="Path of the Flower project"),
     ] = Path("."),
     federation: Annotated[
-        Optional[str],
+        str | None,
         typer.Argument(help="Name of the federation"),
     ] = None,
     federation_config_overrides: Annotated[
-        Optional[list[str]],
+        list[str] | None,
         typer.Option(
             "--federation-config",
             help=FEDERATION_CONFIG_HELP_MESSAGE,
@@ -70,7 +70,11 @@ def stop(  # pylint: disable=R0914
         ),
     ] = CliOutputFormat.DEFAULT,
 ) -> None:
-    """Stop a run."""
+    """Stop a Flower run.
+
+    This command stops a running Flower App execution by sending a stop request to the
+    SuperLink via the Control API.
+    """
     suppress_output = output_format == CliOutputFormat.JSON
     captured_output = io.StringIO()
     try:
@@ -81,7 +85,7 @@ def stop(  # pylint: disable=R0914
         typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
 
         pyproject_path = app / FAB_CONFIG_FILE if app else None
-        config, errors, warnings = load_and_validate(path=pyproject_path)
+        config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
         config = process_loaded_project_config(config, errors, warnings)
         federation, federation_config = validate_federation_in_project_config(
             federation, config, federation_config_overrides
@@ -101,6 +105,7 @@ def stop(  # pylint: disable=R0914
                 f"❌ {err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
             raise typer.Exit(code=1) from err
         finally:
@@ -116,6 +121,7 @@ def stop(  # pylint: disable=R0914
                 f"{err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
     finally:
         if suppress_output:
@@ -124,7 +130,17 @@ def stop(  # pylint: disable=R0914
 
 
 def _stop_run(stub: ControlStub, run_id: int, output_format: str) -> None:
-    """Stop a run."""
+    """Stop a run and display the result.
+
+    Parameters
+    ----------
+    stub : ControlStub
+        The gRPC stub for Control API communication.
+    run_id : int
+        The unique identifier of the run to stop.
+    output_format : str
+        Output format ('default' or 'json').
+    """
     with flwr_cli_grpc_exc_handler():
         response: StopRunResponse = stub.StopRun(request=StopRunRequest(run_id=run_id))
     if response.success:
@@ -139,4 +155,6 @@ def _stop_run(stub: ControlStub, run_id: int, output_format: str) -> None:
             restore_output()
             Console().print_json(run_output)
     else:
-        typer.secho(f"❌ Run {run_id} couldn't be stopped.", fg=typer.colors.RED)
+        typer.secho(
+            f"❌ Run {run_id} couldn't be stopped.", fg=typer.colors.RED, err=True
+        )

flwr/cli/supernode/ls.py

@@ -19,7 +19,7 @@ import io
 import json
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Annotated, Optional, cast
+from typing import Annotated, cast
 
 import typer
 from rich.console import Console
@@ -32,7 +32,7 @@ from flwr.cli.config_utils import (
     process_loaded_project_config,
     validate_federation_in_project_config,
 )
-from flwr.common.constant import FAB_CONFIG_FILE, NOOP_FLWR_AID, CliOutputFormat
+from flwr.common.constant import FAB_CONFIG_FILE, NOOP_ACCOUNT_NAME, CliOutputFormat
 from flwr.common.date import format_timedelta, isoformat8601_utc
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
@@ -44,7 +44,7 @@ from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
 
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
 
-_NodeListType = tuple[int, str, str, str, str, str, str, str]
+_NodeListType = tuple[int, str, str, str, str, str, str, str, str]
 
 
 def ls(  # pylint: disable=R0914, R0913, R0917
@@ -54,7 +54,7 @@ def ls(  # pylint: disable=R0914, R0913, R0917
         typer.Argument(help="Path of the Flower project"),
     ] = Path("."),
     federation: Annotated[
-        Optional[str],
+        str | None,
         typer.Argument(help="Name of the federation"),
     ] = None,
     output_format: Annotated[
@@ -86,7 +86,7 @@ def ls(  # pylint: disable=R0914, R0913, R0917
         typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
 
         pyproject_path = app / FAB_CONFIG_FILE if app else None
-        config, errors, warnings = load_and_validate(path=pyproject_path)
+        config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
         config = process_loaded_project_config(config, errors, warnings)
         federation, federation_config = validate_federation_in_project_config(
             federation, config
@@ -138,7 +138,7 @@ def _format_nodes(
 ) -> list[_NodeListType]:
     """Format node information for display."""
 
-    def _format_datetime(dt_str: Optional[str]) -> str:
+    def _format_datetime(dt_str: str | None) -> str:
         dt = datetime.fromisoformat(dt_str) if dt_str else None
         return isoformat8601_utc(dt).replace("T", " ") if dt else "N/A"
 
@@ -160,6 +160,7 @@ def _format_nodes(
             (
                 node.node_id,
                 node.owner_aid,
+                node.owner_name,
                 node.status,
                 _format_datetime(node.registered_at),
                 _format_datetime(node.last_activated_at),
@@ -188,7 +189,8 @@ def _to_table(nodes_info: list[_NodeListType], verbose: bool) -> Table:
     for row in nodes_info:
         (
             node_id,
-            owner_aid,
+            _,
+            owner_name,
             status,
             _,
             last_activated_at,
@@ -216,7 +218,11 @@ def _to_table(nodes_info: list[_NodeListType], verbose: bool) -> Table:
 
         formatted_row = (
             f"[bold]{node_id}[/bold]",
-            f"{owner_aid}" if owner_aid != NOOP_FLWR_AID else f"[dim]{owner_aid}[/dim]",
+            (
+                f"{owner_name}"
+                if owner_name != NOOP_ACCOUNT_NAME
+                else f"[dim]{owner_name}[/dim]"
+            ),
             f"[{status_style}]{status}",
             f"[cyan]{elapse_activated}[/cyan]" if status == "online" else "",
             time_at,
@@ -233,6 +239,7 @@ def _to_json(nodes_info: list[_NodeListType], verbose: bool) -> str:
         (
             node_id,
             owner_aid,
+            owner_name,
             status,
             created_at,
             activated_at,
@@ -248,6 +255,7 @@ def _to_json(nodes_info: list[_NodeListType], verbose: bool) -> str:
             {
                 "node-id": node_id,
                 "owner-aid": owner_aid,
+                "owner-name": owner_name,
                 "status": status,
                 "created-at": created_at,
                 "online-at": activated_at,

flwr/cli/supernode/register.py

@@ -18,7 +18,7 @@
 import io
 import json
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from cryptography.exceptions import UnsupportedAlgorithm
@@ -57,7 +57,7 @@ def register(  # pylint: disable=R0914
         typer.Argument(help="Path of the Flower project"),
     ] = Path("."),
     federation: Annotated[
-        Optional[str],
+        str | None,
         typer.Argument(help="Name of the federation"),
     ] = None,
     output_format: Annotated[
@@ -85,7 +85,7 @@ def register(  # pylint: disable=R0914
         typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
 
         pyproject_path = app / FAB_CONFIG_FILE if app else None
-        config, errors, warnings = load_and_validate(path=pyproject_path)
+        config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
         config = process_loaded_project_config(config, errors, warnings)
         federation, federation_config = validate_federation_in_project_config(
             federation, config
@@ -107,6 +107,7 @@ def register(  # pylint: disable=R0914
                 f"❌ {err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
             raise typer.Exit(code=1) from err
         finally:
@@ -123,6 +124,7 @@ def register(  # pylint: disable=R0914
                 f"{err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
     finally:
         if suppress_output:
@@ -151,7 +153,9 @@ def _register_node(stub: ControlStub, public_key: bytes, output_format: str) ->
             restore_output()
             Console().print_json(run_output)
     else:
-        typer.secho("❌ SuperNode couldn't be registered.", fg=typer.colors.RED)
+        typer.secho(
+            "❌ SuperNode couldn't be registered.", fg=typer.colors.RED, err=True
+        )
 
 
 def try_load_public_key(public_key_path: Path) -> bytes:
@@ -161,6 +165,7 @@ def try_load_public_key(public_key_path: Path) -> bytes:
             f"❌ Public key file '{public_key_path}' does not exist.",
             fg=typer.colors.RED,
             bold=True,
+            err=True,
         )
         raise typer.Exit(code=1)
 

flwr/cli/supernode/unregister.py

@@ -18,7 +18,7 @@
 import io
 import json
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from rich.console import Console
@@ -49,7 +49,7 @@ def unregister(  # pylint: disable=R0914
         typer.Argument(help="Path of the Flower project"),
     ] = Path("."),
     federation: Annotated[
-        Optional[str],
+        str | None,
         typer.Argument(help="Name of the federation"),
     ] = None,
     output_format: Annotated[
@@ -73,7 +73,7 @@ def unregister(  # pylint: disable=R0914
         typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
 
         pyproject_path = app / FAB_CONFIG_FILE if app else None
-        config, errors, warnings = load_and_validate(path=pyproject_path)
+        config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
         config = process_loaded_project_config(config, errors, warnings)
         federation, federation_config = validate_federation_in_project_config(
             federation, config
@@ -93,6 +93,7 @@ def unregister(  # pylint: disable=R0914
                 f"❌ {err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
             raise typer.Exit(code=1) from err
         finally:
@@ -109,6 +110,7 @@ def unregister(  # pylint: disable=R0914
                 f"{err}",
                 fg=typer.colors.RED,
                 bold=True,
+                err=True,
             )
     finally:
         if suppress_output: