flwr-nightly 1.5.0.dev20230509__py3-none-any.whl → 1.5.0.dev20230511__py3-none-any.whl

flwr/server/app.py

@@ -139,7 +139,7 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
     event(EventType.START_SERVER_ENTER)
 
     # Initialize server and server config
-    initialized_server, initialized_config = _init_defaults(
+    initialized_server, initialized_config = init_defaults(
         server=server,
         config=config,
         strategy=strategy,
@@ -173,7 +173,7 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
     )
 
     # Start training
-    hist = _fl(
+    hist = run_fl(
         server=initialized_server,
         config=initialized_config,
     )
@@ -186,13 +186,13 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
     return hist
 
 
-def _init_defaults(
+def init_defaults(
     server: Optional[Server],
     config: Optional[ServerConfig],
     strategy: Optional[Strategy],
     client_manager: Optional[ClientManager],
 ) -> Tuple[Server, ServerConfig]:
-    # Create server instance if none was given
+    """Create server instance if none was given."""
     if server is None:
         if client_manager is None:
             client_manager = SimpleClientManager()
@@ -209,11 +209,11 @@ def _init_defaults(
     return server, config
 
 
-def _fl(
+def run_fl(
     server: Server,
     config: ServerConfig,
 ) -> History:
-    # Fit model
+    """Train a model on the given server and return the History object."""
     hist = server.fit(num_rounds=config.num_rounds, timeout=config.round_timeout)
     log(INFO, "app_fit: losses_distributed %s", str(hist.losses_distributed))
     log(INFO, "app_fit: metrics_distributed_fit %s", str(hist.metrics_distributed_fit))
@@ -527,7 +527,7 @@ def _run_fleet_api_rest(
     try:
         import uvicorn
 
-        from flwr.server.rest_server.rest_api import app as fast_api_app
+        from flwr.server.fleet.rest_rere.rest_api import app as fast_api_app
     except ModuleNotFoundError:
         sys.exit(MISSING_EXTRA_REST)
     if workers != 1:
@@ -550,7 +550,7 @@ def _run_fleet_api_rest(
         raise ValueError(validation_exceptions)
 
     uvicorn.run(
-        app="flwr.server.rest_server.rest_api:app",
+        app="flwr.server.fleet.rest_rere.rest_api:app",
         port=port,
         host=host,
         reload=False,

flwr/server/fleet/grpc_rere/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2020 Adap 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Server-side part of the gRPC transport layer using Request-Response."""

flwr/server/grpc_server/grpc_server.py

@@ -27,7 +27,7 @@ from flwr.common.logger import log
 from flwr.proto.transport_pb2_grpc import add_FlowerServiceServicer_to_server
 from flwr.server.client_manager import ClientManager
 from flwr.server.driver.driver_servicer import DriverServicer
-from flwr.server.fleet.fleet_servicer import FleetServicer
+from flwr.server.fleet.grpc_rere.fleet_servicer import FleetServicer
 from flwr.server.grpc_server.flower_service_servicer import FlowerServiceServicer
 
 INVALID_CERTIFICATES_ERR_MSG = """

flwr/simulation/app.py

@@ -25,7 +25,7 @@ from flwr.client import ClientLike
 from flwr.common import EventType, event
 from flwr.common.logger import log
 from flwr.server import Server
-from flwr.server.app import ServerConfig, _fl, _init_defaults
+from flwr.server.app import ServerConfig, init_defaults, run_fl
 from flwr.server.client_manager import ClientManager
 from flwr.server.history import History
 from flwr.server.strategy import Strategy
@@ -137,7 +137,7 @@ def start_simulation(  # pylint: disable=too-many-arguments
     )
 
     # Initialize server and server config
-    initialized_server, initialized_config = _init_defaults(
+    initialized_server, initialized_config = init_defaults(
         server=server,
         config=config,
         strategy=strategy,
@@ -194,7 +194,7 @@ def start_simulation(  # pylint: disable=too-many-arguments
         initialized_server.client_manager().register(client=client_proxy)
 
     # Start training
-    hist = _fl(
+    hist = run_fl(
         server=initialized_server,
         config=initialized_config,
     )

{flwr_nightly-1.5.0.dev20230509.dist-info → flwr_nightly-1.5.0.dev20230511.dist-info}/METADATA

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

{flwr_nightly-1.5.0.dev20230509.dist-info → flwr_nightly-1.5.0.dev20230511.dist-info}/RECORD

@@ -48,24 +48,25 @@ flwr/proto/transport_pb2_grpc.py,sha256=vLN3EHtx2aEEMCO4f1Upu-l27BPzd3-5pV-u8wPc
 flwr/proto/transport_pb2_grpc.pyi,sha256=AGXf8RiIiW2J5IKMlm_3qT3AzcDa4F3P5IqUjve_esA,766
 flwr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flwr/server/__init__.py,sha256=fDk0_Aa1UkPBnhgAteeQv42KQyxSgU4JsF7le9gvVyY,1370
-flwr/server/app.py,sha256=QHptvgsG3v0q53orxw_ITkaTsA_MidzjPML5Q5AcpnA,23569
+flwr/server/app.py,sha256=6L47YCZAGUoCY_oZg8As71H-ZERxVzVmsJToLoruwSg,23645
 flwr/server/client_manager.py,sha256=OjJsIFos4kgol_knpGLa2IVCnFQJ1NuN-Qdr5BD6lYU,5941
 flwr/server/client_proxy.py,sha256=f0XnGrhaBzWsKN7j0KD288GqlebhVeJuSOMN38cD8Dc,2228
 flwr/server/criterion.py,sha256=9qfnUrDzgPhF8XIeBzJc1TrGrAmHOgAq24BEmZRN5BQ,1058
 flwr/server/driver/__init__.py,sha256=blORT_Pj4Uclj4FRMj38oiGPJiI9RJXiL5osNMCsQPA,705
 flwr/server/driver/driver_servicer.py,sha256=ArYIocfIM_EoTQ35THWhN0QeuaHDJPUHKq3FR_y21NQ,3919
 flwr/server/fleet/__init__.py,sha256=ripLU3o6YbNV-tNtqeLtM2f79_qeJwzZJiwt6ABYLbs,704
-flwr/server/fleet/fleet_servicer.py,sha256=m9dc1lJRMl9P3ujEDXW8L-2gJIaLq3hYrTngqNwtDHI,1638
+flwr/server/fleet/grpc_rere/__init__.py,sha256=A8q_bIhY6c51pXyUHqAQLedollHyqqp-chl7DDe9rzk,751
+flwr/server/fleet/grpc_rere/fleet_servicer.py,sha256=m9dc1lJRMl9P3ujEDXW8L-2gJIaLq3hYrTngqNwtDHI,1638
+flwr/server/fleet/rest_rere/__init__.py,sha256=2rG5KG7xojkD8jgwUrJPrW4Nsdm_HhwZaQ1poy9x3KQ,728
+flwr/server/fleet/rest_rere/rest_api.py,sha256=RLXyQBoQybciyYlZH9NezFTE_tV0cOxRWC21zRw2gOY,4564
 flwr/server/grpc_server/__init__.py,sha256=MFFOIhntiPA7BkkV1sAPnP3aZr1H-XWMP1-u9GrfZVE,728
 flwr/server/grpc_server/driver_client_manager.py,sha256=KpYaIY4mtOZao3s6cwlgCtirsed-tB41tRqzfr5A-Uc,4467
 flwr/server/grpc_server/flower_service_servicer.py,sha256=iaDfd_GPfu1RUWd5sebKb3Aqv95rXa9xMoDeVB3CNTA,5594
 flwr/server/grpc_server/grpc_bridge.py,sha256=FofohOKyoVhGv7_hHo4FxO4nH9jvRB24brHdZq9LYQ8,6416
 flwr/server/grpc_server/grpc_client_proxy.py,sha256=Byput4zxlI_mF2v2aJlKhQKeha2eAwxJdxkTRVy7l4M,4623
-flwr/server/grpc_server/grpc_server.py,sha256=WiCurb8Juum4npU0I9Yz3GaBQX348d6Gdh6B4ob-jTc,11509
+flwr/server/grpc_server/grpc_server.py,sha256=wxx_djJxKp5fUxz7Or0UHbbWe29-j8Q-3ArvvL9TN6Q,11519
 flwr/server/grpc_server/ins_scheduler.py,sha256=HgxavTZx6ejBRrf-9jxCyEzS8sHDSA0imiwOvfeHdS8,6314
 flwr/server/history.py,sha256=DAI-QKL_DEuFqEgYmHbaul642gF9bWa8E-hdobTYwwA,4457
-flwr/server/rest_server/__init__.py,sha256=2rG5KG7xojkD8jgwUrJPrW4Nsdm_HhwZaQ1poy9x3KQ,728
-flwr/server/rest_server/rest_api.py,sha256=RLXyQBoQybciyYlZH9NezFTE_tV0cOxRWC21zRw2gOY,4564
 flwr/server/server.py,sha256=wH6P4Z8Os63dYWNyhaKf95c0eAZKATe3d_w4tgRN7Xg,15891
 flwr/server/state/__init__.py,sha256=jcTV_f7T8w72NWkAY9kNPFis-FOd3Zm5jLE3CRmvOkE,996
 flwr/server/state/in_memory_state.py,sha256=Vsk0smDQ1pNLUeI5vIGkRLmTT-a0P6yOvyfMX8fDbv4,6521
@@ -94,11 +95,11 @@ flwr/server/utils/__init__.py,sha256=I3aifvGufkoK1Od-w1Xz_nicgAYllqXScQiRU6A5xvA
 flwr/server/utils/tensorboard.py,sha256=8CdSkJAdIaunKbp1fD0Wi6gFSC94YzrpwkKGzezv0nA,5114
 flwr/server/utils/validator.py,sha256=T5Wq5urHI2HD90InACl8-TjFkQJryG8OXXhMLlxvhB4,4941
 flwr/simulation/__init__.py,sha256=ZtAt5bMbbp9IJp1QQOhACN6_qhSPDtGmHF8gypUOZ9s,1271
-flwr/simulation/app.py,sha256=kYvgqQeQKOzOlQRNWdEYnf6FxmvoStfqYGhsjEghqDQ,7773
+flwr/simulation/app.py,sha256=fBIka3dl0x-yCGVoVs9COKRrzgAuoURU1DSPOnQuxgI,7777
 flwr/simulation/ray_transport/__init__.py,sha256=eJ3pijYkI7XhbX2rLu6FBGTo8hZkFL8RSj4twhApOGw,727
 flwr/simulation/ray_transport/ray_client_proxy.py,sha256=yGY8p0TKxak-OH7zqFxd9oDe3TQ_cfAZEp0-JJYEnyg,5472
-flwr_nightly-1.5.0.dev20230509.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-flwr_nightly-1.5.0.dev20230509.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.5.0.dev20230509.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
-flwr_nightly-1.5.0.dev20230509.dist-info/METADATA,sha256=_yCY52LqT9H3c9GEKM_cRS0yVWlwxy1NOpTEnW7KjEg,12772
-flwr_nightly-1.5.0.dev20230509.dist-info/RECORD,,
+flwr_nightly-1.5.0.dev20230511.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+flwr_nightly-1.5.0.dev20230511.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.5.0.dev20230511.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
+flwr_nightly-1.5.0.dev20230511.dist-info/METADATA,sha256=lQ_RxdS18MHTrBVbYwepdJegJwHdwUDKrCNCUK72_Mg,12772
+flwr_nightly-1.5.0.dev20230511.dist-info/RECORD,,