Merge branch 'main' into table-for-baseline-docs

doc/source/ref-changelog.md

@@ -12,9 +12,9 @@
 
   The types of the return values in the docstrings in two methods (`aggregate_fit` and `aggregate_evaluate`) now match the hint types in the code.
 
-- **Unify client API** ([#2303](https://github.com/adap/flower/pull/2303))
+- **Unify client API** ([#2303](https://github.com/adap/flower/pull/2303), [#2390](https://github.com/adap/flower/pull/2390), [#2493](https://github.com/adap/flower/pull/2493))
 
-  Using the `client_fn`, Flower clients can interchangeably run as standalone processes (i.e. via `start_client`) or in simulation (i.e. via `start_simulation`) without requiring changes to how the client class is defined and instantiated.
+  Using the `client_fn`, Flower clients can interchangeably run as standalone processes (i.e. via `start_client`) or in simulation (i.e. via `start_simulation`) without requiring changes to how the client class is defined and instantiated. Calling `start_numpy_client` is now deprecated.
 
 - **Update Flower Baselines**
 
@@ -28,7 +28,7 @@
 
 - **General updates to the simulation engine** ([#2331](https://github.com/adap/flower/pull/2331), [#2447](https://github.com/adap/flower/pull/2447), [#2448](https://github.com/adap/flower/pull/2448))
 
-- **General improvements** ([#2309](https://github.com/adap/flower/pull/2309), [#2310](https://github.com/adap/flower/pull/2310), [2313](https://github.com/adap/flower/pull/2313), [#2316](https://github.com/adap/flower/pull/2316), [2317](https://github.com/adap/flower/pull/2317),[#2349](https://github.com/adap/flower/pull/2349), [#2360](https://github.com/adap/flower/pull/2360), [#2402](https://github.com/adap/flower/pull/2402), [#2446](https://github.com/adap/flower/pull/2446), [#2493](https://github.com/adap/flower/pull/2493))
+- **General improvements** ([#2309](https://github.com/adap/flower/pull/2309), [#2310](https://github.com/adap/flower/pull/2310), [2313](https://github.com/adap/flower/pull/2313), [#2316](https://github.com/adap/flower/pull/2316), [2317](https://github.com/adap/flower/pull/2317),[#2349](https://github.com/adap/flower/pull/2349), [#2360](https://github.com/adap/flower/pull/2360), [#2402](https://github.com/adap/flower/pull/2402), [#2446](https://github.com/adap/flower/pull/2446))
 
   Flower received many improvements under the hood, too many to list here.
 

examples/mt-pytorch/driver.py

@@ -2,7 +2,7 @@
 import random
 import time
 
-from flwr.driver import Driver
+from flwr.driver import GrpcDriver
 from flwr.common import (
     ServerMessage,
     FitIns,
@@ -43,7 +43,7 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:
 
 
 # -------------------------------------------------------------------------- Driver SDK
-driver = Driver(driver_service_address="0.0.0.0:9091", certificates=None)
+driver = GrpcDriver(driver_service_address="0.0.0.0:9091", certificates=None)
 # -------------------------------------------------------------------------- Driver SDK
 
 anonymous_client_nodes = False

examples/secaggplus-mt/driver.py

@@ -6,7 +6,7 @@
 from workflows import get_workflow_factory
 
 from flwr.common import Metrics, ndarrays_to_parameters
-from flwr.driver import Driver
+from flwr.driver import GrpcDriver
 from flwr.proto import driver_pb2, node_pb2, task_pb2
 from flwr.server import History
 
@@ -71,7 +71,7 @@ def weighted_average(metrics: List[Tuple[int, Metrics]]) -> Metrics:
 
 
 # -------------------------------------------------------------------------- Driver SDK
-driver = Driver(driver_service_address="0.0.0.0:9091", certificates=None)
+driver = GrpcDriver(driver_service_address="0.0.0.0:9091", certificates=None)
 # -------------------------------------------------------------------------- Driver SDK
 
 anonymous_client_nodes = False

src/py/flwr/client/__init__.py

@@ -19,18 +19,14 @@
 from .app import start_numpy_client as start_numpy_client
 from .client import Client as Client
 from .numpy_client import NumPyClient as NumPyClient
-from .numpy_client_wrapper import to_client as to_client
 from .run import run_client as run_client
 from .typing import ClientFn as ClientFn
-from .typing import ClientLike as ClientLike
 
 __all__ = [
     "Client",
     "ClientFn",
-    "ClientLike",
     "NumPyClient",
     "run_client",
     "start_client",
     "start_numpy_client",
-    "to_client",
 ]

src/py/flwr/client/app.py

@@ -17,11 +17,12 @@
 
 import sys
 import time
+import warnings
 from logging import INFO
-from typing import Callable, Optional, Union
+from typing import Optional, Union
 
 from flwr.client.client import Client
-from flwr.client.typing import ClientFn, ClientLike
+from flwr.client.typing import ClientFn
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.address import parse_address
 from flwr.common.constant import (
@@ -40,7 +41,7 @@
 
 
 def _check_actionable_client(
-    client: Optional[ClientLike], client_fn: Optional[ClientFn]
+    client: Optional[Client], client_fn: Optional[ClientFn]
 ) -> None:
     if client_fn is None and client is None:
         raise Exception("Both `client_fn` and `client` are `None`, but one is required")
@@ -57,7 +58,7 @@ def start_client(
     *,
     server_address: str,
     client_fn: Optional[ClientFn] = None,
-    client: Optional[ClientLike] = None,
+    client: Optional[Client] = None,
     grpc_max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,
     root_certificates: Optional[Union[bytes, str]] = None,
     transport: Optional[str] = None,
@@ -124,7 +125,7 @@ class `flwr.client.Client` (default: None)
         # Wrap `Client` instance in `client_fn`
         def single_client_factory(
             cid: str,  # pylint: disable=unused-argument
-        ) -> ClientLike:
+        ) -> Client:
             if client is None:  # Added this to keep mypy happy
                 raise Exception(
                     "Both `client_fn` and `client` are `None`, but one is required"
@@ -209,8 +210,7 @@ def single_client_factory(
 def start_numpy_client(
     *,
     server_address: str,
-    client_fn: Optional[Callable[[str], NumPyClient]] = None,
-    client: Optional[NumPyClient] = None,
+    client: NumPyClient,
     grpc_max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,
     root_certificates: Optional[bytes] = None,
     transport: Optional[str] = None,
@@ -223,9 +223,7 @@ def start_numpy_client(
         The IPv4 or IPv6 address of the server. If the Flower server runs on
         the same machine on port 8080, then `server_address` would be
         `"[::]:8080"`.
-    client_fn : Optional[Callable[[str], NumPyClient]]
-        A callable that instantiates a NumPyClient. (default: None)
-    client : Optional[flwr.client.NumPyClient]
+    client : flwr.client.NumPyClient
         An implementation of the abstract base class `flwr.client.NumPyClient`.
     grpc_max_message_length : int (default: 536_870_912, this equals 512MB)
         The maximum length of gRPC messages that can be exchanged with the
@@ -248,42 +246,40 @@ def start_numpy_client(
     --------
     Starting a client with an insecure server connection:
 
-    >>> def client_fn(cid: str):
-    >>>     return FlowerClient()
-    >>>
     >>> start_numpy_client(
     >>>     server_address=localhost:8080,
-    >>>     client_fn=client_fn,
+    >>>     client=FlowerClient(),
     >>> )
 
     Starting an SSL-enabled gRPC client:
 
     >>> from pathlib import Path
-    >>> def client_fn(cid: str):
-    >>>     return FlowerClient()
-    >>>
     >>> start_numpy_client(
     >>>     server_address=localhost:8080,
-    >>>     client_fn=client_fn,
+    >>>     client=FlowerClient(),
     >>>     root_certificates=Path("/crts/root.pem").read_bytes(),
     >>> )
     """
-    # Start
-    _check_actionable_client(client, client_fn)
-
-    wrp_client = client.to_client() if client else None
-    wrp_clientfn = None
-    if client_fn:
+    warnings.warn(
+        "flwr.client.start_numpy_client() is deprecated and will "
+        "be removed in a future version of Flower. Instead, pass "
+        "your client to `flwr.client.start_client()` by calling "
+        "first the `.to_client()` method as shown below: \n"
+        "\tflwr.client.start_client(\n"
+        "\t\tserver_address='<IP>:<PORT>',\n"
+        "\t\tclient=FlowerClient().to_client()\n"
+        "\t)",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
-        def convert(cid: str) -> Client:
-            """Convert `NumPyClient` to `Client` upon instantiation."""
-            return client_fn(cid).to_client()
+    # Calling this function is deprecated. A warning is thrown.
+    # We first need to convert either the supplied client to `Client.`
 
-        wrp_clientfn = convert
+    wrp_client = client.to_client()
 
     start_client(
         server_address=server_address,
-        client_fn=wrp_clientfn,
         client=wrp_client,
         grpc_max_message_length=grpc_max_message_length,
         root_certificates=root_certificates,

src/py/flwr/client/app_test.py

@@ -17,7 +17,6 @@
 
 from typing import Dict, Tuple
 
-from flwr.client import ClientLike, to_client
 from flwr.common import (
     Config,
     EvaluateIns,
@@ -83,26 +82,18 @@ def evaluate(
 
 def test_to_client_with_client() -> None:
     """Test to_client."""
-    # Prepare
-    client_like: ClientLike = PlainClient()
-
-    # Execute
-    actual = to_client(client_like=client_like)
+    client = PlainClient().to_client()
 
     # Assert
-    assert isinstance(actual, Client)
+    assert isinstance(client, Client)
 
 
 def test_to_client_with_numpyclient() -> None:
     """Test fit_clients."""
-    # Prepare
-    client_like: ClientLike = NeedsWrappingClient()
-
-    # Execute
-    actual = to_client(client_like=client_like)
+    client = NeedsWrappingClient().to_client()
 
     # Assert
-    assert isinstance(actual, Client)
+    assert isinstance(client, Client)
 
 
 def test_start_client_transport_invalid() -> None:

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

@@ -28,9 +28,8 @@
     get_server_message_from_task_ins,
     wrap_client_message_in_task_res,
 )
-from flwr.client.numpy_client_wrapper import to_client
 from flwr.client.secure_aggregation import SecureAggregationHandler
-from flwr.client.typing import ClientFn, ClientLike
+from flwr.client.typing import ClientFn
 from flwr.common import serde
 from flwr.proto.task_pb2 import SecureAggregation, Task, TaskIns, TaskRes
 from flwr.proto.transport_pb2 import ClientMessage, Reason, ServerMessage
@@ -64,8 +63,7 @@ def handle(client_fn: ClientFn, task_ins: TaskIns) -> Tuple[TaskRes, int, bool]:
     server_msg = get_server_message_from_task_ins(task_ins, exclude_reconnect_ins=False)
     if server_msg is None:
         # Instantiate the client
-        client_like: ClientLike = client_fn("-1")
-        client = to_client(client_like)
+        client = client_fn("-1")
         # Secure Aggregation
         if task_ins.task.HasField("sa") and isinstance(
             client, SecureAggregationHandler
@@ -120,8 +118,7 @@ def handle_legacy_message(
         return disconnect_msg, sleep_duration, False
 
     # Instantiate the client
-    client_like: ClientLike = client_fn("-1")
-    client = to_client(client_like)
+    client = client_fn("-1")
     # Execute task
     if field == "get_properties_ins":
         return _get_properties(client, server_msg.get_properties_ins), 0, True

src/py/flwr/client/typing.py

@@ -14,10 +14,8 @@
 # ==============================================================================
 """Custom types for Flower clients."""
 
-from typing import Callable, Union
+from typing import Callable
 
 from .client import Client as Client
-from .numpy_client import NumPyClient as NumPyClient
 
-ClientLike = Union[Client, NumPyClient]
-ClientFn = Callable[[str], ClientLike]
+ClientFn = Callable[[str], Client]

src/py/flwr/driver/__init__.py

@@ -16,9 +16,9 @@
 
 
 from .app import start_driver
-from .driver import Driver
+from .driver import GrpcDriver
 
 __all__ = [
     "start_driver",
-    "Driver",
+    "GrpcDriver",
 ]

src/py/flwr/driver/app.py

@@ -31,7 +31,7 @@
 from flwr.server.server import Server
 from flwr.server.strategy import Strategy
 
-from .driver import Driver
+from .driver import GrpcDriver
 from .driver_client_proxy import DriverClientProxy
 
 DEFAULT_SERVER_ADDRESS_DRIVER = "[::]:9091"
@@ -112,7 +112,7 @@ def start_driver(  # pylint: disable=too-many-arguments, too-many-locals
     address = f"[{host}]:{port}" if is_v6 else f"{host}:{port}"
 
     # Create the Driver
-    driver = Driver(driver_service_address=address, certificates=certificates)
+    driver = GrpcDriver(driver_service_address=address, certificates=certificates)
     driver.connect()
     lock = threading.Lock()
 
@@ -157,7 +157,7 @@ def start_driver(  # pylint: disable=too-many-arguments, too-many-locals
 
 
 def update_client_manager(
-    driver: Driver,
+    driver: GrpcDriver,
     client_manager: ClientManager,
     lock: threading.Lock,
 ) -> None: