flwr-nightly 1.16.0.dev20250301__py3-none-any.whl → 1.16.0.dev20250304__py3-none-any.whl

flwr/cli/build.py

@@ -138,6 +138,8 @@ def build(
                 and f.name != "pyproject.toml"  # Exclude the original pyproject.toml
             ]
 
+            all_files.sort()
+
             for file_path in all_files:
                 # Read the file content manually
                 with open(file_path, "rb") as f:

flwr/client/client_app.py

@@ -74,7 +74,7 @@ def _inspect_maybe_adapt_client_fn_signature(client_fn: ClientFnExt) -> ClientFn
 
 
 @contextmanager
-def _empty_lifecycle(_: Context) -> Iterator[None]:
+def _empty_lifespan(_: Context) -> Iterator[None]:
     yield
 
 
@@ -142,11 +142,11 @@ class ClientApp:
         self._train: Optional[ClientAppCallable] = None
         self._evaluate: Optional[ClientAppCallable] = None
         self._query: Optional[ClientAppCallable] = None
-        self._lifecycle = _empty_lifecycle
+        self._lifespan = _empty_lifespan
 
     def __call__(self, message: Message, context: Context) -> Message:
         """Execute `ClientApp`."""
-        with self._lifecycle(context):
+        with self._lifespan(context):
             # Execute message using `client_fn`
             if self._call:
                 return self._call(message, context)
@@ -305,12 +305,12 @@ class ClientApp:
 
         return query_decorator
 
-    def lifecycle(
+    def lifespan(
         self,
     ) -> Callable[
         [Callable[[Context], Iterator[None]]], Callable[[Context], Iterator[None]]
     ]:
-        """Return a decorator that registers the lifecycle fn with the client app.
+        """Return a decorator that registers the lifespan fn with the client app.
 
         The decorated function should accept a `Context` object and use `yield`
         to define enter and exit behavior.
@@ -319,29 +319,33 @@ class ClientApp:
         --------
         >>> app = ClientApp()
         >>>
-        >>> @app.lifecycle()
-        >>> def lifecycle(context: Context) -> None:
+        >>> @app.lifespan()
+        >>> def lifespan(context: Context) -> None:
+        >>>     # Perform initialization tasks before the app starts
         >>>     print("Initializing ClientApp")
-        >>>     yield
+        >>>
+        >>>     yield  # ClientApp is running
+        >>>
+        >>>     # Perform cleanup tasks after the app stops
         >>>     print("Cleaning up ClientApp")
         """
 
-        def lifecycle_decorator(
-            lifecycle_fn: Callable[[Context], Iterator[None]]
+        def lifespan_decorator(
+            lifespan_fn: Callable[[Context], Iterator[None]]
         ) -> Callable[[Context], Iterator[None]]:
-            """Register the lifecycle fn with the ServerApp object."""
-            warn_preview_feature("ClientApp-register-lifecycle-function")
+            """Register the lifespan fn with the ServerApp object."""
+            warn_preview_feature("ClientApp-register-lifespan-function")
 
             @contextmanager
-            def decorated_lifecycle(context: Context) -> Iterator[None]:
-                # Execute the code before `yield` in lifecycle_fn
+            def decorated_lifespan(context: Context) -> Iterator[None]:
+                # Execute the code before `yield` in lifespan_fn
                 try:
-                    if not isinstance(it := lifecycle_fn(context), Iterator):
+                    if not isinstance(it := lifespan_fn(context), Iterator):
                         raise StopIteration
                     next(it)
                 except StopIteration:
                     raise RuntimeError(
-                        "Lifecycle function should yield at least once."
+                        "lifespan function should yield at least once."
                     ) from None
 
                 try:
@@ -349,21 +353,21 @@ class ClientApp:
                     yield
                 finally:
                     try:
-                        # Execute the code after `yield` in lifecycle_fn
+                        # Execute the code after `yield` in lifespan_fn
                         next(it)
                     except StopIteration:
                         pass
                     else:
-                        raise RuntimeError("Lifecycle function should only yield once.")
+                        raise RuntimeError("lifespan function should only yield once.")
 
             # Register provided function with the ClientApp object
             # Ignore mypy error because of different argument names (`_` vs `context`)
-            self._lifecycle = decorated_lifecycle  # type: ignore
+            self._lifespan = decorated_lifespan  # type: ignore
 
             # Return provided function unmodified
-            return lifecycle_fn
+            return lifespan_fn
 
-        return lifecycle_decorator
+        return lifespan_decorator
 
 
 class LoadClientAppError(Exception):

flwr/common/message.py

@@ -126,6 +126,16 @@ class Metadata:  # pylint: disable=too-many-instance-attributes
         """Set creation timestamp for this message."""
         self.__dict__["_created_at"] = value
 
+    @property
+    def delivered_at(self) -> str:
+        """Unix timestamp when the message was delivered."""
+        return cast(str, self.__dict__["_delivered_at"])
+
+    @delivered_at.setter
+    def delivered_at(self, value: str) -> None:
+        """Set delivery timestamp of this message."""
+        self.__dict__["_delivered_at"] = value
+
     @property
     def ttl(self) -> float:
         """Time-to-live for this message."""
@@ -223,6 +233,7 @@ class Message:
             raise ValueError("Either `content` or `error` must be set, but not both.")
 
         metadata.created_at = time.time()  # Set the message creation timestamp
+        metadata.delivered_at = ""
         var_dict = {
             "_metadata": metadata,
             "_content": content,

flwr/server/server_app.py

@@ -48,7 +48,7 @@ SERVER_FN_USAGE_EXAMPLE = """
 
 
 @contextmanager
-def _empty_lifecycle(_: Context) -> Iterator[None]:
+def _empty_lifespan(_: Context) -> Iterator[None]:
     yield
 
 
@@ -112,11 +112,11 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
         self._client_manager = client_manager
         self._server_fn = server_fn
         self._main: Optional[ServerAppCallable] = None
-        self._lifecycle = _empty_lifecycle
+        self._lifespan = _empty_lifespan
 
     def __call__(self, driver: Driver, context: Context) -> None:
         """Execute `ServerApp`."""
-        with self._lifecycle(context):
+        with self._lifespan(context):
             # Compatibility mode
             if not self._main:
                 if self._server_fn:
@@ -186,12 +186,12 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
 
         return main_decorator
 
-    def lifecycle(
+    def lifespan(
         self,
     ) -> Callable[
         [Callable[[Context], Iterator[None]]], Callable[[Context], Iterator[None]]
     ]:
-        """Return a decorator that registers the lifecycle fn with the server app.
+        """Return a decorator that registers the lifespan fn with the server app.
 
         The decorated function should accept a `Context` object and use `yield`
         to define enter and exit behavior.
@@ -200,29 +200,33 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
         --------
         >>> app = ServerApp()
         >>>
-        >>> @app.lifecycle()
-        >>> def lifecycle(context: Context) -> None:
+        >>> @app.lifespan()
+        >>> def lifespan(context: Context) -> None:
+        >>>     # Perform initialization tasks before the app starts
         >>>     print("Initializing ServerApp")
-        >>>     yield
+        >>>
+        >>>     yield  # ServerApp is running
+        >>>
+        >>>     # Perform cleanup tasks after the app stops
         >>>     print("Cleaning up ServerApp")
         """
 
-        def lifecycle_decorator(
-            lifecycle_fn: Callable[[Context], Iterator[None]]
+        def lifespan_decorator(
+            lifespan_fn: Callable[[Context], Iterator[None]]
         ) -> Callable[[Context], Iterator[None]]:
-            """Register the lifecycle fn with the ServerApp object."""
-            warn_preview_feature("ServerApp-register-lifecycle-function")
+            """Register the lifespan fn with the ServerApp object."""
+            warn_preview_feature("ServerApp-register-lifespan-function")
 
             @contextmanager
-            def decorated_lifecycle(context: Context) -> Iterator[None]:
-                # Execute the code before `yield` in lifecycle_fn
+            def decorated_lifespan(context: Context) -> Iterator[None]:
+                # Execute the code before `yield` in lifespan_fn
                 try:
-                    if not isinstance(it := lifecycle_fn(context), Iterator):
+                    if not isinstance(it := lifespan_fn(context), Iterator):
                         raise StopIteration
                     next(it)
                 except StopIteration:
                     raise RuntimeError(
-                        "Lifecycle function should yield at least once."
+                        "lifespan function should yield at least once."
                     ) from None
 
                 try:
@@ -230,21 +234,21 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
                     yield
                 finally:
                     try:
-                        # Execute the code after `yield` in lifecycle_fn
+                        # Execute the code after `yield` in lifespan_fn
                         next(it)
                     except StopIteration:
                         pass
                     else:
-                        raise RuntimeError("Lifecycle function should only yield once.")
+                        raise RuntimeError("lifespan function should only yield once.")
 
             # Register provided function with the ServerApp object
             # Ignore mypy error because of different argument names (`_` vs `context`)
-            self._lifecycle = decorated_lifecycle  # type: ignore
+            self._lifespan = decorated_lifespan  # type: ignore
 
             # Return provided function unmodified
-            return lifecycle_fn
+            return lifespan_fn
 
-        return lifecycle_decorator
+        return lifespan_decorator
 
 
 class LoadServerAppError(Exception):

flwr/server/utils/__init__.py

@@ -16,9 +16,11 @@
 
 
 from .tensorboard import tensorboard as tensorboard
+from .validator import validate_message as validate_message
 from .validator import validate_task_ins_or_res as validate_task_ins_or_res
 
 __all__ = [
     "tensorboard",
+    "validate_message",
     "validate_task_ins_or_res",
 ]

flwr/server/utils/validator.py

@@ -18,6 +18,7 @@
 import time
 from typing import Union
 
+from flwr.common import Message
 from flwr.common.constant import SUPERLINK_NODE_ID
 from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
 
@@ -106,3 +107,75 @@ def validate_task_ins_or_res(tasks_ins_res: Union[TaskIns, TaskRes]) -> list[str
             validation_errors.append("`ancestry` is empty")
 
     return validation_errors
+
+
+# pylint: disable-next=too-many-branches
+def validate_message(message: Message, is_reply_message: bool) -> list[str]:
+    """Validate a Message."""
+    validation_errors = []
+    metadata = message.metadata
+
+    if metadata.message_id != "":
+        validation_errors.append("non-empty `metadata.message_id`")
+
+    # Created/delivered/TTL/Pushed
+    if (
+        metadata.created_at < 1740700800.0
+    ):  # unix timestamp of 28 February 2025 00h:00m:00s UTC
+        validation_errors.append(
+            "`metadata.created_at` must be a float that records the unix timestamp "
+            "in seconds when the message was created."
+        )
+    if metadata.delivered_at != "":
+        validation_errors.append("`metadata.delivered_at` must be an empty str")
+    if metadata.ttl <= 0:
+        validation_errors.append("`metadata.ttl` must be higher than zero")
+
+    # Verify TTL and created_at time
+    current_time = time.time()
+    if metadata.created_at + metadata.ttl <= current_time:
+        validation_errors.append("Message TTL has expired")
+
+    # Source node is set and is not zero
+    if not metadata.src_node_id:
+        validation_errors.append("`metadata.src_node_id` is not set.")
+
+    # Destination node is set and is not zero
+    if not metadata.dst_node_id:
+        validation_errors.append("`metadata.dst_node_id` is not set.")
+
+    # Message type
+    if metadata.message_type == "":
+        validation_errors.append("`metadata.message_type` MUST be set")
+
+    # Content
+    if not message.has_content() != message.has_error():
+        validation_errors.append(
+            "Either message `content` or `error` MUST be set (but not both)"
+        )
+
+    # Link respose to original message
+    if not is_reply_message:
+        if metadata.reply_to_message != "":
+            validation_errors.append("`metadata.reply_to_message` MUST not be set.")
+        if metadata.src_node_id != SUPERLINK_NODE_ID:
+            validation_errors.append(
+                f"`metadata.src_node_id` is not {SUPERLINK_NODE_ID} (SuperLink node ID)"
+            )
+        if metadata.dst_node_id == SUPERLINK_NODE_ID:
+            validation_errors.append(
+                f"`metadata.dst_node_id` is {SUPERLINK_NODE_ID} (SuperLink node ID)"
+            )
+    else:
+        if metadata.reply_to_message == "":
+            validation_errors.append("`metadata.reply_to_message` MUST be set.")
+        if metadata.src_node_id == SUPERLINK_NODE_ID:
+            validation_errors.append(
+                f"`metadata.src_node_id` is {SUPERLINK_NODE_ID} (SuperLink node ID)"
+            )
+        if metadata.dst_node_id != SUPERLINK_NODE_ID:
+            validation_errors.append(
+                f"`metadata.dst_node_id` is not {SUPERLINK_NODE_ID} (SuperLink node ID)"
+            )
+
+    return validation_errors

{flwr_nightly-1.16.0.dev20250301.dist-info → flwr_nightly-1.16.0.dev20250304.dist-info}/METADATA

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

{flwr_nightly-1.16.0.dev20250301.dist-info → flwr_nightly-1.16.0.dev20250304.dist-info}/RECORD

@@ -3,7 +3,7 @@ flwr/cli/__init__.py,sha256=cZJVgozlkC6Ni2Hd_FAIrqefrkCGOV18fikToq-6iLw,720
 flwr/cli/app.py,sha256=UeXrW5gxrUnFViDjAMIxGNZZKwu3a1oAj83v53IWIWM,1382
 flwr/cli/auth_plugin/__init__.py,sha256=FyaoqPzcxlBTFfJ2sBRC5USwQLmAhFr5KuBwfMO4bmo,1052
 flwr/cli/auth_plugin/oidc_cli_plugin.py,sha256=gIhW6Jg9QAo-jL43LYPpw_kn7pdUZZae0s0H8dEgjLM,5384
-flwr/cli/build.py,sha256=4P70i_FnUs0P21aTwjTXtFQSAfY-C04hUDF-2npfJdo,6345
+flwr/cli/build.py,sha256=BbS6yrBz0Q0PkNqaEk_VD261iRMfMmkEuQ3GdJpZW54,6375
 flwr/cli/cli_user_auth_interceptor.py,sha256=aZepPA298s-HjGmkJGMvI_uZe72O5aLC3jri-ilG53o,3126
 flwr/cli/config_utils.py,sha256=LelRR960I36n1IPw7BIu79fKoOh0JePA58kAtoXSTH0,7518
 flwr/cli/constant.py,sha256=g7Ad7o3DJDkJNrWS0T3SSJETWSTkkVJWGpLM8zlbpcY,1289
@@ -74,7 +74,7 @@ flwr/cli/utils.py,sha256=D9XcpxzwkGPNdwX16o0kI-sYnRDMlWYyKNIpz6npRhQ,11236
 flwr/client/__init__.py,sha256=DGDoO0AEAfz-0CUFmLdyUUweAS64-07AOnmDfWUefK4,1192
 flwr/client/app.py,sha256=tNnef5wGVfqMiiGiWzAuULyy1QpvCKukiRmNi_a2cQc,34261
 flwr/client/client.py,sha256=8o58nd9o6ZFcMIaVYPGcV4MSjBG4H0oFgWiv8ZEO3oA,7895
-flwr/client/client_app.py,sha256=WwKvP-22FRP1419oGYZdvRV5Z3JTNDDUse-Z8ikPkZA,14692
+flwr/client/client_app.py,sha256=glgQOWgFB_6NQ3YAzekXJDoy8R5T1JPhOSiFem1-fS8,14847
 flwr/client/clientapp/__init__.py,sha256=kZqChGnTChQ1WGSUkIlW2S5bc0d0mzDubCAmZUGRpEY,800
 flwr/client/clientapp/app.py,sha256=Us5Mw3wvGd_6P1zHOf3TNcRGBBulVZDo3LuZOs17WgM,8963
 flwr/client/clientapp/clientappio_servicer.py,sha256=5L6bjw_j3Mnx9kRFwYwxDNABKurBO5q1jZOWE_X11wQ,8522
@@ -131,7 +131,7 @@ flwr/common/exit/exit_code.py,sha256=PNEnCrZfOILjfDAFu5m-2YWEJBrk97xglq4zCUlqV7E
 flwr/common/exit_handlers.py,sha256=yclujry30954o0lI7vtknTajskPCvK8TXw2V3RdldXU,3174
 flwr/common/grpc.py,sha256=K60AIvIqH0CvkkiqBfw5HoxQfbFOL2DrhKPjbZ8raIE,9786
 flwr/common/logger.py,sha256=Hund1C6bEhMw3GemlzuFK22tXZ27YeHLrFB0b4LP5f8,13041
-flwr/common/message.py,sha256=Zv4ID2BLQsbff0F03DI_MeFoHbSqVZAdDD9NcKYv6Zo,13832
+flwr/common/message.py,sha256=VcGIBkb0te_OIKy22k4oHiOVrx0B2-8S1Gxmq0QLzTg,14210
 flwr/common/object_ref.py,sha256=DXL8NtbN17DSYaR-Zc8WYhaG8rv0_D_cclvP7Sa66So,9134
 flwr/common/parameter.py,sha256=-bFAUayToYDF50FZGrBC1hQYJCQDtB2bbr3ZuVLMtdE,2095
 flwr/common/pyproject.py,sha256=vEAxl800XiJ1JNJDui8vuVV-08msnB6hLt7o95viZl0,1386
@@ -235,7 +235,7 @@ flwr/server/driver/inmemory_driver.py,sha256=7ZtWDDJa8xupPAHNaDdCE2DOIOIYgrffmJM
 flwr/server/history.py,sha256=qSb5_pPTrwofpSYGsZWzMPkl_4uJ4mJFWesxXDrEvDU,5026
 flwr/server/run_serverapp.py,sha256=vIPhvJx0i5sEZO4IKM6ruCXmx4ncat76rh0B4KhdhhM,2446
 flwr/server/server.py,sha256=1ZsFEptmAV-L2vP2etNC9Ed5CLSxpuKzUFkAPQ4l5Xc,17893
-flwr/server/server_app.py,sha256=QtxZKdqP8GUDBIilKRLP7smLjabHPnzS8XhtdqRWbIU,8880
+flwr/server/server_app.py,sha256=Kb0ayKy19awnkslwN9Jx3eBWZJvDeA8VfFBvImmMf_E,9035
 flwr/server/server_config.py,sha256=CZaHVAsMvGLjpWVcLPkiYxgJN4xfIyAiUrCI3fETKY4,1349
 flwr/server/serverapp/__init__.py,sha256=L0K-94UDdTyEZ8LDtYybGIIIv3HW6AhSVjXMUfYJQnQ,800
 flwr/server/serverapp/app.py,sha256=5nFRYYzC2vh0l1fKJofBfKwFam93In4b80wvH9eFfQ8,8651
@@ -303,9 +303,9 @@ flwr/server/superlink/simulation/simulationio_grpc.py,sha256=8aUrZZLdvprKUfLLqFI
 flwr/server/superlink/simulation/simulationio_servicer.py,sha256=J_TmdqM-Bxgp-iPEI3tvCuBpykw1UX0FouMQalEYAF4,6907
 flwr/server/superlink/utils.py,sha256=KVb3K_g2vYfu9TnftcN0ewmev133WZcjuEePMm8d7GE,2137
 flwr/server/typing.py,sha256=5kaRLZuxTEse9A0g7aVna2VhYxU3wTq1f3d3mtw7kXs,1019
-flwr/server/utils/__init__.py,sha256=pltsPHJoXmUIr3utjwwYxu7_ZAGy5u4MVHzv9iA5Un8,908
+flwr/server/utils/__init__.py,sha256=myLB6L0ycQ0rd_nnL1pI-NLdFoOfXcj_z4gIqqj8Ye4,992
 flwr/server/utils/tensorboard.py,sha256=gEBD8w_5uaIfp5aw5RYH66lYZpd_SfkObHQ7eDd9MUk,5466
-flwr/server/utils/validator.py,sha256=BQ56tDrrOOG52q3RVeeCODz-oEBxu4L19wbfkBPdCqw,4419
+flwr/server/utils/validator.py,sha256=UzYFMIyXyORXYRYXbFhOk6q6GDpOE-eIqLhlNFnR__0,7256
 flwr/server/workflow/__init__.py,sha256=SXY0XkwbkezFBxxrFB5hKUtmtAgnYISBkPouR1V71ss,902
 flwr/server/workflow/constant.py,sha256=q4DLdR8Krlxuewq2AQjwTL75hphxE5ODNz4AhViHMXk,1082
 flwr/server/workflow/default_workflows.py,sha256=UMC9JgdomKwxql5G0OV4AeRXWI-bMClaLAOn5OrZMnw,14073
@@ -329,8 +329,8 @@ flwr/superexec/exec_servicer.py,sha256=72AL60LBbWD-OTxTvtPBrnb_M5rccMtU_JAYcEVQV
 flwr/superexec/exec_user_auth_interceptor.py,sha256=YtvcjrD2hMVmZ3y9wHuGI6FwmG_Y__q112t4fFnypy0,3793
 flwr/superexec/executor.py,sha256=_B55WW2TD1fBINpabSSDRenVHXYmvlfhv-k8hJKU4lQ,3115
 flwr/superexec/simulation.py,sha256=WQDon15oqpMopAZnwRZoTICYCfHqtkvFSqiTQ2hLD_g,4088
-flwr_nightly-1.16.0.dev20250301.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.16.0.dev20250301.dist-info/METADATA,sha256=7SD9nmJ4XJXWi7PwV6MkAC_L-4mFriQVvn2823eLLmE,15877
-flwr_nightly-1.16.0.dev20250301.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.16.0.dev20250301.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
-flwr_nightly-1.16.0.dev20250301.dist-info/RECORD,,
+flwr_nightly-1.16.0.dev20250304.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.16.0.dev20250304.dist-info/METADATA,sha256=9UmUVO9D8c2kO1ENirbWqVGKtkre0B99yYfu3kfqLvs,15877
+flwr_nightly-1.16.0.dev20250304.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.16.0.dev20250304.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
+flwr_nightly-1.16.0.dev20250304.dist-info/RECORD,,