flwr-nightly 1.21.0.dev20250908__tar.gz → 1.22.0.dev20250910__tar.gz

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250908
+Version: 1.22.0.dev20250910
 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.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/app/exception.py

@@ -15,11 +15,11 @@
 """Flower application exceptions."""
 
 
-class AppExitException(Exception):
+class AppExitException(BaseException):
     """Base exception for all application-level errors in ServerApp and ClientApp.
 
     When raised, the process will exit and report a telemetry event with the associated
-    exit code.
+    exit code. This is not intended to be caught by user code.
     """
 
     # Default exit code — subclasses must override

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.7.1",
     "torchvision==0.22.1",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets>=0.5.0",
     "torch==2.4.0",
     "trl==0.8.1",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets>=0.5.0",
     "torch==2.7.1",
     "transformers>=4.30.0,<5.0",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.26.5",
 ]

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "numpy>=2.0.2",
 ]
 

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.7.1",
     "torchvision==0.22.1",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.pytorch_msg_api.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.7.1",
     "torchvision==0.22.1",

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.21.0",
+    "flwr[simulation]>=1.22.0",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/clientapp/__init__.py

@@ -15,13 +15,11 @@
 """Public Flower ClientApp APIs."""
 
 
-from flwr.client import mod
 from flwr.client.client_app import ClientApp
 
-from .centraldp_mods import fixedclipping_mod
+from . import mod
 
 __all__ = [
     "ClientApp",
-    "fixedclipping_mod",
     "mod",
 ]

flwr_nightly-1.22.0.dev20250910/py/flwr/clientapp/mod/__init__.py

@@ -0,0 +1,26 @@
+# 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 Built-in Mods."""
+
+
+from flwr.client.mod.comms_mods import arrays_size_mod, message_size_mod
+
+from .centraldp_mods import fixedclipping_mod
+
+__all__ = [
+    "arrays_size_mod",
+    "fixedclipping_mod",
+    "message_size_mod",
+]

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/serverapp/strategy/strategy_utils.py

@@ -21,6 +21,8 @@ from logging import INFO
 from time import sleep
 from typing import Optional, cast
 
+import numpy as np
+
 from flwr.common import (
     Array,
     ArrayRecord,
@@ -99,7 +101,7 @@ def aggregate_arrayrecords(
                     aggregated_np_arrays[key] += value.numpy() * weight
 
     return ArrayRecord(
-        OrderedDict({k: Array(v) for k, v in aggregated_np_arrays.items()})
+        OrderedDict({k: Array(np.asarray(v)) for k, v in aggregated_np_arrays.items()})
     )
 
 

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/serverapp/strategy/strategy_utils_tests.py

@@ -22,8 +22,8 @@ import pytest
 from parameterized import parameterized
 
 from flwr.common import Array, ArrayRecord, ConfigRecord, MetricRecord, RecordDict
+from flwr.serverapp.exception import InconsistentMessageReplies
 
-from ..exception import InconsistentMessageReplies
 from .strategy_utils import (
     aggregate_arrayrecords,
     aggregate_metricrecords,
@@ -71,6 +71,33 @@ def test_arrayrecords_aggregation() -> None:
     assert aggrd.object_id == ArrayRecord(avg_list).object_id
 
 
+def test_arrayrecords_aggregation_with_ndim_zero() -> None:
+    """Test aggregation of ArrayRecords with 0-dim arrays."""
+    num_replies = 3
+    weights = [0.25, 0.4, 0.35]
+    np_arrays = [np.array(np.random.randn()) for _ in range(num_replies)]
+
+    # For 0-dimensional arrays, we just compute the weighted average directly
+    avg_list = [np.average(np_arrays, axis=0, weights=weights)]
+
+    # Construct RecordDicts (mimicing replies)
+    records = [
+        RecordDict(
+            {
+                "arrays": ArrayRecord([np_arrays[i]]),
+                "metrics": MetricRecord({"weight": weights[i]}),
+            }
+        )
+        for i in range(num_replies)
+    ]
+    # Execute aggregate
+    aggrd = aggregate_arrayrecords(records, weighting_metric_name="weight")
+
+    # Assert consistency
+    assert np.isclose(aggrd.to_numpy_ndarrays()[0], avg_list[0])
+    assert aggrd.object_id == ArrayRecord([np.array(avg_list[0])]).object_id
+
+
 def test_metricrecords_aggregation() -> None:
     """Test aggregation of MetricRecords."""
     num_replies = 3

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/py/flwr/supercore/cli/flower_superexec.py

@@ -17,6 +17,7 @@
 
 import argparse
 from logging import INFO
+from typing import Optional
 
 from flwr.common import EventType, event
 from flwr.common.constant import ExecPluginType
@@ -34,6 +35,25 @@ from flwr.supercore.superexec.plugin import (
 )
 from flwr.supercore.superexec.run_superexec import run_superexec
 
+try:
+    from flwr.ee.constant import ExecEePluginType
+    from flwr.ee.exec_plugin import get_ee_plugin_and_stub_class
+except ImportError:
+
+    class ExecEePluginType:  # type: ignore[no-redef]
+        """SuperExec EE plugin types."""
+
+        @staticmethod
+        def all() -> list[str]:
+            """Return all SuperExec EE plugin types."""
+            return []
+
+    def get_ee_plugin_and_stub_class(  # pylint: disable=unused-argument
+        plugin_type: str,
+    ) -> Optional[tuple[type[ExecPlugin], type[object]]]:
+        """Get the EE plugin class and stub class based on the plugin type."""
+        return None
+
 
 def flower_superexec() -> None:
     """Run `flower-superexec` command."""
@@ -73,7 +93,7 @@ def _parse_args() -> argparse.ArgumentParser:
     parser.add_argument(
         "--plugin-type",
         type=str,
-        choices=ExecPluginType.all(),
+        choices=ExecPluginType.all() + ExecEePluginType.all(),
         required=True,
         help="The type of plugin to use.",
     )
@@ -116,4 +136,6 @@ def _get_plugin_and_stub_class(
         return ServerAppExecPlugin, ServerAppIoStub
     if plugin_type == ExecPluginType.SIMULATION:
         return SimulationExecPlugin, SimulationIoStub
+    if ret := get_ee_plugin_and_stub_class(plugin_type):
+        return ret  # type: ignore[no-any-return]
     raise ValueError(f"Unknown plugin type: {plugin_type}")

{flwr_nightly-1.21.0.dev20250908 → flwr_nightly-1.22.0.dev20250910}/pyproject.toml

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