flwr 1.24.0__tar.gz → 1.25.0__tar.gz

{flwr-1.24.0 → flwr-1.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr
-Version: 1.24.0
+Version: 1.25.0
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning
@@ -180,7 +180,7 @@ Quickstart examples:
 - [Quickstart (Pandas)](https://github.com/adap/flower/tree/main/examples/quickstart-pandas)
 - [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart-jax)
 - [Quickstart (MONAI)](https://github.com/adap/flower/tree/main/examples/quickstart-monai)
-- [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)
+- [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/quickstart-sklearn)
 - [Quickstart (Android [TFLite])](https://github.com/adap/flower/tree/main/examples/android)
 - [Quickstart (iOS [CoreML])](https://github.com/adap/flower/tree/main/examples/ios)
 - [Quickstart (MLX)](https://github.com/adap/flower/tree/main/examples/quickstart-mlx)
@@ -197,10 +197,8 @@ Other [examples](https://github.com/adap/flower/tree/main/examples):
 - [Advanced Flower with TensorFlow/Keras](https://github.com/adap/flower/tree/main/examples/advanced-tensorflow)
 - [Advanced Flower with PyTorch](https://github.com/adap/flower/tree/main/examples/advanced-pytorch)
 - [Comprehensive Flower+XGBoost](https://github.com/adap/flower/tree/main/examples/xgboost-comprehensive)
-- [Flower through Docker Compose and with Grafana dashboard](https://github.com/adap/flower/tree/main/examples/flower-via-docker-compose)
 - [Flower with KaplanMeierFitter from the lifelines library](https://github.com/adap/flower/tree/main/examples/federated-kaplan-meier-fitter)
 - [Sample Level Privacy with Opacus](https://github.com/adap/flower/tree/main/examples/opacus)
-- [Sample Level Privacy with TensorFlow-Privacy](https://github.com/adap/flower/tree/main/examples/tensorflow-privacy)
 - [Flower with a Tabular Dataset](https://github.com/adap/flower/tree/main/examples/fl-tabular)
 
 ## Community

{flwr-1.24.0 → flwr-1.25.0}/README.md

@@ -124,7 +124,7 @@ Quickstart examples:
 - [Quickstart (Pandas)](https://github.com/adap/flower/tree/main/examples/quickstart-pandas)
 - [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart-jax)
 - [Quickstart (MONAI)](https://github.com/adap/flower/tree/main/examples/quickstart-monai)
-- [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)
+- [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/quickstart-sklearn)
 - [Quickstart (Android [TFLite])](https://github.com/adap/flower/tree/main/examples/android)
 - [Quickstart (iOS [CoreML])](https://github.com/adap/flower/tree/main/examples/ios)
 - [Quickstart (MLX)](https://github.com/adap/flower/tree/main/examples/quickstart-mlx)
@@ -141,10 +141,8 @@ Other [examples](https://github.com/adap/flower/tree/main/examples):
 - [Advanced Flower with TensorFlow/Keras](https://github.com/adap/flower/tree/main/examples/advanced-tensorflow)
 - [Advanced Flower with PyTorch](https://github.com/adap/flower/tree/main/examples/advanced-pytorch)
 - [Comprehensive Flower+XGBoost](https://github.com/adap/flower/tree/main/examples/xgboost-comprehensive)
-- [Flower through Docker Compose and with Grafana dashboard](https://github.com/adap/flower/tree/main/examples/flower-via-docker-compose)
 - [Flower with KaplanMeierFitter from the lifelines library](https://github.com/adap/flower/tree/main/examples/federated-kaplan-meier-fitter)
 - [Sample Level Privacy with Opacus](https://github.com/adap/flower/tree/main/examples/opacus)
-- [Sample Level Privacy with TensorFlow-Privacy](https://github.com/adap/flower/tree/main/examples/tensorflow-privacy)
 - [Flower with a Tabular Dataset](https://github.com/adap/flower/tree/main/examples/fl-tabular)
 
 ## Community

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/app_cmd/review.py

@@ -36,6 +36,7 @@ from flwr.supercore.primitives.asymmetric_ed25519 import (
     load_private_key,
     sign_message,
 )
+from flwr.supercore.utils import parse_app_spec, request_download_link
 
 from ..auth_plugin.oidc_cli_plugin import OidcCliPlugin
 from ..config_utils import (
@@ -45,7 +46,7 @@ from ..config_utils import (
 )
 from ..constant import FEDERATION_CONFIG_HELP_MESSAGE
 from ..install import install_from_fab
-from ..utils import load_cli_auth_plugin, parse_app_spec, request_download_link
+from ..utils import load_cli_auth_plugin
 
 TRY_AGAIN_MESSAGE = "Please try again or press CTRL+C to abort.\n"
 
@@ -104,12 +105,21 @@ def review(
     token = auth_plugin.access_token
 
     # Validate app version and ID format
-    app_id, app_version = parse_app_spec(app_spec)
+    try:
+        app_id, app_version = parse_app_spec(app_spec)
+    except ValueError as e:
+        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
+        raise typer.Exit(code=1) from e
 
     # Download FAB
     typer.secho("Downloading FAB... ", fg=typer.colors.BLUE)
     url = f"{PLATFORM_API_URL}/hub/fetch-fab"
-    presigned_url = request_download_link(app_id, app_version, url, "fab_url")
+    try:
+        presigned_url, _ = request_download_link(app_id, app_version, url, "fab_url")
+    except ValueError as e:
+        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
+        raise typer.Exit(code=1) from e
+
     fab_bytes = _download_fab(presigned_url)
 
     # Unpack FAB

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/federation/show.py

@@ -41,6 +41,7 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
 from flwr.supercore.constant import NOOP_FEDERATION
+from flwr.supercore.utils import humanize_duration
 
 from ..run_utils import RunRow, format_runs
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
@@ -262,7 +263,7 @@ def _to_runs_table(run_list: list[RunRow]) -> Table:
             f"[bold]{row.run_id}[/bold]",
             f"@{row.fab_id}=={row.fab_version}",
             f"[{status_style}]{row.status_text}[/{status_style}]",
-            row.elapsed,
+            f"{humanize_duration(row.elapsed)}",
         )
         table.add_row(*formatted_row)
 
@@ -298,7 +299,7 @@ def _to_json(
     for node in nodes:
         nodes_list.append(
             {
-                "node_id": node.node_id,
+                "node_id": f"{node.node_id}",
                 "owner": node.owner_name,
                 "status": node.status,
             }
@@ -307,7 +308,7 @@ def _to_json(
     for run in runs:
         runs_list.append(
             {
-                "run_id": run.run_id,
+                "run_id": f"{run.run_id}",
                 "app": f"@{run.fab_id}=={run.fab_version}",
                 "status": run.status_text,
                 "elapsed": run.elapsed,

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/ls.py

@@ -40,6 +40,7 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     ListRunsResponse,
 )
 from flwr.proto.control_pb2_grpc import ControlStub
+from flwr.supercore.utils import humanize_bytes, humanize_duration
 
 from .run_utils import RunRow, format_runs
 from .utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
@@ -231,7 +232,7 @@ def _to_table(run_list: list[RunRow]) -> Table:
             row.federation,
             f"@{row.fab_id}=={row.fab_version}",
             f"[{status_style}]{row.status_text}[/{status_style}]",
-            row.elapsed,
+            humanize_duration(row.elapsed),
             status_changed_at,
         )
         table.add_row(*formatted_row)
@@ -265,11 +266,39 @@ def _to_detail_table(run: RunRow) -> Table:
     table.add_row("App", f"@{run.fab_id}=={run.fab_version}")
     table.add_row("FAB Hash", f"{run.fab_hash[:8]}...{run.fab_hash[-8:]}")
     table.add_row("Status", f"[{status_style}]{run.status_text}[/{status_style}]")
-    table.add_row("Elapsed", f"[blue]{run.elapsed}[/blue]")
+    table.add_row("Elapsed", f"[blue]{humanize_duration(run.elapsed)}[/blue]")
     table.add_row("Pending At", run.pending_at)
     table.add_row("Starting At", run.starting_at)
     table.add_row("Running At", run.running_at)
     table.add_row("Finished At", run.finished_at)
+    table.add_row(
+        "Network traffic (inbound)",
+        f"[blue]{humanize_bytes(run.network_traffic_inbound)}[/blue]",
+    )
+    table.add_row(
+        "Network traffic (outbound)",
+        f"[blue]{humanize_bytes(run.network_traffic_outbound)}[/blue]",
+    )
+    table.add_row(
+        "Network Traffic (total)",
+        "[blue]"
+        f"{humanize_bytes(run.network_traffic_inbound + run.network_traffic_outbound)}"
+        "[/blue]",
+    )
+    table.add_row(
+        "Compute Time (ServerApp)",
+        f"[blue]{humanize_duration(run.compute_time_serverapp)}[/blue]",
+    )
+    table.add_row(
+        "Compute Time (ClientApp)",
+        f"[blue]{humanize_duration(run.compute_time_clientapp)}[/blue]",
+    )
+    table.add_row(
+        "Compute Time (total)",
+        "[blue]"
+        f"{humanize_duration(run.compute_time_serverapp + run.compute_time_clientapp)}"
+        "[/blue]",
+    )
 
     return table
 
@@ -291,7 +320,7 @@ def _to_json(run_list: list[RunRow]) -> str:
     for row in run_list:
         runs_list.append(
             {
-                "run-id": row.run_id,
+                "run-id": f"{row.run_id}",
                 "federation": row.federation,
                 "fab-id": row.fab_id,
                 "fab-name": row.fab_id.split("/")[-1],
@@ -303,6 +332,18 @@ def _to_json(run_list: list[RunRow]) -> str:
                 "starting-at": row.starting_at,
                 "running-at": row.running_at,
                 "finished-at": row.finished_at,
+                "network-traffic": {
+                    "inbound-bytes": row.network_traffic_inbound,
+                    "outbound-bytes": row.network_traffic_outbound,
+                    "total-bytes": row.network_traffic_inbound
+                    + row.network_traffic_outbound,
+                },
+                "compute-time": {
+                    "serverapp-seconds": row.compute_time_serverapp,
+                    "clientapp-seconds": row.compute_time_clientapp,
+                    "total-seconds": row.compute_time_serverapp
+                    + row.compute_time_clientapp,
+                },
             }
         )
 

flwr-1.25.0/py/flwr/cli/new/new.py

@@ -0,0 +1,263 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Flower command line interface `new` command."""
+
+
+import io
+import zipfile
+from pathlib import Path
+from typing import Annotated, cast
+
+import requests
+import typer
+
+from flwr.supercore.constant import PLATFORM_API_URL
+from flwr.supercore.utils import parse_app_spec, request_download_link
+
+from ..utils import prompt_options, prompt_text
+
+
+# pylint: disable=too-many-locals,too-many-branches,too-many-statements
+def new(
+    app_spec: Annotated[
+        str | None,
+        typer.Argument(
+            help="Flower app specifier. Use the format "
+            "'@account_name/app_name' or '@account_name/app_name==x.y.z'. "
+            "Version is optional (defaults to latest)."
+        ),
+    ] = None,
+    framework: Annotated[
+        str | None,
+        typer.Option(case_sensitive=False, help="Deprecated. The ML framework to use"),
+    ] = None,
+    username: Annotated[
+        str | None,
+        typer.Option(
+            case_sensitive=False, help="Deprecated. The Flower username of the author"
+        ),
+    ] = None,
+) -> None:
+    """Create new Flower App."""
+    if framework is not None or username is not None:
+        typer.secho(
+            "❌ The --framework and --username options are deprecated and will be "
+            "removed in future versions of Flower. Please provide an app specifier "
+            "after `flwr new` instead, e.g., '@account_name/app_name' or "
+            "'@account_name/app_name==x.y.z'.",
+            fg=typer.colors.RED,
+            bold=True,
+            err=True,
+        )
+        raise typer.Exit(code=1)
+
+    if app_spec is None:
+        # Fetch recommended apps
+        print(
+            typer.style(
+                "\n🌸 Fetching recommended apps...",
+                fg=typer.colors.GREEN,
+                bold=True,
+            )
+        )
+        apps = fetch_recommended_apps()
+
+        if not apps:
+            typer.secho(
+                "No recommended apps found. Please provide an app specifier manually.",
+                fg=typer.colors.YELLOW,
+            )
+            app_spec = prompt_text("Please provide the app specifier")
+        else:
+            # Extract app_ids and show selection menu
+            app_ids = [app["app_id"] for app in apps]
+            app_spec = prompt_options(
+                "Select a Flower App to create by entering "
+                "the number from the list below:",
+                app_ids,
+            )
+
+    # Download remote app
+    download_remote_app_via_api(app_spec)
+
+
+def print_success_prompt(package_name: str) -> None:
+    """Print styled setup instructions for running a new Flower App after creation."""
+    prompt = typer.style(
+        "🎊 Flower App creation successful.\n\n"
+        "To run your Flower App, first install its dependencies:\n\n",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+
+    prompt += typer.style(
+        f"	cd {package_name} && pip install -e .\n\n",
+        fg=typer.colors.BRIGHT_CYAN,
+        bold=True,
+    )
+
+    prompt += typer.style(
+        "then, run the app:\n\n ",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+
+    prompt += typer.style(
+        "\tflwr run .\n\n",
+        fg=typer.colors.BRIGHT_CYAN,
+        bold=True,
+    )
+
+    prompt += typer.style(
+        "💡 Check the README in your app directory to learn how to\n"
+        "customize it and how to run it using the Deployment Runtime.\n",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+
+    print(prompt)
+
+
+def fetch_recommended_apps() -> list[dict[str, str]]:
+    """Fetch recommended apps from Platform API."""
+    url = f"{PLATFORM_API_URL}/hub/apps?tag=recommended"
+    try:
+        response = requests.get(url, headers={"accept": "application/json"}, timeout=10)
+        response.raise_for_status()
+        data = response.json()
+        apps = data.get("apps", [])
+        return cast(list[dict[str, str]], apps)
+
+    except requests.RequestException as e:
+        typer.secho(
+            f"❌ Failed to fetch recommended apps: {e}",
+            fg=typer.colors.RED,
+            err=True,
+        )
+        raise typer.Exit(code=1) from e
+
+
+# Security: prevent zip-slip
+def _safe_extract_zip(zf: zipfile.ZipFile, dest_dir: Path) -> None:
+    """Extract ZIP file into destination directory."""
+    dest_dir = dest_dir.resolve()
+
+    def _is_within_directory(base: Path, target: Path) -> bool:
+        try:
+            target.relative_to(base)
+            return True
+        except ValueError:
+            return False
+
+    for member in zf.infolist():
+        # Skip directory placeholders;
+        # ZipInfo can represent them as names ending with '/'.
+        if member.is_dir():
+            target_path = (dest_dir / member.filename).resolve()
+            if not _is_within_directory(dest_dir, target_path):
+                raise ValueError(f"Unsafe path in zip: {member.filename}")
+            target_path.mkdir(parents=True, exist_ok=True)
+            continue
+
+        # Files
+        target_path = (dest_dir / member.filename).resolve()
+        if not _is_within_directory(dest_dir, target_path):
+            raise ValueError(f"Unsafe path in zip: {member.filename}")
+
+        # Ensure parent exists
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+
+        # Extract
+        with zf.open(member, "r") as src, open(target_path, "wb") as dst:
+            dst.write(src.read())
+
+
+def _download_zip_to_memory(presigned_url: str) -> io.BytesIO:
+    """Download ZIP file from Platform API to memory."""
+    try:
+        r = requests.get(presigned_url, timeout=60)
+        r.raise_for_status()
+    except requests.RequestException as e:
+        typer.secho(
+            f"ZIP download failed: {e}",
+            fg=typer.colors.RED,
+            err=True,
+        )
+        raise typer.Exit(code=1) from e
+
+    buf = io.BytesIO(r.content)
+    # Validate it's a zip
+    if not zipfile.is_zipfile(buf):
+        typer.secho(
+            "Downloaded file is not a valid ZIP",
+            fg=typer.colors.RED,
+            err=True,
+        )
+        raise typer.Exit(code=1)
+    buf.seek(0)
+    return buf
+
+
+def download_remote_app_via_api(app_spec: str) -> None:
+    """Download App from Platform API."""
+    # Validate app version and ID format
+    try:
+        app_id, app_version = parse_app_spec(app_spec)
+    except ValueError as e:
+        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
+        raise typer.Exit(code=1) from e
+
+    app_name = app_id.split("/")[1]
+
+    project_dir = Path.cwd() / app_name
+    if project_dir.exists():
+        if not typer.confirm(
+            typer.style(
+                f"\n💬 {app_name} already exists, do you want to override it?",
+                fg=typer.colors.MAGENTA,
+                bold=True,
+            )
+        ):
+            return
+
+    typer.secho(
+        f"\n🔗 Requesting download link for {app_id}...",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+    # Fetch ZIP downloading URL
+    url = f"{PLATFORM_API_URL}/hub/fetch-zip"
+    try:
+        presigned_url, _ = request_download_link(app_id, app_version, url, "zip_url")
+    except ValueError as e:
+        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
+        raise typer.Exit(code=1) from e
+
+    typer.secho(
+        "🔽 Downloading ZIP into memory...",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+    zip_buf = _download_zip_to_memory(presigned_url)
+
+    typer.secho(
+        f"📦 Unpacking into {project_dir}...",
+        fg=typer.colors.GREEN,
+        bold=True,
+    )
+    with zipfile.ZipFile(zip_buf) as zf:
+        _safe_extract_zip(zf, Path.cwd())
+
+    print_success_prompt(app_name)

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/run/run.py

@@ -46,14 +46,10 @@ from flwr.common.typing import Fab
 from flwr.proto.control_pb2 import StartRunRequest  # pylint: disable=E0611
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.supercore.constant import NOOP_FEDERATION
+from flwr.supercore.utils import parse_app_spec
 
 from ..log import start_stream
-from ..utils import (
-    flwr_cli_grpc_exc_handler,
-    init_channel,
-    load_cli_auth_plugin,
-    parse_app_spec,
-)
+from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
 
 CONN_REFRESH_PERIOD = 60  # Connection refresh period for log streaming (seconds)
 
@@ -111,8 +107,15 @@ def run(
         app_spec = None
         if (app_str := str(app)).startswith("@"):
             # Validate app version and ID format
-            _ = parse_app_spec(app_str)
+            try:
+                _ = parse_app_spec(app_str)
+            except ValueError as e:
+                typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
+                raise typer.Exit(code=1) from e
+
             app_spec = app_str
+            # Set `app` to current directory for credential storage
+            app = Path(".")
         is_remote_app = app_spec is not None
 
         typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
@@ -212,22 +215,14 @@ def _run_with_control_api(
                 f"🎊 Successfully started run {res.run_id}", fg=typer.colors.GREEN
             )
         else:
-            if is_remote_app:
-                typer.secho(
-                    "❌ Failed to start run. Please check that the provided "
-                    "app identifier (@account_name/app_name) is correct.",
-                    fg=typer.colors.RED,
-                    err=True,
-                )
-            else:
-                typer.secho("❌ Failed to start run", fg=typer.colors.RED, err=True)
+            typer.secho("❌ Failed to start run", fg=typer.colors.RED, err=True)
             raise typer.Exit(code=1)
 
         if output_format == CliOutputFormat.JSON:
             # Only include FAB metadata if we actually built a local FAB
             payload: dict[str, Any] = {
                 "success": res.HasField("run_id"),
-                "run-id": res.run_id if res.HasField("run_id") else None,
+                "run-id": f"{res.run_id}" if res.HasField("run_id") else None,
             }
             if not is_remote_app:
                 payload.update(

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/run_utils.py

@@ -18,7 +18,7 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 
-from flwr.common.date import format_timedelta, isoformat8601_utc
+from flwr.common.date import isoformat8601_utc
 from flwr.common.typing import Run
 
 
@@ -40,8 +40,8 @@ class RunRow:  # pylint: disable=too-many-instance-attributes
         The SHA-256 hash of the FAB.
     status_text : str
         The formatted status text.
-    elapsed : str
-        The formatted elapsed time.
+    elapsed : float
+        The elapsed time in seconds.
     pending_at : str
         Timestamp when run entered pending state.
     starting_at : str
@@ -50,6 +50,16 @@ class RunRow:  # pylint: disable=too-many-instance-attributes
         Timestamp when run entered running state.
     finished_at : str
         Timestamp when run finished.
+    network_traffic_inbound : int
+        The total inbound network traffic (in bytes) used during the run.
+        It includes the traffic from SuperNodes to SuperLink.
+    network_traffic_outbound : int
+        The total outbound network traffic (in bytes) used during the run.
+        It includes the traffic from SuperLink to SuperNodes.
+    compute_time_serverapp : float
+        The total compute time (in seconds) of the ServerApp during the run.
+    compute_time_clientapp : float
+        The total compute time (in seconds) of all ClientApps during the run.
     """
 
     run_id: int
@@ -58,11 +68,15 @@ class RunRow:  # pylint: disable=too-many-instance-attributes
     fab_version: str
     fab_hash: str
     status_text: str
-    elapsed: str
+    elapsed: float
     pending_at: str
     starting_at: str
     running_at: str
     finished_at: str
+    network_traffic_inbound: int
+    network_traffic_outbound: int
+    compute_time_serverapp: float
+    compute_time_clientapp: float
 
 
 def format_runs(runs: list[Run], now_isoformat: str) -> list[RunRow]:
@@ -120,11 +134,15 @@ def format_runs(runs: list[Run], now_isoformat: str) -> list[RunRow]:
             fab_version=run.fab_version,
             fab_hash=run.fab_hash,
             status_text=status_text,
-            elapsed=format_timedelta(elapsed_time),
+            elapsed=elapsed_time.total_seconds(),
             pending_at=_format_datetime(pending_at),
             starting_at=_format_datetime(starting_at),
             running_at=_format_datetime(running_at),
             finished_at=_format_datetime(finished_at),
+            network_traffic_inbound=run.bytes_recv,
+            network_traffic_outbound=run.bytes_sent,
+            compute_time_serverapp=elapsed_time.total_seconds(),
+            compute_time_clientapp=run.clientapp_runtime,
         )
         run_list.append(row)
     return run_list

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/stop.py

@@ -149,7 +149,7 @@ def _stop_run(stub: ControlStub, run_id: int, output_format: str) -> None:
             run_output = json.dumps(
                 {
                     "success": True,
-                    "run-id": run_id,
+                    "run-id": f"{run_id}",
                 }
             )
             restore_output()

{flwr-1.24.0 → flwr-1.25.0}/py/flwr/cli/supernode/ls.py

@@ -33,7 +33,7 @@ from flwr.cli.config_utils import (
     validate_federation_in_project_config,
 )
 from flwr.common.constant import FAB_CONFIG_FILE, NOOP_ACCOUNT_NAME, CliOutputFormat
-from flwr.common.date import format_timedelta, isoformat8601_utc
+from flwr.common.date import isoformat8601_utc
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     ListNodesRequest,
@@ -41,10 +41,11 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
+from flwr.supercore.utils import humanize_duration
 
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
 
-_NodeListType = tuple[int, str, str, str, str, str, str, str, str]
+_NodeListType = tuple[int, str, str, str, str, str, str, str, float]
 
 
 def ls(  # pylint: disable=R0914, R0913, R0917
@@ -166,7 +167,7 @@ def _format_nodes(
                 _format_datetime(node.last_activated_at),
                 _format_datetime(node.last_deactivated_at),
                 _format_datetime(node.unregistered_at),
-                format_timedelta(elapsed_time_activated),
+                elapsed_time_activated.total_seconds(),
             )
         )
 
@@ -224,7 +225,11 @@ def _to_table(nodes_info: list[_NodeListType], verbose: bool) -> Table:
                 else f"[dim]{owner_name}[/dim]"
             ),
             f"[{status_style}]{status}",
-            f"[cyan]{elapse_activated}[/cyan]" if status == "online" else "",
+            (
+                f"[cyan]{humanize_duration(elapse_activated)}[/cyan]"
+                if status == "online"
+                else ""
+            ),
             time_at,
         )
         table.add_row(*formatted_row)
@@ -253,7 +258,7 @@ def _to_json(nodes_info: list[_NodeListType], verbose: bool) -> str:
 
         nodes_list.append(
             {
-                "node-id": node_id,
+                "node-id": f"{node_id}",
                 "owner-aid": owner_aid,
                 "owner-name": owner_name,
                 "status": status,