flwr-nightly 1.20.0.dev20250712__py3-none-any.whl → 1.20.0.dev20250714__py3-none-any.whl

flwr/server/superlink/utils.py

@@ -22,9 +22,9 @@ import grpc
 from flwr.common.constant import Status, SubStatus
 from flwr.common.inflatable import iterate_object_tree
 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.proto.serverappio_pb2 import PushInsMessagesRequest  # pylint: disable=E0611
 from flwr.server.superlink.linkstate import LinkState
 from flwr.supercore.object_store import ObjectStore
 
@@ -77,7 +77,7 @@ def abort_if(
 
 
 def store_mapping_and_register_objects(
-    store: ObjectStore, request: Union[PushInsMessagesRequest, PushMessagesRequest]
+    store: ObjectStore, request: Union[PushAppMessagesRequest, PushMessagesRequest]
 ) -> dict[str, ObjectIDs]:
     """Store Message object to descendants mapping and preregister objects."""
     if not request.messages_list:

flwr/supernode/runtime/run_clientapp.py

@@ -50,8 +50,11 @@ from flwr.proto.clientappio_pb2 import (
     GetRunIdsWithPendingMessagesResponse,
     PullClientAppInputsRequest,
     PullClientAppInputsResponse,
+    PullMessageRequest,
+    PullMessageResponse,
     PushClientAppOutputsRequest,
     PushClientAppOutputsResponse,
+    PushMessageRequest,
     RequestTokenRequest,
     RequestTokenResponse,
 )
@@ -199,10 +202,14 @@ def pull_clientappinputs(
     masked_token = mask_string(token)
     log(INFO, "[flwr-clientapp] Pull `ClientAppInputs` for token %s", masked_token)
     try:
+        # Pull Message
+        res_msg: PullMessageResponse = stub.PullMessage(PullMessageRequest(token=token))
+        message = message_from_proto(res_msg.message)
+
+        # Pull Context, Run and (optional) FAB
         res: PullClientAppInputsResponse = stub.PullClientAppInputs(
             PullClientAppInputsRequest(token=token)
         )
-        message = message_from_proto(res.message)
         context = context_from_proto(res.context)
         run = run_from_proto(res.run)
         fab = fab_from_proto(res.fab) if res.fab else None
@@ -224,10 +231,13 @@ def push_clientappoutputs(
     proto_context = context_to_proto(context)
 
     try:
+
+        # Push Message
+        _ = stub.PushMessage(PushMessageRequest(token=token, message=proto_message))
+
+        # Push Context
         res: PushClientAppOutputsResponse = stub.PushClientAppOutputs(
-            PushClientAppOutputsRequest(
-                token=token, message=proto_message, context=proto_context
-            )
+            PushClientAppOutputsRequest(token=token, context=proto_context)
         )
         return res
     except grpc.RpcError as e:

flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -39,8 +39,12 @@ from flwr.proto.clientappio_pb2 import (  # pylint: disable=E0401
     GetRunIdsWithPendingMessagesResponse,
     PullClientAppInputsRequest,
     PullClientAppInputsResponse,
+    PullMessageRequest,
+    PullMessageResponse,
     PushClientAppOutputsRequest,
     PushClientAppOutputsResponse,
+    PushMessageRequest,
+    PushMessageResponse,
     RequestTokenRequest,
     RequestTokenResponse,
 )
@@ -119,14 +123,12 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             )
             raise RuntimeError("This line should never be reached.")
 
-        # Retrieve message, context, run and fab for this run
-        message = state.get_messages(run_ids=[run_id], is_reply=False)[0]
+        # Retrieve context, run and fab for this run
         context = cast(Context, state.get_context(run_id))
         run = cast(Run, state.get_run(run_id))
         fab = Fab(run.fab_hash, ffs.get(run.fab_hash)[0])  # type: ignore
 
         return PullClientAppInputsResponse(
-            message=message_to_proto(message),
             context=context_to_proto(context),
             run=run_to_proto(run),
             fab=fab_to_proto(fab),
@@ -150,8 +152,7 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             )
             raise RuntimeError("This line should never be reached.")
 
-        # Save the message and context to the state
-        state.store_message(message_from_proto(request.message))
+        # Save the context to the state
         state.store_context(context_from_proto(request.context))
 
         # Remove the token to make the run eligible for processing
@@ -159,3 +160,45 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         state.delete_token(run_id)
 
         return PushClientAppOutputsResponse()
+
+    def PullMessage(
+        self, request: PullMessageRequest, context: grpc.ServicerContext
+    ) -> PullMessageResponse:
+        """Pull one Message."""
+        # Initialize state and ffs connection
+        state = self.state_factory.state()
+
+        # Validate the token
+        run_id = state.get_run_id_by_token(request.token)
+        if run_id is None or not state.verify_token(run_id, request.token):
+            context.abort(
+                grpc.StatusCode.PERMISSION_DENIED,
+                "Invalid token.",
+            )
+            raise RuntimeError("This line should never be reached.")
+
+        # Retrieve message, context, run and fab for this run
+        message = state.get_messages(run_ids=[run_id], is_reply=False)[0]
+
+        return PullMessageResponse(message=message_to_proto(message))
+
+    def PushMessage(
+        self, request: PushMessageRequest, context: grpc.ServicerContext
+    ) -> PushMessageResponse:
+        """Push one Message."""
+        # Initialize state connection
+        state = self.state_factory.state()
+
+        # Validate the token
+        run_id = state.get_run_id_by_token(request.token)
+        if run_id is None or not state.verify_token(run_id, request.token):
+            context.abort(
+                grpc.StatusCode.PERMISSION_DENIED,
+                "Invalid token.",
+            )
+            raise RuntimeError("This line should never be reached.")
+
+        # Save the message and context to the state
+        state.store_message(message_from_proto(request.message))
+
+        return PushMessageResponse()

flwr/supernode/start_client_internal.py

@@ -47,6 +47,11 @@ from flwr.common.constant import (
 from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.grpc import generic_create_grpc_server
+from flwr.common.inflatable import (
+    get_all_nested_objects,
+    get_object_tree,
+    no_object_id_recompute,
+)
 from flwr.common.logger import log
 from flwr.common.retry_invoker import RetryInvoker, RetryState, exponential
 from flwr.common.telemetry import EventType
@@ -289,7 +294,16 @@ def _pull_and_store_message(  # pylint: disable=too-many-positional-arguments
             state.store_context(run_ctx)
 
         # Store the message in the state
+        # This shall be removed after the transition to ObjectStore
         state.store_message(message)
+
+        # Store the message in ObjectStore
+        # This is a temporary solution to store messages in ObjectStore
+        with no_object_id_recompute():
+            object_store.preregister(run_id, get_object_tree(message))
+            for obj_id, obj in get_all_nested_objects(message).items():
+                object_store.put(obj_id, obj.deflate())
+
     except RunNotRunningException:
         if message is None:
             log(

{flwr_nightly-1.20.0.dev20250712.dist-info → flwr_nightly-1.20.0.dev20250714.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.20.0.dev20250712
+Version: 1.20.0.dev20250714
 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.dev20250712.dist-info → flwr_nightly-1.20.0.dev20250714.dist-info}/RECORD

@@ -125,7 +125,7 @@ flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
 flwr/common/inflatable.py,sha256=GDL9oBKs16_yyVdlH6kBf493O5xll_h9V7XB5Mpx1Hc,9524
 flwr/common/inflatable_grpc_utils.py,sha256=ZpwtgF1tGD6NwQkCidbhbeBPDBZ1Nx9eGMHQ04eNEE8,3554
 flwr/common/inflatable_rest_utils.py,sha256=KiZd06XRiXcl_WewOrag0JTvUQt5kZ74UIsQ3FCAXGc,3580
-flwr/common/inflatable_utils.py,sha256=XfgkPl8GKuR7tuOpYVZ3zK4n-LbgMZtwoNxMfUbpiCE,12489
+flwr/common/inflatable_utils.py,sha256=yew5VU8po8yZsmoTVxg-tB5vrvnb2mvBAE55qjiOAq8,12840
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
 flwr/common/message.py,sha256=xAL7iZN5-n-xPQpgoSFvxNrzs8fmiiPfoU0DjNQEhRw,19953
 flwr/common/object_ref.py,sha256=p3SfTeqo3Aj16SkB-vsnNn01zswOPdGNBitcbRnqmUk,9134
@@ -165,10 +165,14 @@ flwr/compat/server/__init__.py,sha256=TGVSoOTuf5T5JHUVrK5wuorQF7L6Wvdem8B4uufvMJ
 flwr/compat/server/app.py,sha256=_lIe7Q4KUk-olq9PYBxIsO3UaOn6N92CWgWQ4hRcAZw,6490
 flwr/compat/simulation/__init__.py,sha256=MApGa-tysDDw34iSdxZ7TWOKtGJM-z3i8fIRJa0qbZ8,750
 flwr/proto/__init__.py,sha256=S3VbQzVwNC1P-3_9EdrXuwgptO-BVuuAe20Z_OUc1cQ,683
-flwr/proto/clientappio_pb2.py,sha256=jkTJnHtHOylYTV0pxfFAaA0CtIPGrwGCcVgCg6i0LhU,4337
-flwr/proto/clientappio_pb2.pyi,sha256=qrH9KeJ8YXRa9iQYlKV8-kwXrmxGr6AJp5f7Yx88CEg,6843
-flwr/proto/clientappio_pb2_grpc.py,sha256=vstXed6-uSOqM0qbaZBwYIgHHs7GH6oKqOq0TniboOk,8035
-flwr/proto/clientappio_pb2_grpc.pyi,sha256=828mbHoq0SxZ3NRmGqiZmpb4KtLPi71piQBMF_2EZxk,2399
+flwr/proto/appio_pb2.py,sha256=rAewGZ8FiIaB-BPdOZHL3lzytzPWmJ-mB6-S8gfcq84,4213
+flwr/proto/appio_pb2.pyi,sha256=Ab8L81Ooyd5OzogmNsEaNRaIhyTd8ZJ9veqwwvxK9Io,7889
+flwr/proto/appio_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
+flwr/proto/appio_pb2_grpc.pyi,sha256=ff2TSiLVnG6IVQcTGzb2DIH3XRSoAvAo_RMcvbMFyc0,76
+flwr/proto/clientappio_pb2.py,sha256=mgxqxwY6Uy7G4XFQPZbHWWScFThFs97HF-RIYCjfZTg,5166
+flwr/proto/clientappio_pb2.pyi,sha256=MNDZpPjLStQp-VGdp91Pe2SmEQAvu96HJz1IWVQOb38,8344
+flwr/proto/clientappio_pb2_grpc.py,sha256=bhUGniS48FKipJYRmbMWCv_kXjt82ca1zqLWepy3rso,11317
+flwr/proto/clientappio_pb2_grpc.pyi,sha256=GoHd2vOw4mDLTMxHJ-osQ6oIRzQZNgXMFOZknghyzsk,3265
 flwr/proto/error_pb2.py,sha256=PQVWrfjVPo88ql_KgV9nCxyQNCcV9PVfmcw7sOzTMro,1084
 flwr/proto/error_pb2.pyi,sha256=ZNH4HhJTU_KfMXlyCeg8FwU-fcUYxTqEmoJPtWtHikc,734
 flwr/proto/error_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
@@ -213,10 +217,10 @@ flwr/proto/run_pb2.py,sha256=76pAp3ugvpsUyx34ehvMTe-o-J2pTTvb1OskDmsAcag,4768
 flwr/proto/run_pb2.pyi,sha256=7hWfS3DzrrrKn5ZXRYL1x1rz9u1ZZd68Sz5kinRBDCk,9542
 flwr/proto/run_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 flwr/proto/run_pb2_grpc.pyi,sha256=ff2TSiLVnG6IVQcTGzb2DIH3XRSoAvAo_RMcvbMFyc0,76
-flwr/proto/serverappio_pb2.py,sha256=ugZZ0zZulDKuL7BZbAMptyMAozmJv888tee0ZrteOB0,6608
-flwr/proto/serverappio_pb2.pyi,sha256=YxIhMPaF9fhBCR6P0AX3t5yM03B15HuwudDPHktMwTk,8914
-flwr/proto/serverappio_pb2_grpc.py,sha256=kUPYPzA8ozjkTp-KVTeTWB_viTj-OJiX-lErH7b5kVc,24374
-flwr/proto/serverappio_pb2_grpc.pyi,sha256=xecgtw0jIrNHMeJkG_cjuIglFM9NFRv1XPLEX7GIdck,6711
+flwr/proto/serverappio_pb2.py,sha256=CeVRUlT3jn4xVaTVi2U9L5H7r7uc_U4DYZOZNxT5kI4,3575
+flwr/proto/serverappio_pb2.pyi,sha256=MDY9CEUnev_oi7Y-gZIXx8divcc0BufLAE2d7nmbo_Y,1319
+flwr/proto/serverappio_pb2_grpc.py,sha256=Y4uz8M2JT5pg6ADobq5hDQyYFjFplRV53J2z8pdRqVk,24140
+flwr/proto/serverappio_pb2_grpc.pyi,sha256=8pFqwGZjBUzyg1hTY7LCbLiYmGL7hlffeS0jyCi7L20,6571
 flwr/proto/simulationio_pb2.py,sha256=sAJX72z-IttVGxyU3PFnG8AFuA-pV7itvBoxz-hOudE,3342
 flwr/proto/simulationio_pb2.pyi,sha256=oXx8_FLBe5B54wduZj-f89kub73XxNtQbThuW8YfPAs,2660
 flwr/proto/simulationio_pb2_grpc.py,sha256=HuGbhOwV_A5GTbvmd5XTm6lSm9fWUgKcxq9OKhgmBT0,12999
@@ -239,7 +243,7 @@ flwr/server/criterion.py,sha256=G4e-6B48Pc7d5rmGVUpIzNKb6UF88O3VmTRuUltgjzM,1061
 flwr/server/fleet_event_log_interceptor.py,sha256=ifV4gUB_hSg7QPLIrAyDpjciqZBOKb0L0abZno3GTwA,3780
 flwr/server/grid/__init__.py,sha256=aWZHezoR2UGMJISB_gPMCm2N_2GSbm97A3lAp7ruhRQ,888
 flwr/server/grid/grid.py,sha256=naGCYt5J6dnmUvrcGkdNyKPe3MBd-0awGm1ALmgahqY,6625
-flwr/server/grid/grpc_grid.py,sha256=F1AtbNxhHZL0-Rlwvynm7eUzOm8J55ENZ2-YQ21lAg4,13519
+flwr/server/grid/grpc_grid.py,sha256=-SLS1VifRo1uxgjRWQJSshkTm5t0s8Wrj2ZZcbSu86I,13581
 flwr/server/grid/inmemory_grid.py,sha256=RjejYT-d-hHuTs1KSs_5wvOdAWKLus8w5_UAcnGt4iw,6168
 flwr/server/history.py,sha256=cCkFhBN4GoHsYYNk5GG1Y089eKJh2DH_ZJbYPwLaGyk,5026
 flwr/server/run_serverapp.py,sha256=v0p6jXj2dFxlRUdoEeF1mnaFd9XRQi6dZCflPY6d3qI,2063
@@ -247,7 +251,7 @@ flwr/server/server.py,sha256=39m4FSN2T-uVA-no9nstN0eWW0co-IUUAIMmpd3V7Jc,17893
 flwr/server/server_app.py,sha256=8uagoZX-3CY3tazPqkIV9jY-cN0YrRRrDmVe23o0AV0,9515
 flwr/server/server_config.py,sha256=e_6ddh0riwOJsdNn2BFev344uMWfDk9n7dyjNpPgm1w,1349
 flwr/server/serverapp/__init__.py,sha256=xcC0T_MQSMS9cicUzUUpMNCOsF2d8Oh_8jvnoBLuZvo,800
-flwr/server/serverapp/app.py,sha256=CQZy_oyDHBQFokkBnwaYvo0X_YFKKYekwTxiGZPtD1w,9491
+flwr/server/serverapp/app.py,sha256=GetSKAsDlNlJFazregZ_Vu63SIIL9KrZXEvSjND7qA0,9407
 flwr/server/serverapp_components.py,sha256=dfSqmrsVy3arKXpl3ZIBQWdV8rehfIms8aJooyzdmEM,2118
 flwr/server/strategy/__init__.py,sha256=HhsSWMWaC7oCb2g7Kqn1MBKdrfvgi8VxACy9ZL706Q0,2836
 flwr/server/strategy/aggregate.py,sha256=smlKKy-uFUuuFR12vlclucnwSQWRz78R79-Km4RWqbw,13978
@@ -302,11 +306,11 @@ flwr/server/superlink/linkstate/sqlite_linkstate.py,sha256=E699Ak0jMF3N7i1SIeFRu
 flwr/server/superlink/linkstate/utils.py,sha256=IeLh7iGRCHU5MEWOl7iriaSE4L__8GWOa2OleXadK5M,15444
 flwr/server/superlink/serverappio/__init__.py,sha256=Fy4zJuoccZe5mZSEIpOmQvU6YeXFBa1M4eZuXXmJcn8,717
 flwr/server/superlink/serverappio/serverappio_grpc.py,sha256=zcvzDhCAnlFxAwCiJUHNm6IE7-rk5jeZqSmPgjEY3AU,2307
-flwr/server/superlink/serverappio/serverappio_servicer.py,sha256=J-c3aRIpSD8Kt0-yWwAecejuNP6YKfW2KTtk21SbFvs,18763
+flwr/server/superlink/serverappio/serverappio_servicer.py,sha256=BBDxoYj1BlNtT7wOr9TUGJUHP6MS5dMKqcBsW4Uji00,18735
 flwr/server/superlink/simulation/__init__.py,sha256=Ry8DrNaZCMcQXvUc4FoCN2m3dvUQgWjasfp015o3Ec4,718
 flwr/server/superlink/simulation/simulationio_grpc.py,sha256=VqWKxjpd4bCgPFKsgtIZPk9YcG0kc1EEmr5k20EKty4,2205
 flwr/server/superlink/simulation/simulationio_servicer.py,sha256=m1T1zvEn81jlfx9hVTqmeWxAu6APCS2YW8l5O0OQvhU,7724
-flwr/server/superlink/utils.py,sha256=SHx612HNv704oRqii3Q1SPtbRdn0AQQi1z-Rqg9moLk,3898
+flwr/server/superlink/utils.py,sha256=kN7Wg7bK0wwK6B3JSXNCrUCVt8LTogKf3lKXAFREZSM,3892
 flwr/server/typing.py,sha256=LvO6gq7H6TAWhA9JFx0WyqHxU7FycyvhSsLjBLPgpts,1011
 flwr/server/utils/__init__.py,sha256=U4gM84-uUFddarODDQkO6SjNUuGhFcsHJZMjSEbezkU,884
 flwr/server/utils/tensorboard.py,sha256=3z3MeF0cu_U6ghNgRd0UQ5bunyDQKxCLpIpEdGMoCJ0,5466
@@ -359,12 +363,12 @@ flwr/supernode/nodestate/in_memory_nodestate.py,sha256=LF3AbaW0bcZHY5yKWwUJSU2RZ
 flwr/supernode/nodestate/nodestate.py,sha256=kkGFxYnLIwT4-UmlPnf6HvAUpPey2urUNrweGybAIY4,6398
 flwr/supernode/nodestate/nodestate_factory.py,sha256=UYTDCcwK_baHUmkzkJDxL0UEqvtTfOMlQRrROMCd0Xo,1430
 flwr/supernode/runtime/__init__.py,sha256=JQdqd2EMTn-ORMeTvewYYh52ls0YKP68jrps1qioxu4,718
-flwr/supernode/runtime/run_clientapp.py,sha256=wDOs0SbTQJxcm4z63qK4mHomKXjyW-VMsUjD-mXD5X4,8248
+flwr/supernode/runtime/run_clientapp.py,sha256=jOACPK1YEwtuJas9cpILcxgPuM756Yzk1cCa04-v78M,8565
 flwr/supernode/servicer/__init__.py,sha256=lucTzre5WPK7G1YLCfaqg3rbFWdNSb7ZTt-ca8gxdEo,717
 flwr/supernode/servicer/clientappio/__init__.py,sha256=7Oy62Y_oijqF7Dxi6tpcUQyOpLc_QpIRZ83NvwmB0Yg,813
-flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=d3GdIabycUoDBDL_eVlt513knGSjQW3-9lG6Cw4QEk4,5719
-flwr/supernode/start_client_internal.py,sha256=DAXuReZ1FCXt9Y1KbM0p-dI50ROWPEJXzfKrl14OE6k,18233
-flwr_nightly-1.20.0.dev20250712.dist-info/METADATA,sha256=bdE0QymAvbw5nIb2g_cpsIl2tMI48rbWdLtgC3H52Rc,15910
-flwr_nightly-1.20.0.dev20250712.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.20.0.dev20250712.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.20.0.dev20250712.dist-info/RECORD,,
+flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=U-uAJ7Yd_BzEqhbpCSgEG9pxX5Zf4RuPVYKimYDvMbU,7176
+flwr/supernode/start_client_internal.py,sha256=_ZqSfL_j4qn6Cg-P6sv3k_n1ZG62J_teokBxnWrXrPE,18772
+flwr_nightly-1.20.0.dev20250714.dist-info/METADATA,sha256=-5TYbMnUQ41aFZf_OizdSM0Rzf84wudcSfT9qkfpTEo,15910
+flwr_nightly-1.20.0.dev20250714.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.20.0.dev20250714.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.20.0.dev20250714.dist-info/RECORD,,