flwr-nightly 1.5.0.dev20230725__tar.gz → 1.5.0.dev20230730__tar.gz

{flwr_nightly-1.5.0.dev20230725 → flwr_nightly-1.5.0.dev20230730}/PKG-INFO

@@ -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 → flwr_nightly-1.5.0.dev20230730}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.5.0-dev20230725"
+version = "1.5.0-dev20230730"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.dev>"]
@@ -71,14 +71,13 @@ iterators = "^0.0.2"
 ray = { version = "==2.5.1", extras = ["default"], optional = true }
 pydantic = { version = "<2.0.0", optional = true }
 # Optional dependencies (REST transport layer)
-requests = { version = "^2.28.2", optional = true }
-fastapi = { version = "^0.95.0", optional = true }
-starlette = { version = "^0.27.0", optional = true }
-uvicorn = { version = "^0.21.1", extras = ["standard"], optional = true }
+requests = { version = "^2.31.0", optional = true }
+starlette = { version = "^0.29.0", optional = true }
+uvicorn = { version = "^0.22.0", extras = ["standard"], optional = true }
 
 [tool.poetry.extras]
 simulation = ["ray", "pydantic"]
-rest = ["fastapi", "requests", "starlette", "uvicorn"]
+rest = ["requests", "starlette", "uvicorn"]
 
 [tool.poetry.group.dev.dependencies]
 types-dataclasses = "==0.6.6"

{flwr_nightly-1.5.0.dev20230725 → flwr_nightly-1.5.0.dev20230730}/src/py/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_nightly-1.5.0.dev20230725 → flwr_nightly-1.5.0.dev20230730}/src/py/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: