flwr-nightly 1.15.0.dev20250127__py3-none-any.whl → 1.15.0.dev20250129__py3-none-any.whl

flwr/cli/utils.py

@@ -20,7 +20,6 @@ import json
 import re
 from collections.abc import Iterator
 from contextlib import contextmanager
-from logging import DEBUG
 from pathlib import Path
 from typing import Any, Callable, Optional, Union, cast
 
@@ -30,8 +29,11 @@ import typer
 from flwr.cli.cli_user_auth_interceptor import CliUserAuthInterceptor
 from flwr.common.auth_plugin import CliAuthPlugin
 from flwr.common.constant import AUTH_TYPE_KEY, CREDENTIALS_DIR, FLWR_DIR
-from flwr.common.grpc import GRPC_MAX_MESSAGE_LENGTH, create_channel
-from flwr.common.logger import log
+from flwr.common.grpc import (
+    GRPC_MAX_MESSAGE_LENGTH,
+    create_channel,
+    on_channel_state_change,
+)
 
 from .auth_plugin import get_cli_auth_plugins
 from .config_utils import validate_certificate_in_federation_config
@@ -264,11 +266,6 @@ def init_channel(
     app: Path, federation_config: dict[str, Any], auth_plugin: Optional[CliAuthPlugin]
 ) -> grpc.Channel:
     """Initialize gRPC channel to the Exec API."""
-
-    def on_channel_state_change(channel_connectivity: str) -> None:
-        """Log channel connectivity."""
-        log(DEBUG, channel_connectivity)
-
     insecure, root_certificates_bytes = validate_certificate_in_federation_config(
         app, federation_config
     )

flwr/client/clientapp/app.py

@@ -29,7 +29,7 @@ from flwr.common.args import add_args_flwr_app_common
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS, ErrorCode
 from flwr.common.exit import ExitCode, flwr_exit
-from flwr.common.grpc import create_channel
+from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.logger import log
 from flwr.common.message import Error
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
@@ -66,11 +66,11 @@ def flwr_clientapp() -> None:
             "flwr-clientapp does not support TLS yet.",
         )
 
-    log(INFO, "Starting Flower ClientApp")
+    log(INFO, "Start `flwr-clientapp` process")
     log(
         DEBUG,
-        "Starting isolated `ClientApp` connected to SuperNode's ClientAppIo API at %s "
-        "with token %s",
+        "`flwr-clientapp` will attempt to connect to SuperNode's "
+        "ClientAppIo API at %s with token %s",
         args.clientappio_api_address,
         args.token,
     )
@@ -83,11 +83,6 @@ def flwr_clientapp() -> None:
     )
 
 
-def on_channel_state_change(channel_connectivity: str) -> None:
-    """Log channel connectivity."""
-    log(DEBUG, channel_connectivity)
-
-
 def run_clientapp(  # pylint: disable=R0914
     clientappio_api_address: str,
     run_once: bool,
@@ -116,11 +111,11 @@ def run_clientapp(  # pylint: disable=R0914
                 time.sleep(1)
 
             # Pull Message, Context, Run and (optional) FAB from SuperNode
-            message, context, run, fab = pull_message(stub=stub, token=token)
+            message, context, run, fab = pull_clientappinputs(stub=stub, token=token)
 
             # Install FAB, if provided
             if fab:
-                log(DEBUG, "Flower ClientApp starts FAB installation.")
+                log(DEBUG, "[flwr-clientapp] Start FAB installation.")
                 install_from_fab(fab.content, flwr_dir=flwr_dir_, skip_prompt=True)
 
             load_client_app_fn = get_load_client_app_fn(
@@ -132,6 +127,7 @@ def run_clientapp(  # pylint: disable=R0914
 
             try:
                 # Load ClientApp
+                log(DEBUG, "[flwr-clientapp] Start `ClientApp` Loading.")
                 client_app: ClientApp = load_client_app_fn(
                     run.fab_id, run.fab_version, fab.hash_str if fab else ""
                 )
@@ -160,7 +156,7 @@ def run_clientapp(  # pylint: disable=R0914
                 )
 
             # Push Message and Context to SuperNode
-            _ = push_message(
+            _ = push_clientappoutputs(
                 stub=stub, token=token, message=reply_message, context=context
             )
 
@@ -183,7 +179,7 @@ def run_clientapp(  # pylint: disable=R0914
 
 def get_token(stub: grpc.Channel) -> Optional[int]:
     """Get a token from SuperNode."""
-    log(DEBUG, "Flower ClientApp process requests token")
+    log(DEBUG, "[flwr-clientapp] Request token")
     try:
         res: GetTokenResponse = stub.GetToken(GetTokenRequest())
         log(DEBUG, "[GetToken] Received token: %s", res.token)
@@ -196,11 +192,11 @@ def get_token(stub: grpc.Channel) -> Optional[int]:
         return None
 
 
-def pull_message(
+def pull_clientappinputs(
     stub: grpc.Channel, token: int
 ) -> tuple[Message, Context, Run, Optional[Fab]]:
-    """Pull message from SuperNode to ClientApp."""
-    log(INFO, "Pulling ClientAppInputs for token %s", token)
+    """Pull ClientAppInputs from SuperNode."""
+    log(INFO, "[flwr-clientapp] Pull `ClientAppInputs` for token %s", token)
     try:
         res: PullClientAppInputsResponse = stub.PullClientAppInputs(
             PullClientAppInputsRequest(token=token)
@@ -215,11 +211,11 @@ def pull_message(
         raise e
 
 
-def push_message(
+def push_clientappoutputs(
     stub: grpc.Channel, token: int, message: Message, context: Context
 ) -> PushClientAppOutputsResponse:
-    """Push message to SuperNode from ClientApp."""
-    log(INFO, "Pushing ClientAppOutputs for token %s", token)
+    """Push ClientAppOutputs to SuperNode."""
+    log(INFO, "[flwr-clientapp] Push `ClientAppOutputs` for token %s", token)
     proto_message = message_to_proto(message)
     proto_context = context_to_proto(context)
 

flwr/client/grpc_client/connection.py

@@ -36,7 +36,7 @@ from flwr.common import (
 from flwr.common import recordset_compat as compat
 from flwr.common import serde
 from flwr.common.constant import MessageType, MessageTypeLegacy
-from flwr.common.grpc import create_channel
+from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.logger import log
 from flwr.common.retry_invoker import RetryInvoker
 from flwr.common.typing import Fab, Run
@@ -48,11 +48,6 @@ from flwr.proto.transport_pb2 import (  # pylint: disable=E0611
 from flwr.proto.transport_pb2_grpc import FlowerServiceStub  # pylint: disable=E0611
 
 
-def on_channel_state_change(channel_connectivity: str) -> None:
-    """Log channel connectivity."""
-    log(DEBUG, channel_connectivity)
-
-
 @contextmanager
 def grpc_connection(  # pylint: disable=R0913,R0915,too-many-positional-arguments
     server_address: str,

flwr/client/grpc_rere_client/connection.py

@@ -20,7 +20,7 @@ import threading
 from collections.abc import Iterator, Sequence
 from contextlib import contextmanager
 from copy import copy
-from logging import DEBUG, ERROR
+from logging import ERROR
 from pathlib import Path
 from typing import Callable, Optional, Union, cast
 
@@ -36,10 +36,13 @@ from flwr.common.constant import (
     PING_DEFAULT_INTERVAL,
     PING_RANDOM_RANGE,
 )
-from flwr.common.grpc import create_channel
+from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.logger import log
 from flwr.common.message import Message, Metadata
 from flwr.common.retry_invoker import RetryInvoker
+from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
+    generate_key_pairs,
+)
 from flwr.common.serde import message_from_proto, message_to_proto, run_from_proto
 from flwr.common.typing import Fab, Run, RunNotRunningException
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
@@ -60,11 +63,6 @@ from .client_interceptor import AuthenticateClientInterceptor
 from .grpc_adapter import GrpcAdapter
 
 
-def on_channel_state_change(channel_connectivity: str) -> None:
-    """Log channel connectivity."""
-    log(DEBUG, channel_connectivity)
-
-
 @contextmanager
 def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     server_address: str,
@@ -130,12 +128,14 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     if isinstance(root_certificates, str):
         root_certificates = Path(root_certificates).read_bytes()
 
-    interceptors: Optional[Sequence[grpc.UnaryUnaryClientInterceptor]] = None
-    if authentication_keys is not None:
-        interceptors = AuthenticateClientInterceptor(
-            authentication_keys[0], authentication_keys[1]
-        )
+    # Automatic node auth: generate keys if user didn't provide any
+    if authentication_keys is None:
+        authentication_keys = generate_key_pairs()
 
+    # Always configure auth interceptor, with either user-provided or generated keys
+    interceptors: Sequence[grpc.UnaryUnaryClientInterceptor] = [
+        AuthenticateClientInterceptor(*authentication_keys),
+    ]
     channel = create_channel(
         server_address=server_address,
         insecure=insecure,

flwr/client/grpc_rere_client/grpc_adapter.py

@@ -42,12 +42,8 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PingResponse,
     PullMessagesRequest,
     PullMessagesResponse,
-    PullTaskInsRequest,
-    PullTaskInsResponse,
     PushMessagesRequest,
     PushMessagesResponse,
-    PushTaskResRequest,
-    PushTaskResResponse,
 )
 from flwr.proto.grpcadapter_pb2 import MessageContainer  # pylint: disable=E0611
 from flwr.proto.grpcadapter_pb2_grpc import GrpcAdapterStub
@@ -130,24 +126,12 @@ class GrpcAdapter:
         """."""
         return self._send_and_receive(request, PingResponse, **kwargs)
 
-    def PullTaskIns(  # pylint: disable=C0103
-        self, request: PullTaskInsRequest, **kwargs: Any
-    ) -> PullTaskInsResponse:
-        """."""
-        return self._send_and_receive(request, PullTaskInsResponse, **kwargs)
-
     def PullMessages(  # pylint: disable=C0103
         self, request: PullMessagesRequest, **kwargs: Any
     ) -> PullMessagesResponse:
         """."""
         return self._send_and_receive(request, PullMessagesResponse, **kwargs)
 
-    def PushTaskRes(  # pylint: disable=C0103
-        self, request: PushTaskResRequest, **kwargs: Any
-    ) -> PushTaskResResponse:
-        """."""
-        return self._send_and_receive(request, PushTaskResResponse, **kwargs)
-
     def PushMessages(  # pylint: disable=C0103
         self, request: PushMessagesRequest, **kwargs: Any
     ) -> PushMessagesResponse:

flwr/client/message_handler/task_handler.py

@@ -15,9 +15,6 @@
 """Task handling."""
 
 
-from typing import Optional
-
-from flwr.proto.fleet_pb2 import PullTaskInsResponse  # pylint: disable=E0611
 from flwr.proto.task_pb2 import TaskIns  # pylint: disable=E0611
 
 
@@ -38,17 +35,3 @@ def validate_task_ins(task_ins: TaskIns) -> bool:
     if not (task_ins.HasField("task") and task_ins.task.HasField("recordset")):
         return False
     return True
-
-
-def get_task_ins(
-    pull_task_ins_response: PullTaskInsResponse,
-) -> Optional[TaskIns]:
-    """Get the first TaskIns, if available."""
-    # Extract a single ServerMessage from the response, if possible
-    if len(pull_task_ins_response.task_ins_list) == 0:
-        return None
-
-    # Only evaluate the first message
-    task_ins: TaskIns = pull_task_ins_response.task_ins_list[0]
-
-    return task_ins

flwr/client/supernode/app.py

@@ -16,7 +16,6 @@
 
 
 import argparse
-import sys
 from logging import DEBUG, ERROR, INFO, WARN
 from pathlib import Path
 from typing import Optional
@@ -65,17 +64,6 @@ def run_supernode() -> None:
             "Ignoring `--flwr-dir`.",
         )
 
-    # Exit if unsupported argument is passed by the user
-    if args.app is not None:
-        log(
-            ERROR,
-            "The `app` argument is deprecated. The SuperNode now automatically "
-            "uses the ClientApp delivered from the SuperLink. Providing the app "
-            "directory manually is no longer supported. Please remove the `app` "
-            "argument from your command.",
-        )
-        sys.exit(1)
-
     root_certificates = try_obtain_root_certificates(args, args.superlink)
     load_fn = get_load_client_app_fn(
         default_app_ref="",
@@ -146,18 +134,6 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         description="Start a Flower SuperNode",
     )
-
-    parser.add_argument(
-        "app",
-        nargs="?",
-        default=None,
-        help=(
-            "(REMOVED) This argument is removed. The SuperNode now automatically "
-            "uses the ClientApp delivered from the SuperLink, so there is no need to "
-            "provide the app directory manually. This argument will be removed in a "
-            "future version."
-        ),
-    )
     _parse_args_common(parser)
     parser.add_argument(
         "--flwr-dir",

flwr/common/differential_privacy.py

@@ -39,7 +39,8 @@ def get_norm(input_arrays: NDArrays) -> float:
 def add_gaussian_noise_inplace(input_arrays: NDArrays, std_dev: float) -> None:
     """Add Gaussian noise to each element of the input arrays."""
     for array in input_arrays:
-        array += np.random.normal(0, std_dev, array.shape)
+        noise = np.random.normal(0, std_dev, array.shape).astype(array.dtype)
+        array += noise
 
 
 def clip_inputs_inplace(input_arrays: NDArrays, clipping_norm: float) -> None:

flwr/common/grpc.py

@@ -80,7 +80,7 @@ def create_channel(
         log(DEBUG, "Opened secure gRPC connection using certificates")
 
     if interceptors is not None:
-        channel = grpc.intercept_channel(channel, interceptors)
+        channel = grpc.intercept_channel(channel, *interceptors)
 
     return channel
 
@@ -224,3 +224,8 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
         server.add_insecure_port(server_address)
 
     return server
+
+
+def on_channel_state_change(channel_connectivity: str) -> None:
+    """Log channel connectivity."""
+    log(DEBUG, channel_connectivity)

flwr/proto/fleet_pb2.py

@@ -23,57 +23,44 @@ _sym_db = _symbol_database.Default()
 
 
 from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
-from flwr.proto import task_pb2 as flwr_dot_proto_dot_task__pb2
 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
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__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\x1a\x18\x66lwr/proto/message.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\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"l\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\"a\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\"\xb0\x01\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.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\xb6\x05\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\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12P\n\x0bPushTaskRes\x12\x1e.flwr.proto.PushTaskResRequest\x1a\x1f.flwr.proto.PushTaskResResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\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\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x18\x66lwr/proto/message.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\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"l\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\"a\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\"\xb0\x01\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.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\x92\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\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\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)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.fleet_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._loaded_options = None
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001'
   _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._loaded_options = None
   _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001'
-  _globals['_CREATENODEREQUEST']._serialized_start=154
-  _globals['_CREATENODEREQUEST']._serialized_end=196
-  _globals['_CREATENODERESPONSE']._serialized_start=198
-  _globals['_CREATENODERESPONSE']._serialized_end=250
-  _globals['_DELETENODEREQUEST']._serialized_start=252
-  _globals['_DELETENODEREQUEST']._serialized_end=303
-  _globals['_DELETENODERESPONSE']._serialized_start=305
-  _globals['_DELETENODERESPONSE']._serialized_end=325
-  _globals['_PINGREQUEST']._serialized_start=327
-  _globals['_PINGREQUEST']._serialized_end=395
-  _globals['_PINGRESPONSE']._serialized_start=397
-  _globals['_PINGRESPONSE']._serialized_end=428
-  _globals['_PULLTASKINSREQUEST']._serialized_start=430
-  _globals['_PULLTASKINSREQUEST']._serialized_end=500
-  _globals['_PULLTASKINSRESPONSE']._serialized_start=502
-  _globals['_PULLTASKINSRESPONSE']._serialized_end=609
-  _globals['_PUSHTASKRESREQUEST']._serialized_start=611
-  _globals['_PUSHTASKRESREQUEST']._serialized_end=707
-  _globals['_PUSHTASKRESRESPONSE']._serialized_start=710
-  _globals['_PUSHTASKRESRESPONSE']._serialized_end=884
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_start=838
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_end=884
-  _globals['_PULLMESSAGESREQUEST']._serialized_start=886
-  _globals['_PULLMESSAGESREQUEST']._serialized_end=960
-  _globals['_PULLMESSAGESRESPONSE']._serialized_start=962
-  _globals['_PULLMESSAGESRESPONSE']._serialized_end=1070
-  _globals['_PUSHMESSAGESREQUEST']._serialized_start=1072
-  _globals['_PUSHMESSAGESREQUEST']._serialized_end=1169
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=1172
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=1348
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=838
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=884
-  _globals['_RECONNECT']._serialized_start=1350
-  _globals['_RECONNECT']._serialized_end=1380
-  _globals['_FLEET']._serialized_start=1383
-  _globals['_FLEET']._serialized_end=2077
+  _globals['_CREATENODEREQUEST']._serialized_start=131
+  _globals['_CREATENODEREQUEST']._serialized_end=173
+  _globals['_CREATENODERESPONSE']._serialized_start=175
+  _globals['_CREATENODERESPONSE']._serialized_end=227
+  _globals['_DELETENODEREQUEST']._serialized_start=229
+  _globals['_DELETENODEREQUEST']._serialized_end=280
+  _globals['_DELETENODERESPONSE']._serialized_start=282
+  _globals['_DELETENODERESPONSE']._serialized_end=302
+  _globals['_PINGREQUEST']._serialized_start=304
+  _globals['_PINGREQUEST']._serialized_end=372
+  _globals['_PINGRESPONSE']._serialized_start=374
+  _globals['_PINGRESPONSE']._serialized_end=405
+  _globals['_PULLMESSAGESREQUEST']._serialized_start=407
+  _globals['_PULLMESSAGESREQUEST']._serialized_end=481
+  _globals['_PULLMESSAGESRESPONSE']._serialized_start=483
+  _globals['_PULLMESSAGESRESPONSE']._serialized_end=591
+  _globals['_PUSHMESSAGESREQUEST']._serialized_start=593
+  _globals['_PUSHMESSAGESREQUEST']._serialized_end=690
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=693
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=869
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=823
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=869
+  _globals['_RECONNECT']._serialized_start=871
+  _globals['_RECONNECT']._serialized_end=901
+  _globals['_FLEET']._serialized_start=904
+  _globals['_FLEET']._serialized_end=1434
 # @@protoc_insertion_point(module_scope)

flwr/proto/fleet_pb2.pyi

@@ -5,7 +5,6 @@ isort:skip_file
 import builtins
 import flwr.proto.message_pb2
 import flwr.proto.node_pb2
-import flwr.proto.task_pb2
 import google.protobuf.descriptor
 import google.protobuf.internal.containers
 import google.protobuf.message
@@ -87,89 +86,6 @@ class PingResponse(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["success",b"success"]) -> None: ...
 global___PingResponse = PingResponse
 
-class PullTaskInsRequest(google.protobuf.message.Message):
-    """PullTaskIns messages"""
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    NODE_FIELD_NUMBER: builtins.int
-    TASK_IDS_FIELD_NUMBER: builtins.int
-    @property
-    def node(self) -> flwr.proto.node_pb2.Node: ...
-    @property
-    def task_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
-    def __init__(self,
-        *,
-        node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
-        task_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
-        ) -> 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_ids",b"task_ids"]) -> None: ...
-global___PullTaskInsRequest = PullTaskInsRequest
-
-class PullTaskInsResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    RECONNECT_FIELD_NUMBER: builtins.int
-    TASK_INS_LIST_FIELD_NUMBER: builtins.int
-    @property
-    def reconnect(self) -> global___Reconnect: ...
-    @property
-    def task_ins_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.task_pb2.TaskIns]: ...
-    def __init__(self,
-        *,
-        reconnect: typing.Optional[global___Reconnect] = ...,
-        task_ins_list: typing.Optional[typing.Iterable[flwr.proto.task_pb2.TaskIns]] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["reconnect",b"reconnect"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["reconnect",b"reconnect","task_ins_list",b"task_ins_list"]) -> None: ...
-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 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):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    class ResultsEntry(google.protobuf.message.Message):
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-        KEY_FIELD_NUMBER: builtins.int
-        VALUE_FIELD_NUMBER: builtins.int
-        key: typing.Text
-        value: builtins.int
-        def __init__(self,
-            *,
-            key: typing.Text = ...,
-            value: builtins.int = ...,
-            ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
-
-    RECONNECT_FIELD_NUMBER: builtins.int
-    RESULTS_FIELD_NUMBER: builtins.int
-    @property
-    def reconnect(self) -> global___Reconnect: ...
-    @property
-    def results(self) -> google.protobuf.internal.containers.ScalarMap[typing.Text, builtins.int]: ...
-    def __init__(self,
-        *,
-        reconnect: typing.Optional[global___Reconnect] = ...,
-        results: typing.Optional[typing.Mapping[typing.Text, builtins.int]] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["reconnect",b"reconnect"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["reconnect",b"reconnect","results",b"results"]) -> None: ...
-global___PushTaskResResponse = PushTaskResResponse
-
 class PullMessagesRequest(google.protobuf.message.Message):
     """PullMessages messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor