Revert files

src/py/flwr/__init__.py

@@ -26,4 +26,4 @@
     "simulation",
 ]
 
-__version__ = _package_version
+__version__ = _package_version

src/py/flwr/__init___test.py

@@ -24,4 +24,4 @@ def test_version() -> None:
     from flwr import __version__  # pylint: disable=import-outside-toplevel
 
     # Assert
-    semver.VersionInfo.parse(__version__)
+    semver.VersionInfo.parse(__version__)

src/py/flwr/cli/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower command line interface."""
+"""Flower command line interface."""

src/py/flwr/cli/app.py

@@ -38,4 +38,4 @@
 app.command()(install)
 
 if __name__ == "__main__":
-    app()
+    app()

src/py/flwr/cli/build.py

@@ -135,4 +135,4 @@ def _load_gitignore(directory: Path) -> pathspec.PathSpec:
     if gitignore_path.exists():
         with open(gitignore_path, encoding="UTF-8") as file:
             patterns.extend(file.readlines())
-    return pathspec.PathSpec.from_lines("gitwildmatch", patterns)
+    return pathspec.PathSpec.from_lines("gitwildmatch", patterns)

src/py/flwr/cli/config_utils.py

@@ -177,4 +177,4 @@ def load_from_string(toml_content: str) -> Optional[Dict[str, Any]]:
         data = tomli.loads(toml_content)
         return data
     except tomli.TOMLDecodeError:
-        return None
+        return None

src/py/flwr/cli/config_utils_test.py

@@ -335,4 +335,4 @@ def test_validate_pyproject_toml_fail() -> None:
     # Assert
     assert not is_valid
     assert len(errors) == 1
-    assert len(warnings) == 0
+    assert len(warnings) == 0

src/py/flwr/cli/example.py

@@ -63,4 +63,4 @@ def example() -> None:
         subprocess.check_output(["mv", examples_dir, "."])
 
         print()
-        print(f"Example ready to use in {os.path.join(os.getcwd(), example_name)}")
+        print(f"Example ready to use in {os.path.join(os.getcwd(), example_name)}")

src/py/flwr/cli/install.py

@@ -208,4 +208,4 @@ def _verify_hashes(list_content: str, tmpdir: Path) -> bool:
         file_path = tmpdir / rel_path
         if not file_path.exists() or get_sha256_hash(file_path) != hash_expected:
             return False
-    return True
+    return True

src/py/flwr/cli/new/__init__.py

@@ -18,4 +18,4 @@
 
 __all__ = [
     "new",
-]
+]

src/py/flwr/cli/new/new.py

@@ -194,4 +194,4 @@ def new(
             fg=typer.colors.BRIGHT_CYAN,
             bold=True,
         )
-    )
+    )

src/py/flwr/cli/new/new_test.py

@@ -137,4 +137,4 @@ def test_new_incorrect_name(tmp_path: str) -> None:
                 assert "Failed to read from stdin" in str(exc_info.value)
 
         finally:
-            os.chdir(origin)
+            os.chdir(origin)

src/py/flwr/cli/new/templates/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower CLI `new` command templates."""
+"""Flower CLI `new` command templates."""

src/py/flwr/cli/new/templates/app/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower CLI `new` command app templates."""
+"""Flower CLI `new` command app templates."""

src/py/flwr/cli/new/templates/app/code/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower CLI `new` command app / code templates."""
+"""Flower CLI `new` command app / code templates."""

src/py/flwr/cli/run/__init__.py

@@ -18,4 +18,4 @@
 
 __all__ = [
     "run",
-]
+]

src/py/flwr/cli/run/run.py

@@ -118,4 +118,4 @@ def on_channel_state_change(channel_connectivity: str) -> None:
     stub = ExecStub(channel)
 
     req = StartRunRequest()
-    stub.StartRun(req)
+    stub.StartRun(req)

src/py/flwr/cli/utils.py

@@ -135,4 +135,4 @@ def get_sha256_hash(file_path: Path) -> str:
             if not data:
                 break
             sha256.update(data)
-    return sha256.hexdigest()
+    return sha256.hexdigest()

src/py/flwr/client/__init__.py

@@ -34,4 +34,4 @@
     "run_supernode",
     "start_client",
     "start_numpy_client",
-]
+]

src/py/flwr/client/app.py

@@ -624,4 +624,4 @@ def signal_handler(sig, frame):  # type: ignore
             raise StopIteration from None
 
         signal.signal(signal.SIGINT, signal_handler)
-        signal.signal(signal.SIGTERM, signal_handler)
+        signal.signal(signal.SIGTERM, signal_handler)

src/py/flwr/client/app_test.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -125,4 +125,4 @@ def test_start_numpy_client_transport_invalid() -> None:
         )
         raise AssertionError()  # Fail the test if no exception was raised
     except ValueError:
-        pass
+        pass

src/py/flwr/client/client.py

@@ -251,4 +251,4 @@ def maybe_call_evaluate(client: Client, evaluate_ins: EvaluateIns) -> EvaluateRe
         )
 
     # If the client implements `evaluate`, call it
-    return client.evaluate(evaluate_ins)
+    return client.evaluate(evaluate_ins)

src/py/flwr/client/client_app.py

@@ -1,4 +1,4 @@
-# Copyright 2024 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.
@@ -237,4 +237,4 @@ def _registration_error(fn_name: str) -> ValueError:
         >>>        content=message.content()
         >>>    )
         """,
-    )
+    )

src/py/flwr/client/client_test.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -281,4 +281,4 @@ def test_maybe_call_evaluate_false() -> None:
     actual = maybe_call_evaluate(client, MagicMock())
 
     # Assert
-    assert actual.status.code == Code.EVALUATE_NOT_IMPLEMENTED
+    assert actual.status.code == Code.EVALUATE_NOT_IMPLEMENTED

src/py/flwr/client/dpfedavg_numpy_client.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -184,4 +184,4 @@ def evaluate(
         extended format (int, float, float, Dict[str, Scalar]) have been
         deprecated and removed since Flower 0.19.
         """
-        return self.client.evaluate(parameters, config)
+        return self.client.evaluate(parameters, config)

src/py/flwr/client/grpc_adapter_client/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Client-side part of the GrpcAdapter transport layer."""
+"""Client-side part of the GrpcAdapter transport layer."""

src/py/flwr/client/grpc_adapter_client/connection.py

@@ -91,4 +91,4 @@ def grpc_adapter(  # pylint: disable=R0913
         authentication_keys=None,  # Authentication is not supported
         adapter_cls=GrpcAdapter,
     ) as conn:
-        yield conn
+        yield conn

src/py/flwr/client/grpc_client/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Client-side part of the gRPC transport layer."""
+"""Client-side part of the gRPC transport layer."""

src/py/flwr/client/grpc_client/connection.py

@@ -238,4 +238,4 @@ def send(message: Message) -> None:
     finally:
         # Make sure to have a final
         channel.close()
-        log(DEBUG, "gRPC channel closed")
+        log(DEBUG, "gRPC channel closed")

src/py/flwr/client/grpc_client/connection_test.py

@@ -167,4 +167,4 @@ def run_client() -> int:
         assert messages_received == EXPECTED_NUM_SERVER_MESSAGE
 
     # Teardown
-    server.stop(1)
+    server.stop(1)

src/py/flwr/client/grpc_rere_client/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Client-side part of the gRPC request-response transport layer."""
+"""Client-side part of the gRPC request-response transport layer."""

src/py/flwr/client/grpc_rere_client/client_interceptor.py

@@ -155,4 +155,4 @@ def intercept_unary_unary(
             self.shared_secret = generate_shared_key(
                 self.private_key, self.server_public_key
             )
-        return response
+        return response

src/py/flwr/client/grpc_rere_client/client_interceptor_test.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -372,4 +372,4 @@ def test_client_auth_get_run(self) -> None:
 
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    unittest.main(verbosity=2)

src/py/flwr/client/grpc_rere_client/connection.py

@@ -1,4 +1,4 @@
-# Copyright 2023 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -281,4 +281,4 @@ def get_run(run_id: int) -> Tuple[str, str]:
         # Yield methods
         yield (receive, send, create_node, delete_node, get_run)
     except Exception as exc:  # pylint: disable=broad-except
-        log(ERROR, exc)
+        log(ERROR, exc)

src/py/flwr/client/grpc_rere_client/grpc_adapter.py

@@ -130,4 +130,4 @@ def GetRun(  # pylint: disable=C0103
         self, request: GetRunRequest, **kwargs: Any
     ) -> GetRunResponse:
         """."""
-        return self._send_and_receive(request, GetRunResponse, **kwargs)
+        return self._send_and_receive(request, GetRunResponse, **kwargs)

src/py/flwr/client/grpc_rere_client/grpc_adapter_test.py

@@ -35,4 +35,4 @@ def test_grpc_adapter_methods() -> None:
     }
 
     # Assert
-    assert expected_methods.issubset(methods)
+    assert expected_methods.issubset(methods)

src/py/flwr/client/heartbeat.py

@@ -71,4 +71,4 @@ def start_ping_loop(
     )
     thread.start()
 
-    return thread
+    return thread

src/py/flwr/client/heartbeat_test.py

@@ -56,4 +56,4 @@ def test_ping_loop_with_failures_terminates(self) -> None:
 
         # Assert
         self.assertTrue(ping_fn.called)
-        self.assertFalse(thread.is_alive())
+        self.assertFalse(thread.is_alive())

src/py/flwr/client/message_handler/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Client-side message handling."""
+"""Client-side message handling."""

src/py/flwr/client/message_handler/message_handler.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -175,4 +175,4 @@ def validate_out_message(out_message: Message, in_message_metadata: Metadata) ->
         and out_meta.created_at > in_meta.created_at
     ):
         return True
-    return False
+    return False

src/py/flwr/client/message_handler/message_handler_test.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
+# 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.
@@ -319,4 +319,4 @@ def test_invalid_message_run_id(self) -> None:
         # Assert
         for invalid_metadata in invalid_metadata_list:
             msg.__dict__["_metadata"] = invalid_metadata
-            self.assertFalse(validate_out_message(msg, self.in_metadata))
+            self.assertFalse(validate_out_message(msg, self.in_metadata))

src/py/flwr/client/message_handler/task_handler.py

@@ -51,4 +51,4 @@ def get_task_ins(
     # Only evaluate the first message
     task_ins: TaskIns = pull_task_ins_response.task_ins_list[0]
 
-    return task_ins
+    return task_ins

src/py/flwr/client/message_handler/task_handler_test.py

@@ -64,4 +64,4 @@ def test_get_task_ins_multiple_ins() -> None:
         reconnect=None, task_ins_list=[expected_task_ins, TaskIns(), TaskIns()]
     )
     actual_task_ins = get_task_ins(res)
-    assert actual_task_ins == expected_task_ins
+    assert actual_task_ins == expected_task_ins

src/py/flwr/client/mod/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 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.
@@ -30,4 +30,4 @@
     "parameters_size_mod",
     "secagg_mod",
     "secaggplus_mod",
-]
+]

src/py/flwr/client/mod/centraldp_mods.py

@@ -156,4 +156,4 @@ def adaptiveclipping_mod(
 
     fit_res.metrics[KEY_NORM_BIT] = norm_bit
     out_msg.content = compat.fitres_to_recordset(fit_res, keep_input=True)
-    return out_msg
+    return out_msg

src/py/flwr/client/mod/comms_mods.py

@@ -76,4 +76,4 @@ def parameters_size_mod(
 
     log(INFO, "Total parameters transmitted: %i bytes", parameters_size_in_bytes)
 
-    return call_next(msg, ctxt)
+    return call_next(msg, ctxt)

src/py/flwr/client/mod/localdp_mod.py

@@ -150,4 +150,4 @@ def __call__(
         )
 
         out_msg.content = compat.fitres_to_recordset(fit_res, keep_input=True)
-        return out_msg
+        return out_msg