flwr-nightly 1.4.0.dev20230325__py3-none-any.whl → 1.4.0.dev20230330__py3-none-any.whl

flwr/simulation/app.py

@@ -21,7 +21,7 @@ from typing import Any, Callable, Dict, List, Optional
 
 import ray
 
-from flwr.client.client import Client
+from flwr.client import ClientLike
 from flwr.common import EventType, event
 from flwr.common.logger import log
 from flwr.server import Server
@@ -38,7 +38,7 @@ Invalid Arguments in method:
 
 `start_simulation(
     *,
-    client_fn: Callable[[str], Client],
+    client_fn: Callable[[str], ClientLike],
     num_clients: Optional[int] = None,
     clients_ids: Optional[List[str]] = None,
     client_resources: Optional[Dict[str, float]] = None,
@@ -61,7 +61,7 @@ REASON:
 
 def start_simulation(  # pylint: disable=too-many-arguments
     *,
-    client_fn: Callable[[str], Client],
+    client_fn: Callable[[str], ClientLike],
     num_clients: Optional[int] = None,
     clients_ids: Optional[List[str]] = None,
     client_resources: Optional[Dict[str, float]] = None,
@@ -76,16 +76,17 @@ def start_simulation(  # pylint: disable=too-many-arguments
 
     Parameters
     ----------
-    client_fn : Callable[[str], Client]
+    client_fn : Callable[[str], ClientLike]
         A function creating client instances. The function must take a single
-        str argument called `cid`. It should return a single client instance.
-        Note that the created client instances are ephemeral and will often be
-        destroyed after a single method invocation. Since client instances are
-        not long-lived, they should not attempt to carry state over method
-        invocations. Any state required by the instance (model, dataset,
-        hyperparameters, ...) should be (re-)created in either the call to
-        `client_fn` or the call to any of the client methods (e.g., load
-        evaluation data in the `evaluate` method itself).
+        str argument called `cid`. It should return a single client instance
+        of type ClientLike. Note that the created client instances
+        are ephemeral and will often be destroyed after a single method
+        invocation. Since client instances are not long-lived, they should not
+         attempt to carry state over method invocations. Any state required by
+        the instance (model, dataset,hyperparameters, ...) should be
+        (re-)created in either the call to `client_fn` or the call to any of
+        the client methods (e.g., load evaluation data in the `evaluate`
+        method itself).
     num_clients : Optional[int]
         The total number of clients in this simulation. This must be set if
         `clients_ids` is not set and vice-versa.

flwr/simulation/ray_transport/ray_client_proxy.py

@@ -15,7 +15,7 @@
 """Ray-based Flower ClientProxy implementation."""
 
 
-from logging import DEBUG
+from logging import ERROR
 from typing import Callable, Dict, Optional, cast
 
 import ray
@@ -52,7 +52,7 @@ class RayClientProxy(ClientProxy):
         try:
             res = ray.get(future_get_properties_res, timeout=timeout)
         except Exception as ex:
-            log(DEBUG, ex)
+            log(ERROR, ex)
             raise ex
         return cast(
             common.GetPropertiesRes,
@@ -69,7 +69,7 @@ class RayClientProxy(ClientProxy):
         try:
             res = ray.get(future_paramseters_res, timeout=timeout)
         except Exception as ex:
-            log(DEBUG, ex)
+            log(ERROR, ex)
             raise ex
         return cast(
             common.GetParametersRes,
@@ -84,7 +84,7 @@ class RayClientProxy(ClientProxy):
         try:
             res = ray.get(future_fit_res, timeout=timeout)
         except Exception as ex:
-            log(DEBUG, ex)
+            log(ERROR, ex)
             raise ex
         return cast(
             common.FitRes,
@@ -101,7 +101,7 @@ class RayClientProxy(ClientProxy):
         try:
             res = ray.get(future_evaluate_res, timeout=timeout)
         except Exception as ex:
-            log(DEBUG, ex)
+            log(ERROR, ex)
             raise ex
         return cast(
             common.EvaluateRes,

{flwr_nightly-1.4.0.dev20230325.dist-info → flwr_nightly-1.4.0.dev20230330.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.4.0.dev20230325
+Version: 1.4.0.dev20230330
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0
@@ -44,7 +44,7 @@ Requires-Dist: importlib-metadata (>=4.0.0,<5.0.0) ; python_version < "3.8"
 Requires-Dist: iterators (>=0.0.2,<0.0.3)
 Requires-Dist: numpy (>=1.21.0,<2.0.0)
 Requires-Dist: protobuf (>=3.19.0,<4.0.0)
-Requires-Dist: ray[default] (==2.3.0) ; extra == "simulation"
+Requires-Dist: ray[default] (>=2.3.0,<3.0.0) ; extra == "simulation"
 Requires-Dist: requests (>=2.28.2,<3.0.0) ; extra == "rest"
 Requires-Dist: starlette (>=0.25.0,<0.26.0)
 Requires-Dist: uvicorn[standard] (>=0.20.0,<0.21.0) ; extra == "rest"

{flwr_nightly-1.4.0.dev20230325.dist-info → flwr_nightly-1.4.0.dev20230330.dist-info}/RECORD

@@ -92,11 +92,11 @@ flwr/server/utils/__init__.py,sha256=I3aifvGufkoK1Od-w1Xz_nicgAYllqXScQiRU6A5xvA
 flwr/server/utils/tensorboard.py,sha256=BeaO4HIm6HrBXNwRXB_BetOrG4zmsDh_dTJzU3AJAv8,5112
 flwr/server/utils/validator.py,sha256=BjDMGy8pgB7nwg-w-QNFQf_lipzc0FbVlx-IdHlEVuQ,4939
 flwr/simulation/__init__.py,sha256=7gYUX6zr_yJd1wtv65xRHajBvurkfoPVXv66buUy4H8,1270
-flwr/simulation/app.py,sha256=4UKy2OgCsTveHmtvIvqL2NsuL0OiIR4n1wDRLrugK88,7737
+flwr/simulation/app.py,sha256=kYvgqQeQKOzOlQRNWdEYnf6FxmvoStfqYGhsjEghqDQ,7773
 flwr/simulation/ray_transport/__init__.py,sha256=eJ3pijYkI7XhbX2rLu6FBGTo8hZkFL8RSj4twhApOGw,727
-flwr/simulation/ray_transport/ray_client_proxy.py,sha256=WLO9ZagPCOyj-7e3x3gz-w0oiMVRdIhdHOkbrnmYvQo,5472
-flwr_nightly-1.4.0.dev20230325.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.4.0.dev20230325.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
-flwr_nightly-1.4.0.dev20230325.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-flwr_nightly-1.4.0.dev20230325.dist-info/METADATA,sha256=vUxAQ6ZW9lTcqFYEnrxIf_4WdR2ur6OXixkx9Ckp0fU,12832
-flwr_nightly-1.4.0.dev20230325.dist-info/RECORD,,
+flwr/simulation/ray_transport/ray_client_proxy.py,sha256=yGY8p0TKxak-OH7zqFxd9oDe3TQ_cfAZEp0-JJYEnyg,5472
+flwr_nightly-1.4.0.dev20230330.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.4.0.dev20230330.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
+flwr_nightly-1.4.0.dev20230330.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+flwr_nightly-1.4.0.dev20230330.dist-info/METADATA,sha256=QgQDA5FLcEymq6UwgEpTRv67SYqhvw5tUHk6Ww3tGu4,12839
+flwr_nightly-1.4.0.dev20230330.dist-info/RECORD,,