flwr-nightly 1.12.0.dev20240923__tar.gz → 1.12.0.dev20240926__tar.gz

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.12.0.dev20240923
+Version: 1.12.0.dev20240926
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -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

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/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

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.12.0.dev20240923"
+version = "1.12.0.dev20240926"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -109,25 +109,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 +136,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"

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/cli/log.py

@@ -26,18 +26,71 @@ 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)
 
 
-# pylint: disable=unused-argument
-def stream_logs(run_id: int, channel: grpc.Channel, period: int) -> None:
+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
 
 
-# pylint: disable=unused-argument
 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:
@@ -175,22 +228,7 @@ def _log_with_superexec(
     channel.subscribe(on_channel_state_change)
 
     if stream:
-        try:
-            while True:
-                logger(INFO, "Starting logstream for run_id `%s`", run_id)
-                stream_logs(run_id, channel, CONN_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()
+        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.dev20240923 → flwr_nightly-1.12.0.dev20240926}/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.dev20240923 → flwr_nightly-1.12.0.dev20240926}/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.dev20240923 → flwr_nightly-1.12.0.dev20240926}/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.dev20240923 → flwr_nightly-1.12.0.dev20240926}/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.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/common/secure_aggregation/secaggplus_utils.py

@@ -43,8 +43,8 @@ def share_keys_plaintext_concat(
     """
     return b"".join(
         [
-            int.to_bytes(src_node_id, 8, "little", signed=True),
-            int.to_bytes(dst_node_id, 8, "little", signed=True),
+            int.to_bytes(src_node_id, 8, "little", signed=False),
+            int.to_bytes(dst_node_id, 8, "little", signed=False),
             int.to_bytes(len(b_share), 4, "little"),
             b_share,
             sk_share,
@@ -72,8 +72,8 @@ def share_keys_plaintext_separate(plaintext: bytes) -> tuple[int, int, bytes, by
         the secret key share of the source sent to the destination.
     """
     src, dst, mark = (
-        int.from_bytes(plaintext[:8], "little", signed=True),
-        int.from_bytes(plaintext[8:16], "little", signed=True),
+        int.from_bytes(plaintext[:8], "little", signed=False),
+        int.from_bytes(plaintext[8:16], "little", signed=False),
         int.from_bytes(plaintext[16:20], "little"),
     )
     ret = (src, dst, plaintext[20 : 20 + mark], plaintext[20 + mark :])

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/common/serde.py

@@ -33,12 +33,12 @@ from flwr.proto.recordset_pb2 import Array as ProtoArray
 from flwr.proto.recordset_pb2 import BoolList, BytesList
 from flwr.proto.recordset_pb2 import ConfigsRecord as ProtoConfigsRecord
 from flwr.proto.recordset_pb2 import ConfigsRecordValue as ProtoConfigsRecordValue
-from flwr.proto.recordset_pb2 import DoubleList
+from flwr.proto.recordset_pb2 import DoubleList, Int, IntList
 from flwr.proto.recordset_pb2 import MetricsRecord as ProtoMetricsRecord
 from flwr.proto.recordset_pb2 import MetricsRecordValue as ProtoMetricsRecordValue
 from flwr.proto.recordset_pb2 import ParametersRecord as ProtoParametersRecord
 from flwr.proto.recordset_pb2 import RecordSet as ProtoRecordSet
-from flwr.proto.recordset_pb2 import Sint64List, StringList
+from flwr.proto.recordset_pb2 import StringList
 from flwr.proto.run_pb2 import Run as ProtoRun
 from flwr.proto.task_pb2 import Task, TaskIns, TaskRes
 from flwr.proto.transport_pb2 import (
@@ -354,7 +354,9 @@ def scalar_to_proto(scalar: typing.Scalar) -> Scalar:
         return Scalar(double=scalar)
 
     if isinstance(scalar, int):
-        return Scalar(sint64=scalar)
+        if scalar >= 0:
+            return Scalar(uint64=scalar)  # Use uint64 for non-negative integers
+        return Scalar(sint64=scalar)  # Use sint64 for negative integers
 
     if isinstance(scalar, str):
         return Scalar(string=scalar)
@@ -374,16 +376,16 @@ def scalar_from_proto(scalar_msg: Scalar) -> typing.Scalar:
 # === Record messages ===
 
 
-_type_to_field = {
+_type_to_field: dict[type, str] = {
     float: "double",
-    int: "sint64",
+    int: "int",
     bool: "bool",
     str: "string",
     bytes: "bytes",
 }
-_list_type_to_class_and_field = {
+_list_type_to_class_and_field: dict[type, tuple[type[GrpcMessage], str]] = {
     float: (DoubleList, "double_list"),
-    int: (Sint64List, "sint64_list"),
+    int: (IntList, "int_list"),
     bool: (BoolList, "bool_list"),
     str: (StringList, "string_list"),
     bytes: (BytesList, "bytes_list"),
@@ -391,6 +393,19 @@ _list_type_to_class_and_field = {
 T = TypeVar("T")
 
 
+def int_to_proto(value: int) -> Int:
+    """Serialize a int to `Int`."""
+    if value >= 0:
+        return Int(uint64=value)
+    return Int(sint64=value)
+
+
+def int_from_proto(value_proto: Int) -> int:
+    """Deserialize a int from `Int`."""
+    fld = cast(str, value_proto.WhichOneof("int"))
+    return cast(int, getattr(value_proto, fld))
+
+
 def _record_value_to_proto(
     value: Any, allowed_types: list[type], proto_class: type[T]
 ) -> T:
@@ -403,12 +418,17 @@ def _record_value_to_proto(
         # Single element
         # Note: `isinstance(False, int) == True`.
         if isinstance(value, t):
-            arg[_type_to_field[t]] = value
+            fld = _type_to_field[t]
+            if t is int:
+                fld = "uint64" if cast(int, value) >= 0 else "sint64"
+            arg[fld] = value
             return proto_class(**arg)
         # List
         if isinstance(value, list) and all(isinstance(item, t) for item in value):
-            list_class, field_name = _list_type_to_class_and_field[t]
-            arg[field_name] = list_class(vals=value)
+            list_class, fld = _list_type_to_class_and_field[t]
+            if t is int:
+                value = [int_to_proto(v) for v in value]
+            arg[fld] = list_class(vals=value)
             return proto_class(**arg)
     # Invalid types
     raise TypeError(
@@ -422,6 +442,8 @@ def _record_value_from_proto(value_proto: GrpcMessage) -> Any:
     value_field = cast(str, value_proto.WhichOneof("value"))
     if value_field.endswith("list"):
         value = list(getattr(value_proto, value_field).vals)
+        if value_field == "int_list":
+            value = [int_from_proto(v) for v in value]
     else:
         value = getattr(value_proto, value_field)
     return value

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/proto/fab_pb2.py

@@ -12,19 +12,20 @@ from google.protobuf.internal import builder as _builder
 _sym_db = _symbol_database.Default()
 
 
+from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/fab.proto\x12\nflwr.proto\"(\n\x03\x46\x61\x62\x12\x10\n\x08hash_str\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\x0c\"!\n\rGetFabRequest\x12\x10\n\x08hash_str\x18\x01 \x01(\t\".\n\x0eGetFabResponse\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fabb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/fab.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\"(\n\x03\x46\x61\x62\x12\x10\n\x08hash_str\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\x0c\"A\n\rGetFabRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08hash_str\x18\x02 \x01(\t\".\n\x0eGetFabResponse\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fabb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.fab_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  _globals['_FAB']._serialized_start=36
-  _globals['_FAB']._serialized_end=76
-  _globals['_GETFABREQUEST']._serialized_start=78
-  _globals['_GETFABREQUEST']._serialized_end=111
-  _globals['_GETFABRESPONSE']._serialized_start=113
-  _globals['_GETFABRESPONSE']._serialized_end=159
+  _globals['_FAB']._serialized_start=59
+  _globals['_FAB']._serialized_end=99
+  _globals['_GETFABREQUEST']._serialized_start=101
+  _globals['_GETFABREQUEST']._serialized_end=166
+  _globals['_GETFABRESPONSE']._serialized_start=168
+  _globals['_GETFABRESPONSE']._serialized_end=214
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/proto/fab_pb2.pyi

@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import builtins
+import flwr.proto.node_pb2
 import google.protobuf.descriptor
 import google.protobuf.message
 import typing
@@ -33,13 +34,18 @@ global___Fab = Fab
 
 class GetFabRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_FIELD_NUMBER: builtins.int
     HASH_STR_FIELD_NUMBER: builtins.int
+    @property
+    def node(self) -> flwr.proto.node_pb2.Node: ...
     hash_str: typing.Text
     def __init__(self,
         *,
+        node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
         hash_str: typing.Text = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["hash_str",b"hash_str"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["hash_str",b"hash_str","node",b"node"]) -> None: ...
 global___GetFabRequest = GetFabRequest
 
 class GetFabResponse(google.protobuf.message.Message):

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/proto/fleet_pb2.py

@@ -18,7 +18,7 @@ from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"*\n\x11\x43reateNodeRequest\x12\x15\n\rping_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"D\n\x0bPingRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x15\n\rping_interval\x18\x02 \x01(\x01\"\x1f\n\x0cPingResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"F\n\x12PullTaskInsRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"k\n\x13PullTaskInsResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rtask_ins_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"@\n\x12PushTaskResRequest\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"\xae\x01\n\x13PushTaskResResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12=\n\x07results\x18\x02 \x03(\x0b\x32,.flwr.proto.PushTaskResResponse.ResultsEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\x8c\x04\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12;\n\x04Ping\x12\x17.flwr.proto.PingRequest\x1a\x18.flwr.proto.PingResponse\"\x00\x12P\n\x0bPullTaskIns\x12\x1e.flwr.proto.PullTaskInsRequest\x1a\x1f.flwr.proto.PullTaskInsResponse\"\x00\x12P\n\x0bPushTaskRes\x12\x1e.flwr.proto.PushTaskResRequest\x1a\x1f.flwr.proto.PushTaskResResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"*\n\x11\x43reateNodeRequest\x12\x15\n\rping_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"D\n\x0bPingRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x15\n\rping_interval\x18\x02 \x01(\x01\"\x1f\n\x0cPingResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"F\n\x12PullTaskInsRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"k\n\x13PullTaskInsResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rtask_ins_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"`\n\x12PushTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rtask_res_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"\xae\x01\n\x13PushTaskResResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12=\n\x07results\x18\x02 \x03(\x0b\x32,.flwr.proto.PushTaskResResponse.ResultsEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\x8c\x04\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12;\n\x04Ping\x12\x17.flwr.proto.PingRequest\x1a\x18.flwr.proto.PingResponse\"\x00\x12P\n\x0bPullTaskIns\x12\x1e.flwr.proto.PullTaskInsRequest\x1a\x1f.flwr.proto.PullTaskInsResponse\"\x00\x12P\n\x0bPushTaskRes\x12\x1e.flwr.proto.PushTaskResRequest\x1a\x1f.flwr.proto.PushTaskResResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -44,13 +44,13 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PULLTASKINSRESPONSE']._serialized_start=476
   _globals['_PULLTASKINSRESPONSE']._serialized_end=583
   _globals['_PUSHTASKRESREQUEST']._serialized_start=585
-  _globals['_PUSHTASKRESREQUEST']._serialized_end=649
-  _globals['_PUSHTASKRESRESPONSE']._serialized_start=652
-  _globals['_PUSHTASKRESRESPONSE']._serialized_end=826
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_start=780
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_end=826
-  _globals['_RECONNECT']._serialized_start=828
-  _globals['_RECONNECT']._serialized_end=858
-  _globals['_FLEET']._serialized_start=861
-  _globals['_FLEET']._serialized_end=1385
+  _globals['_PUSHTASKRESREQUEST']._serialized_end=681
+  _globals['_PUSHTASKRESRESPONSE']._serialized_start=684
+  _globals['_PUSHTASKRESRESPONSE']._serialized_end=858
+  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_start=812
+  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_end=858
+  _globals['_RECONNECT']._serialized_start=860
+  _globals['_RECONNECT']._serialized_end=890
+  _globals['_FLEET']._serialized_start=893
+  _globals['_FLEET']._serialized_end=1417
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.12.0.dev20240923 → flwr_nightly-1.12.0.dev20240926}/src/py/flwr/proto/fleet_pb2.pyi

@@ -124,14 +124,19 @@ global___PullTaskInsResponse = PullTaskInsResponse
 class PushTaskResRequest(google.protobuf.message.Message):
     """PushTaskRes messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_FIELD_NUMBER: builtins.int
     TASK_RES_LIST_FIELD_NUMBER: builtins.int
     @property
+    def node(self) -> flwr.proto.node_pb2.Node: ...
+    @property
     def task_res_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.task_pb2.TaskRes]: ...
     def __init__(self,
         *,
+        node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
         task_res_list: typing.Optional[typing.Iterable[flwr.proto.task_pb2.TaskRes]] = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["task_res_list",b"task_res_list"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node",b"node","task_res_list",b"task_res_list"]) -> None: ...
 global___PushTaskResRequest = PushTaskResRequest
 
 class PushTaskResResponse(google.protobuf.message.Message):

flwr_nightly-1.12.0.dev20240926/src/py/flwr/proto/recordset_pb2.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/recordset.proto
+# Protobuf Python Version: 4.25.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lwr/proto/recordset.proto\x12\nflwr.proto\"0\n\x03Int\x12\x10\n\x06sint64\x18\x01 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x02 \x01(\x04H\x00\x42\x05\n\x03int\"\x1a\n\nDoubleList\x12\x0c\n\x04vals\x18\x01 \x03(\x01\"(\n\x07IntList\x12\x1d\n\x04vals\x18\x01 \x03(\x0b\x32\x0f.flwr.proto.Int\"\x18\n\x08\x42oolList\x12\x0c\n\x04vals\x18\x01 \x03(\x08\"\x1a\n\nStringList\x12\x0c\n\x04vals\x18\x01 \x03(\t\"\x19\n\tBytesList\x12\x0c\n\x04vals\x18\x01 \x03(\x0c\"B\n\x05\x41rray\x12\r\n\x05\x64type\x18\x01 \x01(\t\x12\r\n\x05shape\x18\x02 \x03(\x05\x12\r\n\x05stype\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\"\xab\x01\n\x12MetricsRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12\'\n\x08int_list\x18\x16 \x01(\x0b\x32\x13.flwr.proto.IntListH\x00\x42\x07\n\x05value\"\xe5\x02\n\x12\x43onfigsRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12\x0e\n\x04\x62ool\x18\x04 \x01(\x08H\x00\x12\x10\n\x06string\x18\x05 \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x06 \x01(\x0cH\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12\'\n\x08int_list\x18\x16 \x01(\x0b\x32\x13.flwr.proto.IntListH\x00\x12)\n\tbool_list\x18\x18 \x01(\x0b\x32\x14.flwr.proto.BoolListH\x00\x12-\n\x0bstring_list\x18\x19 \x01(\x0b\x32\x16.flwr.proto.StringListH\x00\x12+\n\nbytes_list\x18\x1a \x01(\x0b\x32\x15.flwr.proto.BytesListH\x00\x42\x07\n\x05value\"M\n\x10ParametersRecord\x12\x11\n\tdata_keys\x18\x01 \x03(\t\x12&\n\x0b\x64\x61ta_values\x18\x02 \x03(\x0b\x32\x11.flwr.proto.Array\"\x8f\x01\n\rMetricsRecord\x12\x31\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32#.flwr.proto.MetricsRecord.DataEntry\x1aK\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.flwr.proto.MetricsRecordValue:\x02\x38\x01\"\x8f\x01\n\rConfigsRecord\x12\x31\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32#.flwr.proto.ConfigsRecord.DataEntry\x1aK\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12-\n\x05value\x18\x02 \x01(\x0b\x32\x1e.flwr.proto.ConfigsRecordValue:\x02\x38\x01\"\x97\x03\n\tRecordSet\x12\x39\n\nparameters\x18\x01 \x03(\x0b\x32%.flwr.proto.RecordSet.ParametersEntry\x12\x33\n\x07metrics\x18\x02 \x03(\x0b\x32\".flwr.proto.RecordSet.MetricsEntry\x12\x33\n\x07\x63onfigs\x18\x03 \x03(\x0b\x32\".flwr.proto.RecordSet.ConfigsEntry\x1aO\n\x0fParametersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1c.flwr.proto.ParametersRecord:\x02\x38\x01\x1aI\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.flwr.proto.MetricsRecord:\x02\x38\x01\x1aI\n\x0c\x43onfigsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.flwr.proto.ConfigsRecord:\x02\x38\x01\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.recordset_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_METRICSRECORD_DATAENTRY']._options = None
+  _globals['_METRICSRECORD_DATAENTRY']._serialized_options = b'8\001'
+  _globals['_CONFIGSRECORD_DATAENTRY']._options = None
+  _globals['_CONFIGSRECORD_DATAENTRY']._serialized_options = b'8\001'
+  _globals['_RECORDSET_PARAMETERSENTRY']._options = None
+  _globals['_RECORDSET_PARAMETERSENTRY']._serialized_options = b'8\001'
+  _globals['_RECORDSET_METRICSENTRY']._options = None
+  _globals['_RECORDSET_METRICSENTRY']._serialized_options = b'8\001'
+  _globals['_RECORDSET_CONFIGSENTRY']._options = None
+  _globals['_RECORDSET_CONFIGSENTRY']._serialized_options = b'8\001'
+  _globals['_INT']._serialized_start=42
+  _globals['_INT']._serialized_end=90
+  _globals['_DOUBLELIST']._serialized_start=92
+  _globals['_DOUBLELIST']._serialized_end=118
+  _globals['_INTLIST']._serialized_start=120
+  _globals['_INTLIST']._serialized_end=160
+  _globals['_BOOLLIST']._serialized_start=162
+  _globals['_BOOLLIST']._serialized_end=186
+  _globals['_STRINGLIST']._serialized_start=188
+  _globals['_STRINGLIST']._serialized_end=214
+  _globals['_BYTESLIST']._serialized_start=216
+  _globals['_BYTESLIST']._serialized_end=241
+  _globals['_ARRAY']._serialized_start=243
+  _globals['_ARRAY']._serialized_end=309
+  _globals['_METRICSRECORDVALUE']._serialized_start=312
+  _globals['_METRICSRECORDVALUE']._serialized_end=483
+  _globals['_CONFIGSRECORDVALUE']._serialized_start=486
+  _globals['_CONFIGSRECORDVALUE']._serialized_end=843
+  _globals['_PARAMETERSRECORD']._serialized_start=845
+  _globals['_PARAMETERSRECORD']._serialized_end=922
+  _globals['_METRICSRECORD']._serialized_start=925
+  _globals['_METRICSRECORD']._serialized_end=1068
+  _globals['_METRICSRECORD_DATAENTRY']._serialized_start=993
+  _globals['_METRICSRECORD_DATAENTRY']._serialized_end=1068
+  _globals['_CONFIGSRECORD']._serialized_start=1071
+  _globals['_CONFIGSRECORD']._serialized_end=1214
+  _globals['_CONFIGSRECORD_DATAENTRY']._serialized_start=1139
+  _globals['_CONFIGSRECORD_DATAENTRY']._serialized_end=1214
+  _globals['_RECORDSET']._serialized_start=1217
+  _globals['_RECORDSET']._serialized_end=1624
+  _globals['_RECORDSET_PARAMETERSENTRY']._serialized_start=1395
+  _globals['_RECORDSET_PARAMETERSENTRY']._serialized_end=1474
+  _globals['_RECORDSET_METRICSENTRY']._serialized_start=1476
+  _globals['_RECORDSET_METRICSENTRY']._serialized_end=1549
+  _globals['_RECORDSET_CONFIGSENTRY']._serialized_start=1551
+  _globals['_RECORDSET_CONFIGSENTRY']._serialized_end=1624
+# @@protoc_insertion_point(module_scope)