flwr-nightly 1.13.0.dev20241021__py3-none-any.whl → 1.13.0.dev20241111__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of flwr-nightly might be problematic. Click here for more details.

Files changed (92) hide show
  1. flwr/cli/build.py +2 -2
  2. flwr/cli/config_utils.py +97 -0
  3. flwr/cli/log.py +63 -97
  4. flwr/cli/new/templates/app/code/flwr_tune/dataset.py.tpl +1 -1
  5. flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl +1 -0
  6. flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl +1 -1
  7. flwr/cli/run/run.py +34 -88
  8. flwr/client/app.py +23 -20
  9. flwr/client/clientapp/app.py +22 -18
  10. flwr/client/nodestate/__init__.py +25 -0
  11. flwr/client/nodestate/in_memory_nodestate.py +38 -0
  12. flwr/client/nodestate/nodestate.py +30 -0
  13. flwr/client/nodestate/nodestate_factory.py +37 -0
  14. flwr/client/{node_state.py → run_info_store.py} +4 -3
  15. flwr/client/supernode/app.py +6 -8
  16. flwr/common/args.py +83 -0
  17. flwr/common/config.py +10 -0
  18. flwr/common/constant.py +39 -5
  19. flwr/common/context.py +9 -4
  20. flwr/common/date.py +3 -3
  21. flwr/common/logger.py +108 -1
  22. flwr/common/object_ref.py +47 -16
  23. flwr/common/serde.py +24 -0
  24. flwr/common/telemetry.py +0 -6
  25. flwr/common/typing.py +10 -1
  26. flwr/proto/exec_pb2.py +14 -17
  27. flwr/proto/exec_pb2.pyi +14 -22
  28. flwr/proto/log_pb2.py +29 -0
  29. flwr/proto/log_pb2.pyi +39 -0
  30. flwr/proto/log_pb2_grpc.py +4 -0
  31. flwr/proto/log_pb2_grpc.pyi +4 -0
  32. flwr/proto/message_pb2.py +8 -8
  33. flwr/proto/message_pb2.pyi +4 -1
  34. flwr/proto/run_pb2.py +32 -27
  35. flwr/proto/run_pb2.pyi +26 -0
  36. flwr/proto/serverappio_pb2.py +52 -0
  37. flwr/proto/{driver_pb2.pyi → serverappio_pb2.pyi} +54 -0
  38. flwr/proto/serverappio_pb2_grpc.py +376 -0
  39. flwr/proto/serverappio_pb2_grpc.pyi +147 -0
  40. flwr/proto/simulationio_pb2.py +38 -0
  41. flwr/proto/simulationio_pb2.pyi +65 -0
  42. flwr/proto/simulationio_pb2_grpc.py +205 -0
  43. flwr/proto/simulationio_pb2_grpc.pyi +81 -0
  44. flwr/server/app.py +272 -105
  45. flwr/server/driver/driver.py +15 -1
  46. flwr/server/driver/grpc_driver.py +25 -36
  47. flwr/server/driver/inmemory_driver.py +6 -16
  48. flwr/server/run_serverapp.py +29 -23
  49. flwr/server/{superlink/state → serverapp}/__init__.py +3 -9
  50. flwr/server/serverapp/app.py +214 -0
  51. flwr/server/strategy/aggregate.py +4 -4
  52. flwr/server/strategy/fedadam.py +11 -1
  53. flwr/server/superlink/driver/__init__.py +1 -1
  54. flwr/server/superlink/driver/{driver_grpc.py → serverappio_grpc.py} +19 -16
  55. flwr/server/superlink/driver/{driver_servicer.py → serverappio_servicer.py} +125 -39
  56. flwr/server/superlink/fleet/grpc_adapter/grpc_adapter_servicer.py +4 -2
  57. flwr/server/superlink/fleet/grpc_bidi/grpc_server.py +2 -2
  58. flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py +4 -2
  59. flwr/server/superlink/fleet/grpc_rere/server_interceptor.py +2 -2
  60. flwr/server/superlink/fleet/message_handler/message_handler.py +7 -7
  61. flwr/server/superlink/fleet/rest_rere/rest_api.py +7 -7
  62. flwr/server/superlink/fleet/vce/vce_api.py +23 -23
  63. flwr/server/superlink/linkstate/__init__.py +28 -0
  64. flwr/server/superlink/{state/in_memory_state.py → linkstate/in_memory_linkstate.py} +184 -36
  65. flwr/server/superlink/{state/state.py → linkstate/linkstate.py} +149 -19
  66. flwr/server/superlink/{state/state_factory.py → linkstate/linkstate_factory.py} +9 -9
  67. flwr/server/superlink/{state/sqlite_state.py → linkstate/sqlite_linkstate.py} +306 -65
  68. flwr/server/superlink/{state → linkstate}/utils.py +81 -30
  69. flwr/server/superlink/simulation/__init__.py +15 -0
  70. flwr/server/superlink/simulation/simulationio_grpc.py +65 -0
  71. flwr/server/superlink/simulation/simulationio_servicer.py +153 -0
  72. flwr/simulation/__init__.py +5 -1
  73. flwr/simulation/app.py +273 -345
  74. flwr/simulation/legacy_app.py +382 -0
  75. flwr/simulation/ray_transport/ray_client_proxy.py +2 -2
  76. flwr/simulation/run_simulation.py +57 -131
  77. flwr/simulation/simulationio_connection.py +86 -0
  78. flwr/superexec/app.py +6 -134
  79. flwr/superexec/deployment.py +61 -66
  80. flwr/superexec/exec_grpc.py +15 -8
  81. flwr/superexec/exec_servicer.py +36 -65
  82. flwr/superexec/executor.py +26 -7
  83. flwr/superexec/simulation.py +54 -107
  84. {flwr_nightly-1.13.0.dev20241021.dist-info → flwr_nightly-1.13.0.dev20241111.dist-info}/METADATA +5 -4
  85. {flwr_nightly-1.13.0.dev20241021.dist-info → flwr_nightly-1.13.0.dev20241111.dist-info}/RECORD +88 -69
  86. {flwr_nightly-1.13.0.dev20241021.dist-info → flwr_nightly-1.13.0.dev20241111.dist-info}/entry_points.txt +2 -0
  87. flwr/client/node_state_tests.py +0 -66
  88. flwr/proto/driver_pb2.py +0 -42
  89. flwr/proto/driver_pb2_grpc.py +0 -239
  90. flwr/proto/driver_pb2_grpc.pyi +0 -94
  91. {flwr_nightly-1.13.0.dev20241021.dist-info → flwr_nightly-1.13.0.dev20241111.dist-info}/LICENSE +0 -0
  92. {flwr_nightly-1.13.0.dev20241021.dist-info → flwr_nightly-1.13.0.dev20241111.dist-info}/WHEEL +0 -0
@@ -0,0 +1,382 @@
1
+ # Copyright 2024 Flower Labs GmbH. All Rights Reserved.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+ # ==============================================================================
15
+ """Flower simulation app."""
16
+
17
+
18
+ import asyncio
19
+ import logging
20
+ import sys
21
+ import threading
22
+ import traceback
23
+ import warnings
24
+ from logging import ERROR, INFO
25
+ from typing import Any, Optional, Union
26
+
27
+ import ray
28
+ from ray.util.scheduling_strategies import NodeAffinitySchedulingStrategy
29
+
30
+ from flwr.client import ClientFnExt
31
+ from flwr.common import EventType, event
32
+ from flwr.common.constant import NODE_ID_NUM_BYTES
33
+ from flwr.common.logger import log, set_logger_propagation, warn_unsupported_feature
34
+ from flwr.server.client_manager import ClientManager
35
+ from flwr.server.history import History
36
+ from flwr.server.server import Server, init_defaults, run_fl
37
+ from flwr.server.server_config import ServerConfig
38
+ from flwr.server.strategy import Strategy
39
+ from flwr.server.superlink.linkstate.utils import generate_rand_int_from_bytes
40
+ from flwr.simulation.ray_transport.ray_actor import (
41
+ ClientAppActor,
42
+ VirtualClientEngineActor,
43
+ VirtualClientEngineActorPool,
44
+ pool_size_from_resources,
45
+ )
46
+ from flwr.simulation.ray_transport.ray_client_proxy import RayActorClientProxy
47
+
48
+ INVALID_ARGUMENTS_START_SIMULATION = """
49
+ INVALID ARGUMENTS ERROR
50
+
51
+ Invalid Arguments in method:
52
+
53
+ `start_simulation(
54
+ *,
55
+ client_fn: ClientFn,
56
+ num_clients: int,
57
+ clients_ids: Optional[List[str]] = None,
58
+ client_resources: Optional[Dict[str, float]] = None,
59
+ server: Optional[Server] = None,
60
+ config: ServerConfig = None,
61
+ strategy: Optional[Strategy] = None,
62
+ client_manager: Optional[ClientManager] = None,
63
+ ray_init_args: Optional[Dict[str, Any]] = None,
64
+ ) -> None:`
65
+
66
+ REASON:
67
+ Method requires:
68
+ - Either `num_clients`[int] or `clients_ids`[List[str]]
69
+ to be set exclusively.
70
+ OR
71
+ - `len(clients_ids)` == `num_clients`
72
+
73
+ """
74
+
75
+ NodeToPartitionMapping = dict[int, int]
76
+
77
+
78
+ def _create_node_id_to_partition_mapping(
79
+ num_clients: int,
80
+ ) -> NodeToPartitionMapping:
81
+ """Generate a node_id:partition_id mapping."""
82
+ nodes_mapping: NodeToPartitionMapping = {} # {node-id; partition-id}
83
+ for i in range(num_clients):
84
+ while True:
85
+ node_id = generate_rand_int_from_bytes(NODE_ID_NUM_BYTES)
86
+ if node_id not in nodes_mapping:
87
+ break
88
+ nodes_mapping[node_id] = i
89
+ return nodes_mapping
90
+
91
+
92
+ # pylint: disable=too-many-arguments,too-many-statements,too-many-branches
93
+ def start_simulation(
94
+ *,
95
+ client_fn: ClientFnExt,
96
+ num_clients: int,
97
+ clients_ids: Optional[list[str]] = None, # UNSUPPORTED, WILL BE REMOVED
98
+ client_resources: Optional[dict[str, float]] = None,
99
+ server: Optional[Server] = None,
100
+ config: Optional[ServerConfig] = None,
101
+ strategy: Optional[Strategy] = None,
102
+ client_manager: Optional[ClientManager] = None,
103
+ ray_init_args: Optional[dict[str, Any]] = None,
104
+ keep_initialised: Optional[bool] = False,
105
+ actor_type: type[VirtualClientEngineActor] = ClientAppActor,
106
+ actor_kwargs: Optional[dict[str, Any]] = None,
107
+ actor_scheduling: Union[str, NodeAffinitySchedulingStrategy] = "DEFAULT",
108
+ ) -> History:
109
+ """Start a Ray-based Flower simulation server.
110
+
111
+ Parameters
112
+ ----------
113
+ client_fn : ClientFnExt
114
+ A function creating `Client` instances. The function must have the signature
115
+ `client_fn(context: Context). It should return
116
+ a single client instance of type `Client`. Note that the created client
117
+ instances are ephemeral and will often be destroyed after a single method
118
+ invocation. Since client instances are not long-lived, they should not attempt
119
+ to carry state over method invocations. Any state required by the instance
120
+ (model, dataset, hyperparameters, ...) should be (re-)created in either the
121
+ call to `client_fn` or the call to any of the client methods (e.g., load
122
+ evaluation data in the `evaluate` method itself).
123
+ num_clients : int
124
+ The total number of clients in this simulation.
125
+ clients_ids : Optional[List[str]]
126
+ UNSUPPORTED, WILL BE REMOVED. USE `num_clients` INSTEAD.
127
+ List `client_id`s for each client. This is only required if
128
+ `num_clients` is not set. Setting both `num_clients` and `clients_ids`
129
+ with `len(clients_ids)` not equal to `num_clients` generates an error.
130
+ Using this argument will raise an error.
131
+ client_resources : Optional[Dict[str, float]] (default: `{"num_cpus": 1, "num_gpus": 0.0}`)
132
+ CPU and GPU resources for a single client. Supported keys
133
+ are `num_cpus` and `num_gpus`. To understand the GPU utilization caused by
134
+ `num_gpus`, as well as using custom resources, please consult the Ray
135
+ documentation.
136
+ server : Optional[flwr.server.Server] (default: None).
137
+ An implementation of the abstract base class `flwr.server.Server`. If no
138
+ instance is provided, then `start_server` will create one.
139
+ config: ServerConfig (default: None).
140
+ Currently supported values are `num_rounds` (int, default: 1) and
141
+ `round_timeout` in seconds (float, default: None).
142
+ strategy : Optional[flwr.server.Strategy] (default: None)
143
+ An implementation of the abstract base class `flwr.server.Strategy`. If
144
+ no strategy is provided, then `start_server` will use
145
+ `flwr.server.strategy.FedAvg`.
146
+ client_manager : Optional[flwr.server.ClientManager] (default: None)
147
+ An implementation of the abstract base class `flwr.server.ClientManager`.
148
+ If no implementation is provided, then `start_simulation` will use
149
+ `flwr.server.client_manager.SimpleClientManager`.
150
+ ray_init_args : Optional[Dict[str, Any]] (default: None)
151
+ Optional dictionary containing arguments for the call to `ray.init`.
152
+ If ray_init_args is None (the default), Ray will be initialized with
153
+ the following default args:
154
+
155
+ { "ignore_reinit_error": True, "include_dashboard": False }
156
+
157
+ An empty dictionary can be used (ray_init_args={}) to prevent any
158
+ arguments from being passed to ray.init.
159
+ keep_initialised: Optional[bool] (default: False)
160
+ Set to True to prevent `ray.shutdown()` in case `ray.is_initialized()=True`.
161
+
162
+ actor_type: VirtualClientEngineActor (default: ClientAppActor)
163
+ Optionally specify the type of actor to use. The actor object, which
164
+ persists throughout the simulation, will be the process in charge of
165
+ executing a ClientApp wrapping input argument `client_fn`.
166
+
167
+ actor_kwargs: Optional[Dict[str, Any]] (default: None)
168
+ If you want to create your own Actor classes, you might need to pass
169
+ some input argument. You can use this dictionary for such purpose.
170
+
171
+ actor_scheduling: Optional[Union[str, NodeAffinitySchedulingStrategy]]
172
+ (default: "DEFAULT")
173
+ Optional string ("DEFAULT" or "SPREAD") for the VCE to choose in which
174
+ node the actor is placed. If you are an advanced user needed more control
175
+ you can use lower-level scheduling strategies to pin actors to specific
176
+ compute nodes (e.g. via NodeAffinitySchedulingStrategy). Please note this
177
+ is an advanced feature. For all details, please refer to the Ray documentation:
178
+ https://docs.ray.io/en/latest/ray-core/scheduling/index.html
179
+
180
+ Returns
181
+ -------
182
+ hist : flwr.server.history.History
183
+ Object containing metrics from training.
184
+ """ # noqa: E501
185
+ # pylint: disable-msg=too-many-locals
186
+ event(
187
+ EventType.START_SIMULATION_ENTER,
188
+ {"num_clients": len(clients_ids) if clients_ids is not None else num_clients},
189
+ )
190
+
191
+ if clients_ids is not None:
192
+ warn_unsupported_feature(
193
+ "Passing `clients_ids` to `start_simulation` is deprecated and not longer "
194
+ "used by `start_simulation`. Use `num_clients` exclusively instead."
195
+ )
196
+ log(ERROR, "`clients_ids` argument used.")
197
+ sys.exit()
198
+
199
+ # Set logger propagation
200
+ loop: Optional[asyncio.AbstractEventLoop] = None
201
+ try:
202
+ loop = asyncio.get_running_loop()
203
+ except RuntimeError:
204
+ loop = None
205
+ finally:
206
+ if loop and loop.is_running():
207
+ # Set logger propagation to False to prevent duplicated log output in Colab.
208
+ logger = logging.getLogger("flwr")
209
+ _ = set_logger_propagation(logger, False)
210
+
211
+ # Initialize server and server config
212
+ initialized_server, initialized_config = init_defaults(
213
+ server=server,
214
+ config=config,
215
+ strategy=strategy,
216
+ client_manager=client_manager,
217
+ )
218
+
219
+ log(
220
+ INFO,
221
+ "Starting Flower simulation, config: %s",
222
+ initialized_config,
223
+ )
224
+
225
+ # Create node-id to partition-id mapping
226
+ nodes_mapping = _create_node_id_to_partition_mapping(num_clients)
227
+
228
+ # Default arguments for Ray initialization
229
+ if not ray_init_args:
230
+ ray_init_args = {
231
+ "ignore_reinit_error": True,
232
+ "include_dashboard": False,
233
+ }
234
+
235
+ # Shut down Ray if it has already been initialized (unless asked not to)
236
+ if ray.is_initialized() and not keep_initialised:
237
+ ray.shutdown()
238
+
239
+ # Initialize Ray
240
+ ray.init(**ray_init_args)
241
+ cluster_resources = ray.cluster_resources()
242
+ log(
243
+ INFO,
244
+ "Flower VCE: Ray initialized with resources: %s",
245
+ cluster_resources,
246
+ )
247
+
248
+ log(
249
+ INFO,
250
+ "Optimize your simulation with Flower VCE: "
251
+ "https://flower.ai/docs/framework/how-to-run-simulations.html",
252
+ )
253
+
254
+ # Log the resources that a single client will be able to use
255
+ if client_resources is None:
256
+ log(
257
+ INFO,
258
+ "No `client_resources` specified. Using minimal resources for clients.",
259
+ )
260
+ client_resources = {"num_cpus": 1, "num_gpus": 0.0}
261
+
262
+ # Each client needs at the very least one CPU
263
+ if "num_cpus" not in client_resources:
264
+ warnings.warn(
265
+ "No `num_cpus` specified in `client_resources`. "
266
+ "Using `num_cpus=1` for each client.",
267
+ stacklevel=2,
268
+ )
269
+ client_resources["num_cpus"] = 1
270
+
271
+ log(
272
+ INFO,
273
+ "Flower VCE: Resources for each Virtual Client: %s",
274
+ client_resources,
275
+ )
276
+
277
+ actor_args = {} if actor_kwargs is None else actor_kwargs
278
+
279
+ # An actor factory. This is called N times to add N actors
280
+ # to the pool. If at some point the pool can accommodate more actors
281
+ # this will be called again.
282
+ def create_actor_fn() -> type[VirtualClientEngineActor]:
283
+ return actor_type.options( # type: ignore
284
+ **client_resources,
285
+ scheduling_strategy=actor_scheduling,
286
+ ).remote(**actor_args)
287
+
288
+ # Instantiate ActorPool
289
+ pool = VirtualClientEngineActorPool(
290
+ create_actor_fn=create_actor_fn,
291
+ client_resources=client_resources,
292
+ )
293
+
294
+ f_stop = threading.Event()
295
+
296
+ # Periodically, check if the cluster has grown (i.e. a new
297
+ # node has been added). If this happens, we likely want to grow
298
+ # the actor pool by adding more Actors to it.
299
+ def update_resources(f_stop: threading.Event) -> None:
300
+ """Periodically check if more actors can be added to the pool.
301
+
302
+ If so, extend the pool.
303
+ """
304
+ if not f_stop.is_set():
305
+ num_max_actors = pool_size_from_resources(client_resources)
306
+ if num_max_actors > pool.num_actors:
307
+ num_new = num_max_actors - pool.num_actors
308
+ log(
309
+ INFO, "The cluster expanded. Adding %s actors to the pool.", num_new
310
+ )
311
+ pool.add_actors_to_pool(num_actors=num_new)
312
+
313
+ threading.Timer(10, update_resources, [f_stop]).start()
314
+
315
+ update_resources(f_stop)
316
+
317
+ log(
318
+ INFO,
319
+ "Flower VCE: Creating %s with %s actors",
320
+ pool.__class__.__name__,
321
+ pool.num_actors,
322
+ )
323
+
324
+ # Register one RayClientProxy object for each client with the ClientManager
325
+ for node_id, partition_id in nodes_mapping.items():
326
+ client_proxy = RayActorClientProxy(
327
+ client_fn=client_fn,
328
+ node_id=node_id,
329
+ partition_id=partition_id,
330
+ num_partitions=num_clients,
331
+ actor_pool=pool,
332
+ )
333
+ initialized_server.client_manager().register(client=client_proxy)
334
+
335
+ hist = History()
336
+ # pylint: disable=broad-except
337
+ try:
338
+ # Start training
339
+ hist = run_fl(
340
+ server=initialized_server,
341
+ config=initialized_config,
342
+ )
343
+ except Exception as ex:
344
+ log(ERROR, ex)
345
+ log(ERROR, traceback.format_exc())
346
+ log(
347
+ ERROR,
348
+ "Your simulation crashed :(. This could be because of several reasons. "
349
+ "The most common are: "
350
+ "\n\t > Sometimes, issues in the simulation code itself can cause crashes. "
351
+ "It's always a good idea to double-check your code for any potential bugs "
352
+ "or inconsistencies that might be contributing to the problem. "
353
+ "For example: "
354
+ "\n\t\t - You might be using a class attribute in your clients that "
355
+ "hasn't been defined."
356
+ "\n\t\t - There could be an incorrect method call to a 3rd party library "
357
+ "(e.g., PyTorch)."
358
+ "\n\t\t - The return types of methods in your clients/strategies might be "
359
+ "incorrect."
360
+ "\n\t > Your system couldn't fit a single VirtualClient: try lowering "
361
+ "`client_resources`."
362
+ "\n\t > All the actors in your pool crashed. This could be because: "
363
+ "\n\t\t - You clients hit an out-of-memory (OOM) error and actors couldn't "
364
+ "recover from it. Try launching your simulation with more generous "
365
+ "`client_resources` setting (i.e. it seems %s is "
366
+ "not enough for your run). Use fewer concurrent actors. "
367
+ "\n\t\t - You were running a multi-node simulation and all worker nodes "
368
+ "disconnected. The head node might still be alive but cannot accommodate "
369
+ "any actor with resources: %s."
370
+ "\nTake a look at the Flower simulation examples for guidance "
371
+ "<https://flower.ai/docs/framework/how-to-run-simulations.html>.",
372
+ client_resources,
373
+ client_resources,
374
+ )
375
+ raise RuntimeError("Simulation crashed.") from ex
376
+
377
+ finally:
378
+ # Stop time monitoring resources in cluster
379
+ f_stop.set()
380
+ event(EventType.START_SIMULATION_LEAVE)
381
+
382
+ return hist
@@ -22,7 +22,7 @@ from typing import Optional
22
22
  from flwr import common
23
23
  from flwr.client import ClientFnExt
24
24
  from flwr.client.client_app import ClientApp
25
- from flwr.client.node_state import NodeState
25
+ from flwr.client.run_info_store import DeprecatedRunInfoStore
26
26
  from flwr.common import DEFAULT_TTL, Message, Metadata, RecordSet
27
27
  from flwr.common.constant import (
28
28
  NUM_PARTITIONS_KEY,
@@ -65,7 +65,7 @@ class RayActorClientProxy(ClientProxy):
65
65
 
66
66
  self.app_fn = _load_app
67
67
  self.actor_pool = actor_pool
68
- self.proxy_state = NodeState(
68
+ self.proxy_state = DeprecatedRunInfoStore(
69
69
  node_id=node_id,
70
70
  node_config={
71
71
  PARTITION_ID_KEY: str(partition_id),