flwr-nightly 1.7.0.dev20240129__tar.gz → 1.7.0.dev20240131__tar.gz

{flwr_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/PKG-INFO

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

{flwr_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.7.0-dev20240129"
+version = "1.7.0-dev20240131"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.dev>"]
@@ -82,7 +82,7 @@ rest = ["requests", "starlette", "uvicorn"]
 types-dataclasses = "==0.6.6"
 types-protobuf = "==3.19.18"
 types-requests = "==2.31.0.20240125"
-types-setuptools = "==69.0.0.20240115"
+types-setuptools = "==69.0.0.20240125"
 clang-format = "==17.0.4"
 isort = "==5.13.2"
 black = { version = "==23.10.1", extras = ["jupyter"] }
@@ -95,7 +95,7 @@ pytest-cov = "==4.1.0"
 pytest-watch = "==4.2.0"
 grpcio-tools = "==1.60.0"
 mypy-protobuf = "==3.2.0"
-jupyterlab = "==4.0.9"
+jupyterlab = "==4.0.12"
 rope = "==1.11.0"
 semver = "==3.0.2"
 sphinx = "==6.2.1"

{flwr_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/src/py/flwr/client/app.py

@@ -34,7 +34,7 @@ from flwr.common.constant import (
     TRANSPORT_TYPE_REST,
     TRANSPORT_TYPES,
 )
-from flwr.common.logger import log, warn_experimental_feature
+from flwr.common.logger import log, warn_deprecated_feature, warn_experimental_feature
 from flwr.common.message import Message
 
 from .flower import load_flower_callable
@@ -88,7 +88,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 +111,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",
@@ -399,6 +404,12 @@ def start_numpy_client(
 ) -> None:
     """Start a Flower NumPyClient which connects to a gRPC server.
 
+    Warning
+    -------
+    This function is deprecated since 1.7.0. Use :code:`flwr.client.start_client`
+    instead and first convert your :code:`NumPyClient` to type
+    :code:`flwr.client.Client` by executing its :code:`to_client()` method.
+
     Parameters
     ----------
     server_address : str
@@ -454,21 +465,22 @@ def start_numpy_client(
     >>>     root_certificates=Path("/crts/root.pem").read_bytes(),
     >>> )
     """
-    # 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,
-    # )
+    mssg = (
+        "flwr.client.start_numpy_client() is deprecated. \n\tInstead, use "
+        "`flwr.client.start_client()` by ensuring you first call "
+        "the `.to_client()` method as shown below: \n"
+        "\tflwr.client.start_client(\n"
+        "\t\tserver_address='<IP>:<PORT>',\n"
+        "\t\tclient=FlowerClient().to_client(),"
+        " # <-- where FlowerClient is of type flwr.client.NumPyClient object\n"
+        "\t)\n"
+        "\tUsing `start_numpy_client()` is deprecated."
+    )
+
+    warn_deprecated_feature(name=mssg)
 
     # Calling this function is deprecated. A warning is thrown.
-    # We first need to convert either the supplied client to `Client.`
+    # We first need to convert the supplied client to `Client.`
 
     wrp_client = client.to_client()
 

{flwr_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/src/py/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_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/src/py/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_nightly-1.7.0.dev20240129 → flwr_nightly-1.7.0.dev20240131}/src/py/flwr/simulation/ray_transport/utils.py

@@ -15,6 +15,7 @@
 """Utilities for Actors in the Virtual Client Engine."""
 
 import traceback
+import warnings
 from logging import ERROR
 
 from flwr.client import Client
@@ -26,7 +27,7 @@ except ModuleNotFoundError:
     TF = None
 
 # Display Deprecation warning once
-# warnings.filterwarnings("once", category=DeprecationWarning)
+warnings.filterwarnings("once", category=DeprecationWarning)
 
 
 def enable_tf_gpu_growth() -> None:
@@ -69,15 +70,15 @@ def check_clientfn_returns_client(client: Client) -> Client:
     the client internally to `Client` by calling `.to_client()`.
     """
     if not isinstance(client, Client):
-        # mssg = (
-        #     " Ensure your client is of type `Client`. Please convert it"
-        #     " using the `.to_client()` method before returning it"
-        #     " in the `client_fn` you pass to `start_simulation`."
-        #     " We have applied this conversion on your behalf."
-        #     " Not returning a `Client` might trigger an error in future"
-        #     " versions of Flower."
-        # )
+        mssg = (
+            " Ensure your client is of type `flwr.client.Client`. Please convert it"
+            " using the `.to_client()` method before returning it"
+            " in the `client_fn` you pass to `start_simulation`."
+            " We have applied this conversion on your behalf."
+            " Not returning a `Client` might trigger an error in future"
+            " versions of Flower."
+        )
 
-        # warnings.warn(mssg, DeprecationWarning, stacklevel=2)
+        warnings.warn(mssg, DeprecationWarning, stacklevel=2)
         client = client.to_client()
     return client