flwr-nightly 1.20.0.dev20250721__tar.gz → 1.20.0.dev20250723__tar.gz

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.20.0.dev20250721
+Version: 1.20.0.dev20250723
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/common/constant.py

@@ -123,7 +123,7 @@ AUTHZ_TYPE_YAML_KEY = "authz_type"  # For key name in YAML file
 PUBLIC_KEY_HEADER = "flwr-public-key-bin"  # Must end with "-bin" for binary data
 SIGNATURE_HEADER = "flwr-signature-bin"  # Must end with "-bin" for binary data
 TIMESTAMP_HEADER = "flwr-timestamp"
-TIMESTAMP_TOLERANCE = 10  # General tolerance for timestamp verification
+TIMESTAMP_TOLERANCE = 300  # General tolerance for timestamp verification
 SYSTEM_TIME_TOLERANCE = 5  # Allowance for system time drift
 
 # Constants for grpc retry

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/common/exit/exit_code.py

@@ -31,6 +31,7 @@ class ExitCode:
     SUPERLINK_THREAD_CRASH = 100
     SUPERLINK_LICENSE_INVALID = 101
     SUPERLINK_LICENSE_MISSING = 102
+    SUPERLINK_LICENSE_URL_INVALID = 103
 
     # ServerApp-specific exit codes (200-299)
 
@@ -70,6 +71,10 @@ EXIT_CODE_HELP = {
         "The license is missing. Please specify the license key by setting the "
         "environment variable `FLWR_LICENSE_KEY`."
     ),
+    ExitCode.SUPERLINK_LICENSE_URL_INVALID: (
+        "The license URL is invalid. Please ensure that the `FLWR_LICENSE_URL` "
+        "environment variable is set to a valid URL."
+    ),
     # ServerApp-specific exit codes (200-299)
     # SuperNode-specific exit codes (300-399)
     ExitCode.SUPERNODE_REST_ADDRESS_INVALID: (

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/common/record/array.py

@@ -264,14 +264,22 @@ class Array(InflatableObject):
 
     def slice_array(self) -> list[tuple[str, InflatableObject]]:
         """Slice Array data and construct a list of ArrayChunks."""
-        children: list[tuple[str, InflatableObject]] = []
+        # Return cached chunks if they exist
+        if "_chunks" in self.__dict__:
+            return cast(list[tuple[str, InflatableObject]], self.__dict__["_chunks"])
+
+        # Chunks are not children as some of them may be identical
+        chunks: list[tuple[str, InflatableObject]] = []
         # memoryview allows for zero-copy slicing
         data_view = memoryview(self.data)
         for start in range(0, len(data_view), MAX_ARRAY_CHUNK_SIZE):
             end = min(start + MAX_ARRAY_CHUNK_SIZE, len(data_view))
             ac = ArrayChunk(data_view[start:end])
-            children.append((ac.object_id, ac))
-        return children
+            chunks.append((ac.object_id, ac))
+
+        # Cache the chunks for future use
+        self.__dict__["_chunks"] = chunks
+        return chunks
 
     def deflate(self) -> bytes:
         """Deflate the Array."""
@@ -386,4 +394,9 @@ class Array(InflatableObject):
         if name in ("dtype", "shape", "stype", "data"):
             # Mark as dirty if any of the main attributes are set
             self.is_dirty = True
+            # Clear cached object ID
+            self.__dict__.pop("_object_id", None)
+            # Clear cached chunks if data is set
+            if name == "data":
+                self.__dict__.pop("_chunks", None)
         super().__setattr__(name, value)

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/common/record/arraychunk.py

@@ -28,9 +28,6 @@ class ArrayChunk(InflatableObject):
 
     data: memoryview
 
-    def __init__(self, data: bytes) -> None:
-        self.data = memoryview(data)
-
     def deflate(self) -> bytes:
         """Deflate the ArrayChunk."""
         return add_header_to_object_body(object_body=self.data, obj=self)

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/server/grid/grpc_grid.py

@@ -260,15 +260,15 @@ class GrpcGrid(Grid):
         run_id = cast(Run, self._run).run_id
         message_ids: list[str] = []
         try:
-            for msg in messages:
-                # Populate metadata
-                msg.metadata.__dict__["_run_id"] = run_id
-                msg.metadata.__dict__["_src_node_id"] = self.node.node_id
-                msg.metadata.__dict__["_message_id"] = msg.object_id
-                # Check message
-                self._check_message(msg)
-                # Try pushing message and its objects
-                with no_object_id_recompute():
+            with no_object_id_recompute():
+                for msg in messages:
+                    # Populate metadata
+                    msg.metadata.__dict__["_run_id"] = run_id
+                    msg.metadata.__dict__["_src_node_id"] = self.node.node_id
+                    msg.metadata.__dict__["_message_id"] = msg.object_id
+                    # Check message
+                    self._check_message(msg)
+                    # Try pushing message and its objects
                     message_ids.append(self._try_push_message(run_id, msg))
 
         except grpc.RpcError as e:

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/supercore/object_store/object_store.py

@@ -99,8 +99,10 @@ class ObjectStore(abc.ABC):
 
         Returns
         -------
-        bytes
-            The object stored under the given object_id.
+        Optional[bytes]
+            The object stored under the given object_id if it exists, else None.
+            The returned bytes will be b"" if the object is not yet available,
+            but has been preregistered.
         """
 
     @abc.abstractmethod

flwr_nightly-1.20.0.dev20250723/py/flwr/supercore/scheduler/__init__.py

@@ -0,0 +1,22 @@
+# 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 App Scheduler."""
+
+
+from .plugin import SchedulerPlugin
+
+__all__ = [
+    "SchedulerPlugin",
+]

flwr_nightly-1.20.0.dev20250723/py/flwr/supercore/scheduler/plugin.py

@@ -0,0 +1,71 @@
+# 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.
+# ==============================================================================
+"""Abstract base class SchedulerPlugin."""
+
+
+from abc import ABC, abstractmethod
+from collections.abc import Sequence
+from typing import Callable, Optional
+
+from flwr.common.typing import Run
+
+
+class SchedulerPlugin(ABC):
+    """Abstract base class for Scheduler plugins."""
+
+    def __init__(
+        self,
+        appio_api_address: str,
+        flwr_dir: str,
+        get_run: Callable[[int], Run],
+    ) -> None:
+        self.appio_api_address = appio_api_address
+        self.flwr_dir = flwr_dir
+        self.get_run = get_run
+
+    @abstractmethod
+    def select_run_id(self, candidate_run_ids: Sequence[int]) -> Optional[int]:
+        """Select a run ID to execute from a sequence of candidates.
+
+        A candidate run ID is one that has at least one pending message and is
+        not currently in progress (i.e., not associated with a token).
+
+        Parameters
+        ----------
+        candidate_run_ids : Sequence[int]
+            A sequence of candidate run IDs to choose from.
+
+        Returns
+        -------
+        Optional[int]
+            The selected run ID, or None if no suitable candidate is found.
+        """
+
+    @abstractmethod
+    def launch_app(self, token: str, run_id: int) -> None:
+        """Launch the application associated with a given run ID and token.
+
+        This method starts the application process using the given `token`.
+        The `run_id` is used solely for bookkeeping purposes, allowing any
+        scheduler implementation to associate this launch with a specific run.
+
+        Parameters
+        ----------
+        token : str
+            The token required to run the application.
+        run_id : int
+           The ID of the run associated with the token, used for tracking or
+           logging purposes.
+        """

flwr_nightly-1.20.0.dev20250723/py/flwr/supernode/scheduler/__init__.py

@@ -0,0 +1,22 @@
+# 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 ClientApp Scheduler."""
+
+
+from .simple_clientapp_scheduler_plugin import SimpleClientAppSchedulerPlugin
+
+__all__ = [
+    "SimpleClientAppSchedulerPlugin",
+]

flwr_nightly-1.20.0.dev20250723/py/flwr/supernode/scheduler/simple_clientapp_scheduler_plugin.py

@@ -0,0 +1,49 @@
+# 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.
+# ==============================================================================
+"""Simple Flower ClientApp Scheduler plugin."""
+
+
+import os
+import subprocess
+from collections.abc import Sequence
+from typing import Optional
+
+from flwr.supercore.scheduler import SchedulerPlugin
+
+
+class SimpleClientAppSchedulerPlugin(SchedulerPlugin):
+    """Simple Flower ClientApp Scheduler plugin.
+
+    The plugin always selects the first candidate run ID.
+    """
+
+    def select_run_id(self, candidate_run_ids: Sequence[int]) -> Optional[int]:
+        """Select a run ID to execute from a sequence of candidates."""
+        if not candidate_run_ids:
+            return None
+        return candidate_run_ids[0]
+
+    def launch_app(self, token: str, run_id: int) -> None:
+        """Launch the application associated with a given run ID and token."""
+        cmds = ["flwr-clientapp", "--insecure"]
+        cmds += ["--clientappio-api-address", self.appio_api_address]
+        cmds += ["--token", token]
+        cmds += ["--parent-pid", str(os.getpid())]
+        cmds += ["--flwr-dir", self.flwr_dir]
+        # Launch the client app without waiting for it to complete.
+        # Since we don't need to manage the process, we intentionally avoid using
+        # a `with` statement. Suppress the pylint warning for it in this case.
+        # pylint: disable-next=consider-using-with
+        subprocess.Popen(cmds)

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/py/flwr/supernode/start_client_internal.py

@@ -23,7 +23,7 @@ from contextlib import contextmanager
 from functools import partial
 from logging import INFO, WARN
 from pathlib import Path
-from typing import Callable, Optional, Union
+from typing import Callable, Optional, Union, cast
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -384,23 +384,29 @@ def _push_messages(
 
         # Define the iterator for yielding object contents
         # This will yield (object_id, content) pairs
-        def yield_object_contents(_obj_tree: ObjectTree) -> Iterator[tuple[str, bytes]]:
+        def yield_object_contents(
+            _obj_tree: ObjectTree, obj_id_set: set[str]
+        ) -> Iterator[tuple[str, bytes]]:
             for tree in iterate_object_tree(_obj_tree):
-                while (content := object_store.get(tree.object_id)) is None:
+                if tree.object_id not in obj_id_set:
+                    continue
+                while (content := object_store.get(tree.object_id)) == b"":
                     # Wait for the content to be available
                     time.sleep(0.5)
-
-                yield tree.object_id, content
+                # At this point, content is guaranteed to be available
+                # therefore we can yield it after casting it to bytes
+                yield tree.object_id, cast(bytes, content)
 
         # Send the message
         try:
             # Send the reply message with its ObjectTree
-            send(message, object_tree)
+            # Get the IDs of objects to send
+            ids_obj_to_send = send(message, object_tree)
 
             # Push object contents from the ObjectStore
             run_id = message.metadata.run_id
             push_object_contents_from_iterable(
-                yield_object_contents(object_tree),
+                yield_object_contents(object_tree, ids_obj_to_send),
                 # Use functools.partial to bind run_id explicitly,
                 # avoiding late binding issues and satisfying flake8 (B023)
                 # Equivalent to:

{flwr_nightly-1.20.0.dev20250721 → flwr_nightly-1.20.0.dev20250723}/pyproject.toml

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