flwr-nightly 1.12.0.dev20240918__tar.gz → 1.12.0.dev20241007__tar.gz

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.12.0.dev20240918
+Version: 1.12.0.dev20241007
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -43,7 +43,7 @@ Requires-Dist: requests (>=2.31.0,<3.0.0) ; extra == "rest"
 Requires-Dist: starlette (>=0.31.0,<0.32.0) ; extra == "rest"
 Requires-Dist: tomli (>=2.0.1,<3.0.0)
 Requires-Dist: tomli-w (>=1.0.0,<2.0.0)
-Requires-Dist: typer[all] (>=0.9.0,<0.10.0)
+Requires-Dist: typer (>=0.12.5,<0.13.0)
 Requires-Dist: uvicorn[standard] (>=0.23.0,<0.24.0) ; extra == "rest"
 Project-URL: Documentation, https://flower.ai
 Project-URL: Repository, https://github.com/adap/flower
@@ -69,6 +69,7 @@ Description-Content-Type: text/markdown
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/adap/flower/blob/main/CONTRIBUTING.md)
 ![Build](https://github.com/adap/flower/actions/workflows/framework.yml/badge.svg)
 [![Downloads](https://static.pepy.tech/badge/flwr)](https://pepy.tech/project/flwr)
+[![Docker Hub](https://img.shields.io/badge/Docker%20Hub-flwr-blue)](https://hub.docker.com/u/flwr)
 [![Slack](https://img.shields.io/badge/Chat-Slack-red)](https://flower.ai/join-slack)
 
 Flower (`flwr`) is a framework for building federated learning systems. The
@@ -152,6 +153,7 @@ Flower Baselines is a collection of community-contributed projects that reproduc
 - [FedNova](https://github.com/adap/flower/tree/main/baselines/fednova)
 - [HeteroFL](https://github.com/adap/flower/tree/main/baselines/heterofl)
 - [FedAvgM](https://github.com/adap/flower/tree/main/baselines/fedavgm)
+- [FedRep](https://github.com/adap/flower/tree/main/baselines/fedrep)
 - [FedStar](https://github.com/adap/flower/tree/main/baselines/fedstar)
 - [FedWav2vec2](https://github.com/adap/flower/tree/main/baselines/fedwav2vec2)
 - [FjORD](https://github.com/adap/flower/tree/main/baselines/fjord)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/README.md

@@ -18,6 +18,7 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/adap/flower/blob/main/CONTRIBUTING.md)
 ![Build](https://github.com/adap/flower/actions/workflows/framework.yml/badge.svg)
 [![Downloads](https://static.pepy.tech/badge/flwr)](https://pepy.tech/project/flwr)
+[![Docker Hub](https://img.shields.io/badge/Docker%20Hub-flwr-blue)](https://hub.docker.com/u/flwr)
 [![Slack](https://img.shields.io/badge/Chat-Slack-red)](https://flower.ai/join-slack)
 
 Flower (`flwr`) is a framework for building federated learning systems. The
@@ -101,6 +102,7 @@ Flower Baselines is a collection of community-contributed projects that reproduc
 - [FedNova](https://github.com/adap/flower/tree/main/baselines/fednova)
 - [HeteroFL](https://github.com/adap/flower/tree/main/baselines/heterofl)
 - [FedAvgM](https://github.com/adap/flower/tree/main/baselines/fedavgm)
+- [FedRep](https://github.com/adap/flower/tree/main/baselines/fedrep)
 - [FedStar](https://github.com/adap/flower/tree/main/baselines/fedstar)
 - [FedWav2vec2](https://github.com/adap/flower/tree/main/baselines/fedwav2vec2)
 - [FjORD](https://github.com/adap/flower/tree/main/baselines/fjord)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.12.0.dev20240918"
+version = "1.12.0.dev20241007"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -43,12 +43,8 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Typing :: Typed",
 ]
-packages = [
-    { include = "flwr", from = "src/py" },
-]
-exclude = [
-    "src/py/**/*_test.py",
-]
+packages = [{ include = "flwr", from = "src/py" }]
+exclude = ["src/py/**/*_test.py"]
 
 [tool.poetry.scripts]
 # `flwr` CLI
@@ -62,7 +58,7 @@ flower-superlink = "flwr.server.app:run_superlink"
 flower-supernode = "flwr.client.supernode.app:run_supernode"
 flower-server-app = "flwr.server.run_serverapp:run_server_app"
 flwr-clientapp = "flwr.client.clientapp:flwr_clientapp"
-flower-client-app = "flwr.client.supernode:run_client_app"  # Deprecated
+flower-client-app = "flwr.client.supernode:run_client_app" # Deprecated
 
 [tool.poetry.dependencies]
 python = "^3.9"
@@ -73,7 +69,7 @@ protobuf = "^4.25.2"
 cryptography = "^42.0.4"
 pycryptodome = "^3.18.0"
 iterators = "^0.0.2"
-typer = { version = "^0.9.0", extras = ["all"] }
+typer = "^0.12.5"
 tomli = "^2.0.1"
 tomli-w = "^1.0.0"
 pathspec = "^0.12.1"
@@ -96,6 +92,7 @@ types-setuptools = "==69.0.0.20240125"
 clang-format = "==17.0.6"
 isort = "==5.13.2"
 black = { version = "==24.2.0", extras = ["jupyter"] }
+taplo = "==0.9.3"
 docformatter = "==1.7.5"
 mypy = "==1.8.0"
 pylint = "==3.0.3"
@@ -109,25 +106,24 @@ mypy-protobuf = "==3.2.0"
 jupyterlab = "==4.0.12"
 rope = "==1.11.0"
 semver = "==3.0.2"
-sphinx = "==6.2.1"
+sphinx = "==7.4.7"
 sphinx-intl = "==2.2.0"
-sphinx-click = "==5.1.0"
-myst-parser = "==1.0.0"
-sphinx-design = "==0.5.0"
+sphinx-click = "==6.0.0"
+myst-parser = "==3.0.1"
+sphinx-design = "==0.6.1"
 sphinx-copybutton = "==0.5.2"
 sphinxcontrib-mermaid = "==0.9.2"
 sphinxcontrib-youtube = "==1.4.1"
-furo = "==2023.9.10"
-sphinx-reredirects = "==0.1.3"
-nbsphinx = "==0.9.4"
+furo = "==2024.8.6"
+sphinx-reredirects = "==0.1.5"
+nbsphinx = "==0.9.5"
 nbstripout = "==0.6.1"
 ruff = "==0.1.9"
 sphinx-argparse = "==0.4.0"
 pipreqs = "==0.4.13"
-mdformat-gfm = "==0.3.5"
+mdformat-gfm = "==0.3.6"
 mdformat-frontmatter = "==2.0.1"
 mdformat-beautysh = "==0.1.1"
-mdformat-myst = "==0.1.5"
 twine = "==5.1.1"
 pyroma = "==4.2"
 check-wheel-contents = "==0.4.0"
@@ -137,6 +133,15 @@ licensecheck = "==2024"
 pre-commit = "==3.5.0"
 sphinx-substitution-extensions = "2022.02.16"
 sphinxext-opengraph = "==0.9.1"
+docstrfmt = { git = "https://github.com/charlesbvll/docstrfmt.git", branch = "patch-1" }
+
+[tool.docstrfmt]
+extend_exclude = [
+    "doc/source/conf.py",
+    "doc/source/tutorial-quickstart-huggingface.rst",
+    "doc/source/_templates/autosummary/*",
+    "doc/source/ref-api/*",
+]
 
 [tool.isort]
 profile = "black"
@@ -152,10 +157,7 @@ disable = "duplicate-code,too-few-public-methods,useless-import-alias"
 [tool.pytest.ini_options]
 minversion = "6.2"
 addopts = "-qq"
-testpaths = [
-    "src/py/flwr",
-    "src/py/flwr_tool",
-]
+testpaths = ["src/py/flwr", "src/py/flwr_tool"]
 filterwarnings = "ignore::DeprecationWarning"
 
 [tool.pytest-watcher]
@@ -168,17 +170,12 @@ patterns = ["*.py"]
 ignore_patterns = []
 
 [tool.mypy]
-plugins = [
-    "numpy.typing.mypy_plugin",
-]
+plugins = ["numpy.typing.mypy_plugin"]
 ignore_missing_imports = true
 strict = true
 
 [[tool.mypy.overrides]]
-module = [
-    "importlib.metadata.*",
-    "importlib_metadata.*",
-]
+module = ["importlib.metadata.*", "importlib_metadata.*"]
 follow_imports = "skip"
 follow_imports_for_stubs = true
 disallow_untyped_calls = false

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/cli/app.py

@@ -19,6 +19,7 @@ from typer.main import get_command
 
 from .build import build
 from .install import install
+from .log import log
 from .new import new
 from .run import run
 
@@ -35,6 +36,7 @@ app.command()(new)
 app.command()(run)
 app.command()(build)
 app.command()(install)
+app.command()(log)
 
 typer_click_object = get_command(app)
 

flwr_nightly-1.12.0.dev20241007/src/py/flwr/cli/log.py

@@ -0,0 +1,234 @@
+# Copyright 2024 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 `log` command."""
+
+import sys
+import time
+from logging import DEBUG, ERROR, INFO
+from pathlib import Path
+from typing import Annotated, Optional
+
+import grpc
+import typer
+
+from flwr.cli.config_utils import load_and_validate
+from flwr.common.grpc import GRPC_MAX_MESSAGE_LENGTH, create_channel
+from flwr.common.logger import log as logger
+from flwr.proto.exec_pb2 import StreamLogsRequest  # pylint: disable=E0611
+from flwr.proto.exec_pb2_grpc import ExecStub
+
+CONN_REFRESH_PERIOD = 60  # Connection refresh period for log streaming (seconds)
+
+
+def start_stream(
+    run_id: int, channel: grpc.Channel, refresh_period: int = CONN_REFRESH_PERIOD
+) -> None:
+    """Start log streaming for a given run ID."""
+    try:
+        while True:
+            logger(INFO, "Starting logstream for run_id `%s`", run_id)
+            stream_logs(run_id, channel, refresh_period)
+            time.sleep(2)
+            logger(DEBUG, "Reconnecting to logstream")
+    except KeyboardInterrupt:
+        logger(INFO, "Exiting logstream")
+    except grpc.RpcError as e:
+        # pylint: disable=E1101
+        if e.code() == grpc.StatusCode.NOT_FOUND:
+            logger(ERROR, "Invalid run_id `%s`, exiting", run_id)
+        if e.code() == grpc.StatusCode.CANCELLED:
+            pass
+    finally:
+        channel.close()
+
+
+def stream_logs(run_id: int, channel: grpc.Channel, duration: int) -> None:
+    """Stream logs from the beginning of a run with connection refresh."""
+    start_time = time.time()
+    stub = ExecStub(channel)
+    req = StreamLogsRequest(run_id=run_id)
+
+    for res in stub.StreamLogs(req):
+        print(res.log_output)
+        if time.time() - start_time > duration:
+            break
+
+
+def print_logs(run_id: int, channel: grpc.Channel, timeout: int) -> None:
+    """Print logs from the beginning of a run."""
+    stub = ExecStub(channel)
+    req = StreamLogsRequest(run_id=run_id)
+
+    try:
+        while True:
+            try:
+                # Enforce timeout for graceful exit
+                for res in stub.StreamLogs(req, timeout=timeout):
+                    print(res.log_output)
+            except grpc.RpcError as e:
+                # pylint: disable=E1101
+                if e.code() == grpc.StatusCode.DEADLINE_EXCEEDED:
+                    break
+                if e.code() == grpc.StatusCode.NOT_FOUND:
+                    logger(ERROR, "Invalid run_id `%s`, exiting", run_id)
+                    break
+                if e.code() == grpc.StatusCode.CANCELLED:
+                    break
+    except KeyboardInterrupt:
+        logger(DEBUG, "Stream interrupted by user")
+    finally:
+        channel.close()
+        logger(DEBUG, "Channel closed")
+
+
+def on_channel_state_change(channel_connectivity: str) -> None:
+    """Log channel connectivity."""
+    logger(DEBUG, channel_connectivity)
+
+
+def log(
+    run_id: Annotated[
+        int,
+        typer.Argument(help="The Flower run ID to query"),
+    ],
+    app: Annotated[
+        Path,
+        typer.Argument(help="Path of the Flower project to run"),
+    ] = Path("."),
+    federation: Annotated[
+        Optional[str],
+        typer.Argument(help="Name of the federation to run the app on"),
+    ] = None,
+    stream: Annotated[
+        bool,
+        typer.Option(
+            "--stream/--show",
+            help="Flag to stream or print logs from the Flower run",
+        ),
+    ] = True,
+) -> None:
+    """Get logs from a Flower project run."""
+    typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
+
+    pyproject_path = app / "pyproject.toml" if app else None
+    config, errors, warnings = load_and_validate(path=pyproject_path)
+
+    if config is None:
+        typer.secho(
+            "Project configuration could not be loaded.\n"
+            "pyproject.toml is invalid:\n"
+            + "\n".join([f"- {line}" for line in errors]),
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        sys.exit()
+
+    if warnings:
+        typer.secho(
+            "Project configuration is missing the following "
+            "recommended properties:\n" + "\n".join([f"- {line}" for line in warnings]),
+            fg=typer.colors.RED,
+            bold=True,
+        )
+
+    typer.secho("Success", fg=typer.colors.GREEN)
+
+    federation = federation or config["tool"]["flwr"]["federations"].get("default")
+
+    if federation is None:
+        typer.secho(
+            "❌ No federation name was provided and the project's `pyproject.toml` "
+            "doesn't declare a default federation (with a SuperExec address or an "
+            "`options.num-supernodes` value).",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
+
+    # Validate the federation exists in the configuration
+    federation_config = config["tool"]["flwr"]["federations"].get(federation)
+    if federation_config is None:
+        available_feds = {
+            fed for fed in config["tool"]["flwr"]["federations"] if fed != "default"
+        }
+        typer.secho(
+            f"❌ There is no `{federation}` federation declared in the "
+            "`pyproject.toml`.\n The following federations were found:\n\n"
+            + "\n".join(available_feds),
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
+
+    if "address" not in federation_config:
+        typer.secho(
+            "❌ `flwr log` currently works with `SuperExec`. Ensure that the correct"
+            "`SuperExec` address is provided in the `pyproject.toml`.",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
+
+    _log_with_superexec(federation_config, run_id, stream)
+
+
+# pylint: disable-next=too-many-branches
+def _log_with_superexec(
+    federation_config: dict[str, str],
+    run_id: int,
+    stream: bool,
+) -> None:
+    insecure_str = federation_config.get("insecure")
+    if root_certificates := federation_config.get("root-certificates"):
+        root_certificates_bytes = Path(root_certificates).read_bytes()
+        if insecure := bool(insecure_str):
+            typer.secho(
+                "❌ `root_certificates` were provided but the `insecure` parameter"
+                "is set to `True`.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+    else:
+        root_certificates_bytes = None
+        if insecure_str is None:
+            typer.secho(
+                "❌ To disable TLS, set `insecure = true` in `pyproject.toml`.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+        if not (insecure := bool(insecure_str)):
+            typer.secho(
+                "❌ No certificate were given yet `insecure` is set to `False`.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+
+    channel = create_channel(
+        server_address=federation_config["address"],
+        insecure=insecure,
+        root_certificates=root_certificates_bytes,
+        max_message_length=GRPC_MAX_MESSAGE_LENGTH,
+        interceptors=None,
+    )
+    channel.subscribe(on_channel_state_change)
+
+    if stream:
+        start_stream(run_id, channel, CONN_REFRESH_PERIOD)
+    else:
+        logger(INFO, "Printing logstream for run_id `%s`", run_id)
+        print_logs(run_id, channel, timeout=5)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/cli/new/new.py

@@ -275,7 +275,7 @@ def new(
         )
     )
 
-    _add = "	huggingface-cli login\n" if framework_str == "flowertune" else ""
+    _add = "	huggingface-cli login\n" if llm_challenge_str else ""
     print(
         typer.style(
             f"	cd {package_name}\n" + "	pip install -e .\n" + _add + "	flwr run\n",

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/cli/new/templates/app/README.flowertune.md.tpl

@@ -55,7 +55,7 @@ We use Mistral-7B model with 4-bit quantization as default. The estimated VRAM c
 | :--------: | :--------: | :--------: | :--------: | :--------: |
 |    VRAM    | ~25.50 GB  | ~17.30 GB  | ~22.80 GB  | ~17.40 GB  |
 
-You can adjust the CPU/GPU resources you assign to each of the clients based on your device, which are specified with `options.backend.clientapp-cpus` and `options.backend.clientapp-gpus` under `[tool.flwr.federations.local-simulation]` entry in `pyproject.toml`.
+You can adjust the CPU/GPU resources you assign to each of the clients based on your device, which are specified with `options.backend.client-resources.num-cpus` and `options.backend.client-resources.num-gpus` under `[tool.flwr.federations.local-simulation]` entry in `pyproject.toml`.
 
 
 ## Model saving

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -17,6 +17,7 @@ dependencies = [
     "transformers==4.39.3",
     "sentencepiece==0.2.0",
     "omegaconf==2.3.0",
+    "hf_transfer==0.1.8",
 ]
 
 [tool.hatch.build.targets.wheel]

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/cli/run/run.py

@@ -34,6 +34,10 @@ from flwr.common.typing import Fab
 from flwr.proto.exec_pb2 import StartRunRequest  # pylint: disable=E0611
 from flwr.proto.exec_pb2_grpc import ExecStub
 
+from ..log import start_stream
+
+CONN_REFRESH_PERIOD = 60  # Connection refresh period for log streaming (seconds)
+
 
 def on_channel_state_change(channel_connectivity: str) -> None:
     """Log channel connectivity."""
@@ -62,6 +66,14 @@ def run(
             "inside the `pyproject.toml` in order to be properly overriden.",
         ),
     ] = None,
+    stream: Annotated[
+        bool,
+        typer.Option(
+            "--stream",
+            help="Use `--stream` with `flwr run` to display logs;\n "
+            "logs are not streamed by default.",
+        ),
+    ] = False,
 ) -> None:
     """Run Flower App."""
     typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
@@ -117,7 +129,7 @@ def run(
         raise typer.Exit(code=1)
 
     if "address" in federation_config:
-        _run_with_superexec(app, federation_config, config_overrides)
+        _run_with_superexec(app, federation_config, config_overrides, stream)
     else:
         _run_without_superexec(app, federation_config, config_overrides, federation)
 
@@ -126,6 +138,7 @@ def _run_with_superexec(
     app: Path,
     federation_config: dict[str, Any],
     config_overrides: Optional[list[str]],
+    stream: bool,
 ) -> None:
 
     insecure_str = federation_config.get("insecure")
@@ -183,6 +196,9 @@ def _run_with_superexec(
     fab_path.unlink()
     typer.secho(f"🎊 Successfully started run {res.run_id}", fg=typer.colors.GREEN)
 
+    if stream:
+        start_stream(res.run_id, channel, CONN_REFRESH_PERIOD)
+
 
 def _run_without_superexec(
     app: Optional[Path],

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/client/grpc_rere_client/client_interceptor.py

@@ -31,6 +31,7 @@ from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     generate_shared_key,
     public_key_to_bytes,
 )
+from flwr.proto.fab_pb2 import GetFabRequest  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     CreateNodeRequest,
     DeleteNodeRequest,
@@ -50,6 +51,7 @@ Request = Union[
     PushTaskResRequest,
     GetRunRequest,
     PingRequest,
+    GetFabRequest,
 ]
 
 
@@ -126,6 +128,7 @@ class AuthenticateClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # type:
                 PushTaskResRequest,
                 GetRunRequest,
                 PingRequest,
+                GetFabRequest,
             ),
         ):
             if self.shared_secret is None:

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/client/grpc_rere_client/connection.py

@@ -269,7 +269,7 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
         task_res = message_to_taskres(message)
 
         # Serialize ProtoBuf to bytes
-        request = PushTaskResRequest(task_res_list=[task_res])
+        request = PushTaskResRequest(node=node, task_res_list=[task_res])
         _ = retry_invoker.invoke(stub.PushTaskRes, request)
 
         # Cleanup
@@ -277,7 +277,7 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
 
     def get_run(run_id: int) -> Run:
         # Call FleetAPI
-        get_run_request = GetRunRequest(run_id=run_id)
+        get_run_request = GetRunRequest(node=node, run_id=run_id)
         get_run_response: GetRunResponse = retry_invoker.invoke(
             stub.GetRun,
             request=get_run_request,
@@ -294,7 +294,7 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
 
     def get_fab(fab_hash: str) -> Fab:
         # Call FleetAPI
-        get_fab_request = GetFabRequest(hash_str=fab_hash)
+        get_fab_request = GetFabRequest(node=node, hash_str=fab_hash)
         get_fab_response: GetFabResponse = retry_invoker.invoke(
             stub.GetFab,
             request=get_fab_request,

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/client/grpc_rere_client/grpc_adapter.py

@@ -24,10 +24,14 @@ from google.protobuf.message import Message as GrpcMessage
 
 from flwr.common import log
 from flwr.common.constant import (
+    GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_NAME_KEY,
+    GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_VERSION_KEY,
     GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY,
+    GRPC_ADAPTER_METADATA_MESSAGE_MODULE_KEY,
+    GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY,
     GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY,
 )
-from flwr.common.version import package_version
+from flwr.common.version import package_name, package_version
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     CreateNodeRequest,
@@ -62,9 +66,16 @@ class GrpcAdapter:
         self, request: GrpcMessage, response_type: type[T], **kwargs: Any
     ) -> T:
         # Serialize request
+        req_cls = request.__class__
         container_req = MessageContainer(
-            metadata={GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY: package_version},
-            grpc_message_name=request.__class__.__qualname__,
+            metadata={
+                GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_NAME_KEY: package_name,
+                GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_VERSION_KEY: package_version,
+                GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY: package_version,
+                GRPC_ADAPTER_METADATA_MESSAGE_MODULE_KEY: req_cls.__module__,
+                GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY: req_cls.__qualname__,
+            },
+            grpc_message_name=req_cls.__qualname__,
             grpc_message_content=request.SerializeToString(),
         )
 

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/client/rest_client/connection.py

@@ -340,7 +340,7 @@ def http_request_response(  # pylint: disable=,R0913, R0914, R0915
         task_res = message_to_taskres(message)
 
         # Serialize ProtoBuf to bytes
-        req = PushTaskResRequest(task_res_list=[task_res])
+        req = PushTaskResRequest(node=node, task_res_list=[task_res])
 
         # Send the request
         res = _request(req, PushTaskResResponse, PATH_PUSH_TASK_RES)
@@ -356,7 +356,7 @@ def http_request_response(  # pylint: disable=,R0913, R0914, R0915
 
     def get_run(run_id: int) -> Run:
         # Construct the request
-        req = GetRunRequest(run_id=run_id)
+        req = GetRunRequest(node=node, run_id=run_id)
 
         # Send the request
         res = _request(req, GetRunResponse, PATH_GET_RUN)
@@ -373,7 +373,7 @@ def http_request_response(  # pylint: disable=,R0913, R0914, R0915
 
     def get_fab(fab_hash: str) -> Fab:
         # Construct the request
-        req = GetFabRequest(hash_str=fab_hash)
+        req = GetFabRequest(node=node, hash_str=fab_hash)
 
         # Send the request
         res = _request(req, GetFabResponse, PATH_GET_FAB)

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/client/supernode/app.py

@@ -79,6 +79,7 @@ def run_supernode() -> None:
         node_config=parse_config_args(
             [args.node_config] if args.node_config else args.node_config
         ),
+        flwr_path=args.flwr_dir,
         isolation=args.isolation,
         supernode_address=args.supernode_address,
     )

{flwr_nightly-1.12.0.dev20240918 → flwr_nightly-1.12.0.dev20241007}/src/py/flwr/common/constant.py

@@ -60,8 +60,6 @@ PING_MAX_INTERVAL = 1e300
 # IDs
 RUN_ID_NUM_BYTES = 8
 NODE_ID_NUM_BYTES = 8
-GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY = "flower-version"
-GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY = "should-exit"
 
 # Constants for FAB
 APP_DIR = "apps"
@@ -72,8 +70,16 @@ FLWR_HOME = "FLWR_HOME"
 PARTITION_ID_KEY = "partition-id"
 NUM_PARTITIONS_KEY = "num-partitions"
 
-GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY = "flower-version"
+# Constants for keys in `metadata` of `MessageContainer` in `grpc-adapter`
+GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_NAME_KEY = "flower-package-name"
+GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_VERSION_KEY = "flower-package-version"
+GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY = "flower-version"  # Deprecated
 GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY = "should-exit"
+GRPC_ADAPTER_METADATA_MESSAGE_MODULE_KEY = "grpc-message-module"
+GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY = "grpc-message-qualname"
+
+# Message TTL
+MESSAGE_TTL_TOLERANCE = 1e-1
 
 
 class MessageType: