flwr-nightly 1.21.0.dev20250904__tar.gz → 1.21.0.dev20250907__tar.gz

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250904
+Version: 1.21.0.dev20250907
 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.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/app/__init__.py

@@ -13,3 +13,22 @@
 # limitations under the License.
 # ==============================================================================
 """Public Flower App APIs."""
+
+
+from flwr.common.context import Context
+from flwr.common.message import Message
+from flwr.common.record import ArrayRecord, ConfigRecord, MetricRecord, RecordDict
+
+from .error import Error
+from .metadata import Metadata
+
+__all__ = [
+    "ArrayRecord",
+    "ConfigRecord",
+    "Context",
+    "Error",
+    "Message",
+    "Metadata",
+    "MetricRecord",
+    "RecordDict",
+]

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/cli/new/templates/app/code/client.pytorch_msg_api.py.tpl

@@ -1,8 +1,8 @@
 """$project_name: A Flower / $framework_str app."""
 
 import torch
-from flwr.client import ClientApp
-from flwr.common import ArrayRecord, Context, Message, MetricRecord, RecordDict
+from flwr.app import ArrayRecord, Context, Message, MetricRecord, RecordDict
+from flwr.clientapp import ClientApp
 
 from $import_name.task import Net, load_data
 from $import_name.task import test as test_fn

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/cli/new/templates/app/code/server.pytorch_msg_api.py.tpl

@@ -1,8 +1,8 @@
 """$project_name: A Flower / $framework_str app."""
 
 import torch
-from flwr.common import ArrayRecord, ConfigRecord, Context
-from flwr.server import Grid, ServerApp
+from flwr.app import ArrayRecord, ConfigRecord, Context
+from flwr.serverapp import Grid, ServerApp
 from flwr.serverapp.strategy import FedAvg
 
 from $import_name.task import Net

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/clientapp/__init__.py

@@ -14,6 +14,14 @@
 # ==============================================================================
 """Public Flower ClientApp APIs."""
 
+
+from flwr.client import mod
+from flwr.client.client_app import ClientApp
+
 from .centraldp_mods import fixedclipping_mod
 
-__all__ = ["fixedclipping_mod"]
+__all__ = [
+    "ClientApp",
+    "fixedclipping_mod",
+    "mod",
+]

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/server/serverapp/app.py

@@ -21,6 +21,7 @@ from pathlib import Path
 from queue import Queue
 from typing import Optional
 
+from flwr.app.exception import AppExitException
 from flwr.cli.config_utils import get_fab_metadata
 from flwr.cli.install import install_from_fab
 from flwr.cli.utils import get_sha256_hash
@@ -37,7 +38,6 @@ from flwr.common.constant import (
     Status,
     SubStatus,
 )
-from flwr.common.exception import AppExitException
 from flwr.common.exit import ExitCode, add_exit_handler, flwr_exit
 from flwr.common.heartbeat import HeartbeatSender, get_grpc_app_heartbeat_fn
 from flwr.common.logger import (

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/__init__.py

@@ -14,8 +14,14 @@
 # ==============================================================================
 """Public Flower ServerApp APIs."""
 
+
+from flwr.server.grid import Grid
+from flwr.server.server_app import ServerApp
+
 from . import strategy
 
 __all__ = [
+    "Grid",
+    "ServerApp",
     "strategy",
 ]

flwr_nightly-1.21.0.dev20250907/py/flwr/serverapp/exception.py

@@ -0,0 +1,38 @@
+# 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 ServerApp exceptions."""
+
+
+from flwr.app.exception import AppExitException
+from flwr.common.exit import ExitCode
+
+
+class InconsistentMessageReplies(AppExitException):
+    """Exception triggered when replies are inconsistent and therefore aggregation must
+    be skipped."""
+
+    exit_code = ExitCode.SERVERAPP_STRATEGY_PRECONDITION_UNMET
+
+    def __init__(self, reason: str):
+        super().__init__(reason)
+
+
+class AggregationError(AppExitException):
+    """Exception triggered when aggregation fails."""
+
+    exit_code = ExitCode.SERVERAPP_STRATEGY_AGGREGATION_ERROR
+
+    def __init__(self, reason: str):
+        super().__init__(reason)

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/fedadagrad.py

@@ -27,8 +27,8 @@ import numpy as np
 
 from flwr.common import Array, ArrayRecord, Message, MetricRecord, RecordDict
 
+from ..exception import AggregationError
 from .fedopt import FedOpt
-from .strategy_utils import AggregationError
 
 
 # pylint: disable=line-too-long

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/fedadam.py

@@ -27,8 +27,8 @@ import numpy as np
 
 from flwr.common import Array, ArrayRecord, Message, MetricRecord, RecordDict
 
+from ..exception import AggregationError
 from .fedopt import FedOpt
-from .strategy_utils import AggregationError
 
 
 # pylint: disable=line-too-long

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/fedopt.py

@@ -34,8 +34,8 @@ from flwr.common import (
 )
 from flwr.server import Grid
 
+from ..exception import AggregationError
 from .fedavg import FedAvg
-from .strategy_utils import AggregationError
 
 
 # pylint: disable=line-too-long

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/fedyogi.py

@@ -26,8 +26,8 @@ import numpy as np
 
 from flwr.common import Array, ArrayRecord, Message, MetricRecord, RecordDict
 
+from ..exception import AggregationError
 from .fedopt import FedOpt
-from .strategy_utils import AggregationError
 
 
 # pylint: disable=line-too-long

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/strategy.py

@@ -140,7 +140,9 @@ class Strategy(ABC):
         timeout: float = 3600,
         train_config: Optional[ConfigRecord] = None,
         evaluate_config: Optional[ConfigRecord] = None,
-        evaluate_fn: Optional[Callable[[int, ArrayRecord], MetricRecord]] = None,
+        evaluate_fn: Optional[
+            Callable[[int, ArrayRecord], Optional[MetricRecord]]
+        ] = None,
     ) -> Result:
         """Execute the federated learning strategy.
 
@@ -164,11 +166,11 @@ class Strategy(ABC):
         evaluate_config : ConfigRecord, optional
             Configuration to be sent to nodes during evaluation rounds.
             If unset, an empty ConfigRecord will be used.
-        evaluate_fn : Callable[[int, ArrayRecord], MetricRecord], optional
+        evaluate_fn : Callable[[int, ArrayRecord], Optional[MetricRecord]], optional
             Optional function for centralized evaluation of the global model. Takes
-            server round number and array record, returns a MetricRecord. If provided,
-            will be called before the first round and after each round. Defaults to
-            None.
+            server round number and array record, returns a MetricRecord or None. If
+            provided, will be called before the first round and after each round.
+            Defaults to None.
 
         Returns
         -------
@@ -193,7 +195,8 @@ class Strategy(ABC):
         if evaluate_fn:
             res = evaluate_fn(0, initial_arrays)
             log(INFO, "Initial global evaluation results: %s", res)
-            result.evaluate_metrics_serverapp[0] = res
+            if res is not None:
+                result.evaluate_metrics_serverapp[0] = res
 
         arrays = initial_arrays
 
@@ -267,7 +270,8 @@ class Strategy(ABC):
                 log(INFO, "Global evaluation")
                 res = evaluate_fn(current_round, arrays)
                 log(INFO, "\t└──> MetricRecord: %s", res)
-                result.evaluate_metrics_serverapp[current_round] = res
+                if res is not None:
+                    result.evaluate_metrics_serverapp[current_round] = res
 
         log(INFO, "")
         log(INFO, "Strategy execution finished in %.2fs", time.time() - t_start)

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/strategy_utils.py

@@ -30,28 +30,9 @@ from flwr.common import (
     RecordDict,
     log,
 )
-from flwr.common.exception import AppExitException
-from flwr.common.exit import ExitCode
 from flwr.server import Grid
 
-
-class InconsistentMessageReplies(AppExitException):
-    """Exception triggered when replies are inconsistent and therefore aggregation must
-    be skipped."""
-
-    exit_code = ExitCode.SERVERAPP_STRATEGY_PRECONDITION_UNMET
-
-    def __init__(self, reason: str):
-        super().__init__(reason)
-
-
-class AggregationError(AppExitException):
-    """Exception triggered when aggregation fails."""
-
-    exit_code = ExitCode.SERVERAPP_STRATEGY_AGGREGATION_ERROR
-
-    def __init__(self, reason: str):
-        super().__init__(reason)
+from ..exception import InconsistentMessageReplies
 
 
 def config_to_str(config: ConfigRecord) -> str:

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/py/flwr/serverapp/strategy/strategy_utils_tests.py

@@ -23,8 +23,8 @@ from parameterized import parameterized
 
 from flwr.common import Array, ArrayRecord, ConfigRecord, MetricRecord, RecordDict
 
+from ..exception import InconsistentMessageReplies
 from .strategy_utils import (
-    InconsistentMessageReplies,
     aggregate_arrayrecords,
     aggregate_metricrecords,
     config_to_str,

{flwr_nightly-1.21.0.dev20250904 → flwr_nightly-1.21.0.dev20250907}/pyproject.toml

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