Update black and isort (#2995)

* Update black and isort

* ran format.sh in baslines/flwr_baselines

* niid_bench format

* formatting new baselines

* format fedbn

---------

Co-authored-by: jafermarq <[email protected]>

baselines/baseline_template/pyproject.toml

@@ -42,8 +42,8 @@ flwr = { extras = ["simulation"], version = "1.5.0" }
 hydra-core = "1.3.2" # don't change this
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/dasha/pyproject.toml

@@ -49,8 +49,8 @@ torchvision = [{ url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.
                { url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.0-cp39-cp39-macosx_11_0_arm64.whl", markers="sys_platform == 'darwin'"}]
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/depthfl/depthfl/models.py

@@ -1,6 +1,5 @@
 """ResNet18 model architecutre, training, and testing functions for CIFAR100."""
 
-
 from typing import List, Tuple
 
 import torch

baselines/depthfl/pyproject.toml

@@ -45,8 +45,8 @@ torch = { url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp3
 torchvision = { url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp310-cp310-linux_x86_64.whl" }
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedavgm/pyproject.toml

@@ -46,8 +46,8 @@ numpy = "1.25.2"
 matplotlib = "^3.7.2"
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedbn/fedbn/dataset.py

@@ -1,4 +1,5 @@
 """Digits dataset."""
+
 import os
 from random import shuffle
 from typing import List, Optional, Tuple

baselines/fedbn/fedbn/strategy.py

@@ -3,6 +3,7 @@
 Needed only when the strategy is not yet implemented in Flower or because you want to
 extend or modify the functionality of an existing strategy.
 """
+
 from typing import Dict, List, Tuple
 
 from flwr.common.typing import Metrics

baselines/fedbn/pyproject.toml

@@ -46,8 +46,8 @@ torchvision = { url = "https://download.pytorch.org/whl/cu117/torchvision-0.15.2
 tqdm = "^4.66.1"
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedmeta/fedmeta/dataset_preparation.py

@@ -6,6 +6,7 @@
 uncomment the lines below and tell us in the README.md (see the "Running the Experiment"
 block) that this file should be executed first.
 """
+
 import json
 import os
 from collections import defaultdict

baselines/fedmeta/fedmeta/main.py

@@ -4,7 +4,6 @@
 model is going to be evaluated, etc. At the end, this script saves the results.
 """
 
-
 import flwr as fl
 import hydra
 from hydra.core.hydra_config import HydraConfig

baselines/fedmeta/fedmeta/strategy.py

@@ -3,6 +3,7 @@
 Needed only when the strategy is not yet implemented in Flower or because you want to
 extend or modify the functionality of an existing strategy.
 """
+
 from collections import OrderedDict
 from logging import WARNING
 from typing import Dict, List, Optional, Tuple, Union

baselines/fedmeta/pyproject.toml

@@ -47,8 +47,8 @@ torchvision = { url = "https://download.pytorch.org/whl/cu117/torchvision-0.15.2
 pillow = "9.5.0" # needed <10.0.0 for LEAF repo scripts
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedmlb/fedmlb/dataset.py

@@ -1,4 +1,5 @@
 """Handle dataset loading and preprocessing utility."""
+
 import os
 from typing import Union
 

baselines/fedmlb/pyproject.toml

@@ -45,8 +45,8 @@ matplotlib = "3.7.1"
 psutil = "5.9.5" # this is just to log some info about memory usage
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fednova/fednova/dataset_preparation.py

@@ -3,7 +3,6 @@
 obtained from source: https://github.com/JYWa/FedNova/blob/master/util_v4.py
 """
 
-
 from random import Random
 
 import numpy as np

baselines/fednova/fednova/utils.py

@@ -1,6 +1,5 @@
 """Utility functions for FedNova such as computing accuracy, plotting results, etc."""
 
-
 import glob
 import os
 from typing import List, Tuple

baselines/fednova/pyproject.toml

@@ -48,8 +48,8 @@ matplotlib = "3.5.3"
 pandas = "1.3.5"
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedpara/fedpara/models.py

@@ -196,9 +196,7 @@ def _calc_from_ratio(self):
         # r3 is floored because we cannot take the ceil as it results a bigger number
         # of parameters than the original problem
 
-        num_target_params = (
-            self.out_channels * self.in_channels * (self.kernel_size**2)
-        )
+        num_target_params = self.out_channels * self.in_channels * (self.kernel_size**2)
         a, b, c = (
             self.kernel_size**2,
             self.out_channels + self.in_channels,

baselines/fedpara/pyproject.toml

@@ -46,8 +46,8 @@ torch = { url = "https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp31
 torchvision = { url = "https://download.pytorch.org/whl/cu117/torchvision-0.15.2%2Bcu117-cp310-cp310-linux_x86_64.whl" }
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedper/fedper/client.py

@@ -1,4 +1,5 @@
 """Client implementation - can call FedPer and FedAvg clients."""
+
 import pickle
 from collections import OrderedDict, defaultdict
 from pathlib import Path
@@ -322,9 +323,9 @@ def client_fn(cid: str) -> BaseClient:
         # Create the test loader
         testloader = DataLoader(testset, config.batch_size)
 
-        manager: Union[
-            Type[MobileNetModelManager], Type[ResNetModelManager]
-        ] = MobileNetModelManager
+        manager: Union[Type[MobileNetModelManager], Type[ResNetModelManager]] = (
+            MobileNetModelManager
+        )
         if config.model_name.lower() == "resnet":
             manager = ResNetModelManager
         elif config.model_name.lower() == "mobile":

baselines/fedper/fedper/constants.py

@@ -1,4 +1,5 @@
 """Constants used in machine learning pipeline."""
+
 from enum import Enum
 
 

baselines/fedper/fedper/dataset.py

@@ -8,6 +8,7 @@
 `dataset_preparation.py` module. You can use all those functions from functions/methods
 defined here of course.
 """
+
 import os
 import pickle
 import sys

baselines/fedper/fedper/dataset_preparation.py

@@ -1,4 +1,5 @@
 """Dataset preparation."""
+
 import os
 import random
 from collections import Counter

baselines/fedper/fedper/implemented_models/mobile_model.py

@@ -1,4 +1,5 @@
 """MobileNet-v1 model, model manager and model split."""
+
 from typing import Dict, List, Optional, Tuple, Union
 
 import torch

baselines/fedper/fedper/implemented_models/resnet_model.py

@@ -1,4 +1,5 @@
 """ResNet model, model manager and split."""
+
 from typing import Dict, List, Optional, Tuple, Union
 
 import torch

baselines/fedper/fedper/models.py

@@ -1,4 +1,5 @@
 """Abstract class for splitting a model into body and head."""
+
 from abc import ABC, abstractmethod
 from collections import OrderedDict
 from typing import Any, Dict, List, Tuple, Type, Union

baselines/fedper/fedper/server.py

@@ -1,4 +1,5 @@
 """Server strategies pipelines for FedPer."""
+
 from flwr.server.strategy.fedavg import FedAvg
 
 from fedper.strategy import (

baselines/fedper/fedper/strategy.py

@@ -1,4 +1,5 @@
 """FL server strategies."""
+
 from collections import OrderedDict
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union

baselines/fedper/fedper/utils.py

@@ -1,4 +1,5 @@
 """Utility functions for FedPer."""
+
 import os
 import pickle
 import time
@@ -97,9 +98,9 @@ def get_create_model_fn(
 ]:
     """Get create model function."""
     device = config.server_device
-    split: Union[
-        Type[MobileNetModelSplit], Type[ResNetModelSplit]
-    ] = MobileNetModelSplit
+    split: Union[Type[MobileNetModelSplit], Type[ResNetModelSplit]] = (
+        MobileNetModelSplit
+    )
     if config.model_name.lower() == "mobile":
 
         def create_model() -> Union[Type[MobileNet], Type[ResNet]]:

baselines/fedper/pyproject.toml

@@ -47,8 +47,8 @@ torch = { url = "https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp31
 torchvision = { url = "https://download.pytorch.org/whl/cu117/torchvision-0.15.2%2Bcu117-cp310-cp310-linux_x86_64.whl" }
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedprox/fedprox/client.py

@@ -1,6 +1,5 @@
 """Defines the MNIST Flower Client and a function to instantiate it."""
 
-
 from collections import OrderedDict
 from typing import Callable, Dict, List, Tuple
 

baselines/fedprox/fedprox/dataset.py

@@ -1,6 +1,5 @@
 """MNIST dataset utilities for federated learning."""
 
-
 from typing import Optional, Tuple
 
 import torch

baselines/fedprox/fedprox/dataset_preparation.py

@@ -1,4 +1,5 @@
 """Functions for dataset download and processing."""
+
 from typing import List, Optional, Tuple
 
 import numpy as np

baselines/fedprox/fedprox/models.py

@@ -1,6 +1,5 @@
 """CNN model architecture, training, and testing functions for MNIST."""
 
-
 from typing import List, Tuple
 
 import torch

baselines/fedprox/fedprox/server.py

@@ -1,6 +1,5 @@
 """Flower Server."""
 
-
 from collections import OrderedDict
 from typing import Callable, Dict, Optional, Tuple
 

baselines/fedprox/fedprox/strategy.py

@@ -1,6 +1,5 @@
 """Flower strategy."""
 
-
 from typing import List, Tuple, Union
 
 from flwr.common import Metrics

baselines/fedprox/pyproject.toml

@@ -47,8 +47,8 @@ torch = { url = "https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp31
 torchvision = { url = "https://download.pytorch.org/whl/cu117/torchvision-0.15.2%2Bcu117-cp310-cp310-linux_x86_64.whl" }
 
 [tool.poetry.dev-dependencies]
-isort = "==5.11.5"
-black = "==23.1.0"
+isort = "==5.13.2"
+black = "==24.2.0"
 docformatter = "==1.5.1"
 mypy = "==1.4.1"
 pylint = "==2.8.2"

baselines/fedstar/fedstar/client.py

@@ -1,4 +1,5 @@
 """Required imports for client.py script."""
+
 import gc
 import logging
 import os

baselines/fedstar/fedstar/clients.py

@@ -1,4 +1,5 @@
 """Required imports for clients.py script."""
+
 import multiprocessing
 import os
 import sys

baselines/fedstar/fedstar/dataset.py

@@ -1,4 +1,5 @@
 """Required imports for data.py script."""
+
 import os
 
 import numpy as np

baselines/fedstar/fedstar/dataset_preparation.py

@@ -1,4 +1,5 @@
 """Generate 1-second audio clip from background sounds in speechcommands."""
+
 import os
 import random
 

baselines/fedstar/fedstar/models.py

@@ -1,4 +1,5 @@
 """Required imports for data.py script."""
+
 import itertools
 import time
 

baselines/fedstar/fedstar/server.py

@@ -1,4 +1,5 @@
 """Required imports for server.py script."""
+
 import gc
 import logging
 import os