flwr-nightly 1.7.0.dev20240130__py3-none-any.whl → 1.7.0.dev20240201__py3-none-any.whl

flwr/client/app.py

@@ -18,7 +18,7 @@
 import argparse
 import sys
 import time
-from logging import INFO, WARN
+from logging import DEBUG, INFO, WARN
 from pathlib import Path
 from typing import Callable, ContextManager, Optional, Tuple, Union
 
@@ -62,7 +62,12 @@ def run_client() -> None:
                 "the '--root-certificates' option when running in insecure mode, "
                 "or omit '--insecure' to use HTTPS."
             )
-        log(WARN, "Option `--insecure` was set. Starting insecure HTTP client.")
+        log(
+            WARN,
+            "Option `--insecure` was set. "
+            "Starting insecure HTTP client connected to %s.",
+            args.server,
+        )
         root_certificates = None
     else:
         # Load the certificates if provided, or load the system certificates
@@ -71,11 +76,19 @@ def run_client() -> None:
             root_certificates = None
         else:
             root_certificates = Path(cert_path).read_bytes()
+        log(
+            DEBUG,
+            "Starting secure HTTPS client connected to %s "
+            "with the following certificates: %s.",
+            args.server,
+            cert_path,
+        )
 
-    print(args.root_certificates)
-    print(args.server)
-    print(args.dir)
-    print(args.callable)
+    log(
+        DEBUG,
+        "The Flower client uses `%s` to execute tasks",
+        args.callable,
+    )
 
     callable_dir = args.dir
     if callable_dir is not None:
@@ -88,7 +101,7 @@ def run_client() -> None:
     _start_client_internal(
         server_address=args.server,
         load_flower_callable_fn=_load,
-        transport="grpc-rere",  # Only
+        transport="rest" if args.rest else "grpc-rere",
         root_certificates=root_certificates,
         insecure=args.insecure,
     )
@@ -111,6 +124,11 @@ def _parse_args_client() -> argparse.ArgumentParser:
         help="Run the client without HTTPS. By default, the client runs with "
         "HTTPS enabled. Use this flag only if you understand the risks.",
     )
+    parser.add_argument(
+        "--rest",
+        action="store_true",
+        help="Use REST as a transport layer for the client.",
+    )
     parser.add_argument(
         "--root-certificates",
         metavar="ROOT_CERT",

flwr/client/dpfedavg_numpy_client.py

@@ -22,13 +22,20 @@ import numpy as np
 
 from flwr.client.numpy_client import NumPyClient
 from flwr.common.dp import add_gaussian_noise, clip_by_l2
+from flwr.common.logger import warn_deprecated_feature
 from flwr.common.typing import Config, NDArrays, Scalar
 
 
 class DPFedAvgNumPyClient(NumPyClient):
-    """Wrapper for configuring a Flower client for DP."""
+    """Wrapper for configuring a Flower client for DP.
+
+    Warning
+    -------
+    This class is deprecated and will be removed in a future release.
+    """
 
     def __init__(self, client: NumPyClient) -> None:
+        warn_deprecated_feature("`DPFedAvgNumPyClient` wrapper")
         super().__init__()
         self.client = client
 

flwr/client/middleware/__init__.py

@@ -15,8 +15,10 @@
 """Middleware layers."""
 
 
+from .secure_aggregation.secaggplus_middleware import secaggplus_middleware
 from .utils import make_ffn
 
 __all__ = [
     "make_ffn",
+    "secaggplus_middleware",
 ]

flwr/client/{secure_aggregation → middleware/secure_aggregation}/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2023 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.
@@ -13,12 +13,8 @@
 # limitations under the License.
 # ==============================================================================
 """Secure Aggregation handlers."""
-
-
-from .handler import SecureAggregationHandler
-from .secaggplus_handler import SecAggPlusHandler
+from .secaggplus_middleware import secaggplus_middleware
 
 __all__ = [
-    "SecAggPlusHandler",
-    "SecureAggregationHandler",
+    "secaggplus_middleware",
 ]

flwr/client/{secure_aggregation/secaggplus_handler.py → middleware/secure_aggregation/secaggplus_middleware.py}

@@ -1,4 +1,4 @@
-# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2024 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.
@@ -17,18 +17,18 @@
 
 import os
 from dataclasses import dataclass, field
-from logging import ERROR, INFO, WARNING
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
-
-from flwr.client.client import Client
-from flwr.client.numpy_client import NumPyClient
-from flwr.common import (
-    bytes_to_ndarray,
-    ndarray_to_bytes,
-    ndarrays_to_parameters,
-    parameters_to_ndarrays,
-)
+from logging import INFO, WARNING
+from typing import Any, Callable, Dict, List, Tuple, cast
+
+from flwr.client.typing import FlowerCallable
+from flwr.common import ndarray_to_bytes, parameters_to_ndarrays
+from flwr.common import recordset_compat as compat
+from flwr.common.configsrecord import ConfigsRecord
+from flwr.common.constant import TASK_TYPE_FIT
+from flwr.common.context import Context
 from flwr.common.logger import log
+from flwr.common.message import Message, Metadata
+from flwr.common.recordset import RecordSet
 from flwr.common.secure_aggregation.crypto.shamir import create_shares
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     bytes_to_private_key,
@@ -56,7 +56,6 @@ from flwr.common.secure_aggregation.secaggplus_constants import (
     KEY_DESTINATION_LIST,
     KEY_MASKED_PARAMETERS,
     KEY_MOD_RANGE,
-    KEY_PARAMETERS,
     KEY_PUBLIC_KEY_1,
     KEY_PUBLIC_KEY_2,
     KEY_SAMPLE_NUMBER,
@@ -68,6 +67,8 @@ from flwr.common.secure_aggregation.secaggplus_constants import (
     KEY_STAGE,
     KEY_TARGET_RANGE,
     KEY_THRESHOLD,
+    RECORD_KEY_CONFIGS,
+    RECORD_KEY_STATE,
     STAGE_COLLECT_MASKED_INPUT,
     STAGE_SETUP,
     STAGE_SHARE_KEYS,
@@ -79,9 +80,7 @@ from flwr.common.secure_aggregation.secaggplus_utils import (
     share_keys_plaintext_concat,
     share_keys_plaintext_separate,
 )
-from flwr.common.typing import FitIns, Value
-
-from .handler import SecureAggregationHandler
+from flwr.common.typing import ConfigsRecordValues, FitRes
 
 
 @dataclass
@@ -89,6 +88,8 @@ from .handler import SecureAggregationHandler
 class SecAggPlusState:
     """State of the SecAgg+ protocol."""
 
+    current_stage: str = STAGE_UNMASK
+
     sid: int = 0
     sample_num: int = 0
     share_num: int = 0
@@ -112,70 +113,115 @@ class SecAggPlusState:
     ss2_dict: Dict[int, bytes] = field(default_factory=dict)
     public_keys_dict: Dict[int, Tuple[bytes, bytes]] = field(default_factory=dict)
 
-    client: Optional[Union[Client, NumPyClient]] = None
-
-
-class SecAggPlusHandler(SecureAggregationHandler):
-    """Message handler for the SecAgg+ protocol."""
-
-    _shared_state = SecAggPlusState()
-    _current_stage = STAGE_UNMASK
-
-    def handle_secure_aggregation(
-        self, named_values: Dict[str, Value]
-    ) -> Dict[str, Value]:
-        """Handle incoming message and return results, following the SecAgg+ protocol.
-
-        Parameters
-        ----------
-        named_values : Dict[str, Value]
-            The named values retrieved from the SecureAggregation sub-message
-            of Task message in the server's TaskIns.
+    def __init__(self, **kwargs: ConfigsRecordValues) -> None:
+        for k, v in kwargs.items():
+            if k.endswith(":V"):
+                continue
+            new_v: Any = v
+            if k.endswith(":K"):
+                k = k[:-2]
+                keys = cast(List[int], v)
+                values = cast(List[bytes], kwargs[f"{k}:V"])
+                if len(values) > len(keys):
+                    updated_values = [
+                        tuple(values[i : i + 2]) for i in range(0, len(values), 2)
+                    ]
+                    new_v = dict(zip(keys, updated_values))
+                else:
+                    new_v = dict(zip(keys, values))
+            self.__setattr__(k, new_v)
+
+    def to_dict(self) -> Dict[str, ConfigsRecordValues]:
+        """Convert the state to a dictionary."""
+        ret = vars(self)
+        for k in list(ret.keys()):
+            if isinstance(ret[k], dict):
+                # Replace dict with two lists
+                v = cast(Dict[str, Any], ret.pop(k))
+                ret[f"{k}:K"] = list(v.keys())
+                if k == "public_keys_dict":
+                    v_list: List[bytes] = []
+                    for b1_b2 in cast(List[Tuple[bytes, bytes]], v.values()):
+                        v_list.extend(b1_b2)
+                    ret[f"{k}:V"] = v_list
+                else:
+                    ret[f"{k}:V"] = list(v.values())
+        return ret
+
+
+def _get_fit_fn(
+    msg: Message, ctxt: Context, call_next: FlowerCallable
+) -> Callable[[], FitRes]:
+    """Get the fit function."""
+
+    def fit() -> FitRes:
+        out_msg = call_next(msg, ctxt)
+        return compat.recordset_to_fitres(out_msg.message, keep_input=False)
+
+    return fit
+
+
+def secaggplus_middleware(
+    msg: Message,
+    ctxt: Context,
+    call_next: FlowerCallable,
+) -> Message:
+    """Handle incoming message and return results, following the SecAgg+ protocol."""
+    # Ignore non-fit messages
+    if msg.metadata.task_type != TASK_TYPE_FIT:
+        return call_next(msg, ctxt)
+
+    # Retrieve local state
+    if RECORD_KEY_STATE not in ctxt.state.configs:
+        ctxt.state.set_configs(RECORD_KEY_STATE, ConfigsRecord({}))
+    state_dict = ctxt.state.get_configs(RECORD_KEY_STATE).data
+    state = SecAggPlusState(**state_dict)
+
+    # Retrieve incoming configs
+    configs = msg.message.get_configs(RECORD_KEY_CONFIGS).data
 
-        Returns
-        -------
-        Dict[str, Value]
-            The final/intermediate results of the SecAgg+ protocol.
-        """
-        # Check if self is a client
-        if not isinstance(self, (Client, NumPyClient)):
-            raise TypeError(
-                "The subclass of SecAggPlusHandler must be "
-                "the subclass of Client or NumPyClient."
-            )
-
-        # Check the validity of the next stage
-        check_stage(self._current_stage, named_values)
-
-        # Update the current stage
-        self._current_stage = cast(str, named_values.pop(KEY_STAGE))
+    # Check the validity of the next stage
+    check_stage(state.current_stage, configs)
+
+    # Update the current stage
+    state.current_stage = cast(str, configs.pop(KEY_STAGE))
+
+    # Check the validity of the configs based on the current stage
+    check_configs(state.current_stage, configs)
+
+    # Execute
+    if state.current_stage == STAGE_SETUP:
+        res = _setup(state, configs)
+    elif state.current_stage == STAGE_SHARE_KEYS:
+        res = _share_keys(state, configs)
+    elif state.current_stage == STAGE_COLLECT_MASKED_INPUT:
+        fit = _get_fit_fn(msg, ctxt, call_next)
+        res = _collect_masked_input(state, configs, fit)
+    elif state.current_stage == STAGE_UNMASK:
+        res = _unmask(state, configs)
+    else:
+        raise ValueError(f"Unknown secagg stage: {state.current_stage}")
 
-        # Check the validity of the `named_values` based on the current stage
-        check_named_values(self._current_stage, named_values)
+    # Save state
+    ctxt.state.set_configs(RECORD_KEY_STATE, ConfigsRecord(state.to_dict()))
 
-        # Execute
-        if self._current_stage == STAGE_SETUP:
-            self._shared_state = SecAggPlusState(client=self)
-            return _setup(self._shared_state, named_values)
-        if self._current_stage == STAGE_SHARE_KEYS:
-            return _share_keys(self._shared_state, named_values)
-        if self._current_stage == STAGE_COLLECT_MASKED_INPUT:
-            return _collect_masked_input(self._shared_state, named_values)
-        if self._current_stage == STAGE_UNMASK:
-            return _unmask(self._shared_state, named_values)
-        raise ValueError(f"Unknown secagg stage: {self._current_stage}")
+    # Return message
+    return Message(
+        metadata=Metadata(0, "", "", "", TASK_TYPE_FIT),
+        message=RecordSet(configs={RECORD_KEY_CONFIGS: ConfigsRecord(res, False)}),
+    )
 
 
-def check_stage(current_stage: str, named_values: Dict[str, Value]) -> None:
+def check_stage(current_stage: str, configs: Dict[str, ConfigsRecordValues]) -> None:
     """Check the validity of the next stage."""
     # Check the existence of KEY_STAGE
-    if KEY_STAGE not in named_values:
+    if KEY_STAGE not in configs:
         raise KeyError(
             f"The required key '{KEY_STAGE}' is missing from the input `named_values`."
         )
 
     # Check the value type of the KEY_STAGE
-    next_stage = named_values[KEY_STAGE]
+    next_stage = configs[KEY_STAGE]
     if not isinstance(next_stage, str):
         raise TypeError(
             f"The value for the key '{KEY_STAGE}' must be of type {str}, "
@@ -198,8 +244,8 @@ def check_stage(current_stage: str, named_values: Dict[str, Value]) -> None:
 
 
 # pylint: disable-next=too-many-branches
-def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
-    """Check the validity of the input `named_values`."""
+def check_configs(stage: str, configs: Dict[str, ConfigsRecordValues]) -> None:
+    """Check the validity of the configs."""
     # Check `named_values` for the setup stage
     if stage == STAGE_SETUP:
         key_type_pairs = [
@@ -212,7 +258,7 @@ def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
             (KEY_MOD_RANGE, int),
         ]
         for key, expected_type in key_type_pairs:
-            if key not in named_values:
+            if key not in configs:
                 raise KeyError(
                     f"Stage {STAGE_SETUP}: the required key '{key}' is "
                     "missing from the input `named_values`."
@@ -220,14 +266,14 @@ def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
             # Bool is a subclass of int in Python,
             # so `isinstance(v, int)` will return True even if v is a boolean.
             # pylint: disable-next=unidiomatic-typecheck
-            if type(named_values[key]) is not expected_type:
+            if type(configs[key]) is not expected_type:
                 raise TypeError(
                     f"Stage {STAGE_SETUP}: The value for the key '{key}' "
                     f"must be of type {expected_type}, "
-                    f"but got {type(named_values[key])} instead."
+                    f"but got {type(configs[key])} instead."
                 )
     elif stage == STAGE_SHARE_KEYS:
-        for key, value in named_values.items():
+        for key, value in configs.items():
             if (
                 not isinstance(value, list)
                 or len(value) != 2
@@ -242,18 +288,17 @@ def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
         key_type_pairs = [
             (KEY_CIPHERTEXT_LIST, bytes),
             (KEY_SOURCE_LIST, int),
-            (KEY_PARAMETERS, bytes),
         ]
         for key, expected_type in key_type_pairs:
-            if key not in named_values:
+            if key not in configs:
                 raise KeyError(
                     f"Stage {STAGE_COLLECT_MASKED_INPUT}: "
                     f"the required key '{key}' is "
                     "missing from the input `named_values`."
                 )
-            if not isinstance(named_values[key], list) or any(
+            if not isinstance(configs[key], list) or any(
                 elm
-                for elm in cast(List[Any], named_values[key])
+                for elm in cast(List[Any], configs[key])
                 # pylint: disable-next=unidiomatic-typecheck
                 if type(elm) is not expected_type
             ):
@@ -268,15 +313,15 @@ def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
             (KEY_DEAD_SECURE_ID_LIST, int),
         ]
         for key, expected_type in key_type_pairs:
-            if key not in named_values:
+            if key not in configs:
                 raise KeyError(
                     f"Stage {STAGE_UNMASK}: "
                     f"the required key '{key}' is "
                     "missing from the input `named_values`."
                 )
-            if not isinstance(named_values[key], list) or any(
+            if not isinstance(configs[key], list) or any(
                 elm
-                for elm in cast(List[Any], named_values[key])
+                for elm in cast(List[Any], configs[key])
                 # pylint: disable-next=unidiomatic-typecheck
                 if type(elm) is not expected_type
             ):
@@ -289,9 +334,11 @@ def check_named_values(stage: str, named_values: Dict[str, Value]) -> None:
         raise ValueError(f"Unknown secagg stage: {stage}")
 
 
-def _setup(state: SecAggPlusState, named_values: Dict[str, Value]) -> Dict[str, Value]:
+def _setup(
+    state: SecAggPlusState, configs: Dict[str, ConfigsRecordValues]
+) -> Dict[str, ConfigsRecordValues]:
     # Assigning parameter values to object fields
-    sec_agg_param_dict = named_values
+    sec_agg_param_dict = configs
     state.sample_num = cast(int, sec_agg_param_dict[KEY_SAMPLE_NUMBER])
     state.sid = cast(int, sec_agg_param_dict[KEY_SECURE_ID])
     log(INFO, "Client %d: starting stage 0...", state.sid)
@@ -324,9 +371,9 @@ def _setup(state: SecAggPlusState, named_values: Dict[str, Value]) -> Dict[str,
 
 # pylint: disable-next=too-many-locals
 def _share_keys(
-    state: SecAggPlusState, named_values: Dict[str, Value]
-) -> Dict[str, Value]:
-    named_bytes_tuples = cast(Dict[str, Tuple[bytes, bytes]], named_values)
+    state: SecAggPlusState, configs: Dict[str, ConfigsRecordValues]
+) -> Dict[str, ConfigsRecordValues]:
+    named_bytes_tuples = cast(Dict[str, Tuple[bytes, bytes]], configs)
     key_dict = {int(sid): (pk1, pk2) for sid, (pk1, pk2) in named_bytes_tuples.items()}
     log(INFO, "Client %d: starting stage 1...", state.sid)
     state.public_keys_dict = key_dict
@@ -386,12 +433,14 @@ def _share_keys(
 
 # pylint: disable-next=too-many-locals
 def _collect_masked_input(
-    state: SecAggPlusState, named_values: Dict[str, Value]
-) -> Dict[str, Value]:
+    state: SecAggPlusState,
+    configs: Dict[str, ConfigsRecordValues],
+    fit: Callable[[], FitRes],
+) -> Dict[str, ConfigsRecordValues]:
     log(INFO, "Client %d: starting stage 2...", state.sid)
     available_clients: List[int] = []
-    ciphertexts = cast(List[bytes], named_values[KEY_CIPHERTEXT_LIST])
-    srcs = cast(List[int], named_values[KEY_SOURCE_LIST])
+    ciphertexts = cast(List[bytes], configs[KEY_CIPHERTEXT_LIST])
+    srcs = cast(List[int], configs[KEY_SOURCE_LIST])
     if len(ciphertexts) + 1 < state.threshold:
         raise ValueError("Not enough available neighbour clients.")
 
@@ -417,18 +466,9 @@ def _collect_masked_input(
         state.sk1_share_dict[src] = sk1_share
 
     # Fit client
-    parameters_bytes = cast(List[bytes], named_values[KEY_PARAMETERS])
-    parameters = [bytes_to_ndarray(w) for w in parameters_bytes]
-    if isinstance(state.client, Client):
-        fit_res = state.client.fit(
-            FitIns(parameters=ndarrays_to_parameters(parameters), config={})
-        )
-        parameters_factor = fit_res.num_examples
-        parameters = parameters_to_ndarrays(fit_res.parameters)
-    elif isinstance(state.client, NumPyClient):
-        parameters, parameters_factor, _ = state.client.fit(parameters, {})
-    else:
-        log(ERROR, "Client %d: fit function is missing.", state.sid)
+    fit_res = fit()
+    parameters_factor = fit_res.num_examples
+    parameters = parameters_to_ndarrays(fit_res.parameters)
 
     # Quantize parameter update (vector)
     quantized_parameters = quantize(
@@ -468,11 +508,13 @@ def _collect_masked_input(
     }
 
 
-def _unmask(state: SecAggPlusState, named_values: Dict[str, Value]) -> Dict[str, Value]:
+def _unmask(
+    state: SecAggPlusState, configs: Dict[str, ConfigsRecordValues]
+) -> Dict[str, ConfigsRecordValues]:
     log(INFO, "Client %d: starting stage 3...", state.sid)
 
-    active_sids = cast(List[int], named_values[KEY_ACTIVE_SECURE_ID_LIST])
-    dead_sids = cast(List[int], named_values[KEY_DEAD_SECURE_ID_LIST])
+    active_sids = cast(List[int], configs[KEY_ACTIVE_SECURE_ID_LIST])
+    dead_sids = cast(List[int], configs[KEY_DEAD_SECURE_ID_LIST])
     # Send private mask seed share for every avaliable client (including itclient)
     # Send first private key share for building pairwise mask for every dropped client
     if len(active_sids) < state.threshold:

flwr/common/dp.py

@@ -19,11 +19,13 @@ from typing import Tuple
 
 import numpy as np
 
+from flwr.common.logger import warn_deprecated_feature
 from flwr.common.typing import NDArrays
 
 
 # Calculates the L2-norm of a potentially ragged array
 def _get_update_norm(update: NDArrays) -> float:
+    warn_deprecated_feature("`_get_update_norm` method")
     flattened_update = update[0]
     for i in range(1, len(update)):
         flattened_update = np.append(flattened_update, update[i])
@@ -32,6 +34,7 @@ def _get_update_norm(update: NDArrays) -> float:
 
 def add_gaussian_noise(update: NDArrays, std_dev: float) -> NDArrays:
     """Add iid Gaussian noise to each floating point value in the update."""
+    warn_deprecated_feature("`add_gaussian_noise` method")
     update_noised = [
         layer + np.random.normal(0, std_dev, layer.shape) for layer in update
     ]
@@ -40,6 +43,7 @@ def add_gaussian_noise(update: NDArrays, std_dev: float) -> NDArrays:
 
 def clip_by_l2(update: NDArrays, threshold: float) -> Tuple[NDArrays, bool]:
     """Scales the update so thats its L2 norm is upper-bound to threshold."""
+    warn_deprecated_feature("`clip_by_l2` method")
     update_norm = _get_update_norm(update)
     scaling_factor = min(1, threshold / update_norm)
     update_clipped: NDArrays = [layer * scaling_factor for layer in update]

flwr/common/secure_aggregation/secaggplus_constants.py

@@ -14,6 +14,8 @@
 # ==============================================================================
 """Constants for the SecAgg/SecAgg+ protocol."""
 
+RECORD_KEY_STATE = "secaggplus_state"
+RECORD_KEY_CONFIGS = "secaggplus_configs"
 
 # Names of stages
 STAGE_SETUP = "setup"

flwr/driver/app.py

@@ -110,7 +110,9 @@ def start_driver(  # pylint: disable=too-many-arguments, too-many-locals
     # Create the Driver
     if isinstance(root_certificates, str):
         root_certificates = Path(root_certificates).read_bytes()
-    driver = GrpcDriver(driver_service_address=address, certificates=root_certificates)
+    driver = GrpcDriver(
+        driver_service_address=address, root_certificates=root_certificates
+    )
     driver.connect()
     lock = threading.Lock()
 

flwr/driver/driver.py

@@ -49,10 +49,10 @@ class Driver:
     def __init__(
         self,
         driver_service_address: str = DEFAULT_SERVER_ADDRESS_DRIVER,
-        certificates: Optional[bytes] = None,
+        root_certificates: Optional[bytes] = None,
     ) -> None:
         self.addr = driver_service_address
-        self.certificates = certificates
+        self.root_certificates = root_certificates
         self.grpc_driver: Optional[GrpcDriver] = None
         self.run_id: Optional[int] = None
         self.node = Node(node_id=0, anonymous=True)
@@ -62,7 +62,8 @@ class Driver:
         if self.grpc_driver is None or self.run_id is None:
             # Connect and create run
             self.grpc_driver = GrpcDriver(
-                driver_service_address=self.addr, certificates=self.certificates
+                driver_service_address=self.addr,
+                root_certificates=self.root_certificates,
             )
             self.grpc_driver.connect()
             res = self.grpc_driver.create_run(CreateRunRequest())

flwr/driver/grpc_driver.py

@@ -51,10 +51,10 @@ class GrpcDriver:
     def __init__(
         self,
         driver_service_address: str = DEFAULT_SERVER_ADDRESS_DRIVER,
-        certificates: Optional[bytes] = None,
+        root_certificates: Optional[bytes] = None,
     ) -> None:
         self.driver_service_address = driver_service_address
-        self.certificates = certificates
+        self.root_certificates = root_certificates
         self.channel: Optional[grpc.Channel] = None
         self.stub: Optional[DriverStub] = None
 
@@ -66,8 +66,8 @@ class GrpcDriver:
             return
         self.channel = create_channel(
             server_address=self.driver_service_address,
-            insecure=(self.certificates is None),
-            root_certificates=self.certificates,
+            insecure=(self.root_certificates is None),
+            root_certificates=self.root_certificates,
         )
         self.stub = DriverStub(self.channel)
         log(INFO, "[Driver] Connected to %s", self.driver_service_address)

flwr/server/app.py

@@ -532,7 +532,7 @@ def _run_fleet_api_grpc_rere(
     """Run Fleet API (gRPC, request-response)."""
     # Create Fleet API gRPC server
     fleet_servicer = FleetServicer(
-        state=state_factory.state(),
+        state_factory=state_factory,
     )
     fleet_add_servicer_to_server_fn = add_FleetServicer_to_server
     fleet_grpc_server = generic_create_grpc_server(

flwr/server/fleet/grpc_bidi/flower_service_servicer.py

@@ -18,7 +18,7 @@ Relevant knowledge for reading this modules code:
 - https://github.com/grpc/grpc/blob/master/doc/statuscodes.md
 """
 
-
+import uuid
 from typing import Callable, Iterator
 
 import grpc
@@ -91,9 +91,12 @@ class FlowerServiceServicer(transport_pb2_grpc.FlowerServiceServicer):
           wrapping the actual message
         - The `Join` method is (pretty much) unaware of the protocol
         """
-        peer: str = context.peer()
+        # When running Flower behind a proxy, the peer can be the same for
+        # different clients, so instead of `cid: str = context.peer()` we
+        # use a `UUID4` that is unique.
+        cid: str = uuid.uuid4().hex
         bridge = self.grpc_bridge_factory()
-        client_proxy = self.client_proxy_factory(peer, bridge)
+        client_proxy = self.client_proxy_factory(cid, bridge)
         is_success = register_client_proxy(self.client_manager, client_proxy, context)
 
         if is_success:

flwr/server/fleet/grpc_rere/fleet_servicer.py

@@ -32,14 +32,14 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PushTaskResResponse,
 )
 from flwr.server.fleet.message_handler import message_handler
-from flwr.server.state import State
+from flwr.server.state import StateFactory
 
 
 class FleetServicer(fleet_pb2_grpc.FleetServicer):
     """Fleet API servicer."""
 
-    def __init__(self, state: State) -> None:
-        self.state = state
+    def __init__(self, state_factory: StateFactory) -> None:
+        self.state_factory = state_factory
 
     def CreateNode(
         self, request: CreateNodeRequest, context: grpc.ServicerContext
@@ -48,7 +48,7 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
         log(INFO, "FleetServicer.CreateNode")
         return message_handler.create_node(
             request=request,
-            state=self.state,
+            state=self.state_factory.state(),
         )
 
     def DeleteNode(
@@ -58,7 +58,7 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
         log(INFO, "FleetServicer.DeleteNode")
         return message_handler.delete_node(
             request=request,
-            state=self.state,
+            state=self.state_factory.state(),
         )
 
     def PullTaskIns(
@@ -68,7 +68,7 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
         log(INFO, "FleetServicer.PullTaskIns")
         return message_handler.pull_task_ins(
             request=request,
-            state=self.state,
+            state=self.state_factory.state(),
         )
 
     def PushTaskRes(
@@ -78,5 +78,5 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
         log(INFO, "FleetServicer.PushTaskRes")
         return message_handler.push_task_res(
             request=request,
-            state=self.state,
+            state=self.state_factory.state(),
         )

flwr/server/strategy/dpfedavg_adaptive.py

@@ -24,6 +24,7 @@ from typing import Dict, List, Optional, Tuple, Union
 import numpy as np
 
 from flwr.common import FitIns, FitRes, Parameters, Scalar
+from flwr.common.logger import warn_deprecated_feature
 from flwr.server.client_manager import ClientManager
 from flwr.server.client_proxy import ClientProxy
 from flwr.server.strategy.dpfedavg_fixed import DPFedAvgFixed
@@ -31,7 +32,12 @@ from flwr.server.strategy.strategy import Strategy
 
 
 class DPFedAvgAdaptive(DPFedAvgFixed):
-    """Wrapper for configuring a Strategy for DP with Adaptive Clipping."""
+    """Wrapper for configuring a Strategy for DP with Adaptive Clipping.
+
+    Warning
+    -------
+    This class is deprecated and will be removed in a future release.
+    """
 
     # pylint: disable=too-many-arguments,too-many-instance-attributes
     def __init__(
@@ -45,6 +51,7 @@ class DPFedAvgAdaptive(DPFedAvgFixed):
         clip_norm_target_quantile: float = 0.5,
         clip_count_stddev: Optional[float] = None,
     ) -> None:
+        warn_deprecated_feature("`DPFedAvgAdaptive` wrapper")
         super().__init__(
             strategy=strategy,
             num_sampled_clients=num_sampled_clients,

flwr/server/strategy/dpfedavg_fixed.py

@@ -17,11 +17,11 @@
 Paper: arxiv.org/pdf/1710.06963.pdf
 """
 
-
 from typing import Dict, List, Optional, Tuple, Union
 
 from flwr.common import EvaluateIns, EvaluateRes, FitIns, FitRes, Parameters, Scalar
 from flwr.common.dp import add_gaussian_noise
+from flwr.common.logger import warn_deprecated_feature
 from flwr.common.parameter import ndarrays_to_parameters, parameters_to_ndarrays
 from flwr.server.client_manager import ClientManager
 from flwr.server.client_proxy import ClientProxy
@@ -29,7 +29,12 @@ from flwr.server.strategy.strategy import Strategy
 
 
 class DPFedAvgFixed(Strategy):
-    """Wrapper for configuring a Strategy for DP with Fixed Clipping."""
+    """Wrapper for configuring a Strategy for DP with Fixed Clipping.
+
+    Warning
+    -------
+    This class is deprecated and will be removed in a future release.
+    """
 
     # pylint: disable=too-many-arguments,too-many-instance-attributes
     def __init__(
@@ -40,6 +45,7 @@ class DPFedAvgFixed(Strategy):
         noise_multiplier: float = 1,
         server_side_noising: bool = True,
     ) -> None:
+        warn_deprecated_feature("`DPFedAvgFixed` wrapper")
         super().__init__()
         self.strategy = strategy
         # Doing fixed-size subsampling as in https://arxiv.org/abs/1905.03871.

flwr/server/strategy/fedxgb_bagging.py

@@ -44,6 +44,11 @@ class FedXgbBagging(FedAvg):
         self.global_model: Optional[bytes] = None
         super().__init__(**kwargs)
 
+    def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
+        rep = f"FedXgbBagging(accept_failures={self.accept_failures})"
+        return rep
+
     def aggregate_fit(
         self,
         server_round: int,

flwr/server/strategy/fedxgb_cyclic.py

@@ -37,6 +37,11 @@ class FedXgbCyclic(FedAvg):
         self.global_model: Optional[bytes] = None
         super().__init__(**kwargs)
 
+    def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
+        rep = f"FedXgbCyclic(accept_failures={self.accept_failures})"
+        return rep
+
     def aggregate_fit(
         self,
         server_round: int,

{flwr_nightly-1.7.0.dev20240130.dist-info → flwr_nightly-1.7.0.dev20240201.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.7.0.dev20240130
+Version: 1.7.0.dev20240201
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0
@@ -82,8 +82,7 @@ design of Flower is based on a few guiding principles:
 
 - **Framework-agnostic**: Different machine learning frameworks have different
   strengths. Flower can be used with any machine learning framework, for
-  example, [PyTorch](https://pytorch.org),
-  [TensorFlow](https://tensorflow.org), [Hugging Face Transformers](https://huggingface.co/), [PyTorch Lightning](https://pytorchlightning.ai/), [scikit-learn](https://scikit-learn.org/), [JAX](https://jax.readthedocs.io/), [TFLite](https://tensorflow.org/lite/), [fastai](https://www.fast.ai/), [Pandas](https://pandas.pydata.org/) for federated analytics, or even raw [NumPy](https://numpy.org/)
+  example, [PyTorch](https://pytorch.org), [TensorFlow](https://tensorflow.org), [Hugging Face Transformers](https://huggingface.co/), [PyTorch Lightning](https://pytorchlightning.ai/), [scikit-learn](https://scikit-learn.org/), [JAX](https://jax.readthedocs.io/), [TFLite](https://tensorflow.org/lite/), [fastai](https://www.fast.ai/), [MLX](https://ml-explore.github.io/mlx/build/html/index.html), [XGBoost](https://xgboost.readthedocs.io/en/stable/), [Pandas](https://pandas.pydata.org/) for federated analytics, or even raw [NumPy](https://numpy.org/)
   for users who enjoy computing gradients by hand.
 
 - **Understandable**: Flower is written with maintainability in mind. The
@@ -129,7 +128,7 @@ Stay tuned, more tutorials are coming soon. Topics include **Privacy and Securit
 - [Quickstart (TensorFlow)](https://flower.dev/docs/framework/tutorial-quickstart-tensorflow.html)
 - [Quickstart (PyTorch)](https://flower.dev/docs/framework/tutorial-quickstart-pytorch.html)
 - [Quickstart (Hugging Face)](https://flower.dev/docs/framework/tutorial-quickstart-huggingface.html)
-- [Quickstart (PyTorch Lightning [code example])](https://flower.dev/docs/framework/tutorial-quickstart-pytorch-lightning.html)
+- [Quickstart (PyTorch Lightning)](https://flower.dev/docs/framework/tutorial-quickstart-pytorch-lightning.html)
 - [Quickstart (Pandas)](https://flower.dev/docs/framework/tutorial-quickstart-pandas.html)
 - [Quickstart (fastai)](https://flower.dev/docs/framework/tutorial-quickstart-fastai.html)
 - [Quickstart (JAX)](https://flower.dev/docs/framework/tutorial-quickstart-jax.html)
@@ -148,11 +147,17 @@ Flower Baselines is a collection of community-contributed projects that reproduc
 - [FedMLB](https://github.com/adap/flower/tree/main/baselines/fedmlb)
 - [FedPer](https://github.com/adap/flower/tree/main/baselines/fedper)
 - [FedProx](https://github.com/adap/flower/tree/main/baselines/fedprox)
+- [FedNova](https://github.com/adap/flower/tree/main/baselines/fednova)
+- [HeteroFL](https://github.com/adap/flower/tree/main/baselines/heterofl)
+- [FedAvgM](https://github.com/adap/flower/tree/main/baselines/fedavgm)
 - [FedWav2vec2](https://github.com/adap/flower/tree/main/baselines/fedwav2vec2)
 - [FjORD](https://github.com/adap/flower/tree/main/baselines/fjord)
 - [MOON](https://github.com/adap/flower/tree/main/baselines/moon)
 - [niid-Bench](https://github.com/adap/flower/tree/main/baselines/niid_bench)
 - [TAMUNA](https://github.com/adap/flower/tree/main/baselines/tamuna)
+- [FedVSSL](https://github.com/adap/flower/tree/main/baselines/fedvssl)
+- [FedXGBoost](https://github.com/adap/flower/tree/main/baselines/hfedxgboost)
+- [FedPara](https://github.com/adap/flower/tree/main/baselines/fedpara)
 - [FedAvg](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/flwr_baselines/publications/fedavg_mnist)
 - [FedOpt](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/flwr_baselines/publications/adaptive_federated_optimization)
 
@@ -174,16 +179,23 @@ Quickstart examples:
 - [Quickstart (Pandas)](https://github.com/adap/flower/tree/main/examples/quickstart-pandas)
 - [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart-jax)
 - [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)
+- [Quickstart (XGBoost)](https://github.com/adap/flower/tree/main/examples/xgboost-quickstart)
 - [Quickstart (Android [TFLite])](https://github.com/adap/flower/tree/main/examples/android)
 - [Quickstart (iOS [CoreML])](https://github.com/adap/flower/tree/main/examples/ios)
+- [Quickstart (MLX)](https://github.com/adap/flower/tree/main/examples/quickstart-mlx)
+- [Quickstart (XGBoost)](https://github.com/adap/flower/tree/main/examples/xgboost-quickstart)
 
 Other [examples](https://github.com/adap/flower/tree/main/examples):
 
 - [Raspberry Pi & Nvidia Jetson Tutorial](https://github.com/adap/flower/tree/main/examples/embedded-devices)
 - [PyTorch: From Centralized to Federated](https://github.com/adap/flower/tree/main/examples/pytorch-from-centralized-to-federated)
+- [Vertical FL](https://github.com/adap/flower/tree/main/examples/vertical-fl)
+- [Federated Finetuning of OpenAI's Whisper](https://github.com/adap/flower/tree/main/examples/whisper-federated-finetuning)
+- [Comprehensive XGBoost](https://github.com/adap/flower/tree/main/examples/xgboost-comprehensive)
 - [Advanced Flower with TensorFlow/Keras](https://github.com/adap/flower/tree/main/examples/advanced-tensorflow)
 - [Advanced Flower with PyTorch](https://github.com/adap/flower/tree/main/examples/advanced-pytorch)
-- Single-Machine Simulation of Federated Learning Systems ([PyTorch](https://github.com/adap/flower/tree/main/examples/simulation_pytorch)) ([Tensorflow](https://github.com/adap/flower/tree/main/examples/simulation_tensorflow))
+- Single-Machine Simulation of Federated Learning Systems ([PyTorch](https://github.com/adap/flower/tree/main/examples/simulation-pytorch)) ([Tensorflow](https://github.com/adap/flower/tree/main/examples/simulation-tensorflow))
+- [Comprehensive Flower+XGBoost](https://github.com/adap/flower/tree/main/examples/xgboost-comprehensive)
 - [Flower through Docker Compose and with Grafana dashboard](https://github.com/adap/flower/tree/main/examples/flower-via-docker-compose)
 
 ## Community

{flwr_nightly-1.7.0.dev20240130.dist-info → flwr_nightly-1.7.0.dev20240201.dist-info}/RECORD

@@ -1,8 +1,8 @@
 flwr/__init__.py,sha256=6zbcS7z2q-VUdmpFppLH6BacsE-ZFmfq6OvtKNOyYE0,981
 flwr/client/__init__.py,sha256=2T4enmlE4PsoKiGTvXwBKSlhOjZ7MXRy5oCGNf0UH9Y,1111
-flwr/client/app.py,sha256=eBZocV3uFm1w0H6Vp6DmelojSzIHKlcXHVOZzHowE7c,19483
+flwr/client/app.py,sha256=EMN_gRPn6Jn9sDUaDRHFHVR7p4a9a1VWq358-7ToZmg,19947
 flwr/client/client.py,sha256=ATcsqAMS9zpMBJ9ZUbBeB7BEPWX_VWISONy0p6Wxl5g,8210
-flwr/client/dpfedavg_numpy_client.py,sha256=0XryFdCMM_RLiNLCr6evLp-6R7ZjeMmRUROIgzRmtmc,7215
+flwr/client/dpfedavg_numpy_client.py,sha256=9Tnig4iml2J88HBKNahegjXjbfvIQyBtaIQaqjbeqsA,7435
 flwr/client/flower.py,sha256=QKWBjB8YbzlKfC1EPVpxLfiYRL078C7BL5hPaX_rUMY,4211
 flwr/client/grpc_client/__init__.py,sha256=LsnbqXiJhgQcB0XzAlUQgPx011Uf7Y7yabIC1HxivJ8,735
 flwr/client/grpc_client/connection.py,sha256=x50raKKVKVNjNNOr2u1gOS2Ts6ohs2cAGrRXZw6sgLE,8226
@@ -11,16 +11,15 @@ flwr/client/grpc_rere_client/connection.py,sha256=Ey1xN0a69nv59MV8-BC8BpYwPqhufU
 flwr/client/message_handler/__init__.py,sha256=abHvBRJJiiaAMNgeILQbMOa6h8WqMK2BcnvxwQZFpic,719
 flwr/client/message_handler/message_handler.py,sha256=cknnjvgmNdBZOcPfJ4bBjcIK8ZDqXZMiXK69-toumNs,5900
 flwr/client/message_handler/task_handler.py,sha256=_mmUiMKlnO196Jqw9sEgTevkWQm7ra-Vf3JzQD-Cx_A,4128
-flwr/client/middleware/__init__.py,sha256=Eo3JvAV5XqmyRySNqeiw93YNETmmP5ixEOMeBA6ah4w,769
+flwr/client/middleware/__init__.py,sha256=mYWAt8YUy2aiL-kK7LDASgMpbsYxfRoE4iptf1zene4,874
+flwr/client/middleware/secure_aggregation/__init__.py,sha256=3GinEPdTOULN5D9BD2ujX0uEEUHytlKoCT81rErw6sw,819
+flwr/client/middleware/secure_aggregation/secaggplus_middleware.py,sha256=A6fpS3uQEP_vMeRZ688GK7LJ13WlP1TQksyMapvHGHU,20111
 flwr/client/middleware/utils.py,sha256=8fWgKhDr_HV7ZawcgcPKqfwdDUpDfAtLItxtTi3oC5Q,1281
 flwr/client/node_state.py,sha256=0hk1RZuFZ3_S7Y8Q0BCP60NljxnT9vqPmIflvCCGxnQ,1819
 flwr/client/node_state_tests.py,sha256=H3sO526boAlDS491fO5xvZhl5XNDzzl-I8DiaVmnsXM,2195
 flwr/client/numpy_client.py,sha256=42e8_gZU5gwzpvVXQr6LEWEGfpWYTcQ0MY0F0owNlAc,10310
 flwr/client/rest_client/__init__.py,sha256=ThwOnkMdzxo_UuyTI47Q7y9oSpuTgNT2OuFvJCfuDiw,735
 flwr/client/rest_client/connection.py,sha256=NK3PFGJvOwh3bUNSp5nfkfLHa6T5kzQ0XN9ire9F4tk,11964
-flwr/client/secure_aggregation/__init__.py,sha256=XCDycteBTivym0zwkwqXhFMCAoDoHBZQg5GxdMnFCfA,888
-flwr/client/secure_aggregation/handler.py,sha256=oRyGCerz92aED7UydYwJ7OFVxUwHqedG3PshHrdZq-Y,1522
-flwr/client/secure_aggregation/secaggplus_handler.py,sha256=2jKtRhoJaVRmMJgJ2v8VRUCw2ko7uhTL2_h8CZVFwZA,18928
 flwr/client/typing.py,sha256=pk0eIYcLUXRic_rRxQxW7Vdp7b6cRjlRiagpMs7HicQ,1023
 flwr/common/__init__.py,sha256=qttep0POwoigzB5pcraZa4YMt9jsCSfeibcrTQMUjIc,2884
 flwr/common/address.py,sha256=iTAN9jtmIGMrWFnx9XZQl45ZEtQJVZZLYPRBSNVARGI,1882
@@ -28,7 +27,7 @@ flwr/common/configsrecord.py,sha256=i41syiXeG4CyWr4ujOCxTDBZKiClNnNgR4xbufxThh0,
 flwr/common/constant.py,sha256=tQxp9yXKXVajh6obsUlFs4UYIiTBxl4bGHnj9ds7NLQ,1263
 flwr/common/context.py,sha256=OP4mTxsCdU2LS63TegdLHaEDpxULZ4AQ4ybZl7jEdDU,1329
 flwr/common/date.py,sha256=UWhBZj49yX9LD4BmatS_ZFZu_-kweGh0KQJ1djyWWH4,891
-flwr/common/dp.py,sha256=hF45cPElXxcQsh4AoquAyaTrNi0xCrIcKx7xOcV_1XU,1782
+flwr/common/dp.py,sha256=Hc3lLHihjexbJaD_ft31gdv9XRcwOTgDBwJzICuok3A,2004
 flwr/common/grpc.py,sha256=qVLB0d6bCuaBRW5YB0vEZXsR7Bo3R2lh4ONiCocqwRI,2270
 flwr/common/logger.py,sha256=qX_gqEyrmGOH0x_r8uQ1Vskz4fGvEij9asdo4DUOPY8,4135
 flwr/common/message.py,sha256=GQuhFmvJIrCG6h4L-jQMsn6KYh-nmNqNNo5qVe7ye5w,1847
@@ -44,17 +43,17 @@ flwr/common/secure_aggregation/crypto/shamir.py,sha256=yY35ZgHlB4YyGW_buG-1X-0M-
 flwr/common/secure_aggregation/crypto/symmetric_encryption.py,sha256=-zDyQoTsHHQjR7o-92FNIikg1zM_Ke9yynaD5u2BXbQ,3546
 flwr/common/secure_aggregation/ndarrays_arithmetic.py,sha256=KAHCEHGSTJ6mCgnC8dTpIx6URk11s5XxWTHI_7ToGIg,2979
 flwr/common/secure_aggregation/quantization.py,sha256=appui7GGrkRPsupF59TkapeV4Na_CyPi73JtJ1pimdI,2310
-flwr/common/secure_aggregation/secaggplus_constants.py,sha256=m5UDo7IgRkMS3yixhzz7DhhAv6VAQMCghglMygSPU_k,1606
+flwr/common/secure_aggregation/secaggplus_constants.py,sha256=pITi-nuzrNvKWR42XwVFBuejv1RdGLwmuErLp0X0t_Y,1686
 flwr/common/secure_aggregation/secaggplus_utils.py,sha256=PleDyDu7jHNAfbRoEaoQiOjxG6iMl9yA8rNKYTfnyFw,3155
 flwr/common/serde.py,sha256=rXUSH9TNFsRDBTdr9bGCKGLyjNuzagUOQVynS_luWkI,19643
 flwr/common/telemetry.py,sha256=se_-pHgEWcmN09ChSpTeek72l1UJHf7GbwXBB1KXBjQ,7683
 flwr/common/typing.py,sha256=3Wu6Ol1Ja6Gb0WdlcXVEn1EHYJbc4oRRJA81vEegxBo,4382
 flwr/common/version.py,sha256=A0MKvyKPrV8wLg0YCAODTqM71v26NEH36c6JYtfgg0o,667
 flwr/driver/__init__.py,sha256=NQ4KeZ5fP9wdxGjcr2cP41_7TLuuYQ3u4J7GwYtQ488,870
-flwr/driver/app.py,sha256=rTBmbDt3kUN9-j3I-HwZE43Y1oSjVb3DR3R2ntt4f5c,7249
-flwr/driver/driver.py,sha256=S9KsRlpf7j3y6jGaAgu4TwM_AyHlZFhJV-HgfwJKxks,3967
+flwr/driver/app.py,sha256=rhACazH0J06Tnqy5aU0DoJlx5ZksK4b0NgHkM1bAE38,7268
+flwr/driver/driver.py,sha256=BhCXx55Lk9WdpcfjlHhKyLbGdiIvawIvMWYPewIaI8I,4009
 flwr/driver/driver_client_proxy.py,sha256=wKC3R-293dOqxNytzf78z6tuDCXORbuJAdICyZ5jeK8,6126
-flwr/driver/grpc_driver.py,sha256=KlJT_wWVm9xx2xapzC0Kgn1UDnBBem514aaTtzJSlkw,4560
+flwr/driver/grpc_driver.py,sha256=Ekcxx4Miqume02fiBjBRJhItaOFNpn120WT3uRIPWIc,4585
 flwr/flower/__init__.py,sha256=aUO5V7ovBwDoXuS9Dqlpzq_m_VGRpYiRgR2jpokRPy8,786
 flwr/proto/__init__.py,sha256=hbY7JYakwZwCkYgCNlmHdc8rtvfoJbAZLalMdc--CGc,683
 flwr/proto/driver_pb2.py,sha256=JHIdjNPTgp6YHD-_lz5ZZFB0VIOR3_GmcaOTN4jndc4,3115
@@ -83,7 +82,7 @@ flwr/proto/transport_pb2_grpc.py,sha256=vLN3EHtx2aEEMCO4f1Upu-l27BPzd3-5pV-u8wPc
 flwr/proto/transport_pb2_grpc.pyi,sha256=AGXf8RiIiW2J5IKMlm_3qT3AzcDa4F3P5IqUjve_esA,766
 flwr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flwr/server/__init__.py,sha256=SG7XJWnskPZu30VfY5WmXbfYKeb8UFrths4qprAb0yg,1377
-flwr/server/app.py,sha256=KeRcABvbNnTXHdsz-WPMjNcgLRrdZR6MLNTX8bIK83Y,25619
+flwr/server/app.py,sha256=WYAyWQZksetbzR8Gos_LSQOTzzhzapuRhjXdks6K9xM,25619
 flwr/server/client_manager.py,sha256=T8UDSRJBVD3fyIDI7NTAA-NA7GPrMNNgH2OAF54RRxE,6127
 flwr/server/client_proxy.py,sha256=8ScGDvP3jHbl8DV3hyFID5N5VEVlXn8ZTQXtkdOfssI,2234
 flwr/server/criterion.py,sha256=ypbAexbztzGUxNen9RCHF91QeqiEQix4t4Ih3E-42MM,1061
@@ -91,12 +90,12 @@ flwr/server/driver/__init__.py,sha256=STB1_DASVEg7Cu6L7VYxTzV7UMkgtBkFim09Z82Dh8
 flwr/server/driver/driver_servicer.py,sha256=8JwftxoMMqHPAEgvE2TDDvm4zW2-7xaHYoji5kb6k8k,4553
 flwr/server/fleet/__init__.py,sha256=C6GCSD5eP5Of6_dIeSe1jx9HnV0icsvWyQ5EKAUHJRU,711
 flwr/server/fleet/grpc_bidi/__init__.py,sha256=mgGJGjwT6VU7ovC1gdnnqttjyBPlNIcZnYRqx4K3IBQ,735
-flwr/server/fleet/grpc_bidi/flower_service_servicer.py,sha256=v1oDksCIphGoTCMbz68DjaTk7Pw89wjGTJUw4rezV1Q,5756
+flwr/server/fleet/grpc_bidi/flower_service_servicer.py,sha256=DVYlKxOVHwdQVux9XKJTomWwoLLlhhPhvvluU50hO4E,5956
 flwr/server/fleet/grpc_bidi/grpc_bridge.py,sha256=LSOmabFXAQxKycQOliplKmigbmVwdm-D4CI-hJ0Pav0,6458
 flwr/server/fleet/grpc_bidi/grpc_client_proxy.py,sha256=MubuEEAZAcKzx9LYAB87B2sjvZWWyQS3RPAJJm1GS4I,4695
 flwr/server/fleet/grpc_bidi/grpc_server.py,sha256=TY_Z8ComreNNOOKveeUO6eE5hoSuTvx_EWqQl0zRADQ,11779
 flwr/server/fleet/grpc_rere/__init__.py,sha256=bEJOMWbSlqkw-y5ZHtEXczhoSlAxErcRYffmTMQAV8M,758
-flwr/server/fleet/grpc_rere/fleet_servicer.py,sha256=tG_t9_Fpbs-K1uT5B6GeLdrQCVcOXAdtqBGg_f7ZVVw,2603
+flwr/server/fleet/grpc_rere/fleet_servicer.py,sha256=I6-mfOIKjxiGgHuL2AeiKqYnXDY_qBN1YXDJw1cttcA,2705
 flwr/server/fleet/message_handler/__init__.py,sha256=hEY0l61ojH8Iz30_K1btm1HJ6J49iZJSFUsVYqUTw3A,731
 flwr/server/fleet/message_handler/message_handler.py,sha256=_SauWQUO6VCMRRNXDfg3gv2h1FKG7e7p8F-Nj4aY6OM,2823
 flwr/server/fleet/rest_rere/__init__.py,sha256=VKDvDq5H8koOUztpmQacVzGJXPLEEkL1Vmolxt3mvnY,735
@@ -111,8 +110,8 @@ flwr/server/state/state_factory.py,sha256=91cSB-KOAFM37z7T098WxTkVeKNaAZ_mTI75sn
 flwr/server/strategy/__init__.py,sha256=EDTv_lU67VmZ8pRqy5fabQDhq5x4oRiD-KHoXhOIWMs,2096
 flwr/server/strategy/aggregate.py,sha256=QyRIJtI5gnuY1NbgrcrOvkHxGIxBvApq7d9Y4xl-6W4,13468
 flwr/server/strategy/bulyan.py,sha256=8GsSVJzRSoSWE2zQUKqC3Z795grdN9xpmc3MSGGXnzM,6532
-flwr/server/strategy/dpfedavg_adaptive.py,sha256=Wu0StMixNy-1fIJ3Bo2HcytoDQv5Xe5dCZcrsMTOBdg,4660
-flwr/server/strategy/dpfedavg_fixed.py,sha256=roWpIRhup30P1tEgijsJGBAPqtLIuJZ9etFeukwKpjU,7004
+flwr/server/strategy/dpfedavg_adaptive.py,sha256=hLJkPQJl1bHjwrBNg3PSRFKf3no0hg5EHiFaWhHlWqw,4877
+flwr/server/strategy/dpfedavg_fixed.py,sha256=mV_UimlGigUJjc2a9dmUig5EuVZ4yGIb9pkq31bKG1A,7217
 flwr/server/strategy/fault_tolerant_fedavg.py,sha256=veGcehB6rXT_MihNDrD1v5JY-TxJi7fybdDl-OZooDQ,5900
 flwr/server/strategy/fedadagrad.py,sha256=9yoVdZOFTjQ7DpaVrYLH9ca88WgJVWepld6UXybGQMY,6505
 flwr/server/strategy/fedadam.py,sha256=Zvqo6oChwB2aDGHeLXHNE74nHGwkFAWODLZ8f6Dtq1g,6763
@@ -123,8 +122,8 @@ flwr/server/strategy/fedmedian.py,sha256=HpmUkLLXWgmMgQiEK2cG1l5nOd99ykAWdUxV5uU
 flwr/server/strategy/fedopt.py,sha256=xqu-7513C8bFBw2qrzvduk9o2mT0sPHNVLKmVbJ3V4U,5242
 flwr/server/strategy/fedprox.py,sha256=BBmIDoRtDeb3TpigO1beBZ79wIVy2UsVDIDnxktoyas,6862
 flwr/server/strategy/fedtrimmedavg.py,sha256=p12uA7EN0k_CfYeh513P3m8mH3h14SmR3C_MQ9vw6Sc,5890
-flwr/server/strategy/fedxgb_bagging.py,sha256=BqtHfdRrLW5AhnBiN_aiECWcgIvgFEzku_76D98vMXg,5895
-flwr/server/strategy/fedxgb_cyclic.py,sha256=CjlFdy-0lxM4m1O6lYL2498lImPHhxiTkiOvPTXKj24,5423
+flwr/server/strategy/fedxgb_bagging.py,sha256=Fm6bkulhPkes2k5lyG7oxgwtdJrXeNWDa-FCc_5AGVY,6080
+flwr/server/strategy/fedxgb_cyclic.py,sha256=keiPOtd843-5uWWpRqJkEhvoNqTEB4zSIr51F6soosQ,5607
 flwr/server/strategy/fedxgb_nn_avg.py,sha256=tA6X43juce0ShfRgfeNxRIcpSUlgVNwGB8vYoUuNFhI,4047
 flwr/server/strategy/fedyogi.py,sha256=fG9i1WEdUXTYh5mTmagGLHqc12OogEsj3s3IopwM4ZA,6801
 flwr/server/strategy/krum.py,sha256=yaYAZw4KOL84nc_PZAp43rBl0pXC0dT6y46sEuZrirA,6285
@@ -139,8 +138,8 @@ flwr/simulation/ray_transport/__init__.py,sha256=FsaAnzC4cw4DqoouBCix6496k29jACk
 flwr/simulation/ray_transport/ray_actor.py,sha256=G_g50ISt3Knf0zuX1wmw39gsDXSoMI5f3rmYZWGrUh4,17062
 flwr/simulation/ray_transport/ray_client_proxy.py,sha256=UxQEzWmklp3WO2V7LH5vNyAgYL7KYFFZQa1HTUSgEqY,9429
 flwr/simulation/ray_transport/utils.py,sha256=5dwzUppfJP8lrpBU1rvhzfPZqAeGo8wx-hOm8wy_HmA,3376
-flwr_nightly-1.7.0.dev20240130.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.7.0.dev20240130.dist-info/METADATA,sha256=clCdgXSkrZfi3u8GQhP0L2Hf3uuxexRQCfU5WPAWwAk,13584
-flwr_nightly-1.7.0.dev20240130.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-flwr_nightly-1.7.0.dev20240130.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
-flwr_nightly-1.7.0.dev20240130.dist-info/RECORD,,
+flwr_nightly-1.7.0.dev20240201.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.7.0.dev20240201.dist-info/METADATA,sha256=9Dy5grkrz2m-B-DQV_fT1We-X7-wXAEhYB5dyEH181c,14811
+flwr_nightly-1.7.0.dev20240201.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+flwr_nightly-1.7.0.dev20240201.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
+flwr_nightly-1.7.0.dev20240201.dist-info/RECORD,,

flwr/client/secure_aggregation/handler.py

@@ -1,43 +0,0 @@
-# Copyright 2020 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.
-# ==============================================================================
-"""Message Handler for Secure Aggregation (abstract base class)."""
-
-
-from abc import ABC, abstractmethod
-from typing import Dict
-
-from flwr.common.typing import Value
-
-
-class SecureAggregationHandler(ABC):
-    """Abstract base class for secure aggregation message handlers."""
-
-    @abstractmethod
-    def handle_secure_aggregation(
-        self, named_values: Dict[str, Value]
-    ) -> Dict[str, Value]:
-        """Handle incoming Secure Aggregation message and return results.
-
-        Parameters
-        ----------
-        named_values : Dict[str, Value]
-            The named values retrieved from the SecureAggregation sub-message
-            of Task message in the server's TaskIns.
-
-        Returns
-        -------
-        Dict[str, Value]
-            The final/intermediate results of the Secure Aggregation protocol.
-        """