update fastapi package

Author: NatalyaGrigoreva

README.md

@@ -30,6 +30,7 @@ pip install FastAPI-JSONAPI
 Create a test.py file and copy the following code into it
 
 ```python
+from contextlib import asynccontextmanager
 from pathlib import Path
 from typing import Any, ClassVar, Optional
 
@@ -171,26 +172,26 @@ def add_routes(app: FastAPI):
     return tags
 
 
-def create_app() -> FastAPI:
-    """
-    Create app factory.
-
-    :return: app
-    """
-    app = FastAPI(
-        title="FastAPI and SQLAlchemy",
-        debug=True,
-        openapi_url="/openapi.json",
-        docs_url="/docs",
-    )
+# noinspection PyUnusedLocal
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     add_routes(app)
-    app.on_event("startup")(Connector.init)
-    app.on_event("shutdown")(Connector.dispose)
     init(app)
-    return app
+
+    await Connector.init()
+
+    yield
+
+    await Connector.dispose()
 
 
-app = create_app()
+app = FastAPI(
+    lifespan=lifespan,
+    title="FastAPI and SQLAlchemy",
+    debug=True,
+    openapi_url="/openapi.json",
+    docs_url="/docs",
+)
 
 
 if __name__ == "__main__":

docs/python_snippets/client_generated_id/schematic_example.py

@@ -1,9 +1,11 @@
 import sys
+from contextlib import asynccontextmanager
 from pathlib import Path
 from typing import ClassVar, Annotated, Optional
 
 import uvicorn
 from fastapi import APIRouter, Depends, FastAPI
+from fastapi.responses import ORJSONResponse as JSONResponse
 from pydantic import ConfigDict
 from sqlalchemy.engine import make_url
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -58,11 +60,6 @@ class UserInSchema(UserAttributesBaseSchema):
     id: Annotated[int, ClientCanSetId()]
 
 
-async def sqlalchemy_init() -> None:
-    async with db.engine.begin() as conn:
-        await conn.run_sync(Base.metadata.create_all)
-
-
 class SessionDependency(BaseModel):
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
@@ -95,7 +92,7 @@ class UserListView(ListViewBaseGeneric):
     }
 
 
-def add_routes(app: FastAPI):
+def add_routes(app: FastAPI) -> list[dict]:
     tags = [
         {
             "name": "User",
@@ -121,26 +118,28 @@ def add_routes(app: FastAPI):
     return tags
 
 
-def create_app() -> FastAPI:
-    """
-    Create app factory.
-
-    :return: app
-    """
-    app = FastAPI(
-        title="FastAPI and SQLAlchemy",
-        debug=True,
-        openapi_url="/openapi.json",
-        docs_url="/docs",
-    )
+# noinspection PyUnusedLocal
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     add_routes(app)
-    app.on_event("startup")(sqlalchemy_init)
-    app.on_event("shutdown")(db.dispose)
     init(app)
-    return app
 
+    async with db.engine.begin() as conn:
+        await conn.run_sync(Base.metadata.create_all)
+
+    yield
 
-app = create_app()
+    await db.dispose()
+
+
+app = FastAPI(
+    title="FastAPI and SQLAlchemy",
+    lifespan=lifespan,
+    debug=True,
+    default_response_class=JSONResponse,
+    docs_url="/docs",
+    openapi_url="/openapi.json",
+)
 
 
 if __name__ == "__main__":

docs/requirements.txt

@@ -1,4 +1,4 @@
-fastapi>0.100.0
+fastapi>=0.112.3
 orjson>=3.2.1
 pydantic>=2.6.0
 sphinx

examples/api_for_sqlalchemy/asgi.py

@@ -5,10 +5,12 @@
 """
 
 import sys
+from contextlib import asynccontextmanager
 from pathlib import Path
 
 import uvicorn
 from fastapi import FastAPI
+from fastapi.responses import ORJSONResponse as JSONResponse
 
 from examples.api_for_sqlalchemy.api.views_base import db
 from examples.api_for_sqlalchemy.models.base import Base
@@ -19,34 +21,34 @@
 sys.path.append(f"{CURRENT_DIR.parent.parent}")
 
 
-async def sqlalchemy_init() -> None:
+# noinspection PyUnusedLocal
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    app.config = {"MAX_INCLUDE_DEPTH": 5}
+    add_routes(app)
+    init(app)
+
     async with db.engine.begin() as conn:
         await conn.run_sync(Base.metadata.create_all)
 
+    yield
 
-def create_app() -> FastAPI:
-    """
-    Create app factory.
+    await db.engine.dispose()
 
-    :return: app
-    """
-    app = FastAPI(
-        title="FastAPI and SQLAlchemy",
-        debug=True,
-        openapi_url="/openapi.json",
-        docs_url="/docs",
-    )
-    app.config = {"MAX_INCLUDE_DEPTH": 5}
-    add_routes(app)
-    app.on_event("startup")(sqlalchemy_init)
-    app.on_event("shutdown")(db.dispose)
-    init(app)
-    return app
+
+app = FastAPI(
+    title="FastAPI and SQLAlchemy",
+    lifespan=lifespan,
+    debug=True,
+    default_response_class=JSONResponse,
+    docs_url="/docs",
+    openapi_url="/openapi.json",
+)
 
 
 if __name__ == "__main__":
     uvicorn.run(
-        "asgi:app",
+        "main:app",
         host="0.0.0.0",
         port=8082,
         reload=True,

examples/api_for_sqlalchemy/main.py

@@ -1,9 +1,11 @@
 import sys
+from contextlib import asynccontextmanager
 from pathlib import Path
 from typing import Any, ClassVar, Optional
 
 import uvicorn
 from fastapi import APIRouter, Depends, FastAPI
+from fastapi.responses import ORJSONResponse as JSONResponse
 from pydantic import ConfigDict
 from sqlalchemy.engine import make_url
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -44,11 +46,6 @@ class UserSchema(BaseModel):
     name: str
 
 
-async def sqlalchemy_init() -> None:
-    async with db.engine.begin() as conn:
-        await conn.run_sync(Base.metadata.create_all)
-
-
 class SessionDependency(BaseModel):
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
@@ -105,26 +102,28 @@ def add_routes(app: FastAPI):
     return tags
 
 
-def create_app() -> FastAPI:
-    """
-    Create app factory.
-
-    :return: app
-    """
-    app = FastAPI(
-        title="FastAPI and SQLAlchemy",
-        debug=True,
-        openapi_url="/openapi.json",
-        docs_url="/docs",
-    )
+# noinspection PyUnusedLocal
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     add_routes(app)
-    app.on_event("startup")(sqlalchemy_init)
-    app.on_event("shutdown")(db.dispose)
     init(app)
-    return app
 
+    async with db.engine.begin() as conn:
+        await conn.run_sync(Base.metadata.create_all)
+
+    yield
 
-app = create_app()
+    await db.dispose()
+
+
+app = FastAPI(
+    title="FastAPI and SQLAlchemy",
+    lifespan=lifespan,
+    debug=True,
+    default_response_class=JSONResponse,
+    docs_url="/docs",
+    openapi_url="/openapi.json",
+)
 
 
 if __name__ == "__main__":

examples/api_minimal.py

@@ -1,4 +1,5 @@
 import inspect
+from contextlib import AsyncExitStack
 from typing import Any, Awaitable, Callable, TypeVar, Union
 
 from fastapi import Request
@@ -23,20 +24,23 @@ def __init__(self, request: Request):
     async def solve_dependencies_and_run(self, dependant: Dependant) -> ReturnType:
         body_data = await self.request.body() or None
         body = body_data and (await self.request.json())
-        values, errors, *_ = await solve_dependencies(
-            request=self.request,
-            dependant=dependant,
-            body=body,
-        )
-
-        if errors:
-            raise RequestValidationError(errors, body=body)
+        async with AsyncExitStack() as async_exit_stack:
+            solved_dependencies = await solve_dependencies(
+                request=self.request,
+                dependant=dependant,
+                body=body,
+                async_exit_stack=async_exit_stack,
+                embed_body_fields=True,
+            )
+
+        if solved_dependencies.errors:
+            raise RequestValidationError(solved_dependencies.errors, body=body)
 
         orig_func: Callable[..., FuncReturnType[Any]] = dependant.call  # type: ignore
         if inspect.iscoroutinefunction(orig_func):
-            function_call_result = await orig_func(**values)
+            function_call_result = await orig_func(**solved_dependencies.values)
         else:
-            function_call_result = orig_func(**values)
+            function_call_result = orig_func(**solved_dependencies.values)
 
         return function_call_result