flwr-nightly 1.5.0.dev20230725__py3-none-any.whl → 1.5.0.dev20230730__py3-none-any.whl

flwr/server/app.py

@@ -282,8 +282,7 @@ def run_fleet_api() -> None:
     # Start Fleet API
     if args.fleet_api_type == TRANSPORT_TYPE_REST:
         if (
-            importlib.util.find_spec("fastapi")
-            and importlib.util.find_spec("requests")
+            importlib.util.find_spec("requests")
             and importlib.util.find_spec("starlette")
             and importlib.util.find_spec("uvicorn")
         ) is None:
@@ -376,8 +375,7 @@ def run_server() -> None:
     # Start Fleet API
     if args.fleet_api_type == TRANSPORT_TYPE_REST:
         if (
-            importlib.util.find_spec("fastapi")
-            and importlib.util.find_spec("requests")
+            importlib.util.find_spec("requests")
             and importlib.util.find_spec("starlette")
             and importlib.util.find_spec("uvicorn")
         ) is None:

flwr/server/fleet/rest_rere/rest_api.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""REST API server."""
+"""Experimental REST API server."""
 
 
 import sys
@@ -23,16 +23,16 @@ from flwr.server.fleet.message_handler import message_handler
 from flwr.server.state import State
 
 try:
-    from fastapi import FastAPI, HTTPException, Request, Response
+    from starlette.applications import Starlette
     from starlette.datastructures import Headers
+    from starlette.exceptions import HTTPException
+    from starlette.requests import Request
+    from starlette.responses import Response
+    from starlette.routing import Route
 except ModuleNotFoundError:
     sys.exit(MISSING_EXTRA_REST)
 
 
-app: FastAPI = FastAPI()
-
-
-@app.post("/api/v0/fleet/pull-task-ins", response_class=Response)
 async def pull_task_ins(request: Request) -> Response:
     """Pull TaskIns."""
     _check_headers(request.headers)
@@ -62,7 +62,6 @@ async def pull_task_ins(request: Request) -> Response:
     )
 
 
-@app.post("/api/v0/fleet/push-task-res", response_class=Response)
 async def push_task_res(request: Request) -> Response:  # Check if token is needed here
     """Push TaskRes."""
     _check_headers(request.headers)
@@ -92,6 +91,17 @@ async def push_task_res(request: Request) -> Response:  # Check if token is need
     )
 
 
+routes = [
+    Route("/api/v0/fleet/pull-task-ins", pull_task_ins, methods=["POST"]),
+    Route("/api/v0/fleet/push-task-res", push_task_res, methods=["POST"]),
+]
+
+app: Starlette = Starlette(
+    debug=False,
+    routes=routes,
+)
+
+
 def _check_headers(headers: Headers) -> None:
     """Check if expected headers are set."""
     if "content-type" not in headers:

{flwr_nightly-1.5.0.dev20230725.dist-info → flwr_nightly-1.5.0.dev20230730.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.5.0.dev20230725
+Version: 1.5.0.dev20230730
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0
@@ -33,7 +33,6 @@ Classifier: Typing :: Typed
 Provides-Extra: rest
 Provides-Extra: simulation
 Requires-Dist: cryptography (>=41.0.2,<42.0.0)
-Requires-Dist: fastapi (>=0.95.0,<0.96.0) ; extra == "rest"
 Requires-Dist: grpcio (>=1.48.2,<2.0.0,!=1.52.0)
 Requires-Dist: importlib-metadata (>=4.0.0,<5.0.0) ; python_version < "3.8"
 Requires-Dist: iterators (>=0.0.2,<0.0.3)
@@ -42,9 +41,9 @@ Requires-Dist: protobuf (>=3.19.0,<4.0.0)
 Requires-Dist: pycryptodome (>=3.18.0,<4.0.0)
 Requires-Dist: pydantic (<2.0.0) ; extra == "simulation"
 Requires-Dist: ray[default] (==2.5.1) ; extra == "simulation"
-Requires-Dist: requests (>=2.28.2,<3.0.0) ; extra == "rest"
-Requires-Dist: starlette (>=0.27.0,<0.28.0) ; extra == "rest"
-Requires-Dist: uvicorn[standard] (>=0.21.1,<0.22.0) ; extra == "rest"
+Requires-Dist: requests (>=2.31.0,<3.0.0) ; extra == "rest"
+Requires-Dist: starlette (>=0.29.0,<0.30.0) ; extra == "rest"
+Requires-Dist: uvicorn[standard] (>=0.22.0,<0.23.0) ; extra == "rest"
 Project-URL: Documentation, https://flower.dev
 Project-URL: Repository, https://github.com/adap/flower
 Description-Content-Type: text/markdown

{flwr_nightly-1.5.0.dev20230725.dist-info → flwr_nightly-1.5.0.dev20230730.dist-info}/RECORD

@@ -53,7 +53,7 @@ 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=qb-8DZzxrlB30FNd6a22IU7uPKrGEMZcc98l0tKWm_Y,26333
+flwr/server/app.py,sha256=Np5EmHqcGDNSBEmBD_b_vuwvTvZWhecw11y08fEiViY,26229
 flwr/server/client_manager.py,sha256=x9QYmwFkN4BMqZ-I2GBQgRB2HbPVwjHhMS0eBudwbJ4,6120
 flwr/server/client_proxy.py,sha256=02so_31pp7U5nX9zD79L9rWbB2bhRFvELeG12LdxOaM,2227
 flwr/server/criterion.py,sha256=VgR9xvn0YZMMrEZOwH9hdSeLHybLKlK2Ymoor3RlWv4,1054
@@ -72,7 +72,7 @@ flwr/server/fleet/grpc_rere/fleet_servicer.py,sha256=hLIxV7NhG9eG0QQAhNWEZc-KbtO
 flwr/server/fleet/message_handler/__init__.py,sha256=P1NBR3HKEcyOjELw1XaCSjNc94WYnIUGjAn9YcgW6k4,724
 flwr/server/fleet/message_handler/message_handler.py,sha256=6eY3tGE4kMruKobKW8irjJyyQbTTOJezwlvZDeiBBA4,2876
 flwr/server/fleet/rest_rere/__init__.py,sha256=2rG5KG7xojkD8jgwUrJPrW4Nsdm_HhwZaQ1poy9x3KQ,728
-flwr/server/fleet/rest_rere/rest_api.py,sha256=Q3wbofJyjyefVCJKWGlUH_I_BZfrOaBMDwN7bdVFozk,3686
+flwr/server/fleet/rest_rere/rest_api.py,sha256=R_UZUjPTFKKe1XIq5NbSFNdn5yd-gXizUNIHiKSN_Hc,3934
 flwr/server/history.py,sha256=xI7LfjV67VQZkKoHRpzILG1zKb_a0pMyL2vpn15BsxM,4897
 flwr/server/server.py,sha256=amrh_Xpfkq8EQdnDubDn3NPyIuv8-SIm6wZ8bhdb9mE,15958
 flwr/server/state/__init__.py,sha256=jcTV_f7T8w72NWkAY9kNPFis-FOd3Zm5jLE3CRmvOkE,996
@@ -106,8 +106,8 @@ flwr/simulation/__init__.py,sha256=ZtAt5bMbbp9IJp1QQOhACN6_qhSPDtGmHF8gypUOZ9s,1
 flwr/simulation/app.py,sha256=uScSm6ep7ngJno1eDAgG9ReGYyYcez4GhhwpRQzjLGA,7762
 flwr/simulation/ray_transport/__init__.py,sha256=eJ3pijYkI7XhbX2rLu6FBGTo8hZkFL8RSj4twhApOGw,727
 flwr/simulation/ray_transport/ray_client_proxy.py,sha256=TClE-Y9udGCUWi-mfwv83VLBV55eOXosc2HxyLHYZi0,5471
-flwr_nightly-1.5.0.dev20230725.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.5.0.dev20230725.dist-info/METADATA,sha256=9Su-GNZ156KbWsBPfGqD6Ursh1rjuAouoWfxSwVH5KA,13223
-flwr_nightly-1.5.0.dev20230725.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-flwr_nightly-1.5.0.dev20230725.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
-flwr_nightly-1.5.0.dev20230725.dist-info/RECORD,,
+flwr_nightly-1.5.0.dev20230730.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.5.0.dev20230730.dist-info/METADATA,sha256=fzIAT9TuFV8pZ8iQDLnXF-rLypWTrK2K9J6eTIvUTtQ,13163
+flwr_nightly-1.5.0.dev20230730.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+flwr_nightly-1.5.0.dev20230730.dist-info/entry_points.txt,sha256=1uLlD5tIunkzALMfMWnqjdE_D5hRUX_I1iMmOMv6tZI,181
+flwr_nightly-1.5.0.dev20230730.dist-info/RECORD,,