flwr-nightly 1.10.0.dev20240722__py3-none-any.whl → 1.11.0.dev20240805__py3-none-any.whl

flwr/client/supernode/app.py

@@ -62,8 +62,8 @@ def run_supernode() -> None:
     root_certificates = _get_certificates(args)
     load_fn = _get_load_client_app_fn(
         default_app_ref=getattr(args, "client-app"),
-        dir_arg=args.dir,
-        flwr_dir_arg=args.flwr_dir,
+        project_dir=args.dir,
+        flwr_dir=args.flwr_dir,
         multi_app=True,
     )
     authentication_keys = _try_setup_client_authentication(args)
@@ -100,7 +100,7 @@ def run_client_app() -> None:
     root_certificates = _get_certificates(args)
     load_fn = _get_load_client_app_fn(
         default_app_ref=getattr(args, "client-app"),
-        dir_arg=args.dir,
+        project_dir=args.dir,
         multi_app=False,
     )
     authentication_keys = _try_setup_client_authentication(args)
@@ -176,9 +176,9 @@ def _get_certificates(args: argparse.Namespace) -> Optional[bytes]:
 
 def _get_load_client_app_fn(
     default_app_ref: str,
-    dir_arg: str,
+    project_dir: str,
     multi_app: bool,
-    flwr_dir_arg: Optional[str] = None,
+    flwr_dir: Optional[str] = None,
 ) -> Callable[[str, str], ClientApp]:
     """Get the load_client_app_fn function.
 
@@ -189,38 +189,21 @@ def _get_load_client_app_fn(
     If `multi_app` is False, it ignores `fab_id` and `fab_version` and
     loads a default ClientApp.
     """
-    # Find the Flower directory containing Flower Apps (only for multi-app)
-    if not multi_app:
-        flwr_dir = Path("")
-    else:
-        if flwr_dir_arg is None:
-            flwr_dir = get_flwr_dir()
-        else:
-            flwr_dir = Path(flwr_dir_arg).absolute()
-
-    inserted_path = None
-
     if not multi_app:
         log(
             DEBUG,
             "Flower SuperNode will load and validate ClientApp `%s`",
             default_app_ref,
         )
-        # Insert sys.path
-        dir_path = Path(dir_arg).absolute()
-        sys.path.insert(0, str(dir_path))
-        inserted_path = str(dir_path)
 
-        valid, error_msg = validate(default_app_ref)
+        valid, error_msg = validate(default_app_ref, project_dir=project_dir)
         if not valid and error_msg:
             raise LoadClientAppError(error_msg) from None
 
     def _load(fab_id: str, fab_version: str) -> ClientApp:
+        runtime_project_dir = Path(project_dir).absolute()
         # If multi-app feature is disabled
         if not multi_app:
-            # Get sys path to be inserted
-            dir_path = Path(dir_arg).absolute()
-
             # Set app reference
             client_app_ref = default_app_ref
         # If multi-app feature is enabled but the fab id is not specified
@@ -231,43 +214,29 @@ def _get_load_client_app_fn(
                 ) from None
 
             log(WARN, "FAB ID is not provided; the default ClientApp will be loaded.")
-            # Get sys path to be inserted
-            dir_path = Path(dir_arg).absolute()
 
             # Set app reference
             client_app_ref = default_app_ref
         # If multi-app feature is enabled
         else:
             try:
-                project_dir = get_project_dir(fab_id, fab_version, flwr_dir)
-                config = get_project_config(project_dir)
+                runtime_project_dir = get_project_dir(
+                    fab_id, fab_version, get_flwr_dir(flwr_dir)
+                )
+                config = get_project_config(runtime_project_dir)
             except Exception as e:
                 raise LoadClientAppError("Failed to load ClientApp") from e
 
-            # Get sys path to be inserted
-            dir_path = Path(project_dir).absolute()
-
             # Set app reference
             client_app_ref = config["tool"]["flwr"]["app"]["components"]["clientapp"]
 
-        # Set sys.path
-        nonlocal inserted_path
-        if inserted_path != str(dir_path):
-            # Remove the previously inserted path
-            if inserted_path is not None:
-                sys.path.remove(inserted_path)
-            # Insert the new path
-            sys.path.insert(0, str(dir_path))
-
-        inserted_path = str(dir_path)
-
         # Load ClientApp
         log(
             DEBUG,
             "Loading ClientApp `%s`",
             client_app_ref,
         )
-        client_app = load_app(client_app_ref, LoadClientAppError, dir_path)
+        client_app = load_app(client_app_ref, LoadClientAppError, runtime_project_dir)
 
         if not isinstance(client_app, ClientApp):
             raise LoadClientAppError(

flwr/common/config.py

@@ -113,8 +113,13 @@ def get_fused_config(run: Run, flwr_dir: Optional[Path]) -> UserConfig:
     return get_fused_config_from_dir(project_dir, run.override_config)
 
 
-def flatten_dict(raw_dict: Dict[str, Any], parent_key: str = "") -> UserConfig:
+def flatten_dict(
+    raw_dict: Optional[Dict[str, Any]], parent_key: str = ""
+) -> UserConfig:
     """Flatten dict by joining nested keys with a given separator."""
+    if raw_dict is None:
+        return {}
+
     items: List[Tuple[str, UserConfigValue]] = []
     separator: str = "."
     for k, v in raw_dict.items():

flwr/common/object_ref.py

@@ -33,22 +33,41 @@ attribute.
 """
 
 
+_current_sys_path: Optional[str] = None
+
+
 def validate(
     module_attribute_str: str,
     check_module: bool = True,
+    project_dir: Optional[Union[str, Path]] = None,
 ) -> Tuple[bool, Optional[str]]:
     """Validate object reference.
 
-    The object reference string should have the form <module>:<attribute>. Valid
-    examples include `client:app` and `project.package.module:wrapper.app`. It must
-    refer to a module on the PYTHONPATH and the module needs to have the specified
-    attribute.
+    Parameters
+    ----------
+    module_attribute_str : str
+        The reference to the object. It should have the form `<module>:<attribute>`.
+        Valid examples include `client:app` and `project.package.module:wrapper.app`.
+        It must refer to a module on the PYTHONPATH or in the provided `project_dir`
+        and the module needs to have the specified attribute.
+    check_module : bool (default: True)
+        Flag indicating whether to verify the existence of the module and the
+        specified attribute within it.
+    project_dir : Optional[Union[str, Path]] (default: None)
+        The directory containing the module. If None, the current working directory
+        is used. If `check_module` is True, the `project_dir` will be inserted into
+        the system path, and the previously inserted `project_dir` will be removed.
 
     Returns
     -------
     Tuple[bool, Optional[str]]
         A boolean indicating whether an object reference is valid and
         the reason why it might not be.
+
+    Note
+    ----
+    This function will modify `sys.path` by inserting the provided `project_dir`
+    and removing the previously inserted `project_dir`.
     """
     module_str, _, attributes_str = module_attribute_str.partition(":")
     if not module_str:
@@ -63,6 +82,9 @@ def validate(
         )
 
     if check_module:
+        # Set the system path
+        _set_sys_path(project_dir)
+
         # Load module
         module = find_spec(module_str)
         if module and module.origin:
@@ -89,18 +111,40 @@ def load_app(  # pylint: disable= too-many-branches
 ) -> Any:
     """Return the object specified in a module attribute string.
 
-    The module/attribute string should have the form <module>:<attribute>. Valid
-    examples include `client:app` and `project.package.module:wrapper.app`. It must
-    refer to a module on the PYTHONPATH, the module needs to have the specified
-    attribute.
+    Parameters
+    ----------
+    module_attribute_str : str
+        The reference to the object. It should have the form `<module>:<attribute>`.
+        Valid examples include `client:app` and `project.package.module:wrapper.app`.
+        It must refer to a module on the PYTHONPATH or in the provided `project_dir`
+        and the module needs to have the specified attribute.
+    error_type : Type[Exception]
+        The type of exception to be raised if the provided `module_attribute_str` is
+        in an invalid format.
+    project_dir : Optional[Union[str, Path]], optional (default=None)
+        The directory containing the module. If None, the current working directory
+        is used. The `project_dir` will be inserted into the system path, and the
+        previously inserted `project_dir` will be removed.
+
+    Returns
+    -------
+    Any
+        The object specified by the module attribute string.
+
+    Note
+    ----
+    This function will modify `sys.path` by inserting the provided `project_dir`
+    and removing the previously inserted `project_dir`.
     """
-    valid, error_msg = validate(module_attribute_str)
+    valid, error_msg = validate(module_attribute_str, check_module=False)
     if not valid and error_msg:
         raise error_type(error_msg) from None
 
     module_str, _, attributes_str = module_attribute_str.partition(":")
 
     try:
+        _set_sys_path(project_dir)
+
         if module_str not in sys.modules:
             module = importlib.import_module(module_str)
         # Hack: `tabnet` does not work with `importlib.reload`
@@ -116,19 +160,15 @@ def load_app(  # pylint: disable= too-many-branches
             module = sys.modules[module_str]
         else:
             module = sys.modules[module_str]
+
             if project_dir is None:
-                path: Optional[str] = getattr(module, "__file__", None)
-                if path is not None:
-                    project_dir = str(Path(path).parent)
-            else:
-                project_dir = str(Path(project_dir).absolute())
+                project_dir = Path.cwd()
 
             # Reload cached modules in the project directory
-            if project_dir is not None:
-                for m in list(sys.modules.values()):
-                    path = getattr(m, "__file__", None)
-                    if path is not None and path.startswith(project_dir):
-                        importlib.reload(m)
+            for m in list(sys.modules.values()):
+                path: Optional[str] = getattr(m, "__file__", None)
+                if path is not None and path.startswith(str(project_dir)):
+                    importlib.reload(m)
 
     except ModuleNotFoundError as err:
         raise error_type(
@@ -140,15 +180,38 @@ def load_app(  # pylint: disable= too-many-branches
     try:
         for attribute_str in attributes_str.split("."):
             attribute = getattr(attribute, attribute_str)
-    except AttributeError:
+    except AttributeError as err:
         raise error_type(
             f"Unable to load attribute {attributes_str} from module {module_str}"
             f"{OBJECT_REF_HELP_STR}",
-        ) from None
+        ) from err
 
     return attribute
 
 
+def _set_sys_path(directory: Optional[Union[str, Path]]) -> None:
+    """Set the system path."""
+    if directory is None:
+        directory = Path.cwd()
+    else:
+        directory = Path(directory).absolute()
+
+    # If the directory has already been added to `sys.path`, return
+    if str(directory) in sys.path:
+        return
+
+    # Remove the old path if it exists and is not `""`.
+    global _current_sys_path  # pylint: disable=global-statement
+    if _current_sys_path is not None:
+        sys.path.remove(_current_sys_path)
+
+    # Add the new path to sys.path
+    sys.path.insert(0, str(directory))
+
+    # Update the current_sys_path
+    _current_sys_path = str(directory)
+
+
 def _find_attribute_in_module(file_path: str, attribute_name: str) -> bool:
     """Check if attribute_name exists in module's abstract symbolic tree."""
     with open(file_path, encoding="utf-8") as file:

flwr/proto/driver_pb2.py

@@ -15,10 +15,11 @@ _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
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66lwr/proto/driver.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xcd\x01\n\x10\x43reateRunRequest\x12\x0e\n\x06\x66\x61\x62_id\x18\x01 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x02 \x01(\t\x12I\n\x0foverride_config\x18\x03 \x03(\x0b\x32\x30.flwr.proto.CreateRunRequest.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\"#\n\x11\x43reateRunResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"@\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"F\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes2\x84\x03\n\x06\x44river\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\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66lwr/proto/driver.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\x1a\x1a\x66lwr/proto/transport.proto\"\xeb\x01\n\x10\x43reateRunRequest\x12\x0e\n\x06\x66\x61\x62_id\x18\x01 \x01(\t\x12\x13\n\x0b\x66\x61\x62_version\x18\x02 \x01(\t\x12I\n\x0foverride_config\x18\x03 \x03(\x0b\x32\x30.flwr.proto.CreateRunRequest.OverrideConfigEntry\x12\x1c\n\x03\x66\x61\x62\x18\x04 \x01(\x0b\x32\x0f.flwr.proto.Fab\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\"#\n\x11\x43reateRunResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"@\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"F\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes2\xc7\x03\n\x06\x44river\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\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -27,24 +28,24 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._options = None
   _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
-  _globals['_CREATERUNREQUEST']._serialized_start=136
-  _globals['_CREATERUNREQUEST']._serialized_end=341
-  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=268
-  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=341
-  _globals['_CREATERUNRESPONSE']._serialized_start=343
-  _globals['_CREATERUNRESPONSE']._serialized_end=378
-  _globals['_GETNODESREQUEST']._serialized_start=380
-  _globals['_GETNODESREQUEST']._serialized_end=413
-  _globals['_GETNODESRESPONSE']._serialized_start=415
-  _globals['_GETNODESRESPONSE']._serialized_end=466
-  _globals['_PUSHTASKINSREQUEST']._serialized_start=468
-  _globals['_PUSHTASKINSREQUEST']._serialized_end=532
-  _globals['_PUSHTASKINSRESPONSE']._serialized_start=534
-  _globals['_PUSHTASKINSRESPONSE']._serialized_end=573
-  _globals['_PULLTASKRESREQUEST']._serialized_start=575
-  _globals['_PULLTASKRESREQUEST']._serialized_end=645
-  _globals['_PULLTASKRESRESPONSE']._serialized_start=647
-  _globals['_PULLTASKRESRESPONSE']._serialized_end=712
-  _globals['_DRIVER']._serialized_start=715
-  _globals['_DRIVER']._serialized_end=1103
+  _globals['_CREATERUNREQUEST']._serialized_start=158
+  _globals['_CREATERUNREQUEST']._serialized_end=393
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=320
+  _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=393
+  _globals['_CREATERUNRESPONSE']._serialized_start=395
+  _globals['_CREATERUNRESPONSE']._serialized_end=430
+  _globals['_GETNODESREQUEST']._serialized_start=432
+  _globals['_GETNODESREQUEST']._serialized_end=465
+  _globals['_GETNODESRESPONSE']._serialized_start=467
+  _globals['_GETNODESRESPONSE']._serialized_end=518
+  _globals['_PUSHTASKINSREQUEST']._serialized_start=520
+  _globals['_PUSHTASKINSREQUEST']._serialized_end=584
+  _globals['_PUSHTASKINSRESPONSE']._serialized_start=586
+  _globals['_PUSHTASKINSRESPONSE']._serialized_end=625
+  _globals['_PULLTASKRESREQUEST']._serialized_start=627
+  _globals['_PULLTASKRESREQUEST']._serialized_end=697
+  _globals['_PULLTASKRESRESPONSE']._serialized_start=699
+  _globals['_PULLTASKRESRESPONSE']._serialized_end=764
+  _globals['_DRIVER']._serialized_start=767
+  _globals['_DRIVER']._serialized_end=1222
 # @@protoc_insertion_point(module_scope)

flwr/proto/driver_pb2.pyi

@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import builtins
+import flwr.proto.fab_pb2
 import flwr.proto.node_pb2
 import flwr.proto.task_pb2
 import flwr.proto.transport_pb2
@@ -35,17 +36,22 @@ class CreateRunRequest(google.protobuf.message.Message):
     FAB_ID_FIELD_NUMBER: builtins.int
     FAB_VERSION_FIELD_NUMBER: builtins.int
     OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
+    FAB_FIELD_NUMBER: 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]: ...
+    @property
+    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
     def __init__(self,
         *,
         fab_id: typing.Text = ...,
         fab_version: typing.Text = ...,
         override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
+        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["fab",b"fab"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","fab_id",b"fab_id","fab_version",b"fab_version","override_config",b"override_config"]) -> None: ...
 global___CreateRunRequest = CreateRunRequest
 
 class CreateRunResponse(google.protobuf.message.Message):

flwr/proto/driver_pb2_grpc.py

@@ -3,6 +3,7 @@
 import grpc
 
 from flwr.proto import driver_pb2 as flwr_dot_proto_dot_driver__pb2
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
 
@@ -40,6 +41,11 @@ class DriverStub(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.Driver/GetFab',
+                request_serializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString,
+                )
 
 
 class DriverServicer(object):
@@ -80,6 +86,13 @@ class DriverServicer(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_DriverServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -108,6 +121,11 @@ def add_DriverServicer_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.Driver', rpc_method_handlers)
@@ -202,3 +220,20 @@ class Driver(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.Driver/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/driver_pb2_grpc.pyi

@@ -4,6 +4,7 @@ isort:skip_file
 """
 import abc
 import flwr.proto.driver_pb2
+import flwr.proto.fab_pb2
 import flwr.proto.run_pb2
 import grpc
 
@@ -34,6 +35,11 @@ class DriverStub:
         flwr.proto.run_pb2.GetRunResponse]
     """Get run details"""
 
+    GetFab: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.fab_pb2.GetFabRequest,
+        flwr.proto.fab_pb2.GetFabResponse]
+    """Get FAB"""
+
 
 class DriverServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
@@ -76,5 +82,13 @@ class DriverServicer(metaclass=abc.ABCMeta):
         """Get run details"""
         pass
 
+    @abc.abstractmethod
+    def GetFab(self,
+        request: flwr.proto.fab_pb2.GetFabRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.fab_pb2.GetFabResponse:
+        """Get FAB"""
+        pass
+
 
 def add_DriverServicer_to_server(servicer: DriverServicer, server: grpc.Server) -> None: ...

flwr/proto/exec_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\x15\x66lwr/proto/exec.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xb8\x01\n\x0fStartRunRequest\x12\x10\n\x08\x66\x61\x62_file\x18\x01 \x01(\x0c\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.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\"\"\n\x10StartRunResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"#\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"(\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t2\xa0\x01\n\x04\x45xec\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/exec.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/transport.proto\"\xd3\x02\n\x0fStartRunRequest\x12\x10\n\x08\x66\x61\x62_file\x18\x01 \x01(\x0c\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12L\n\x11\x66\x65\x64\x65ration_config\x18\x03 \x03(\x0b\x32\x31.flwr.proto.StartRunRequest.FederationConfigEntry\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\x1aK\n\x15\x46\x65\x64\x65rationConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\"\n\x10StartRunResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"#\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"(\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t2\xa0\x01\n\x04\x45xec\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -24,16 +24,20 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._options = None
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_STARTRUNREQUEST_FEDERATIONCONFIGENTRY']._options = None
+  _globals['_STARTRUNREQUEST_FEDERATIONCONFIGENTRY']._serialized_options = b'8\001'
   _globals['_STARTRUNREQUEST']._serialized_start=66
-  _globals['_STARTRUNREQUEST']._serialized_end=250
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=177
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=250
-  _globals['_STARTRUNRESPONSE']._serialized_start=252
-  _globals['_STARTRUNRESPONSE']._serialized_end=286
-  _globals['_STREAMLOGSREQUEST']._serialized_start=288
-  _globals['_STREAMLOGSREQUEST']._serialized_end=323
-  _globals['_STREAMLOGSRESPONSE']._serialized_start=325
-  _globals['_STREAMLOGSRESPONSE']._serialized_end=365
-  _globals['_EXEC']._serialized_start=368
-  _globals['_EXEC']._serialized_end=528
+  _globals['_STARTRUNREQUEST']._serialized_end=405
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=255
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=328
+  _globals['_STARTRUNREQUEST_FEDERATIONCONFIGENTRY']._serialized_start=330
+  _globals['_STARTRUNREQUEST_FEDERATIONCONFIGENTRY']._serialized_end=405
+  _globals['_STARTRUNRESPONSE']._serialized_start=407
+  _globals['_STARTRUNRESPONSE']._serialized_end=441
+  _globals['_STREAMLOGSREQUEST']._serialized_start=443
+  _globals['_STREAMLOGSREQUEST']._serialized_end=478
+  _globals['_STREAMLOGSRESPONSE']._serialized_start=480
+  _globals['_STREAMLOGSRESPONSE']._serialized_end=520
+  _globals['_EXEC']._serialized_start=523
+  _globals['_EXEC']._serialized_end=683
 # @@protoc_insertion_point(module_scope)

flwr/proto/exec_pb2.pyi

@@ -29,17 +29,36 @@ class StartRunRequest(google.protobuf.message.Message):
         def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
         def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
 
+    class FederationConfigEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        @property
+        def value(self) -> flwr.proto.transport_pb2.Scalar: ...
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Optional[flwr.proto.transport_pb2.Scalar] = ...,
+            ) -> None: ...
+        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
     FAB_FILE_FIELD_NUMBER: builtins.int
     OVERRIDE_CONFIG_FIELD_NUMBER: builtins.int
+    FEDERATION_CONFIG_FIELD_NUMBER: builtins.int
     fab_file: builtins.bytes
     @property
     def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
+    @property
+    def federation_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
     def __init__(self,
         *,
         fab_file: builtins.bytes = ...,
         override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
+        federation_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["fab_file",b"fab_file","override_config",b"override_config"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["fab_file",b"fab_file","federation_config",b"federation_config","override_config",b"override_config"]) -> None: ...
 global___StartRunRequest = StartRunRequest
 
 class StartRunResponse(google.protobuf.message.Message):