flwr-nightly 1.15.0.dev20250119__tar.gz → 1.15.0.dev20250121__tar.gz

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/PKG-INFO

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

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/pyproject.toml

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

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/common/auth_plugin/auth_plugin.py

@@ -38,6 +38,7 @@ class ExecAuthPlugin(ABC):
     def __init__(
         self,
         user_auth_config_path: Path,
+        verify_tls_cert: bool,
     ):
         """Abstract constructor."""
 

flwr_nightly-1.15.0.dev20250121/src/py/flwr/proto/serverappio_pb2.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: flwr/proto/serverappio.proto
+# Protobuf Python Version: 5.29.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    29,
+    0,
+    '',
+    'flwr/proto/serverappio.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import log_pb2 as flwr_dot_proto_dot_log__pb2
+from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
+from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
+from flwr.proto import task_pb2 as flwr_dot_proto_dot_task__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/serverappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/log.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"P\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"V\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"T\n\x16PushInsMessagesRequest\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\".\n\x17PushInsMessagesResponse\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\"=\n\x16PullResMessagesRequest\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\"E\n\x17PullResMessagesResponse\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\"\x1c\n\x1aPullServerAppInputsRequest\"\x7f\n\x1bPullServerAppInputsResponse\x12$\n\x07\x63ontext\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Fab\"S\n\x1bPushServerAppOutputsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\"\x1e\n\x1cPushServerAppOutputsResponse2\xd5\x08\n\x0bServerAppIo\x12J\n\tCreateRun\x12\x1c.flwr.proto.CreateRunRequest\x1a\x1d.flwr.proto.CreateRunResponse\"\x00\x12G\n\x08GetNodes\x12\x1b.flwr.proto.GetNodesRequest\x1a\x1c.flwr.proto.GetNodesResponse\"\x00\x12P\n\x0bPushTaskIns\x12\x1e.flwr.proto.PushTaskInsRequest\x1a\x1f.flwr.proto.PushTaskInsResponse\"\x00\x12Y\n\x0cPushMessages\x12\".flwr.proto.PushInsMessagesRequest\x1a#.flwr.proto.PushInsMessagesResponse\"\x00\x12P\n\x0bPullTaskRes\x12\x1e.flwr.proto.PullTaskResRequest\x1a\x1f.flwr.proto.PullTaskResResponse\"\x00\x12Y\n\x0cPullMessages\x12\".flwr.proto.PullResMessagesRequest\x1a#.flwr.proto.PullResMessagesResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x12h\n\x13PullServerAppInputs\x12&.flwr.proto.PullServerAppInputsRequest\x1a\'.flwr.proto.PullServerAppInputsResponse\"\x00\x12k\n\x14PushServerAppOutputs\x12\'.flwr.proto.PushServerAppOutputsRequest\x1a(.flwr.proto.PushServerAppOutputsResponse\"\x00\x12\\\n\x0fUpdateRunStatus\x12\".flwr.proto.UpdateRunStatusRequest\x1a#.flwr.proto.UpdateRunStatusResponse\"\x00\x12S\n\x0cGetRunStatus\x12\x1f.flwr.proto.GetRunStatusRequest\x1a .flwr.proto.GetRunStatusResponse\"\x00\x12G\n\x08PushLogs\x12\x1b.flwr.proto.PushLogsRequest\x1a\x1c.flwr.proto.PushLogsResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.serverappio_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_GETNODESREQUEST']._serialized_start=182
+  _globals['_GETNODESREQUEST']._serialized_end=215
+  _globals['_GETNODESRESPONSE']._serialized_start=217
+  _globals['_GETNODESRESPONSE']._serialized_end=268
+  _globals['_PUSHTASKINSREQUEST']._serialized_start=270
+  _globals['_PUSHTASKINSREQUEST']._serialized_end=350
+  _globals['_PUSHTASKINSRESPONSE']._serialized_start=352
+  _globals['_PUSHTASKINSRESPONSE']._serialized_end=391
+  _globals['_PULLTASKRESREQUEST']._serialized_start=393
+  _globals['_PULLTASKRESREQUEST']._serialized_end=479
+  _globals['_PULLTASKRESRESPONSE']._serialized_start=481
+  _globals['_PULLTASKRESRESPONSE']._serialized_end=546
+  _globals['_PUSHINSMESSAGESREQUEST']._serialized_start=548
+  _globals['_PUSHINSMESSAGESREQUEST']._serialized_end=632
+  _globals['_PUSHINSMESSAGESRESPONSE']._serialized_start=634
+  _globals['_PUSHINSMESSAGESRESPONSE']._serialized_end=680
+  _globals['_PULLRESMESSAGESREQUEST']._serialized_start=682
+  _globals['_PULLRESMESSAGESREQUEST']._serialized_end=743
+  _globals['_PULLRESMESSAGESRESPONSE']._serialized_start=745
+  _globals['_PULLRESMESSAGESRESPONSE']._serialized_end=814
+  _globals['_PULLSERVERAPPINPUTSREQUEST']._serialized_start=816
+  _globals['_PULLSERVERAPPINPUTSREQUEST']._serialized_end=844
+  _globals['_PULLSERVERAPPINPUTSRESPONSE']._serialized_start=846
+  _globals['_PULLSERVERAPPINPUTSRESPONSE']._serialized_end=973
+  _globals['_PUSHSERVERAPPOUTPUTSREQUEST']._serialized_start=975
+  _globals['_PUSHSERVERAPPOUTPUTSREQUEST']._serialized_end=1058
+  _globals['_PUSHSERVERAPPOUTPUTSRESPONSE']._serialized_start=1060
+  _globals['_PUSHSERVERAPPOUTPUTSRESPONSE']._serialized_end=1090
+  _globals['_SERVERAPPIO']._serialized_start=1093
+  _globals['_SERVERAPPIO']._serialized_end=2202
+# @@protoc_insertion_point(module_scope)

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/proto/serverappio_pb2.pyi

@@ -101,6 +101,62 @@ class PullTaskResResponse(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["task_res_list",b"task_res_list"]) -> None: ...
 global___PullTaskResResponse = PullTaskResResponse
 
+class PushInsMessagesRequest(google.protobuf.message.Message):
+    """PushMessages messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGES_LIST_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    @property
+    def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        messages_list: typing.Optional[typing.Iterable[flwr.proto.message_pb2.Message]] = ...,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list","run_id",b"run_id"]) -> None: ...
+global___PushInsMessagesRequest = PushInsMessagesRequest
+
+class PushInsMessagesResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGE_IDS_FIELD_NUMBER: builtins.int
+    @property
+    def message_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
+    def __init__(self,
+        *,
+        message_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_ids",b"message_ids"]) -> None: ...
+global___PushInsMessagesResponse = PushInsMessagesResponse
+
+class PullResMessagesRequest(google.protobuf.message.Message):
+    """PullMessages messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGE_IDS_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    @property
+    def message_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        message_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_ids",b"message_ids","run_id",b"run_id"]) -> None: ...
+global___PullResMessagesRequest = PullResMessagesRequest
+
+class PullResMessagesResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGES_LIST_FIELD_NUMBER: builtins.int
+    @property
+    def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
+    def __init__(self,
+        *,
+        messages_list: typing.Optional[typing.Iterable[flwr.proto.message_pb2.Message]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list"]) -> None: ...
+global___PullResMessagesResponse = PullResMessagesResponse
+
 class PullServerAppInputsRequest(google.protobuf.message.Message):
     """PullServerAppInputs messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/proto/serverappio_pb2_grpc.py

@@ -52,11 +52,21 @@ class ServerAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.FromString,
                 _registered_method=True)
+        self.PushMessages = channel.unary_unary(
+                '/flwr.proto.ServerAppIo/PushMessages',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesResponse.FromString,
+                _registered_method=True)
         self.PullTaskRes = channel.unary_unary(
                 '/flwr.proto.ServerAppIo/PullTaskRes',
                 request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.FromString,
                 _registered_method=True)
+        self.PullMessages = channel.unary_unary(
+                '/flwr.proto.ServerAppIo/PullMessages',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullResMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullResMessagesResponse.FromString,
+                _registered_method=True)
         self.GetRun = channel.unary_unary(
                 '/flwr.proto.ServerAppIo/GetRun',
                 request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
@@ -118,6 +128,12 @@ class ServerAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def PushMessages(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def PullTaskRes(self, request, context):
         """Get task results
         """
@@ -125,6 +141,12 @@ class ServerAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def PullMessages(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def GetRun(self, request, context):
         """Get run details
         """
@@ -192,11 +214,21 @@ def add_ServerAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.SerializeToString,
             ),
+            'PushMessages': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushMessages,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesResponse.SerializeToString,
+            ),
             'PullTaskRes': grpc.unary_unary_rpc_method_handler(
                     servicer.PullTaskRes,
                     request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.SerializeToString,
             ),
+            'PullMessages': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullMessages,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullResMessagesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PullResMessagesResponse.SerializeToString,
+            ),
             'GetRun': grpc.unary_unary_rpc_method_handler(
                     servicer.GetRun,
                     request_deserializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.FromString,
@@ -324,6 +356,33 @@ class ServerAppIo(object):
             metadata,
             _registered_method=True)
 
+    @staticmethod
+    def PushMessages(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.ServerAppIo/PushMessages',
+            flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PushInsMessagesResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
     @staticmethod
     def PullTaskRes(request,
             target,
@@ -351,6 +410,33 @@ class ServerAppIo(object):
             metadata,
             _registered_method=True)
 
+    @staticmethod
+    def PullMessages(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.ServerAppIo/PullMessages',
+            flwr_dot_proto_dot_serverappio__pb2.PullResMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PullResMessagesResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
     @staticmethod
     def GetRun(request,
             target,

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/proto/serverappio_pb2_grpc.pyi

@@ -26,11 +26,19 @@ class ServerAppIoStub:
         flwr.proto.serverappio_pb2.PushTaskInsResponse]
     """Create one or more tasks"""
 
+    PushMessages: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.serverappio_pb2.PushInsMessagesRequest,
+        flwr.proto.serverappio_pb2.PushInsMessagesResponse]
+
     PullTaskRes: grpc.UnaryUnaryMultiCallable[
         flwr.proto.serverappio_pb2.PullTaskResRequest,
         flwr.proto.serverappio_pb2.PullTaskResResponse]
     """Get task results"""
 
+    PullMessages: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.serverappio_pb2.PullResMessagesRequest,
+        flwr.proto.serverappio_pb2.PullResMessagesResponse]
+
     GetRun: grpc.UnaryUnaryMultiCallable[
         flwr.proto.run_pb2.GetRunRequest,
         flwr.proto.run_pb2.GetRunResponse]
@@ -92,6 +100,12 @@ class ServerAppIoServicer(metaclass=abc.ABCMeta):
         """Create one or more tasks"""
         pass
 
+    @abc.abstractmethod
+    def PushMessages(self,
+        request: flwr.proto.serverappio_pb2.PushInsMessagesRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.serverappio_pb2.PushInsMessagesResponse: ...
+
     @abc.abstractmethod
     def PullTaskRes(self,
         request: flwr.proto.serverappio_pb2.PullTaskResRequest,
@@ -100,6 +114,12 @@ class ServerAppIoServicer(metaclass=abc.ABCMeta):
         """Get task results"""
         pass
 
+    @abc.abstractmethod
+    def PullMessages(self,
+        request: flwr.proto.serverappio_pb2.PullResMessagesRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.serverappio_pb2.PullResMessagesResponse: ...
+
     @abc.abstractmethod
     def GetRun(self,
         request: flwr.proto.run_pb2.GetRunRequest,

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/server/app.py

@@ -228,6 +228,13 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
         "enabled" if certificates is not None else "disabled",
     )
 
+    # Graceful shutdown
+    register_exit_handlers(
+        event_type=EventType.START_SERVER_LEAVE,
+        exit_message="Flower server terminated gracefully.",
+        grpc_servers=[grpc_server],
+    )
+
     # Start training
     hist = run_fl(
         server=initialized_server,
@@ -265,10 +272,14 @@ def run_superlink() -> None:
     # Obtain certificates
     certificates = try_obtain_server_certificates(args, args.fleet_api_type)
 
+    # Disable the user auth TLS check if args.disable_oidc_tls_cert_verification is
+    # provided
+    verify_tls_cert = not getattr(args, "disable_oidc_tls_cert_verification", None)
+
     auth_plugin: Optional[ExecAuthPlugin] = None
     # Load the auth plugin if the args.user_auth_config is provided
     if cfg_path := getattr(args, "user_auth_config", None):
-        auth_plugin = _try_obtain_exec_auth_plugin(Path(cfg_path))
+        auth_plugin = _try_obtain_exec_auth_plugin(Path(cfg_path), verify_tls_cert)
 
     # Initialize StateFactory
     state_factory = LinkStateFactory(args.database)
@@ -619,7 +630,9 @@ def _try_setup_node_authentication(
         )
 
 
-def _try_obtain_exec_auth_plugin(config_path: Path) -> Optional[ExecAuthPlugin]:
+def _try_obtain_exec_auth_plugin(
+    config_path: Path, verify_tls_cert: bool
+) -> Optional[ExecAuthPlugin]:
     # Load YAML file
     with config_path.open("r", encoding="utf-8") as file:
         config: dict[str, Any] = yaml.safe_load(file)
@@ -632,7 +645,9 @@ def _try_obtain_exec_auth_plugin(config_path: Path) -> Optional[ExecAuthPlugin]:
     try:
         all_plugins: dict[str, type[ExecAuthPlugin]] = get_exec_auth_plugins()
         auth_plugin_class = all_plugins[auth_type]
-        return auth_plugin_class(user_auth_config_path=config_path)
+        return auth_plugin_class(
+            user_auth_config_path=config_path, verify_tls_cert=verify_tls_cert
+        )
     except KeyError:
         if auth_type != "":
             sys.exit(

{flwr_nightly-1.15.0.dev20250119 → flwr_nightly-1.15.0.dev20250121}/src/py/flwr/server/superlink/driver/serverappio_servicer.py

@@ -16,14 +16,13 @@
 
 
 import threading
-import time
 from logging import DEBUG, INFO
 from typing import Optional
 from uuid import UUID
 
 import grpc
 
-from flwr.common import ConfigsRecord
+from flwr.common import ConfigsRecord, now
 from flwr.common.constant import Status
 from flwr.common.logger import log
 from flwr.common.serde import (
@@ -31,6 +30,10 @@ from flwr.common.serde import (
     context_to_proto,
     fab_from_proto,
     fab_to_proto,
+    message_from_proto,
+    message_from_taskres,
+    message_to_proto,
+    message_to_taskins,
     run_status_from_proto,
     run_status_to_proto,
     run_to_proto,
@@ -57,10 +60,14 @@ from flwr.proto.run_pb2 import (  # pylint: disable=E0611
 from flwr.proto.serverappio_pb2 import (  # pylint: disable=E0611
     GetNodesRequest,
     GetNodesResponse,
+    PullResMessagesRequest,
+    PullResMessagesResponse,
     PullServerAppInputsRequest,
     PullServerAppInputsResponse,
     PullTaskResRequest,
     PullTaskResResponse,
+    PushInsMessagesRequest,
+    PushInsMessagesResponse,
     PushServerAppOutputsRequest,
     PushServerAppOutputsResponse,
     PushTaskInsRequest,
@@ -149,7 +156,7 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         )
 
         # Set pushed_at (timestamp in seconds)
-        pushed_at = time.time()
+        pushed_at = now().timestamp()
         for task_ins in request.task_ins_list:
             task_ins.task.pushed_at = pushed_at
 
@@ -182,6 +189,59 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             task_ids=[str(task_id) if task_id else "" for task_id in task_ids]
         )
 
+    def PushMessages(
+        self, request: PushInsMessagesRequest, context: grpc.ServicerContext
+    ) -> PushInsMessagesResponse:
+        """Push a set of Messages."""
+        log(DEBUG, "ServerAppIoServicer.PushMessages")
+
+        # Init state
+        state: LinkState = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_if(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+            context,
+        )
+
+        # Set pushed_at (timestamp in seconds)
+        pushed_at = now().timestamp()
+
+        # Validate request and insert in State
+        _raise_if(
+            validation_error=len(request.messages_list) == 0,
+            request_name="PushMessages",
+            detail="`messages_list` must not be empty",
+        )
+        message_ids: list[Optional[UUID]] = []
+        while request.messages_list:
+            message_proto = request.messages_list.pop(0)
+            message = message_from_proto(message_proto=message_proto)
+            task_ins = message_to_taskins(message=message)
+            task_ins.task.pushed_at = pushed_at
+            validation_errors = validate_task_ins_or_res(task_ins)
+            _raise_if(
+                validation_error=bool(validation_errors),
+                request_name="PushMessages",
+                detail=", ".join(validation_errors),
+            )
+            _raise_if(
+                validation_error=request.run_id != task_ins.run_id,
+                request_name="PushMessages",
+                detail="`task_ins` has mismatched `run_id`",
+            )
+            # Store
+            message_id: Optional[UUID] = state.store_task_ins(task_ins=task_ins)
+            message_ids.append(message_id)
+
+        return PushInsMessagesResponse(
+            message_ids=[
+                str(message_id) if message_id else "" for message_id in message_ids
+            ]
+        )
+
     def PullTaskRes(
         self, request: PullTaskResRequest, context: grpc.ServicerContext
     ) -> PullTaskResResponse:
@@ -221,6 +281,52 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
 
         return PullTaskResResponse(task_res_list=task_res_list)
 
+    def PullMessages(
+        self, request: PullResMessagesRequest, context: grpc.ServicerContext
+    ) -> PullResMessagesResponse:
+        """Pull a set of Messages."""
+        log(DEBUG, "ServerAppIoServicer.PullMessages")
+
+        # Init state
+        state: LinkState = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_if(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+            context,
+        )
+
+        # Convert each task_id str to UUID
+        message_ids: set[UUID] = {
+            UUID(message_id) for message_id in request.message_ids
+        }
+
+        # Read from state
+        task_res_list: list[TaskRes] = state.get_task_res(task_ids=message_ids)
+
+        # Convert to Messages
+        messages_list = []
+        while task_res_list:
+            task_res = task_res_list.pop(0)
+            _raise_if(
+                validation_error=request.run_id != task_res.run_id,
+                request_name="PullMessages",
+                detail="`task_res` has mismatched `run_id`",
+            )
+            message = message_from_taskres(taskres=task_res)
+            messages_list.append(message_to_proto(message))
+
+        # Delete the TaskIns/TaskRes pairs if TaskRes is found
+        task_ins_ids_to_delete = {
+            UUID(task_res.task.ancestry[0]) for task_res in task_res_list
+        }
+
+        state.delete_tasks(task_ins_ids=task_ins_ids_to_delete)
+
+        return PullResMessagesResponse(messages_list=messages_list)
+
     def GetRun(
         self, request: GetRunRequest, context: grpc.ServicerContext
     ) -> GetRunResponse:

flwr_nightly-1.15.0.dev20250119/src/py/flwr/proto/serverappio_pb2.py

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
-# source: flwr/proto/serverappio.proto
-# Protobuf Python Version: 5.29.0
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
-    _runtime_version.Domain.PUBLIC,
-    5,
-    29,
-    0,
-    '',
-    'flwr/proto/serverappio.proto'
-)
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from flwr.proto import log_pb2 as flwr_dot_proto_dot_log__pb2
-from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
-from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
-from flwr.proto import task_pb2 as flwr_dot_proto_dot_task__pb2
-from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
-from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/serverappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/log.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"P\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"V\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"\x1c\n\x1aPullServerAppInputsRequest\"\x7f\n\x1bPullServerAppInputsResponse\x12$\n\x07\x63ontext\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Fab\"S\n\x1bPushServerAppOutputsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\"\x1e\n\x1cPushServerAppOutputsResponse2\x9f\x07\n\x0bServerAppIo\x12J\n\tCreateRun\x12\x1c.flwr.proto.CreateRunRequest\x1a\x1d.flwr.proto.CreateRunResponse\"\x00\x12G\n\x08GetNodes\x12\x1b.flwr.proto.GetNodesRequest\x1a\x1c.flwr.proto.GetNodesResponse\"\x00\x12P\n\x0bPushTaskIns\x12\x1e.flwr.proto.PushTaskInsRequest\x1a\x1f.flwr.proto.PushTaskInsResponse\"\x00\x12P\n\x0bPullTaskRes\x12\x1e.flwr.proto.PullTaskResRequest\x1a\x1f.flwr.proto.PullTaskResResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\x00\x12h\n\x13PullServerAppInputs\x12&.flwr.proto.PullServerAppInputsRequest\x1a\'.flwr.proto.PullServerAppInputsResponse\"\x00\x12k\n\x14PushServerAppOutputs\x12\'.flwr.proto.PushServerAppOutputsRequest\x1a(.flwr.proto.PushServerAppOutputsResponse\"\x00\x12\\\n\x0fUpdateRunStatus\x12\".flwr.proto.UpdateRunStatusRequest\x1a#.flwr.proto.UpdateRunStatusResponse\"\x00\x12S\n\x0cGetRunStatus\x12\x1f.flwr.proto.GetRunStatusRequest\x1a .flwr.proto.GetRunStatusResponse\"\x00\x12G\n\x08PushLogs\x12\x1b.flwr.proto.PushLogsRequest\x1a\x1c.flwr.proto.PushLogsResponse\"\x00\x62\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.serverappio_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_GETNODESREQUEST']._serialized_start=182
-  _globals['_GETNODESREQUEST']._serialized_end=215
-  _globals['_GETNODESRESPONSE']._serialized_start=217
-  _globals['_GETNODESRESPONSE']._serialized_end=268
-  _globals['_PUSHTASKINSREQUEST']._serialized_start=270
-  _globals['_PUSHTASKINSREQUEST']._serialized_end=350
-  _globals['_PUSHTASKINSRESPONSE']._serialized_start=352
-  _globals['_PUSHTASKINSRESPONSE']._serialized_end=391
-  _globals['_PULLTASKRESREQUEST']._serialized_start=393
-  _globals['_PULLTASKRESREQUEST']._serialized_end=479
-  _globals['_PULLTASKRESRESPONSE']._serialized_start=481
-  _globals['_PULLTASKRESRESPONSE']._serialized_end=546
-  _globals['_PULLSERVERAPPINPUTSREQUEST']._serialized_start=548
-  _globals['_PULLSERVERAPPINPUTSREQUEST']._serialized_end=576
-  _globals['_PULLSERVERAPPINPUTSRESPONSE']._serialized_start=578
-  _globals['_PULLSERVERAPPINPUTSRESPONSE']._serialized_end=705
-  _globals['_PUSHSERVERAPPOUTPUTSREQUEST']._serialized_start=707
-  _globals['_PUSHSERVERAPPOUTPUTSREQUEST']._serialized_end=790
-  _globals['_PUSHSERVERAPPOUTPUTSRESPONSE']._serialized_start=792
-  _globals['_PUSHSERVERAPPOUTPUTSRESPONSE']._serialized_end=822
-  _globals['_SERVERAPPIO']._serialized_start=825
-  _globals['_SERVERAPPIO']._serialized_end=1752
-# @@protoc_insertion_point(module_scope)