flwr-nightly 1.11.0.dev20240724__py3-none-any.whl → 1.11.0.dev20240811__py3-none-any.whl

flwr/proto/fleet_pb2.py

@@ -15,9 +15,10 @@ _sym_db = _symbol_database.Default()
 from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__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\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\"*\n\x11\x43reateNodeRequest\x12\x15\n\rping_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"D\n\x0bPingRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x15\n\rping_interval\x18\x02 \x01(\x01\"\x1f\n\x0cPingResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"F\n\x12PullTaskInsRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"k\n\x13PullTaskInsResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rtask_ins_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"@\n\x12PushTaskResRequest\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"\xae\x01\n\x13PushTaskResResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12=\n\x07results\x18\x02 \x03(\x0b\x32,.flwr.proto.PushTaskResResponse.ResultsEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\xc9\x03\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12;\n\x04Ping\x12\x17.flwr.proto.PingRequest\x1a\x18.flwr.proto.PingResponse\"\x00\x12P\n\x0bPullTaskIns\x12\x1e.flwr.proto.PullTaskInsRequest\x1a\x1f.flwr.proto.PullTaskInsResponse\"\x00\x12P\n\x0bPushTaskRes\x12\x1e.flwr.proto.PushTaskResRequest\x1a\x1f.flwr.proto.PushTaskResResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\"*\n\x11\x43reateNodeRequest\x12\x15\n\rping_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"D\n\x0bPingRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x15\n\rping_interval\x18\x02 \x01(\x01\"\x1f\n\x0cPingResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"F\n\x12PullTaskInsRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"k\n\x13PullTaskInsResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rtask_ins_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"@\n\x12PushTaskResRequest\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes\"\xae\x01\n\x13PushTaskResResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12=\n\x07results\x18\x02 \x03(\x0b\x32,.flwr.proto.PushTaskResResponse.ResultsEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\x8c\x04\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12;\n\x04Ping\x12\x17.flwr.proto.PingRequest\x1a\x18.flwr.proto.PingResponse\"\x00\x12P\n\x0bPullTaskIns\x12\x1e.flwr.proto.PullTaskInsRequest\x1a\x1f.flwr.proto.PullTaskInsResponse\"\x00\x12P\n\x0bPushTaskRes\x12\x1e.flwr.proto.PushTaskResRequest\x1a\x1f.flwr.proto.PushTaskResResponse\"\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\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,30 +27,30 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._options = None
   _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001'
-  _globals['_CREATENODEREQUEST']._serialized_start=106
-  _globals['_CREATENODEREQUEST']._serialized_end=148
-  _globals['_CREATENODERESPONSE']._serialized_start=150
-  _globals['_CREATENODERESPONSE']._serialized_end=202
-  _globals['_DELETENODEREQUEST']._serialized_start=204
-  _globals['_DELETENODEREQUEST']._serialized_end=255
-  _globals['_DELETENODERESPONSE']._serialized_start=257
-  _globals['_DELETENODERESPONSE']._serialized_end=277
-  _globals['_PINGREQUEST']._serialized_start=279
-  _globals['_PINGREQUEST']._serialized_end=347
-  _globals['_PINGRESPONSE']._serialized_start=349
-  _globals['_PINGRESPONSE']._serialized_end=380
-  _globals['_PULLTASKINSREQUEST']._serialized_start=382
-  _globals['_PULLTASKINSREQUEST']._serialized_end=452
-  _globals['_PULLTASKINSRESPONSE']._serialized_start=454
-  _globals['_PULLTASKINSRESPONSE']._serialized_end=561
-  _globals['_PUSHTASKRESREQUEST']._serialized_start=563
-  _globals['_PUSHTASKRESREQUEST']._serialized_end=627
-  _globals['_PUSHTASKRESRESPONSE']._serialized_start=630
-  _globals['_PUSHTASKRESRESPONSE']._serialized_end=804
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_start=758
-  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_end=804
-  _globals['_RECONNECT']._serialized_start=806
-  _globals['_RECONNECT']._serialized_end=836
-  _globals['_FLEET']._serialized_start=839
-  _globals['_FLEET']._serialized_end=1296
+  _globals['_CREATENODEREQUEST']._serialized_start=128
+  _globals['_CREATENODEREQUEST']._serialized_end=170
+  _globals['_CREATENODERESPONSE']._serialized_start=172
+  _globals['_CREATENODERESPONSE']._serialized_end=224
+  _globals['_DELETENODEREQUEST']._serialized_start=226
+  _globals['_DELETENODEREQUEST']._serialized_end=277
+  _globals['_DELETENODERESPONSE']._serialized_start=279
+  _globals['_DELETENODERESPONSE']._serialized_end=299
+  _globals['_PINGREQUEST']._serialized_start=301
+  _globals['_PINGREQUEST']._serialized_end=369
+  _globals['_PINGRESPONSE']._serialized_start=371
+  _globals['_PINGRESPONSE']._serialized_end=402
+  _globals['_PULLTASKINSREQUEST']._serialized_start=404
+  _globals['_PULLTASKINSREQUEST']._serialized_end=474
+  _globals['_PULLTASKINSRESPONSE']._serialized_start=476
+  _globals['_PULLTASKINSRESPONSE']._serialized_end=583
+  _globals['_PUSHTASKRESREQUEST']._serialized_start=585
+  _globals['_PUSHTASKRESREQUEST']._serialized_end=649
+  _globals['_PUSHTASKRESRESPONSE']._serialized_start=652
+  _globals['_PUSHTASKRESRESPONSE']._serialized_end=826
+  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_start=780
+  _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_end=826
+  _globals['_RECONNECT']._serialized_start=828
+  _globals['_RECONNECT']._serialized_end=858
+  _globals['_FLEET']._serialized_start=861
+  _globals['_FLEET']._serialized_end=1385
 # @@protoc_insertion_point(module_scope)

flwr/proto/fleet_pb2_grpc.py

@@ -2,6 +2,7 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import fleet_pb2 as flwr_dot_proto_dot_fleet__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
@@ -45,6 +46,11 @@ class FleetStub(object):
                 request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
                 )
+        self.GetFab = channel.unary_unary(
+                '/flwr.proto.Fleet/GetFab',
+                request_serializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString,
+                )
 
 
 class FleetServicer(object):
@@ -92,6 +98,13 @@ class FleetServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def GetFab(self, request, context):
+        """Get FAB
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_FleetServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -125,6 +138,11 @@ def add_FleetServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.SerializeToString,
             ),
+            'GetFab': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetFab,
+                    request_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'flwr.proto.Fleet', rpc_method_handlers)
@@ -236,3 +254,20 @@ class Fleet(object):
             flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def GetFab(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.Fleet/GetFab',
+            flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString,
+            flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/fleet_pb2_grpc.pyi

@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import abc
+import flwr.proto.fab_pb2
 import flwr.proto.fleet_pb2
 import flwr.proto.run_pb2
 import grpc
@@ -41,6 +42,11 @@ class FleetStub:
         flwr.proto.run_pb2.GetRunRequest,
         flwr.proto.run_pb2.GetRunResponse]
 
+    GetFab: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.fab_pb2.GetFabRequest,
+        flwr.proto.fab_pb2.GetFabResponse]
+    """Get FAB"""
+
 
 class FleetServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
@@ -89,5 +95,13 @@ class FleetServicer(metaclass=abc.ABCMeta):
         context: grpc.ServicerContext,
     ) -> flwr.proto.run_pb2.GetRunResponse: ...
 
+    @abc.abstractmethod
+    def GetFab(self,
+        request: flwr.proto.fab_pb2.GetFabRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.fab_pb2.GetFabResponse:
+        """Get FAB"""
+        pass
+
 
 def add_FleetServicer_to_server(servicer: FleetServicer, server: grpc.Server) -> None: ...

flwr/proto/run_pb2.py

@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/run.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xc3\x01\n\x03Run\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\x12\x0e\n\x06\x66\x61\x62_id\x18\x02 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x03 \x01(\t\x12<\n\x0foverride_config\x18\x04 \x03(\x0b\x32#.flwr.proto.Run.OverrideConfigEntry\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\x1f\n\rGetRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\".\n\x0eGetRunResponse\x12\x1c\n\x03run\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Runb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/run.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xd5\x01\n\x03Run\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\x12\x0e\n\x06\x66\x61\x62_id\x18\x02 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x03 \x01(\t\x12<\n\x0foverride_config\x18\x04 \x03(\x0b\x32#.flwr.proto.Run.OverrideConfigEntry\x12\x10\n\x08\x66\x61\x62_hash\x18\x05 \x01(\t\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\x1f\n\rGetRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\".\n\x0eGetRunResponse\x12\x1c\n\x03run\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Runb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,11 +25,11 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_RUN_OVERRIDECONFIGENTRY']._options = None
   _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
   _globals['_RUN']._serialized_start=65
-  _globals['_RUN']._serialized_end=260
-  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_start=187
-  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_end=260
-  _globals['_GETRUNREQUEST']._serialized_start=262
-  _globals['_GETRUNREQUEST']._serialized_end=293
-  _globals['_GETRUNRESPONSE']._serialized_start=295
-  _globals['_GETRUNRESPONSE']._serialized_end=341
+  _globals['_RUN']._serialized_end=278
+  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_start=205
+  _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_end=278
+  _globals['_GETRUNREQUEST']._serialized_start=280
+  _globals['_GETRUNREQUEST']._serialized_end=311
+  _globals['_GETRUNRESPONSE']._serialized_start=313
+  _globals['_GETRUNRESPONSE']._serialized_end=359
 # @@protoc_insertion_point(module_scope)

flwr/proto/run_pb2.pyi

@@ -33,19 +33,22 @@ class Run(google.protobuf.message.Message):
     FAB_ID_FIELD_NUMBER: builtins.int
     FAB_VERSION_FIELD_NUMBER: builtins.int
     OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
+    FAB_HASH_FIELD_NUMBER: builtins.int
     run_id: builtins.int
     fab_id: typing.Text
     fab_version: typing.Text
     @property
     def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
+    fab_hash: typing.Text
     def __init__(self,
         *,
         run_id: builtins.int = ...,
         fab_id: typing.Text = ...,
         fab_version: typing.Text = ...,
         override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
+        fab_hash: typing.Text = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config","run_id",b"run_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["fab_hash",b"fab_hash","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config","run_id",b"run_id"]) -> None: ...
 global___Run = Run
 
 class GetRunRequest(google.protobuf.message.Message):

flwr/server/run_serverapp.py

@@ -24,7 +24,8 @@ from typing import Optional
 from flwr.common import Context, EventType, RecordSet, event
 from flwr.common.config import (
     get_flwr_dir,
-    get_fused_config,
+    get_fused_config_from_dir,
+    get_metadata_from_config,
     get_project_config,
     get_project_dir,
 )
@@ -146,51 +147,50 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
             cert_path,
         )
 
-    server_app_attr: Optional[str] = getattr(args, "server-app")
-    if not (server_app_attr is None) ^ (args.run_id is None):
+    app_path: Optional[str] = args.app
+    if not (app_path is None) ^ (args.run_id is None):
         raise sys.exit(
-            "Please provide either a ServerApp reference or a Run ID, but not both. "
+            "Please provide either a Flower App path or a Run ID, but not both. "
             "For more details, use: ``flower-server-app -h``"
         )
 
     # Initialize GrpcDriver
-    if args.run_id is not None:
-        # User provided `--run-id`, but not `server-app`
+    if app_path is None:
+        # User provided `--run-id`, but not `app_dir`
         driver = GrpcDriver(
             run_id=args.run_id,
             driver_service_address=args.superlink,
             root_certificates=root_certificates,
         )
+        flwr_dir = get_flwr_dir(args.flwr_dir)
+        run_ = driver.run
+        app_path = str(get_project_dir(run_.fab_id, run_.fab_version, flwr_dir))
+        config = get_project_config(app_path)
     else:
-        # User provided `server-app`, but not `--run-id`
+        # User provided `app_dir`, but not `--run-id`
         # Create run if run_id is not provided
         driver = GrpcDriver(
             run_id=0,  # Will be overwritten
             driver_service_address=args.superlink,
             root_certificates=root_certificates,
         )
+        # Load config from the project directory
+        config = get_project_config(app_path)
+        fab_version, fab_id = get_metadata_from_config(config)
+
         # Create run
-        req = CreateRunRequest(fab_id=args.fab_id, fab_version=args.fab_version)
+        req = CreateRunRequest(fab_id=fab_id, fab_version=fab_version)
         res: CreateRunResponse = driver._stub.CreateRun(req)  # pylint: disable=W0212
         # Overwrite driver._run_id
         driver._run_id = res.run_id  # pylint: disable=W0212
 
-    server_app_run_config = {}
-
-    # Dynamically obtain ServerApp path based on run_id
-    if args.run_id is not None:
-        # User provided `--run-id`, but not `server-app`
-        flwr_dir = get_flwr_dir(args.flwr_dir)
-        run_ = driver.run
-        server_app_dir = str(get_project_dir(run_.fab_id, run_.fab_version, flwr_dir))
-        config = get_project_config(server_app_dir)
-        server_app_attr = config["tool"]["flwr"]["app"]["components"]["serverapp"]
-        server_app_run_config = get_fused_config(run_, flwr_dir)
-    else:
-        # User provided `server-app`, but not `--run-id`
-        server_app_dir = str(Path(args.dir).absolute())
+    # Obtain server app reference and the run config
+    server_app_attr = config["tool"]["flwr"]["app"]["components"]["serverapp"]
+    server_app_run_config = get_fused_config_from_dir(
+        Path(app_path), driver.run.override_config
+    )
 
-    log(DEBUG, "Flower will load ServerApp `%s` in %s", server_app_attr, server_app_dir)
+    log(DEBUG, "Flower will load ServerApp `%s` in %s", server_app_attr, app_path)
 
     log(
         DEBUG,
@@ -201,7 +201,7 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
     # Run the ServerApp with the Driver
     run(
         driver=driver,
-        server_app_dir=server_app_dir,
+        server_app_dir=app_path,
         server_app_run_config=server_app_run_config,
         server_app_attr=server_app_attr,
     )
@@ -219,15 +219,16 @@ def _parse_args_run_server_app() -> argparse.ArgumentParser:
     )
 
     parser.add_argument(
-        "server-app",
+        "app",
         nargs="?",
         default=None,
-        help="For example: `server:app` or `project.package.module:wrapper.app`",
+        help="Load and run the `ServerApp` from the specified Flower App path. "
+        "The `pyproject.toml` file must be located in the root of this path.",
     )
     parser.add_argument(
         "--insecure",
         action="store_true",
-        help="Run the server app without HTTPS. By default, the app runs with "
+        help="Run the `ServerApp` without HTTPS. By default, the app runs with "
         "HTTPS enabled. Use this flag only if you understand the risks.",
     )
     parser.add_argument(
@@ -252,25 +253,6 @@ def _parse_args_run_server_app() -> argparse.ArgumentParser:
         default=ADDRESS_DRIVER_API,
         help="SuperLink Driver API (gRPC-rere) address (IPv4, IPv6, or a domain name)",
     )
-    parser.add_argument(
-        "--dir",
-        default="",
-        help="Add specified directory to the PYTHONPATH and load Flower "
-        "app from there."
-        " Default: current working directory.",
-    )
-    parser.add_argument(
-        "--fab-id",
-        default=None,
-        type=str,
-        help="The identifier of the FAB used in the run.",
-    )
-    parser.add_argument(
-        "--fab-version",
-        default=None,
-        type=str,
-        help="The version of the FAB used in the run.",
-    )
     parser.add_argument(
         "--run-id",
         default=None,

flwr/server/superlink/driver/driver_servicer.py

@@ -35,6 +35,7 @@ from flwr.proto.driver_pb2 import (  # pylint: disable=E0611
     PushTaskInsRequest,
     PushTaskInsResponse,
 )
+from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     GetRunRequest,
@@ -163,6 +164,12 @@ class DriverServicer(driver_pb2_grpc.DriverServicer):
             )
         )
 
+    def GetFab(
+        self, request: GetFabRequest, context: grpc.ServicerContext
+    ) -> GetFabResponse:
+        """Will be implemented later."""
+        raise NotImplementedError
+
 
 def _raise_if(validation_error: bool, detail: str) -> None:
     if validation_error:

flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -21,6 +21,7 @@ import grpc
 
 from flwr.common.logger import log
 from flwr.proto import fleet_pb2_grpc  # pylint: disable=E0611
+from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     CreateNodeRequest,
     CreateNodeResponse,
@@ -101,3 +102,9 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
             request=request,
             state=self.state_factory.state(),
         )
+
+    def GetFab(
+        self, request: GetFabRequest, context: grpc.ServicerContext
+    ) -> GetFabResponse:
+        """Will be implemented later."""
+        raise NotImplementedError

flwr/server/superlink/fleet/vce/backend/backend.py

@@ -29,7 +29,7 @@ BackendConfig = Dict[str, Dict[str, ConfigsRecordValues]]
 class Backend(ABC):
     """Abstract base class for a Simulation Engine Backend."""
 
-    def __init__(self, backend_config: BackendConfig, work_dir: str) -> None:
+    def __init__(self, backend_config: BackendConfig) -> None:
         """Construct a backend."""
 
     @abstractmethod

flwr/server/superlink/fleet/vce/backend/raybackend.py

@@ -14,9 +14,8 @@
 # ==============================================================================
 """Ray backend for the Fleet API using the Simulation Engine."""
 
-import pathlib
 from logging import DEBUG, ERROR
-from typing import Callable, Dict, List, Tuple, Union
+from typing import Callable, Dict, Tuple, Union
 
 import ray
 
@@ -33,7 +32,6 @@ from .backend import Backend, BackendConfig
 
 ClientResourcesDict = Dict[str, Union[int, float]]
 ActorArgsDict = Dict[str, Union[int, float, Callable[[], None]]]
-RunTimeEnvDict = Dict[str, Union[str, List[str]]]
 
 
 class RayBackend(Backend):
@@ -42,18 +40,14 @@ class RayBackend(Backend):
     def __init__(
         self,
         backend_config: BackendConfig,
-        work_dir: str,
     ) -> None:
         """Prepare RayBackend by initialising Ray and creating the ActorPool."""
         log(DEBUG, "Initialising: %s", self.__class__.__name__)
         log(DEBUG, "Backend config: %s", backend_config)
 
-        if not pathlib.Path(work_dir).exists():
-            raise ValueError(f"Specified work_dir {work_dir} does not exist.")
-
         # Initialise ray
         self.init_args_key = "init_args"
-        self.init_ray(backend_config, work_dir)
+        self.init_ray(backend_config)
 
         # Validate client resources
         self.client_resources_key = "client_resources"
@@ -68,23 +62,6 @@ class RayBackend(Backend):
             actor_kwargs=actor_kwargs,
         )
 
-    def _configure_runtime_env(self, work_dir: str) -> RunTimeEnvDict:
-        """Return list of files/subdirectories to exclude relative to work_dir.
-
-        Without this, Ray will push everything to the Ray Cluster.
-        """
-        runtime_env: RunTimeEnvDict = {"working_dir": work_dir}
-
-        excludes = []
-        path = pathlib.Path(work_dir)
-        for p in path.rglob("*"):
-            # Exclude files need to be relative to the working_dir
-            if p.is_file() and not str(p).endswith(".py"):
-                excludes.append(str(p.relative_to(path)))
-        runtime_env["excludes"] = excludes
-
-        return runtime_env
-
     def _validate_client_resources(self, config: BackendConfig) -> ClientResourcesDict:
         client_resources_config = config.get(self.client_resources_key)
         client_resources: ClientResourcesDict = {}
@@ -123,26 +100,18 @@ class RayBackend(Backend):
                 actor_args["on_actor_init_fn"] = enable_tf_gpu_growth
         return actor_args
 
-    def init_ray(self, backend_config: BackendConfig, work_dir: str) -> None:
+    def init_ray(self, backend_config: BackendConfig) -> None:
         """Intialises Ray if not already initialised."""
         if not ray.is_initialized():
-            # Init ray and append working dir if needed
-            runtime_env = (
-                self._configure_runtime_env(work_dir=work_dir) if work_dir else None
-            )
-
             ray_init_args: Dict[
                 str,
-                Union[ConfigsRecordValues, RunTimeEnvDict],
+                ConfigsRecordValues,
             ] = {}
 
             if backend_config.get(self.init_args_key):
                 for k, v in backend_config[self.init_args_key].items():
                     ray_init_args[k] = v
 
-            if runtime_env is not None:
-                ray_init_args["runtime_env"] = runtime_env
-
             ray.init(**ray_init_args)
 
     @property

flwr/server/superlink/fleet/vce/vce_api.py

@@ -339,7 +339,7 @@ def start_vce(
 
     def backend_fn() -> Backend:
         """Instantiate a Backend."""
-        return backend_type(backend_config, work_dir=app_dir)
+        return backend_type(backend_config)
 
     # Load ClientApp if needed
     def _load() -> ClientApp:
@@ -347,9 +347,9 @@ def start_vce(
         if client_app_attr:
             app = _get_load_client_app_fn(
                 default_app_ref=client_app_attr,
-                project_dir=app_dir,
+                app_path=app_dir,
                 flwr_dir=flwr_dir,
-                multi_app=True,
+                multi_app=False,
             )(run.fab_id, run.fab_version)
 
         if client_app:

flwr/superexec/simulation.py

@@ -63,8 +63,10 @@ class SimulationEngine(Executor):
     def __init__(
         self,
         num_supernodes: Optional[int] = None,
+        verbose: Optional[bool] = False,
     ) -> None:
         self.num_supernodes = num_supernodes
+        self.verbose = verbose
 
     @override
     def set_config(
@@ -80,6 +82,8 @@ class SimulationEngine(Executor):
             Supported configuration key/value pairs:
             - "num-supernodes": int
                 Number of nodes to register for the simulation.
+            - "verbose": bool
+                Set verbosity of logs.
         """
         if num_supernodes := config.get("num-supernodes"):
             if not isinstance(num_supernodes, int):
@@ -97,6 +101,13 @@ class SimulationEngine(Executor):
                 "positive integer."
             )
 
+        if verbose := config.get("verbose"):
+            if not isinstance(verbose, bool):
+                raise ValueError(
+                    "The `verbose` value must be a string `true` or `false`."
+                )
+            self.verbose = verbose
+
     @override
     def start_run(
         self,
@@ -121,10 +132,11 @@ class SimulationEngine(Executor):
             fab_path = install_from_fab(fab_file, None, True)
 
             # Install FAB Python package
-            subprocess.check_call(
+            subprocess.run(
                 [sys.executable, "-m", "pip", "install", "--no-deps", str(fab_path)],
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL,
+                stdout=None if self.verbose else subprocess.DEVNULL,
+                stderr=None if self.verbose else subprocess.DEVNULL,
+                check=True,
             )
 
             # Load and validate config

{flwr_nightly-1.11.0.dev20240724.dist-info → flwr_nightly-1.11.0.dev20240811.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.11.0.dev20240724
+Version: 1.11.0.dev20240811
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -33,7 +33,7 @@ Classifier: Typing :: Typed
 Provides-Extra: rest
 Provides-Extra: simulation
 Requires-Dist: cryptography (>=42.0.4,<43.0.0)
-Requires-Dist: grpcio (>=1.60.0,<2.0.0,!=1.64.2,!=1.65.1)
+Requires-Dist: grpcio (>=1.60.0,<2.0.0,!=1.64.2,!=1.65.1,!=1.65.2,!=1.65.4)
 Requires-Dist: iterators (>=0.0.2,<0.0.3)
 Requires-Dist: numpy (>=1.21.0,<2.0.0)
 Requires-Dist: pathspec (>=0.12.1,<0.13.0)