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

flwr/proto/fleet_pb2_grpc.py

@@ -51,21 +51,11 @@ class FleetStub(object):
                 request_serializer=flwr_dot_proto_dot_fleet__pb2.PingRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_fleet__pb2.PingResponse.FromString,
                 _registered_method=True)
-        self.PullTaskIns = channel.unary_unary(
-                '/flwr.proto.Fleet/PullTaskIns',
-                request_serializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsResponse.FromString,
-                _registered_method=True)
         self.PullMessages = channel.unary_unary(
                 '/flwr.proto.Fleet/PullMessages',
                 request_serializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesResponse.FromString,
                 _registered_method=True)
-        self.PushTaskRes = channel.unary_unary(
-                '/flwr.proto.Fleet/PushTaskRes',
-                request_serializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResResponse.FromString,
-                _registered_method=True)
         self.PushMessages = channel.unary_unary(
                 '/flwr.proto.Fleet/PushMessages',
                 request_serializer=flwr_dot_proto_dot_fleet__pb2.PushMessagesRequest.SerializeToString,
@@ -104,33 +94,19 @@ class FleetServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def PullTaskIns(self, request, context):
-        """Retrieve one or more tasks, if possible
-
-        HTTP API path: /api/v1/fleet/pull-task-ins
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
     def PullMessages(self, request, context):
-        """HTTP API path: /api/v1/fleet/pull-messages
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
+        """Retrieve one or more messages, if possible
 
-    def PushTaskRes(self, request, context):
-        """Complete one or more tasks, if possible
-
-        HTTP API path: /api/v1/fleet/push-task-res
+        HTTP API path: /api/v1/fleet/pull-messages
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
     def PushMessages(self, request, context):
-        """HTTP API path: /api/v1/fleet/push-messages
+        """Complete one or more messages, if possible
+
+        HTTP API path: /api/v1/fleet/push-messages
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -167,21 +143,11 @@ def add_FleetServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_fleet__pb2.PingRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_fleet__pb2.PingResponse.SerializeToString,
             ),
-            'PullTaskIns': grpc.unary_unary_rpc_method_handler(
-                    servicer.PullTaskIns,
-                    request_deserializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsResponse.SerializeToString,
-            ),
             'PullMessages': grpc.unary_unary_rpc_method_handler(
                     servicer.PullMessages,
                     request_deserializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesResponse.SerializeToString,
             ),
-            'PushTaskRes': grpc.unary_unary_rpc_method_handler(
-                    servicer.PushTaskRes,
-                    request_deserializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResResponse.SerializeToString,
-            ),
             'PushMessages': grpc.unary_unary_rpc_method_handler(
                     servicer.PushMessages,
                     request_deserializer=flwr_dot_proto_dot_fleet__pb2.PushMessagesRequest.FromString,
@@ -289,33 +255,6 @@ class Fleet(object):
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def PullTaskIns(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/flwr.proto.Fleet/PullTaskIns',
-            flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.SerializeToString,
-            flwr_dot_proto_dot_fleet__pb2.PullTaskInsResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def PullMessages(request,
             target,
@@ -343,33 +282,6 @@ class Fleet(object):
             metadata,
             _registered_method=True)
 
-    @staticmethod
-    def PushTaskRes(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/flwr.proto.Fleet/PushTaskRes',
-            flwr_dot_proto_dot_fleet__pb2.PushTaskResRequest.SerializeToString,
-            flwr_dot_proto_dot_fleet__pb2.PushTaskResResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
     @staticmethod
     def PushMessages(request,
             target,

flwr/proto/fleet_pb2_grpc.pyi

@@ -22,31 +22,21 @@ class FleetStub:
         flwr.proto.fleet_pb2.PingRequest,
         flwr.proto.fleet_pb2.PingResponse]
 
-    PullTaskIns: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.fleet_pb2.PullTaskInsRequest,
-        flwr.proto.fleet_pb2.PullTaskInsResponse]
-    """Retrieve one or more tasks, if possible
-
-    HTTP API path: /api/v1/fleet/pull-task-ins
-    """
-
     PullMessages: grpc.UnaryUnaryMultiCallable[
         flwr.proto.fleet_pb2.PullMessagesRequest,
         flwr.proto.fleet_pb2.PullMessagesResponse]
-    """HTTP API path: /api/v1/fleet/pull-messages"""
+    """Retrieve one or more messages, if possible
 
-    PushTaskRes: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.fleet_pb2.PushTaskResRequest,
-        flwr.proto.fleet_pb2.PushTaskResResponse]
-    """Complete one or more tasks, if possible
-
-    HTTP API path: /api/v1/fleet/push-task-res
+    HTTP API path: /api/v1/fleet/pull-messages
     """
 
     PushMessages: grpc.UnaryUnaryMultiCallable[
         flwr.proto.fleet_pb2.PushMessagesRequest,
         flwr.proto.fleet_pb2.PushMessagesResponse]
-    """HTTP API path: /api/v1/fleet/push-messages"""
+    """Complete one or more messages, if possible
+
+    HTTP API path: /api/v1/fleet/push-messages
+    """
 
     GetRun: grpc.UnaryUnaryMultiCallable[
         flwr.proto.run_pb2.GetRunRequest,
@@ -77,33 +67,14 @@ class FleetServicer(metaclass=abc.ABCMeta):
         context: grpc.ServicerContext,
     ) -> flwr.proto.fleet_pb2.PingResponse: ...
 
-    @abc.abstractmethod
-    def PullTaskIns(self,
-        request: flwr.proto.fleet_pb2.PullTaskInsRequest,
-        context: grpc.ServicerContext,
-    ) -> flwr.proto.fleet_pb2.PullTaskInsResponse:
-        """Retrieve one or more tasks, if possible
-
-        HTTP API path: /api/v1/fleet/pull-task-ins
-        """
-        pass
-
     @abc.abstractmethod
     def PullMessages(self,
         request: flwr.proto.fleet_pb2.PullMessagesRequest,
         context: grpc.ServicerContext,
     ) -> flwr.proto.fleet_pb2.PullMessagesResponse:
-        """HTTP API path: /api/v1/fleet/pull-messages"""
-        pass
+        """Retrieve one or more messages, if possible
 
-    @abc.abstractmethod
-    def PushTaskRes(self,
-        request: flwr.proto.fleet_pb2.PushTaskResRequest,
-        context: grpc.ServicerContext,
-    ) -> flwr.proto.fleet_pb2.PushTaskResResponse:
-        """Complete one or more tasks, if possible
-
-        HTTP API path: /api/v1/fleet/push-task-res
+        HTTP API path: /api/v1/fleet/pull-messages
         """
         pass
 
@@ -112,7 +83,10 @@ class FleetServicer(metaclass=abc.ABCMeta):
         request: flwr.proto.fleet_pb2.PushMessagesRequest,
         context: grpc.ServicerContext,
     ) -> flwr.proto.fleet_pb2.PushMessagesResponse:
-        """HTTP API path: /api/v1/fleet/push-messages"""
+        """Complete one or more messages, if possible
+
+        HTTP API path: /api/v1/fleet/push-messages
+        """
         pass
 
     @abc.abstractmethod

flwr/server/app.py

@@ -374,8 +374,9 @@ def run_superlink() -> None:
             bckg_threads.append(fleet_thread)
         elif args.fleet_api_type == TRANSPORT_TYPE_GRPC_RERE:
             node_public_keys = _try_load_public_keys_node_authentication(args)
-            interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None
+            auto_auth = True
             if node_public_keys is not None:
+                auto_auth = False
                 state = state_factory.state()
                 state.clear_supernode_auth_keys()
                 state.store_node_public_keys(node_public_keys)
@@ -384,7 +385,10 @@ def run_superlink() -> None:
                     "Node authentication enabled with %d known public keys",
                     len(node_public_keys),
                 )
-                interceptors = [AuthenticateServerInterceptor(state_factory)]
+            else:
+                log(DEBUG, "Automatic node authentication enabled")
+
+            interceptors = [AuthenticateServerInterceptor(state_factory, auto_auth)]
 
             fleet_server = _run_fleet_api_grpc_rere(
                 address=fleet_address,

flwr/server/driver/grpc_driver.py

@@ -28,7 +28,7 @@ from flwr.common.constant import (
     SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
     SUPERLINK_NODE_ID,
 )
-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 _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.common.serde import message_from_proto, message_to_proto, run_from_proto
@@ -49,7 +49,7 @@ from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub  # pylint: disable=E
 from .driver import Driver
 
 ERROR_MESSAGE_DRIVER_NOT_CONNECTED = """
-[Driver] Error: Not connected.
+[flwr-serverapp] Error: Not connected.
 
 Call `connect()` on the `GrpcDriverStub` instance before calling any of the other
 `GrpcDriverStub` methods.
@@ -100,9 +100,10 @@ class GrpcDriver(Driver):
             insecure=(self._cert is None),
             root_certificates=self._cert,
         )
+        self._channel.subscribe(on_channel_state_change)
         self._grpc_stub = ServerAppIoStub(self._channel)
         _wrap_stub(self._grpc_stub, self._retry_invoker)
-        log(DEBUG, "[Driver] Connected to %s", self._addr)
+        log(DEBUG, "[flwr-serverapp] Connected to %s", self._addr)
 
     def _disconnect(self) -> None:
         """Disconnect from the ServerAppIo API."""
@@ -113,7 +114,7 @@ class GrpcDriver(Driver):
         self._channel = None
         self._grpc_stub = None
         channel.close()
-        log(DEBUG, "[Driver] Disconnected")
+        log(DEBUG, "[flwr-serverapp] Disconnected")
 
     def set_run(self, run_id: int) -> None:
         """Set the run."""

flwr/server/serverapp/app.py

@@ -72,7 +72,7 @@ def flwr_serverapp() -> None:
 
     args = _parse_args_run_flwr_serverapp().parse_args()
 
-    log(INFO, "Starting Flower ServerApp")
+    log(INFO, "Start `flwr-serverapp` process")
 
     if not args.insecure:
         flwr_exit(
@@ -82,7 +82,8 @@ def flwr_serverapp() -> None:
 
     log(
         DEBUG,
-        "Starting isolated `ServerApp` connected to SuperLink's ServerAppIo API at %s",
+        "`flwr-serverapp` will attempt to connect to SuperLink's "
+        "ServerAppIo API at %s",
         args.serverappio_api_address,
     )
     run_serverapp(
@@ -121,6 +122,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
         try:
             # Pull ServerAppInputs from LinkState
             req = PullServerAppInputsRequest()
+            log(DEBUG, "[flwr-serverapp] Pull ServerAppInputs")
             res: PullServerAppInputsResponse = driver._stub.PullServerAppInputs(req)
             if not res.HasField("run"):
                 sleep(3)
@@ -143,7 +145,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
                 stub=driver._stub,
             )
 
-            log(DEBUG, "ServerApp process starts FAB installation.")
+            log(DEBUG, "[flwr-serverapp] Start FAB installation.")
             install_from_fab(fab.content, flwr_dir=flwr_dir_, skip_prompt=True)
 
             fab_id, fab_version = get_fab_metadata(fab.content)
@@ -164,7 +166,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
 
             log(
                 DEBUG,
-                "Flower will load ServerApp `%s` in %s",
+                "[flwr-serverapp] Will load ServerApp `%s` in %s",
                 server_app_attr,
                 app_path,
             )
@@ -190,6 +192,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
 
             # Send resulting context
             context_proto = context_to_proto(updated_context)
+            log(DEBUG, "[flwr-serverapp] Will push ServerAppOutputs")
             out_req = PushServerAppOutputsRequest(
                 run_id=run.run_id, context=context_proto
             )

flwr/server/superlink/driver/serverappio_servicer.py

@@ -362,9 +362,8 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
     ) -> PullServerAppInputsResponse:
         """Pull ServerApp process inputs."""
         log(DEBUG, "ServerAppIoServicer.PullServerAppInputs")
-        # Init access to LinkState and Ffs
+        # Init access to LinkState
         state = self.state_factory.state()
-        ffs = self.ffs_factory.ffs()
 
         # Lock access to LinkState, preventing obtaining the same pending run_id
         with self.lock:
@@ -374,6 +373,9 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             if run_id is None:
                 return PullServerAppInputsResponse()
 
+            # Init access to Ffs
+            ffs = self.ffs_factory.ffs()
+
             # Retrieve Context, Run and Fab for the run_id
             serverapp_ctxt = state.get_serverapp_context(run_id)
             run = state.get_run(run_id)

flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -18,6 +18,7 @@
 from logging import DEBUG, INFO
 
 import grpc
+from google.protobuf.json_format import MessageToDict
 
 from flwr.common.logger import log
 from flwr.common.typing import InvalidRunStatusException
@@ -32,12 +33,8 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PingResponse,
     PullMessagesRequest,
     PullMessagesResponse,
-    PullTaskInsRequest,
-    PullTaskInsResponse,
     PushMessagesRequest,
     PushMessagesResponse,
-    PushTaskResRequest,
-    PushTaskResResponse,
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 from flwr.server.superlink.ffs.ffs_factory import FfsFactory
@@ -60,13 +57,13 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
     ) -> CreateNodeResponse:
         """."""
         log(INFO, "[Fleet.CreateNode] Request ping_interval=%s", request.ping_interval)
-        log(DEBUG, "[Fleet.CreateNode] Request: %s", request)
+        log(DEBUG, "[Fleet.CreateNode] Request: %s", MessageToDict(request))
         response = message_handler.create_node(
             request=request,
             state=self.state_factory.state(),
         )
         log(INFO, "[Fleet.CreateNode] Created node_id=%s", response.node.node_id)
-        log(DEBUG, "[Fleet.CreateNode] Response: %s", response)
+        log(DEBUG, "[Fleet.CreateNode] Response: %s", MessageToDict(response))
         return response
 
     def DeleteNode(
@@ -74,7 +71,7 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
     ) -> DeleteNodeResponse:
         """."""
         log(INFO, "[Fleet.DeleteNode] Delete node_id=%s", request.node.node_id)
-        log(DEBUG, "[Fleet.DeleteNode] Request: %s", request)
+        log(DEBUG, "[Fleet.DeleteNode] Request: %s", MessageToDict(request))
         return message_handler.delete_node(
             request=request,
             state=self.state_factory.state(),
@@ -82,57 +79,23 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
 
     def Ping(self, request: PingRequest, context: grpc.ServicerContext) -> PingResponse:
         """."""
-        log(DEBUG, "[Fleet.Ping] Request: %s", request)
+        log(DEBUG, "[Fleet.Ping] Request: %s", MessageToDict(request))
         return message_handler.ping(
             request=request,
             state=self.state_factory.state(),
         )
 
-    def PullTaskIns(
-        self, request: PullTaskInsRequest, context: grpc.ServicerContext
-    ) -> PullTaskInsResponse:
-        """Pull TaskIns."""
-        log(INFO, "[Fleet.PullTaskIns] node_id=%s", request.node.node_id)
-        log(DEBUG, "[Fleet.PullTaskIns] Request: %s", request)
-        return message_handler.pull_task_ins(
-            request=request,
-            state=self.state_factory.state(),
-        )
-
     def PullMessages(
         self, request: PullMessagesRequest, context: grpc.ServicerContext
     ) -> PullMessagesResponse:
         """Pull Messages."""
         log(INFO, "[Fleet.PullMessages] node_id=%s", request.node.node_id)
-        log(DEBUG, "[Fleet.PullMessages] Request: %s", request)
+        log(DEBUG, "[Fleet.PullMessages] Request: %s", MessageToDict(request))
         return message_handler.pull_messages(
             request=request,
             state=self.state_factory.state(),
         )
 
-    def PushTaskRes(
-        self, request: PushTaskResRequest, context: grpc.ServicerContext
-    ) -> PushTaskResResponse:
-        """Push TaskRes."""
-        if request.task_res_list:
-            log(
-                INFO,
-                "[Fleet.PushTaskRes] Push results from node_id=%s",
-                request.task_res_list[0].task.producer.node_id,
-            )
-        else:
-            log(INFO, "[Fleet.PushTaskRes] No task results to push")
-
-        try:
-            res = message_handler.push_task_res(
-                request=request,
-                state=self.state_factory.state(),
-            )
-        except InvalidRunStatusException as e:
-            abort_grpc_context(e.message, context)
-
-        return res
-
     def PushMessages(
         self, request: PushMessagesRequest, context: grpc.ServicerContext
     ) -> PushMessagesResponse:

flwr/server/superlink/fleet/grpc_rere/server_interceptor.py

@@ -106,6 +106,8 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
         # Continue the RPC call
         expected_node_id = state.get_node_id(node_pk_bytes)
         if not handler_call_details.method.endswith("CreateNode"):
+            # All calls, except for `CreateNode`, must provide a public key that is
+            # already mapped to a `node_id` (in `LinkState`)
             if expected_node_id is None:
                 return _unary_unary_rpc_terminator("Invalid node ID")
         # One of the method handlers in

flwr/server/superlink/fleet/message_handler/message_handler.py

@@ -39,12 +39,8 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PingResponse,
     PullMessagesRequest,
     PullMessagesResponse,
-    PullTaskInsRequest,
-    PullTaskInsResponse,
     PushMessagesRequest,
     PushMessagesResponse,
-    PushTaskResRequest,
-    PushTaskResResponse,
     Reconnect,
 )
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
@@ -53,7 +49,7 @@ from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     GetRunResponse,
     Run,
 )
-from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
+from flwr.proto.task_pb2 import TaskIns  # pylint: disable=E0611
 from flwr.server.superlink.ffs.ffs import Ffs
 from flwr.server.superlink.linkstate import LinkState
 from flwr.server.superlink.utils import check_abort
@@ -89,21 +85,6 @@ def ping(
     return PingResponse(success=res)
 
 
-def pull_task_ins(request: PullTaskInsRequest, state: LinkState) -> PullTaskInsResponse:
-    """Pull TaskIns handler."""
-    node = request.node  # pylint: disable=no-member
-    node_id: int = node.node_id
-
-    # Retrieve TaskIns from State
-    task_ins_list: list[TaskIns] = state.get_task_ins(node_id=node_id, limit=1)
-
-    # Build response
-    response = PullTaskInsResponse(
-        task_ins_list=task_ins_list,
-    )
-    return response
-
-
 def pull_messages(
     request: PullMessagesRequest, state: LinkState
 ) -> PullMessagesResponse:
@@ -124,35 +105,6 @@ def pull_messages(
     return PullMessagesResponse(messages_list=msg_proto)
 
 
-def push_task_res(request: PushTaskResRequest, state: LinkState) -> PushTaskResResponse:
-    """Push TaskRes handler."""
-    # pylint: disable=no-member
-    task_res: TaskRes = request.task_res_list[0]
-    # pylint: enable=no-member
-
-    # Abort if the run is not running
-    abort_msg = check_abort(
-        task_res.run_id,
-        [Status.PENDING, Status.STARTING, Status.FINISHED],
-        state,
-    )
-    if abort_msg:
-        raise InvalidRunStatusException(abort_msg)
-
-    # Set pushed_at (timestamp in seconds)
-    task_res.task.pushed_at = time.time()
-
-    # Store TaskRes in State
-    task_id: Optional[UUID] = state.store_task_res(task_res=task_res)
-
-    # Build response
-    response = PushTaskResResponse(
-        reconnect=Reconnect(reconnect=5),
-        results={str(task_id): 0},
-    )
-    return response
-
-
 def push_messages(
     request: PushMessagesRequest, state: LinkState
 ) -> PushMessagesResponse:

flwr/server/superlink/fleet/rest_rere/rest_api.py

@@ -33,12 +33,8 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PingResponse,
     PullMessagesRequest,
     PullMessagesResponse,
-    PullTaskInsRequest,
-    PullTaskInsResponse,
     PushMessagesRequest,
     PushMessagesResponse,
-    PushTaskResRequest,
-    PushTaskResResponse,
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 from flwr.server.superlink.ffs.ffs import Ffs
@@ -110,16 +106,6 @@ async def delete_node(request: DeleteNodeRequest) -> DeleteNodeResponse:
     return message_handler.delete_node(request=request, state=state)
 
 
-@rest_request_response(PullTaskInsRequest)
-async def pull_task_ins(request: PullTaskInsRequest) -> PullTaskInsResponse:
-    """Pull TaskIns."""
-    # Get state from app
-    state: LinkState = cast(LinkStateFactory, app.state.STATE_FACTORY).state()
-
-    # Handle message
-    return message_handler.pull_task_ins(request=request, state=state)
-
-
 @rest_request_response(PullMessagesRequest)
 async def pull_message(request: PullMessagesRequest) -> PullMessagesResponse:
     """Pull PullMessages."""
@@ -130,17 +116,6 @@ async def pull_message(request: PullMessagesRequest) -> PullMessagesResponse:
     return message_handler.pull_messages(request=request, state=state)
 
 
-# Check if token is needed here
-@rest_request_response(PushTaskResRequest)
-async def push_task_res(request: PushTaskResRequest) -> PushTaskResResponse:
-    """Push TaskRes."""
-    # Get state from app
-    state: LinkState = cast(LinkStateFactory, app.state.STATE_FACTORY).state()
-
-    # Handle message
-    return message_handler.push_task_res(request=request, state=state)
-
-
 @rest_request_response(PushMessagesRequest)
 async def push_message(request: PushMessagesRequest) -> PushMessagesResponse:
     """Pull PushMessages."""
@@ -187,9 +162,7 @@ async def get_fab(request: GetFabRequest) -> GetFabResponse:
 routes = [
     Route("/api/v0/fleet/create-node", create_node, methods=["POST"]),
     Route("/api/v0/fleet/delete-node", delete_node, methods=["POST"]),
-    Route("/api/v0/fleet/pull-task-ins", pull_task_ins, methods=["POST"]),
     Route("/api/v0/fleet/pull-messages", pull_message, methods=["POST"]),
-    Route("/api/v0/fleet/push-task-res", push_task_res, methods=["POST"]),
     Route("/api/v0/fleet/push-messages", push_message, methods=["POST"]),
     Route("/api/v0/fleet/ping", ping, methods=["POST"]),
     Route("/api/v0/fleet/get-run", get_run, methods=["POST"]),

flwr/simulation/simulationio_connection.py

@@ -21,7 +21,7 @@ from typing import Optional, cast
 import grpc
 
 from flwr.common.constant import SIMULATIONIO_API_DEFAULT_CLIENT_ADDRESS
-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 _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.proto.simulationio_pb2_grpc import SimulationIoStub  # pylint: disable=E0611
@@ -73,6 +73,7 @@ class SimulationIoConnection:
             insecure=(self._cert is None),
             root_certificates=self._cert,
         )
+        self._channel.subscribe(on_channel_state_change)
         self._grpc_stub = SimulationIoStub(self._channel)
         _wrap_stub(self._grpc_stub, self._retry_invoker)
         log(DEBUG, "[SimulationIO] Connected to %s", self._addr)

{flwr_nightly-1.15.0.dev20250127.dist-info → flwr_nightly-1.15.0.dev20250129.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.15.0.dev20250127
+Version: 1.15.0.dev20250129
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0