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

flwr/server/superlink/linkstate/utils.py

@@ -20,12 +20,21 @@ from os import urandom
 from typing import Optional, Union
 from uuid import UUID, uuid4
 
-from flwr.common import ConfigsRecord, Context, log, now, serde
+from flwr.common import (
+    ConfigsRecord,
+    Context,
+    Error,
+    Message,
+    Metadata,
+    log,
+    now,
+    serde,
+)
 from flwr.common.constant import SUPERLINK_NODE_ID, ErrorCode, Status, SubStatus
 from flwr.common.typing import RunStatus
 
 # pylint: disable=E0611
-from flwr.proto.error_pb2 import Error
+from flwr.proto.error_pb2 import Error as ProtoError
 from flwr.proto.message_pb2 import Context as ProtoContext
 from flwr.proto.node_pb2 import Node
 from flwr.proto.recordset_pb2 import ConfigsRecord as ProtoConfigsRecord
@@ -262,7 +271,7 @@ def create_taskres_for_unavailable_taskins(taskins_id: Union[str, UUID]) -> Task
             ttl=0,
             ancestry=[str(taskins_id)],
             task_type="",  # Unknown message type
-            error=Error(
+            error=ProtoError(
                 code=ErrorCode.MESSAGE_UNAVAILABLE,
                 reason=MESSAGE_UNAVAILABLE_ERROR_REASON,
             ),
@@ -301,7 +310,7 @@ def create_taskres_for_unavailable_taskres(ref_taskins: TaskIns) -> TaskRes:
             ttl=ttl,
             ancestry=[ref_taskins.task_id],
             task_type=ref_taskins.task.task_type,
-            error=Error(
+            error=ProtoError(
                 code=ErrorCode.REPLY_MESSAGE_UNAVAILABLE,
                 reason=REPLY_MESSAGE_UNAVAILABLE_ERROR_REASON,
             ),
@@ -309,11 +318,64 @@ def create_taskres_for_unavailable_taskres(ref_taskins: TaskIns) -> TaskRes:
     )
 
 
+def create_message_error_unavailable_res_message(ins_metadata: Metadata) -> Message:
+    """Generate an error Message that the SuperLink returns carrying the specified
+    error."""
+    current_time = now().timestamp()
+    ttl = max(ins_metadata.ttl - (current_time - ins_metadata.created_at), 0)
+    metadata = Metadata(
+        run_id=ins_metadata.run_id,
+        message_id=str(uuid4()),
+        src_node_id=SUPERLINK_NODE_ID,
+        dst_node_id=SUPERLINK_NODE_ID,
+        reply_to_message=ins_metadata.message_id,
+        group_id=ins_metadata.group_id,
+        message_type=ins_metadata.message_type,
+        ttl=ttl,
+    )
+
+    return Message(
+        metadata=metadata,
+        error=Error(
+            code=ErrorCode.REPLY_MESSAGE_UNAVAILABLE,
+            reason=REPLY_MESSAGE_UNAVAILABLE_ERROR_REASON,
+        ),
+    )
+
+
+def create_message_error_unavailable_ins_message(reply_to_message: UUID) -> Message:
+    """Error to indicate that the enquired Message had expired before reply arrived or
+    that it isn't found."""
+    metadata = Metadata(
+        run_id=0,  # Unknown
+        message_id=str(uuid4()),
+        src_node_id=SUPERLINK_NODE_ID,
+        dst_node_id=SUPERLINK_NODE_ID,
+        reply_to_message=str(reply_to_message),
+        group_id="",  # Unknown
+        message_type="",  # Unknown
+        ttl=0,
+    )
+
+    return Message(
+        metadata=metadata,
+        error=Error(
+            code=ErrorCode.MESSAGE_UNAVAILABLE,
+            reason=MESSAGE_UNAVAILABLE_ERROR_REASON,
+        ),
+    )
+
+
 def has_expired(task_ins_or_res: Union[TaskIns, TaskRes], current_time: float) -> bool:
     """Check if the TaskIns/TaskRes has expired."""
     return task_ins_or_res.task.ttl + task_ins_or_res.task.created_at < current_time
 
 
+def message_ttl_has_expired(message_metadata: Metadata, current_time: float) -> bool:
+    """Check if the Message has expired."""
+    return message_metadata.ttl + message_metadata.created_at < current_time
+
+
 def verify_taskins_ids(
     inquired_taskins_ids: set[UUID],
     found_taskins_dict: dict[UUID, TaskIns],
@@ -353,6 +415,48 @@ def verify_taskins_ids(
     return ret_dict
 
 
+def verify_message_ids(
+    inquired_message_ids: set[UUID],
+    found_message_ins_dict: dict[UUID, Message],
+    current_time: Optional[float] = None,
+    update_set: bool = True,
+) -> dict[UUID, Message]:
+    """Verify found Messages and generate error Messages for invalid ones.
+
+    Parameters
+    ----------
+    inquired_message_ids : set[UUID]
+        Set of Message IDs for which to generate error Message if invalid.
+    found_message_ins_dict : dict[UUID, Message]
+        Dictionary containing all found Message indexed by their IDs.
+    current_time : Optional[float] (default: None)
+        The current time to check for expiration. If set to `None`, the current time
+        will automatically be set to the current timestamp using `now().timestamp()`.
+    update_set : bool (default: True)
+        If True, the `inquired_message_ids` will be updated to remove invalid ones,
+        by default True.
+
+    Returns
+    -------
+    dict[UUID, Message]
+        A dictionary of error Message indexed by the corresponding ID of the message
+        they are a reply of.
+    """
+    ret_dict = {}
+    current = current_time if current_time else now().timestamp()
+    for message_id in list(inquired_message_ids):
+        # Generate error message if the inquired message doesn't exist or has expired
+        message_ins = found_message_ins_dict.get(message_id)
+        if message_ins is None or message_ttl_has_expired(
+            message_ins.metadata, current
+        ):
+            if update_set:
+                inquired_message_ids.remove(message_id)
+            message_res = create_message_error_unavailable_ins_message(message_id)
+            ret_dict[message_id] = message_res
+    return ret_dict
+
+
 def verify_found_taskres(
     inquired_taskins_ids: set[UUID],
     found_taskins_dict: dict[UUID, TaskIns],
@@ -397,3 +501,48 @@ def verify_found_taskres(
             taskres.task.delivered_at = now().isoformat()
         ret_dict[taskins_id] = taskres
     return ret_dict
+
+
+def verify_found_message_replies(
+    inquired_message_ids: set[UUID],
+    found_message_ins_dict: dict[UUID, Message],
+    found_message_res_list: list[Message],
+    current_time: Optional[float] = None,
+    update_set: bool = True,
+) -> dict[UUID, Message]:
+    """Verify found Message replies and generate error Message for invalid ones.
+
+    Parameters
+    ----------
+    inquired_message_ids : set[UUID]
+        Set of Message IDs for which to generate error Message if invalid.
+    found_message_ins_dict : dict[UUID, Message]
+        Dictionary containing all found instruction Messages indexed by their IDs.
+    found_message_res_list : dict[Message, Message]
+        List of found Message to be verified.
+    current_time : Optional[float] (default: None)
+        The current time to check for expiration. If set to `None`, the current time
+        will automatically be set to the current timestamp using `now().timestamp()`.
+    update_set : bool (default: True)
+        If True, the `inquired_message_ids` will be updated to remove ones
+        that have a reply Message, by default True.
+
+    Returns
+    -------
+    dict[UUID, Message]
+        A dictionary of Message indexed by the corresponding Message ID.
+    """
+    ret_dict: dict[UUID, Message] = {}
+    current = current_time if current_time else now().timestamp()
+    for message_res in found_message_res_list:
+        message_ins_id = UUID(message_res.metadata.reply_to_message)
+        if update_set:
+            inquired_message_ids.remove(message_ins_id)
+        # Check if the reply Message has expired
+        if message_ttl_has_expired(message_res.metadata, current):
+            # No need to insert the error Message
+            message_res = create_message_error_unavailable_res_message(
+                found_message_ins_dict[message_ins_id].metadata
+            )
+        ret_dict[message_ins_id] = message_res
+    return ret_dict

flwr/server/workflow/default_workflows.py

@@ -64,10 +64,13 @@ class DefaultWorkflow:
             )
 
         # Start the thread updating nodes
-        thread, f_stop = start_update_client_manager_thread(
+        thread, f_stop, c_done = start_update_client_manager_thread(
             driver, context.client_manager
         )
 
+        # Wait until the node registration done
+        c_done.wait()
+
         # Initialize parameters
         log(INFO, "[INIT]")
         default_init_params_workflow(driver, context)

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

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

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

@@ -223,15 +223,15 @@ flwr/server/app.py,sha256=a_3hM-RktaPp3QTKDlBuHATB9oS2deGShZGEtmhlnX0,31005
 flwr/server/client_manager.py,sha256=7Ese0tgrH-i-ms363feYZJKwB8gWnXSmg_hYF2Bju4U,6227
 flwr/server/client_proxy.py,sha256=4G-oTwhb45sfWLx2uZdcXD98IZwdTS6F88xe3akCdUg,2399
 flwr/server/compat/__init__.py,sha256=VxnJtJyOjNFQXMNi9hIuzNlZM5n0Hj1p3aq_Pm2udw4,892
-flwr/server/compat/app.py,sha256=5vkHHm_h-4cMthvWD1GJo1ZW3eihytjGgvsgfXUK9gA,3298
-flwr/server/compat/app_utils.py,sha256=Kggcoi5vQCBQmYvXBBUxhtDUcIwFiQyfphkHp2K1WxM,3546
+flwr/server/compat/app.py,sha256=Y0xAqXLn20e6XKGb2nHdeUYdCj_Dux-SyFCc-5ivhqk,3369
+flwr/server/compat/app_utils.py,sha256=568PfvPME8KHjX-L5GB2rYQa_Wy8iUBGs22KJqn8Xk0,3824
 flwr/server/compat/driver_client_proxy.py,sha256=jMmrfqSm4-qW0jOCTpHhN9Kw0ohfMwsyKU9buBzrfG0,4958
 flwr/server/compat/legacy_context.py,sha256=wBzBcfV6YO6IQGriM_FdJ5XZfiBBEEJdS_OdAiF47dY,1804
 flwr/server/criterion.py,sha256=ypbAexbztzGUxNen9RCHF91QeqiEQix4t4Ih3E-42MM,1061
 flwr/server/driver/__init__.py,sha256=bikRv6CjTwSvYh7tf10gziU5o2YotOWhhftz2tr3KDc,886
-flwr/server/driver/driver.py,sha256=u_fMfqLYTroTafGCNwKPHI4lttRL-Z5CqeT3_FHSq-Q,5701
-flwr/server/driver/grpc_driver.py,sha256=3mSws0l83fWD4aq9-MmHFnIfyf4REoAXUkWfyJDHros,9864
-flwr/server/driver/inmemory_driver.py,sha256=7ZtWDDJa8xupPAHNaDdCE2DOIOIYgrffmJMdKjs3wdA,6616
+flwr/server/driver/driver.py,sha256=X072eFWl8Kx-aZbahTkpAc1wwoojr8A4uO2yozwwSbE,5705
+flwr/server/driver/grpc_driver.py,sha256=CLa9pxN2yf1lIdxkFHVVWrs_9EFHSNUU9SJluNIQwKM,9868
+flwr/server/driver/inmemory_driver.py,sha256=ISdouBg6BvoUCMpUNykS2b6ncnCl_ZXcDGKLtpJUMLE,6614
 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
@@ -293,11 +293,11 @@ flwr/server/superlink/fleet/vce/backend/backend.py,sha256=LBAQxnbfPAphVOVIvYMj0Q
 flwr/server/superlink/fleet/vce/backend/raybackend.py,sha256=jsUkFEVQTnrucK1jNQ_cUM8YwL7W4MQNA1GAf8ibRdg,7156
 flwr/server/superlink/fleet/vce/vce_api.py,sha256=iXNSAJ7f8Sg1hOrVuRTGRkLdSWeFIpNWbusoOTc4I8I,12971
 flwr/server/superlink/linkstate/__init__.py,sha256=v-2JyJlCB3qyhMNwMjmcNVOq4rkooqFU0LHH8Zo1jls,1064
-flwr/server/superlink/linkstate/in_memory_linkstate.py,sha256=4ahMj7TLe-GO2ctyeZ2BBRkviGv27s6x1NS_ETRJHP8,20514
-flwr/server/superlink/linkstate/linkstate.py,sha256=LWA5zRwN829GDAeSo5kmkzsMu0SkXa9qg4aG_0QN0uk,12159
+flwr/server/superlink/linkstate/in_memory_linkstate.py,sha256=tw98opVU78Q9jfIORLRhwSATiMTfDa5THlcegwXSzWM,29377
+flwr/server/superlink/linkstate/linkstate.py,sha256=Yi76bAq-OJmDjl1HAQInrPIU0m9dKMiYugNJXKpKyuw,15843
 flwr/server/superlink/linkstate/linkstate_factory.py,sha256=ISSMjDlwuN7swxjOeYlTNpI_kuZ8PGkMcJnf1dbhUSE,2069
-flwr/server/superlink/linkstate/sqlite_linkstate.py,sha256=YEXk_3avSF9T9sk5xxYwNeljLZ-qzg1zIAJOlkkmsX0,40146
-flwr/server/superlink/linkstate/utils.py,sha256=EpRehwI4NeEW3oINICPWP9STK49N0aszd5s5jtle7DQ,13602
+flwr/server/superlink/linkstate/sqlite_linkstate.py,sha256=c33n0iOZiQwNd07KfPkQbKZ7cSEX5LGg1crlUHd1ZD0,55309
+flwr/server/superlink/linkstate/utils.py,sha256=vKJYvzP_MbYD2Qo8ly6Qibyb4SI92G_4sB60ubELj64,19048
 flwr/server/superlink/simulation/__init__.py,sha256=mg-oapC9dkzEfjXPQFior5lpWj4g9kwbLovptyYM_g0,718
 flwr/server/superlink/simulation/simulationio_grpc.py,sha256=8aUrZZLdvprKUfLLqFID4aItus9beU6m1qLQYIPB7k0,2224
 flwr/server/superlink/simulation/simulationio_servicer.py,sha256=J_TmdqM-Bxgp-iPEI3tvCuBpykw1UX0FouMQalEYAF4,6907
@@ -308,7 +308,7 @@ flwr/server/utils/tensorboard.py,sha256=gEBD8w_5uaIfp5aw5RYH66lYZpd_SfkObHQ7eDd9
 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
+flwr/server/workflow/default_workflows.py,sha256=RwDX7hXOI1-q4FH9A0onHvadqa5yXTzslpmShPpXodk,14152
 flwr/server/workflow/secure_aggregation/__init__.py,sha256=3XlgDOjD_hcukTGl6Bc1B-8M_dPlVSJuTbvXIbiO-Ic,880
 flwr/server/workflow/secure_aggregation/secagg_workflow.py,sha256=l2IdMdJjs1bgHs5vQgLSOVzar7v2oxUn46oCrnVE1rM,5839
 flwr/server/workflow/secure_aggregation/secaggplus_workflow.py,sha256=rfn2etO1nb7u-1oRl-H9q3enJZz3shMINZaBB7rPsC4,29671
@@ -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.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,,
+flwr_nightly-1.16.0.dev20250306.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.16.0.dev20250306.dist-info/METADATA,sha256=QeUbeAdWXzaQVzTbWnix4C4edvDHIKVh_CxkJN7dTo0,15877
+flwr_nightly-1.16.0.dev20250306.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.16.0.dev20250306.dist-info/entry_points.txt,sha256=JlNxX3qhaV18_2yj5a3kJW1ESxm31cal9iS_N_pf1Rk,538
+flwr_nightly-1.16.0.dev20250306.dist-info/RECORD,,