flwr-nightly 1.11.0.dev20240806__tar.gz → 1.11.0.dev20240808__tar.gz

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.11.0.dev20240806
+Version: 1.11.0.dev20240808
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/pyproject.toml

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

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/flwr/common/typing.py

@@ -199,3 +199,11 @@ class Run:
     fab_id: str
     fab_version: str
     override_config: UserConfig
+
+
+@dataclass
+class Fab:
+    """Fab file representation."""
+
+    hash_str: str
+    content: bytes

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/flwr/proto/fab_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/fab.proto\x12\nflwr.proto\"$\n\x03\x46\x61\x62\x12\x0c\n\x04hash\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\x0c\"\x1d\n\rGetFabRequest\x12\x0c\n\x04hash\x18\x01 \x01(\t\".\n\x0eGetFabResponse\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fabb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66lwr/proto/fab.proto\x12\nflwr.proto\"(\n\x03\x46\x61\x62\x12\x10\n\x08hash_str\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\x0c\"!\n\rGetFabRequest\x12\x10\n\x08hash_str\x18\x01 \x01(\t\".\n\x0eGetFabResponse\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fabb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -22,9 +22,9 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.fab_pb2', _globa
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_FAB']._serialized_start=36
-  _globals['_FAB']._serialized_end=72
-  _globals['_GETFABREQUEST']._serialized_start=74
-  _globals['_GETFABREQUEST']._serialized_end=103
-  _globals['_GETFABRESPONSE']._serialized_start=105
-  _globals['_GETFABRESPONSE']._serialized_end=151
+  _globals['_FAB']._serialized_end=76
+  _globals['_GETFABREQUEST']._serialized_start=78
+  _globals['_GETFABREQUEST']._serialized_end=111
+  _globals['_GETFABRESPONSE']._serialized_start=113
+  _globals['_GETFABRESPONSE']._serialized_end=159
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/flwr/proto/fab_pb2.pyi

@@ -12,9 +12,9 @@ DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
 class Fab(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    HASH_FIELD_NUMBER: builtins.int
+    HASH_STR_FIELD_NUMBER: builtins.int
     CONTENT_FIELD_NUMBER: builtins.int
-    hash: typing.Text
+    hash_str: typing.Text
     """This field is the hash of the data field. It is used to identify the data.
     The hash is calculated using the SHA-256 algorithm and is represented as a
     hex string (sha256hex).
@@ -25,21 +25,21 @@ class Fab(google.protobuf.message.Message):
 
     def __init__(self,
         *,
-        hash: typing.Text = ...,
+        hash_str: typing.Text = ...,
         content: builtins.bytes = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["content",b"content","hash",b"hash"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["content",b"content","hash_str",b"hash_str"]) -> None: ...
 global___Fab = Fab
 
 class GetFabRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    HASH_FIELD_NUMBER: builtins.int
-    hash: typing.Text
+    HASH_STR_FIELD_NUMBER: builtins.int
+    hash_str: typing.Text
     def __init__(self,
         *,
-        hash: typing.Text = ...,
+        hash_str: typing.Text = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["hash",b"hash"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["hash_str",b"hash_str"]) -> None: ...
 global___GetFabRequest = GetFabRequest
 
 class GetFabResponse(google.protobuf.message.Message):

{flwr_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/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_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/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_nightly-1.11.0.dev20240806 → flwr_nightly-1.11.0.dev20240808}/src/py/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: