flwr-nightly 1.20.0.dev20250723__tar.gz → 1.20.0.dev20250724__tar.gz

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.20.0.dev20250723
+Version: 1.20.0.dev20250724
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/proto/clientappio_pb2.py

@@ -18,7 +18,7 @@ from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 from flwr.proto import appio_pb2 as flwr_dot_proto_dot_appio__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto\"%\n#GetRunIdsWithPendingMessagesRequest\"7\n$GetRunIdsWithPendingMessagesResponse\x12\x0f\n\x07run_ids\x18\x01 \x03(\x04\"%\n\x13RequestTokenRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"%\n\x14RequestTokenResponse\x12\r\n\x05token\x18\x01 \x01(\t2\xec\x06\n\x0b\x43lientAppIo\x12\x83\x01\n\x1cGetRunIdsWithPendingMessages\x12/.flwr.proto.GetRunIdsWithPendingMessagesRequest\x1a\x30.flwr.proto.GetRunIdsWithPendingMessagesResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12\\\n\x13PullClientAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12_\n\x14PushClientAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12X\n\x0bPushMessage\x12\".flwr.proto.PushAppMessagesRequest\x1a#.flwr.proto.PushAppMessagesResponse\"\x00\x12X\n\x0bPullMessage\x12\".flwr.proto.PullAppMessagesRequest\x1a#.flwr.proto.PullAppMessagesResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto\"%\n#GetRunIdsWithPendingMessagesRequest\"7\n$GetRunIdsWithPendingMessagesResponse\x12\x0f\n\x07run_ids\x18\x01 \x03(\x04\"%\n\x13RequestTokenRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"%\n\x14RequestTokenResponse\x12\r\n\x05token\x18\x01 \x01(\t2\xaf\x07\n\x0b\x43lientAppIo\x12\x83\x01\n\x1cGetRunIdsWithPendingMessages\x12/.flwr.proto.GetRunIdsWithPendingMessagesRequest\x1a\x30.flwr.proto.GetRunIdsWithPendingMessagesResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\\\n\x13PullClientAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12_\n\x14PushClientAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12X\n\x0bPushMessage\x12\".flwr.proto.PushAppMessagesRequest\x1a#.flwr.proto.PushAppMessagesResponse\"\x00\x12X\n\x0bPullMessage\x12\".flwr.proto.PullAppMessagesRequest\x1a#.flwr.proto.PullAppMessagesResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -34,5 +34,5 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_REQUESTTOKENRESPONSE']._serialized_start=273
   _globals['_REQUESTTOKENRESPONSE']._serialized_end=310
   _globals['_CLIENTAPPIO']._serialized_start=313
-  _globals['_CLIENTAPPIO']._serialized_end=1189
+  _globals['_CLIENTAPPIO']._serialized_end=1256
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/proto/clientappio_pb2_grpc.py

@@ -5,6 +5,7 @@ import grpc
 from flwr.proto import appio_pb2 as flwr_dot_proto_dot_appio__pb2
 from flwr.proto import clientappio_pb2 as flwr_dot_proto_dot_clientappio__pb2
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
 
 class ClientAppIoStub(object):
@@ -26,6 +27,11 @@ class ClientAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.FromString,
                 )
+        self.GetRun = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/GetRun',
+                request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
+                )
         self.PullClientAppInputs = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PullClientAppInputs',
                 request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
@@ -80,6 +86,13 @@ class ClientAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def GetRun(self, request, context):
+        """Get run details
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def PullClientAppInputs(self, request, context):
         """Pull client app inputs
         """
@@ -142,6 +155,11 @@ def add_ClientAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.SerializeToString,
             ),
+            'GetRun': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetRun,
+                    request_deserializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.SerializeToString,
+            ),
             'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullClientAppInputs,
                     request_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.FromString,
@@ -221,6 +239,23 @@ class ClientAppIo(object):
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def GetRun(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.ClientAppIo/GetRun',
+            flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
+            flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def PullClientAppInputs(request,
             target,

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/proto/clientappio_pb2_grpc.pyi

@@ -6,6 +6,7 @@ import abc
 import flwr.proto.appio_pb2
 import flwr.proto.clientappio_pb2
 import flwr.proto.message_pb2
+import flwr.proto.run_pb2
 import grpc
 
 class ClientAppIoStub:
@@ -20,6 +21,11 @@ class ClientAppIoStub:
         flwr.proto.clientappio_pb2.RequestTokenResponse]
     """Request token"""
 
+    GetRun: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.run_pb2.GetRunRequest,
+        flwr.proto.run_pb2.GetRunResponse]
+    """Get run details"""
+
     PullClientAppInputs: grpc.UnaryUnaryMultiCallable[
         flwr.proto.appio_pb2.PullAppInputsRequest,
         flwr.proto.appio_pb2.PullAppInputsResponse]
@@ -73,6 +79,14 @@ class ClientAppIoServicer(metaclass=abc.ABCMeta):
         """Request token"""
         pass
 
+    @abc.abstractmethod
+    def GetRun(self,
+        request: flwr.proto.run_pb2.GetRunRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.run_pb2.GetRunResponse:
+        """Get run details"""
+        pass
+
     @abc.abstractmethod
     def PullClientAppInputs(self,
         request: flwr.proto.appio_pb2.PullAppInputsRequest,

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/server/grid/grpc_grid.py

@@ -22,10 +22,13 @@ from typing import Optional, cast
 
 import grpc
 
-from flwr.common import Message, RecordDict
+from flwr.app.error import Error
+from flwr.common import Message, Metadata, RecordDict, now
 from flwr.common.constant import (
     SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
     SUPERLINK_NODE_ID,
+    ErrorCode,
+    MessageType,
 )
 from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.inflatable import (
@@ -39,12 +42,13 @@ from flwr.common.inflatable_protobuf_utils import (
     make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
+    ObjectUnavailableError,
     inflate_object_from_contents,
     pull_objects,
     push_objects,
 )
 from flwr.common.logger import log, warn_deprecated_feature
-from flwr.common.message import remove_content_from_message
+from flwr.common.message import make_message, remove_content_from_message
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.common.serde import message_to_proto, run_from_proto
 from flwr.common.typing import Run
@@ -307,16 +311,42 @@ class GrpcGrid(Grid):
             inflated_msgs: list[Message] = []
             for msg_proto, msg_tree in zip(res.messages_list, res.message_object_trees):
                 msg_id = msg_proto.metadata.message_id
-                all_object_contents = pull_objects(
-                    object_ids=[
-                        tree.object_id for tree in iterate_object_tree(msg_tree)
-                    ],
-                    pull_object_fn=make_pull_object_fn_protobuf(
-                        pull_object_protobuf=self._stub.PullObject,
-                        node=self.node,
-                        run_id=run_id,
-                    ),
-                )
+                try:
+                    all_object_contents = pull_objects(
+                        object_ids=[
+                            tree.object_id for tree in iterate_object_tree(msg_tree)
+                        ],
+                        pull_object_fn=make_pull_object_fn_protobuf(
+                            pull_object_protobuf=self._stub.PullObject,
+                            node=self.node,
+                            run_id=run_id,
+                        ),
+                    )
+                except ObjectUnavailableError as e:
+                    # An ObjectUnavailableError indicates that the object is not yet
+                    # available. If this point has been reached, it means that the
+                    # Grid has tried to pull the object for the maximum number of times
+                    # or for the maximum time allowed, so we return an inflated message
+                    # with an error
+                    inflated_msgs.append(
+                        make_message(
+                            metadata=Metadata(
+                                run_id=run_id,
+                                message_id="",
+                                src_node_id=self.node.node_id,
+                                dst_node_id=self.node.node_id,
+                                message_type=MessageType.SYSTEM,
+                                group_id="",
+                                ttl=0,
+                                reply_to_message_id=msg_proto.metadata.reply_to_message_id,
+                                created_at=now().timestamp(),
+                            ),
+                            error=Error(
+                                code=ErrorCode.MESSAGE_UNAVAILABLE, reason=(str(e))
+                            ),
+                        )
+                    )
+                    continue
 
                 # Confirm that the message has been received
                 self._stub.ConfirmMessageReceived(

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/server/superlink/utils.py

@@ -21,9 +21,6 @@ import grpc
 
 from flwr.common.constant import Status, SubStatus
 from flwr.common.typing import RunStatus
-from flwr.proto.appio_pb2 import PushAppMessagesRequest  # pylint: disable=E0611
-from flwr.proto.fleet_pb2 import PushMessagesRequest  # pylint: disable=E0611
-from flwr.proto.message_pb2 import ObjectIDs  # pylint: disable=E0611
 from flwr.server.superlink.linkstate import LinkState
 from flwr.supercore.object_store import ObjectStore
 
@@ -73,27 +70,3 @@ def abort_if(
     """Abort context if status of the provided `run_id` is in `abort_status_list`."""
     msg = check_abort(run_id, abort_status_list, state, store)
     abort_grpc_context(msg, context)
-
-
-def store_mapping_and_register_objects(
-    store: ObjectStore, request: Union[PushAppMessagesRequest, PushMessagesRequest]
-) -> dict[str, ObjectIDs]:
-    """Store Message object to descendants mapping and preregister objects."""
-    if not request.messages_list:
-        return {}
-
-    objects_to_push: dict[str, ObjectIDs] = {}
-
-    # Get run_id from the first message in the list
-    # All messages of a request should in the same run
-    run_id = request.messages_list[0].metadata.run_id
-
-    for object_tree in request.message_object_trees:
-        # Preregister
-        object_ids_just_registered = store.preregister(run_id, object_tree)
-        # Keep track of objects that need to be pushed
-        objects_to_push[object_tree.object_id] = ObjectIDs(
-            object_ids=object_ids_just_registered
-        )
-
-    return objects_to_push

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -59,6 +59,7 @@ from flwr.proto.message_pb2 import (
     PushObjectRequest,
     PushObjectResponse,
 )
+from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 
 # pylint: disable=E0601
 from flwr.supercore.ffs import FfsFactory
@@ -118,6 +119,23 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         # Return the token
         return RequestTokenResponse(token=token)
 
+    def GetRun(
+        self, request: GetRunRequest, context: grpc.ServicerContext
+    ) -> GetRunResponse:
+        """Get run information."""
+        log(DEBUG, "ClientAppIo.GetRun")
+
+        # Initialize state connection
+        state = self.state_factory.state()
+
+        # Retrieve run information
+        run = state.get_run(request.run_id)
+
+        if run is None:
+            return GetRunResponse()
+
+        return GetRunResponse(run=run_to_proto(run))
+
     def PullClientAppInputs(
         self, request: PullAppInputsRequest, context: grpc.ServicerContext
     ) -> PullAppInputsResponse:

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/py/flwr/supernode/start_client_internal.py

@@ -237,6 +237,12 @@ def start_client_internal(
                 ]
                 subprocess.run(command, check=False)
 
+            # No message has been pulled therefore we can skip the push stage.
+            if run_id is None:
+                # If no message was received, wait for a while
+                time.sleep(3)
+                continue
+
             _push_messages(
                 state=state,
                 object_store=store,
@@ -244,9 +250,6 @@ def start_client_internal(
                 push_object=push_object,
             )
 
-            # Sleep for 3 seconds before the next iteration
-            time.sleep(3)
-
 
 def _pull_and_store_message(  # pylint: disable=too-many-positional-arguments
     state: NodeState,
@@ -358,8 +361,10 @@ def _push_messages(
     push_object: Callable[[int, str, bytes], None],
 ) -> None:
     """Push reply messages to the SuperLink."""
-    # Get messages to send
-    reply_messages = state.get_messages(is_reply=True)
+    # This is to ensure that only one message is processed at a time
+    # Wait until a reply message is available
+    while not (reply_messages := state.get_messages(is_reply=True)):
+        time.sleep(0.5)
 
     for message in reply_messages:
         # Log message sending

{flwr_nightly-1.20.0.dev20250723 → flwr_nightly-1.20.0.dev20250724}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.20.0.dev20250723"
+version = "1.20.0.dev20250724"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]