flwr-nightly 1.19.0.dev20250521__py3-none-any.whl → 1.19.0.dev20250523__py3-none-any.whl

flwr/supercore/object_store/in_memory_object_store.py

@@ -0,0 +1,65 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Flower in-memory ObjectStore implementation."""
+
+
+from typing import Optional
+
+from flwr.common.inflatable import get_object_id, is_valid_sha256_hash
+
+from .object_store import ObjectStore
+
+
+class InMemoryObjectStore(ObjectStore):
+    """In-memory implementation of the ObjectStore interface."""
+
+    def __init__(self, verify: bool = True) -> None:
+        self.verify = verify
+        self.store: dict[str, bytes] = {}
+
+    def put(self, object_id: str, object_content: bytes) -> None:
+        """Put an object into the store."""
+        # Verify object ID format (must be a valid sha256 hash)
+        if not is_valid_sha256_hash(object_id):
+            raise ValueError(f"Invalid object ID format: {object_id}")
+
+        # Verify object_id and object_content match
+        if self.verify:
+            object_id_from_content = get_object_id(object_content)
+            if object_id != object_id_from_content:
+                raise ValueError(f"Object ID {object_id} does not match content hash")
+
+        # Return if object is already present in the store
+        if object_id in self.store:
+            return
+
+        self.store[object_id] = object_content
+
+    def get(self, object_id: str) -> Optional[bytes]:
+        """Get an object from the store."""
+        return self.store.get(object_id)
+
+    def delete(self, object_id: str) -> None:
+        """Delete an object from the store."""
+        if object_id in self.store:
+            del self.store[object_id]
+
+    def clear(self) -> None:
+        """Clear the store."""
+        self.store.clear()
+
+    def __contains__(self, object_id: str) -> bool:
+        """Check if an object_id is in the store."""
+        return object_id in self.store

flwr/supercore/object_store/object_store.py

@@ -0,0 +1,86 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Flower abstract ObjectStore definition."""
+
+
+import abc
+from typing import Optional
+
+
+class ObjectStore(abc.ABC):
+    """Abstract base class for `ObjectStore` implementations.
+
+    This class defines the interface for an object store that can store, retrieve, and
+    delete objects identified by object IDs.
+    """
+
+    @abc.abstractmethod
+    def put(self, object_id: str, object_content: bytes) -> None:
+        """Put an object into the store.
+
+        Parameters
+        ----------
+        object_id : str
+            The object_id under which to store the object.
+        object_content : bytes
+            The deflated object to store.
+        """
+
+    @abc.abstractmethod
+    def get(self, object_id: str) -> Optional[bytes]:
+        """Get an object from the store.
+
+        Parameters
+        ----------
+        object_id : str
+            The object_id under which the object is stored.
+
+        Returns
+        -------
+        bytes
+            The object stored under the given object_id.
+        """
+
+    @abc.abstractmethod
+    def delete(self, object_id: str) -> None:
+        """Delete an object from the store.
+
+        Parameters
+        ----------
+        object_id : str
+            The object_id under which the object is stored.
+        """
+
+    @abc.abstractmethod
+    def clear(self) -> None:
+        """Clear the store.
+
+        This method should remove all objects from the store.
+        """
+
+    @abc.abstractmethod
+    def __contains__(self, object_id: str) -> bool:
+        """Check if an object_id is in the store.
+
+        Parameters
+        ----------
+        object_id : str
+            The object_id to check.
+
+        Returns
+        -------
+        bool
+            True if the object_id is in the store, False otherwise.
+        """

flwr/supercore/object_store/object_store_factory.py

@@ -0,0 +1,44 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Factory class that creates ObjectStore instances."""
+
+
+from logging import DEBUG
+from typing import Optional
+
+from flwr.common.logger import log
+
+from .in_memory_object_store import InMemoryObjectStore
+from .object_store import ObjectStore
+
+
+class ObjectStoreFactory:
+    """Factory class that creates ObjectStore instances."""
+
+    def __init__(self) -> None:
+        self.store_instance: Optional[ObjectStore] = None
+
+    def store(self) -> ObjectStore:
+        """Return an ObjectStore instance and create it, if necessary.
+
+        Returns
+        -------
+        ObjectStore
+            An ObjectStore instance for storing objects by object_id.
+        """
+        if self.store_instance is None:
+            self.store_instance = InMemoryObjectStore()
+        log(DEBUG, "Using InMemoryObjectStore")
+        return self.store_instance

flwr/{client/supernode → supernode/cli}/__init__.py

@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower SuperNode."""
+"""Flower command line interface for SuperNode."""
 
 
-from .app import run_supernode as run_supernode
+from .flower_supernode import flower_supernode
 
-__all__ = [
-    "run_supernode",
-]
+__all__ = ["flower_supernode"]

flwr/{client/supernode/app.py → supernode/cli/flower_supernode.py}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower SuperNode."""
+"""`flower-supernode` command."""
 
 
 import argparse
@@ -43,11 +43,10 @@ from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.logger import log
 
-from ..clientapp.utils import get_load_client_app_fn
 from ..start_client_internal import start_client_internal
 
 
-def run_supernode() -> None:
+def flower_supernode() -> None:
     """Run Flower SuperNode."""
     args = _parse_args_run_supernode().parse_args()
 
@@ -64,12 +63,6 @@ def run_supernode() -> None:
         )
 
     root_certificates = try_obtain_root_certificates(args, args.superlink)
-    load_fn = get_load_client_app_fn(
-        default_app_ref="",
-        app_path=None,
-        flwr_dir=args.flwr_dir,
-        multi_app=True,
-    )
     authentication_keys = _try_setup_client_authentication(args)
 
     log(DEBUG, "Isolation mode: %s", args.isolation)
@@ -82,7 +75,6 @@ def run_supernode() -> None:
 
     start_client_internal(
         server_address=args.superlink,
-        load_client_app_fn=load_fn,
         transport=args.transport,
         root_certificates=root_certificates,
         insecure=args.insecure,