flwr-nightly 1.5.0.dev20230615__tar.gz → 1.5.0.dev20230619__tar.gz

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.5.0.dev20230615
+Version: 1.5.0.dev20230619
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.5.0-dev20230615"
+version = "1.5.0-dev20230619"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.dev>"]
@@ -98,6 +98,7 @@ furo = "==2022.12.7"
 sphinx-reredirects = "==0.1.2"
 nbsphinx = "==0.9.2"
 nbstripout = "==0.6.1"
+ruff = "==0.0.272"
 sphinx-argparse = "==0.4.0"
 pipreqs = "==0.4.13"
 
@@ -156,3 +157,39 @@ follow_imports_for_stubs = true
 [tool.docformatter]
 wrap-summaries = 88
 wrap-descriptions = 88
+
+[tool.ruff]
+target-version = "py37"
+line-length = 88
+select = ["D", "E", "F", "W", "B", "ISC", "C4"]
+fixable = ["D", "E", "F", "W", "B", "ISC", "C4"]
+ignore = ["B024", "B027"]
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+    "proto",
+]
+
+[tool.ruff.pydocstyle]
+convention = "numpy"
+
+[tool.ruff.per-file-ignores]
+"src/py/flwr/server/strategy/*.py" = ["E501"]

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/setup.py

@@ -52,7 +52,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'flwr-nightly',
-    'version': '1.5.0.dev20230615',
+    'version': '1.5.0.dev20230619',
     'description': 'Flower: A Friendly Federated Learning Framework',
     'long_description': '# Flower: A Friendly Federated Learning Framework\n\n<p align="center">\n  <a href="https://flower.dev/">\n    <img src="https://flower.dev/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflower_white_border.c2012e70.png&w=640&q=75" width="140px" alt="Flower Website" />\n  </a>\n</p>\n<p align="center">\n    <a href="https://flower.dev/">Website</a> |\n    <a href="https://flower.dev/blog">Blog</a> |\n    <a href="https://flower.dev/docs/">Docs</a> |\n    <a href="https://flower.dev/conf/flower-summit-2022">Conference</a> |\n    <a href="https://flower.dev/join-slack">Slack</a>\n    <br /><br />\n</p>\n\n[![GitHub license](https://img.shields.io/github/license/adap/flower)](https://github.com/adap/flower/blob/main/LICENSE)\n[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/adap/flower/blob/main/CONTRIBUTING.md)\n![Build](https://github.com/adap/flower/actions/workflows/flower.yml/badge.svg)\n![Downloads](https://pepy.tech/badge/flwr)\n[![Slack](https://img.shields.io/badge/Chat-Slack-red)](https://flower.dev/join-slack)\n\nFlower (`flwr`) is a framework for building federated learning systems. The\ndesign of Flower is based on a few guiding principles:\n\n* **Customizable**: Federated learning systems vary wildly from one use case to\n  another. Flower allows for a wide range of different configurations depending\n  on the needs of each individual use case.\n\n* **Extendable**: Flower originated from a research project at the University of\n  Oxford, so it was built with AI research in mind. Many components can be\n  extended and overridden to build new state-of-the-art systems.\n\n* **Framework-agnostic**: Different machine learning frameworks have different\n  strengths. Flower can be used with any machine learning framework, for\n  example, [PyTorch](https://pytorch.org),\n  [TensorFlow](https://tensorflow.org), [Hugging Face Transformers](https://huggingface.co/), [PyTorch Lightning](https://pytorchlightning.ai/), [MXNet](https://mxnet.apache.org/), [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/\n) for federated analytics, or even raw [NumPy](https://numpy.org/)\n  for users who enjoy computing gradients by hand.\n\n* **Understandable**: Flower is written with maintainability in mind. The\n  community is encouraged to both read and contribute to the codebase.\n\nMeet the Flower community on [flower.dev](https://flower.dev)!\n\n## Federated Learning Tutorial\n\nFlower\'s goal is to make federated learning accessible to everyone. This series of tutorials introduces the fundamentals of federated learning and how to implement them in Flower.\n\n0. **What is Federated Learning?**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-0-What-is-FL.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-0-What-is-FL.ipynb))\n\n1. **An Introduction to Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-1-Intro-to-FL-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-1-Intro-to-FL-PyTorch.ipynb))\n\n2. **Using Strategies in Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-2-Strategies-in-FL-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-2-Strategies-in-FL-PyTorch.ipynb))\n   \n3. **Building Strategies for Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-3-Building-a-Strategy-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-3-Building-a-Strategy-PyTorch.ipynb))\n   \n4. **Custom Clients for Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-4-Client-and-NumPyClient-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-4-Client-and-NumPyClient-PyTorch.ipynb))\n\nStay tuned, more tutorials are coming soon. Topics include **Privacy and Security in Federated Learning**, and **Scaling Federated Learning**.\n\n## Documentation\n\n[Flower Docs](https://flower.dev/docs):\n* [Installation](https://flower.dev/docs/installation.html)\n* [Quickstart (TensorFlow)](https://flower.dev/docs/quickstart-tensorflow.html)\n* [Quickstart (PyTorch)](https://flower.dev/docs/quickstart-pytorch.html)\n* [Quickstart (Hugging Face [code example])](https://flower.dev/docs/quickstart-huggingface.html)\n* [Quickstart (PyTorch Lightning [code example])](https://flower.dev/docs/quickstart-pytorch-lightning.html)\n* [Quickstart (MXNet)](https://flower.dev/docs/example-mxnet-walk-through.html)\n* [Quickstart (Pandas)](https://flower.dev/docs/quickstart-pandas.html)\n* [Quickstart (fastai)](https://flower.dev/docs/quickstart-fastai.html)\n* [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart_jax)\n* [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)\n* [Quickstart (TFLite on Android [code example])](https://github.com/adap/flower/tree/main/examples/android)\n* [Quickstart (iOS)](https://flower.dev/docs/quickstart-ios.html)\n\n## Flower Baselines\n\nFlower Baselines is a collection of community-contributed experiments that reproduce the experiments performed in popular federated learning publications. Researchers can build on Flower Baselines to quickly evaluate new ideas:\n\n* [FedAvg](https://arxiv.org/abs/1602.05629):\n  * [MNIST](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedavg_mnist)\n* [FedProx](https://arxiv.org/abs/1812.06127):\n  * [MNIST](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedprox_mnist)\n* [FedBN: Federated Learning on non-IID Features via Local Batch Normalization](https://arxiv.org/abs/2102.07623):\n  * [Convergence Rate](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedbn/convergence_rate)\n* [Adaptive Federated Optimization](https://arxiv.org/abs/2003.00295):\n  * [CIFAR-10/100](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/adaptive_federated_optimization)\n\nCheck the Flower documentation to learn more: [Using Baselines](https://flower.dev/docs/using-baselines.html)\n\nThe Flower community loves contributions! Make your work more visible and enable others to build on it by contributing it as a baseline: [Contributing Baselines](https://flower.dev/docs/contributing-baselines.html)\n\n## Flower Usage Examples\n\nSeveral code examples show different usage scenarios of Flower (in combination with popular machine learning frameworks such as PyTorch or TensorFlow).\n\nQuickstart examples:\n\n* [Quickstart (TensorFlow)](https://github.com/adap/flower/tree/main/examples/quickstart_tensorflow)\n* [Quickstart (PyTorch)](https://github.com/adap/flower/tree/main/examples/quickstart_pytorch)\n* [Quickstart (Hugging Face)](https://github.com/adap/flower/tree/main/examples/quickstart_huggingface)\n* [Quickstart (PyTorch Lightning)](https://github.com/adap/flower/tree/main/examples/quickstart_pytorch_lightning)\n* [Quickstart (fastai)](https://github.com/adap/flower/tree/main/examples/quickstart_fastai)\n* [Quickstart (Pandas)](https://github.com/adap/flower/tree/main/examples/quickstart_pandas)\n* [Quickstart (MXNet)](https://github.com/adap/flower/tree/main/examples/quickstart_mxnet)\n* [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart_jax)\n* [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)\n* [Quickstart (TFLite on Android)](https://github.com/adap/flower/tree/main/examples/android)\n\nOther [examples](https://github.com/adap/flower/tree/main/examples):\n\n* [Raspberry Pi & Nvidia Jetson Tutorial](https://github.com/adap/flower/tree/main/examples/embedded_devices)\n* [Android & TFLite](https://github.com/adap/flower/tree/main/examples/android)\n* [PyTorch: From Centralized to Federated](https://github.com/adap/flower/tree/main/examples/pytorch_from_centralized_to_federated)\n* [MXNet: From Centralized to Federated](https://github.com/adap/flower/tree/main/examples/mxnet_from_centralized_to_federated)\n* [Advanced Flower with TensorFlow/Keras](https://github.com/adap/flower/tree/main/examples/advanced_tensorflow)\n* [Advanced Flower with PyTorch](https://github.com/adap/flower/tree/main/examples/advanced_pytorch)\n* 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))\n\n## Community\n\nFlower is built by a wonderful community of researchers and engineers. [Join Slack](https://flower.dev/join-slack) to meet them, [contributions](#contributing-to-flower) are welcome.\n\n<a href="https://github.com/adap/flower/graphs/contributors">\n  <img src="https://contrib.rocks/image?repo=adap/flower" />\n</a>\n\n## Citation\n\nIf you publish work that uses Flower, please cite Flower as follows: \n\n```bibtex\n@article{beutel2020flower,\n  title={Flower: A Friendly Federated Learning Research Framework},\n  author={Beutel, Daniel J and Topal, Taner and Mathur, Akhil and Qiu, Xinchi and Fernandez-Marques, Javier and Gao, Yan and Sani, Lorenzo and Kwing, Hei Li and Parcollet, Titouan and Gusmão, Pedro PB de and Lane, Nicholas D}, \n  journal={arXiv preprint arXiv:2007.14390},\n  year={2020}\n}\n```\n\nPlease also consider adding your publication to the list of Flower-based publications in the docs, just open a Pull Request.\n\n## Contributing to Flower\n\nWe welcome contributions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) to get started!\n',
     'author': 'The Flower Authors',

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/client/grpc_client/connection.py

@@ -102,8 +102,11 @@ def grpc_connection(
 
     server_message_iterator: Iterator[ServerMessage] = stub.Join(iter(queue.get, None))
 
-    receive: Callable[[], ServerMessage] = lambda: next(server_message_iterator)
-    send: Callable[[ClientMessage], None] = lambda msg: queue.put(msg, block=False)
+    def receive() -> ServerMessage:
+        return next(server_message_iterator)
+
+    def send(msg: ClientMessage) -> None:
+        return queue.put(msg, block=False)
 
     try:
         yield (receive, send)

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/common/constant.py

@@ -23,7 +23,7 @@ To use the REST API, install `flwr` with the `rest` extra:
     `pip install flwr[rest]`.
 """
 
-TRANSPORT_TYPE_GRPC_BIDI = "grpc-bido"
+TRANSPORT_TYPE_GRPC_BIDI = "grpc-bidi"
 TRANSPORT_TYPE_GRPC_RERE = "grpc-rere"
 TRANSPORT_TYPE_REST = "rest"
 TRANSPORT_TYPES = [

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/app.py

@@ -628,7 +628,7 @@ def _validate_ssl_files(
     if not bool(ssl_keyfile) == bool(ssl_certfile):
         msg = (
             "When setting one of `--ssl-keyfile` and "
-            + "`--ssl-certfile`, both have to be used."
+            "`--ssl-certfile`, both have to be used."
         )
         log(ERROR, msg)
         validation_exceptions.append(ValueError(msg))

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/state/sqlite_state.py

@@ -226,7 +226,7 @@ class SqliteState(State):
         if node_id == 0:
             msg = (
                 "`node_id` must be >= 1"
-                + "\n\n For requesting anonymous tasks use `node_id` equal `None`"
+                "\n\n For requesting anonymous tasks use `node_id` equal `None`"
             )
             raise AssertionError(msg)
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/dpfedavg_adaptive.py

@@ -67,6 +67,7 @@ class DPFedAvgAdaptive(DPFedAvgFixed):
             ) ** (-0.5)
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = "Strategy with DP with Adaptive Clipping enabled."
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/dpfedavg_fixed.py

@@ -56,6 +56,7 @@ class DPFedAvgFixed(Strategy):
         self.server_side_noising = server_side_noising
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = "Strategy with DP with Fixed Clipping enabled."
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fault_tolerant_fedavg.py

@@ -79,6 +79,7 @@ class FaultTolerantFedAvg(FedAvg):
         self.completion_rate_evaluate = min_completion_rate_evaluate
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         return "FaultTolerantFedAvg()"
 
     def aggregate_fit(

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedadagrad.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Adaptive Federated Optimization using Adagrad (FedAdagrad) [Reddi et al., 2020]
-strategy.
+"""FedAdagrad [Reddi et al., 2020] strategy.
+
+Adaptive Federated Optimization using Adagrad.
 
 Paper: arxiv.org/abs/2003.00295
 """
@@ -37,15 +38,13 @@ from flwr.server.client_proxy import ClientProxy
 from .fedopt import FedOpt
 
 
-# flake8: noqa: E501
 class FedAdagrad(FedOpt):
-    """Adaptive Federated Optimization using Adagrad (FedAdagrad) [Reddi et al., 2020]
-    strategy.
+    """FedAdagrad strategy - Adaptive Federated Optimization using Adagrad.
 
     Paper: https://arxiv.org/abs/2003.00295
     """
 
-    # pylint: disable=too-many-arguments,too-many-locals,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-locals,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -128,6 +127,7 @@ class FedAdagrad(FedOpt):
         )
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedAdagrad(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedadam.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Adaptive Federated Optimization using Adam (FedAdam) [Reddi et al., 2020] strategy.
+"""Adaptive Federated Optimization using Adam (FedAdam) strategy.
+
+[Reddi et al., 2020]
 
 Paper: arxiv.org/abs/2003.00295
 """
@@ -36,15 +38,13 @@ from flwr.server.client_proxy import ClientProxy
 from .fedopt import FedOpt
 
 
-# flake8: noqa: E501
 class FedAdam(FedOpt):
-    """Adaptive Federated Optimization using Adam (FedAdam) [Reddi et al., 2020]
-    strategy.
+    """FedAdam - Adaptive Federated Optimization using Adam.
 
     Paper: https://arxiv.org/abs/2003.00295
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals, line-too-long
     def __init__(
         self,
         *,
@@ -133,6 +133,7 @@ class FedAdam(FedOpt):
         )
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedAdam(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedavg.py

@@ -48,11 +48,10 @@ than or equal to the values of `min_fit_clients` and `min_evaluate_clients`.
 """
 
 
-# flake8: noqa: E501
 class FedAvg(Strategy):
     """Configurable FedAvg strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -86,8 +85,8 @@ class FedAvg(Strategy):
             will still be sampled. Defaults to 1.0.
         fraction_evaluate : float, optional
             Fraction of clients used during validation. In case `min_evaluate_clients`
-            is larger than `fraction_evaluate * available_clients`, `min_evaluate_clients`
-            will still be sampled. Defaults to 1.0.
+            is larger than `fraction_evaluate * available_clients`,
+            `min_evaluate_clients` will still be sampled. Defaults to 1.0.
         min_fit_clients : int, optional
             Minimum number of clients used during training. Defaults to 2.
         min_evaluate_clients : int, optional
@@ -131,6 +130,7 @@ class FedAvg(Strategy):
         self.evaluate_metrics_aggregation_fn = evaluate_metrics_aggregation_fn
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedAvg(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedavg_android.py

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Federated Averaging (FedAvg) [McMahan et al., 2016] strategy with custom
-serialization for Android devices.
+"""FedAvg [McMahan et al., 2016] strategy with custom serialization for Android devices.
 
 Paper: arxiv.org/abs/1602.05629
 """
@@ -40,11 +39,10 @@ from .aggregate import aggregate, weighted_loss_avg
 from .strategy import Strategy
 
 
-# flake8: noqa: E501
 class FedAvgAndroid(Strategy):
     """Configurable FedAvg strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -80,7 +78,7 @@ class FedAvgAndroid(Strategy):
             Minimum number of clients used during validation. Defaults to 2.
         min_available_clients : Optional[int]
             Minimum number of total clients in the system. Defaults to 2.
-        evaluate_fn : Optional[Callable[[int, NDArrays, Dict[str, Scalar]],Optional[Tuple[float, Dict[str, Scalar]]]]]
+        evaluate_fn : Optional[Callable[[int, NDArrays, Dict[str, Scalar]], Optional[Tuple[float, Dict[str, Scalar]]]]]
             Optional function used for validation. Defaults to None.
         on_fit_config_fn : Optional[Callable[[int], Dict[str, Scalar]]]
             Function used to configure training. Defaults to None.
@@ -105,6 +103,7 @@ class FedAvgAndroid(Strategy):
         self.initial_parameters = initial_parameters
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedAvg(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedavgm.py

@@ -38,11 +38,10 @@ from .aggregate import aggregate
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedAvgM(FedAvg):
     """Configurable FedAvg with Momentum strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -98,7 +97,6 @@ class FedAvgM(FedAvg):
         server_momentum: float
             Server-side momentum factor used for FedAvgM. Defaults to 0.0.
         """
-
         super().__init__(
             fraction_fit=fraction_fit,
             fraction_evaluate=fraction_evaluate,
@@ -121,6 +119,7 @@ class FedAvgM(FedAvg):
         self.momentum_vector: Optional[NDArrays] = None
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedAvgM(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedmedian.py

@@ -35,11 +35,11 @@ from .aggregate import aggregate_median
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedMedian(FedAvg):
     """Configurable FedAvg with Momentum strategy implementation."""
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedMedian(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedopt.py

@@ -31,11 +31,10 @@ from flwr.common import (
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedOpt(FedAvg):
     """Configurable FedAdagrad strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals, line-too-long
     def __init__(
         self,
         *,
@@ -127,5 +126,6 @@ class FedOpt(FedAvg):
         self.v_t: Optional[NDArrays] = None
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedOpt(accept_failures={self.accept_failures})"
         return rep

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedprox.py

@@ -27,11 +27,10 @@ from flwr.server.client_proxy import ClientProxy
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedProx(FedAvg):
     """Configurable FedProx strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -54,18 +53,19 @@ class FedProx(FedAvg):
         evaluate_metrics_aggregation_fn: Optional[MetricsAggregationFn] = None,
         proximal_mu: float,
     ) -> None:
-        """Federated Optimization strategy.
+        r"""Federated Optimization strategy.
 
         Implementation based on https://arxiv.org/abs/1812.06127
 
-        The strategy in itself will not be different than FedAvg, the client needs to be adjusted.
+        The strategy in itself will not be different than FedAvg, the client needs to
+        be adjusted.
         A proximal term needs to be added to the loss function during the training:
 
         .. math::
             \\frac{\\mu}{2} || w - w^t ||^2
 
-        Where $w^t$ are the global parameters and $w$ are the local weights the function will
-        be optimized with.
+        Where $w^t$ are the global parameters and $w$ are the local weights the function
+        will be optimized with.
 
         In PyTorch, for example, the loss would go from:
 
@@ -79,9 +79,11 @@ class FedProx(FedAvg):
 
           for local_weights, global_weights in zip(net.parameters(), global_params):
               proximal_term += (local_weights - global_weights).norm(2)
-          loss = criterion(net(inputs), labels) + (config["proximal_mu"] / 2) * proximal_term
+          loss = criterion(net(inputs), labels) + (config["proximal_mu"] / 2) *
+          proximal_term
 
-        With `global_params` being a copy of the parameters before the training takes place.
+        With `global_params` being a copy of the parameters before the training takes
+        place.
 
         .. code:: python
 
@@ -95,8 +97,8 @@ class FedProx(FedAvg):
             will still be sampled. Defaults to 1.0.
         fraction_evaluate : float, optional
             Fraction of clients used during validation. In case `min_evaluate_clients`
-            is larger than `fraction_evaluate * available_clients`, `min_evaluate_clients`
-            will still be sampled. Defaults to 1.0.
+            is larger than `fraction_evaluate * available_clients`,
+            `min_evaluate_clients` will still be sampled. Defaults to 1.0.
         min_fit_clients : int, optional
             Minimum number of clients used during training. Defaults to 2.
         min_evaluate_clients : int, optional
@@ -123,7 +125,6 @@ class FedProx(FedAvg):
             regularization will be used (that is, the client parameters will need to be
             closer to the server parameters during training).
         """
-
         super().__init__(
             fraction_fit=fraction_fit,
             fraction_evaluate=fraction_evaluate,
@@ -141,6 +142,7 @@ class FedProx(FedAvg):
         self.proximal_mu = proximal_mu
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedProx(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedtrimmedavg.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Federated Averaging with Trimmed Mean [Dong Yin, et al., 2021]
+"""Federated Averaging with Trimmed Mean [Dong Yin, et al., 2021].
 
 Paper: arxiv.org/abs/1803.01498
 """
@@ -35,14 +35,13 @@ from .aggregate import aggregate_trimmed_avg
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedTrimmedAvg(FedAvg):
-    """Federated Averaging with Trimmed Mean [Dong Yin, et al., 2021]
+    """Federated Averaging with Trimmed Mean [Dong Yin, et al., 2021].
 
     Paper: https://arxiv.org/abs/1803.01498
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -65,7 +64,8 @@ class FedTrimmedAvg(FedAvg):
         evaluate_metrics_aggregation_fn: Optional[MetricsAggregationFn] = None,
         beta: float = 0.2,
     ) -> None:
-        """
+        """Federated Averaging with Trimmed Mean [Dong Yin, et al., 2021].
+
         Parameters
         ----------
         fraction_fit : float, optional
@@ -78,8 +78,7 @@ class FedTrimmedAvg(FedAvg):
             Minimum number of clients used during validation. Defaults to 2.
         min_available_clients : int, optional
             Minimum number of total clients in the system. Defaults to 2.
-        evaluate_fn : Optional[Callable[[int, NDArrays, Dict[str, Scalar]],
-            Optional[Tuple[float, Dict[str, Scalar]]]]]
+        evaluate_fn : Optional[Callable[[int, NDArrays, Dict[str, Scalar]], Optional[Tuple[float, Dict[str, Scalar]]]]]
             Optional function used for validation. Defaults to None.
         on_fit_config_fn : Callable[[int], Dict[str, Scalar]], optional
             Function used to configure training. Defaults to None.
@@ -92,7 +91,6 @@ class FedTrimmedAvg(FedAvg):
         beta : float, optional
             Fraction to cut off of both tails of the distribution. Defaults to 0.2.
         """
-
         super().__init__(
             fraction_fit=fraction_fit,
             fraction_evaluate=fraction_evaluate,
@@ -110,6 +108,7 @@ class FedTrimmedAvg(FedAvg):
         self.beta = beta
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedTrimmedAvg(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedxgb_nn_avg.py

@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Federated XGBoost in the horizontal setting based on building Neural Network and
-averaging on prediction outcomes [Ma et al., 2023].
+"""Federated XGBoost [Ma et al., 2023] strategy.
+
+Strategy in the horizontal setting based on building Neural Network and averaging on
+prediction outcomes.
 
 Paper: Coming
 """
@@ -30,11 +32,11 @@ from .aggregate import aggregate
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class FedXgbNnAvg(FedAvg):
     """Configurable FedXgbNnAvg strategy implementation."""
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedXgbNnAvg(accept_failures={self.accept_failures})"
         return rep
 
@@ -56,7 +58,7 @@ class FedXgbNnAvg(FedAvg):
         server_round: int,
         results: List[Tuple[ClientProxy, FitRes]],
         failures: List[Union[Tuple[ClientProxy, FitRes], BaseException]],
-    ) -> Tuple[Optional[Any], Dict[str, Scalar],]:
+    ) -> Tuple[Optional[Any], Dict[str, Scalar]]:
         """Aggregate fit results using weighted average."""
         if not results:
             return None, {}
@@ -67,7 +69,7 @@ class FedXgbNnAvg(FedAvg):
         # Convert results
         weights_results = [
             (
-                parameters_to_ndarrays(fit_res.parameters[0].parameters),  # type: ignore
+                parameters_to_ndarrays(fit_res.parameters[0].parameters),  # type: ignore # noqa: E501 # pylint: disable=line-too-long
                 fit_res.num_examples,
             )
             for _, fit_res in results
@@ -75,7 +77,7 @@ class FedXgbNnAvg(FedAvg):
         parameters_aggregated = ndarrays_to_parameters(aggregate(weights_results))
 
         # Aggregate XGBoost trees from all clients
-        trees_aggregated = [fit_res.parameters[1] for _, fit_res in results]  # type: ignore
+        trees_aggregated = [fit_res.parameters[1] for _, fit_res in results]  # type: ignore # noqa: E501 # pylint: disable=line-too-long
 
         # Aggregate custom metrics if aggregation fn was provided
         metrics_aggregated = {}

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/fedyogi.py

@@ -36,15 +36,15 @@ from flwr.server.client_proxy import ClientProxy
 from .fedopt import FedOpt
 
 
-# flake8: noqa: E501
 class FedYogi(FedOpt):
-    """Adaptive Federated Optimization using Yogi (FedYogi) [Reddi et al., 2020]
-    strategy.
+    """FedYogi [Reddi et al., 2020] strategy.
+
+    Adaptive Federated Optimization using Yogi.
 
     Paper: https://arxiv.org/abs/2003.00295
     """
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals, line-too-long
     def __init__(
         self,
         *,
@@ -134,6 +134,7 @@ class FedYogi(FedOpt):
         )
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"FedYogi(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/krum.py

@@ -39,11 +39,10 @@ from .aggregate import aggregate_krum
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
 class Krum(FedAvg):
     """Configurable Krum strategy implementation."""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,line-too-long
+    # pylint: disable=too-many-arguments,too-many-instance-attributes, line-too-long
     def __init__(
         self,
         *,
@@ -67,7 +66,7 @@ class Krum(FedAvg):
         fit_metrics_aggregation_fn: Optional[MetricsAggregationFn] = None,
         evaluate_metrics_aggregation_fn: Optional[MetricsAggregationFn] = None,
     ) -> None:
-        """Configurable Krum strategy.
+        """Krum strategy.
 
         Parameters
         ----------
@@ -84,7 +83,8 @@ class Krum(FedAvg):
         num_malicious_clients : int, optional
             Number of malicious clients in the system. Defaults to 0.
         num_clients_to_keep : int, optional
-            Number of clients to keep before averaging (MultiKrum). Defaults to 0, in that case classical Krum is applied.
+            Number of clients to keep before averaging (MultiKrum). Defaults to 0, in
+            that case classical Krum is applied.
         evaluate_fn : Optional[Callable[[int, NDArrays, Dict[str, Scalar]], Optional[Tuple[float, Dict[str, Scalar]]]]]
             Optional function used for validation. Defaults to None.
         on_fit_config_fn : Callable[[int], Dict[str, Scalar]], optional
@@ -96,7 +96,6 @@ class Krum(FedAvg):
         initial_parameters : Parameters, optional
             Initial global model parameters.
         """
-
         super().__init__(
             fraction_fit=fraction_fit,
             fraction_evaluate=fraction_evaluate,
@@ -115,6 +114,7 @@ class Krum(FedAvg):
         self.num_clients_to_keep = num_clients_to_keep
 
     def __repr__(self) -> str:
+        """Compute a string representation of the strategy."""
         rep = f"Krum(accept_failures={self.accept_failures})"
         return rep
 

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/strategy/qfedavg.py

@@ -90,7 +90,7 @@ class QFedAvg(FedAvg):
         self.pre_weights: Optional[NDArrays] = None
 
     def __repr__(self) -> str:
-        # pylint: disable=line-too-long
+        """Compute a string representation of the strategy."""
         rep = f"QffedAvg(learning_rate={self.learning_rate}, "
         rep += f"q_param={self.q_param}, pre_weights={self.pre_weights})"
         return rep

{flwr_nightly-1.5.0.dev20230615 → flwr_nightly-1.5.0.dev20230619}/src/py/flwr/server/utils/tensorboard.py

@@ -50,7 +50,7 @@ def tensorboard(logdir: str) -> Callable[[Strategy], Strategy]:
     """
     print(
         "\n\t\033[32mStart TensorBoard with the following parameters"
-        + f"\n\t$ tensorboard --logdir {logdir}\033[39m\n"
+        f"\n\t$ tensorboard --logdir {logdir}\033[39m\n"
     )
     # Create logdir if it does not yet exist
     os.makedirs(logdir, exist_ok=True)