From e1fcff51d4f14bb61b6c88472699a1aaa62c9ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tin=20Tvrtkovi=C4=87?= <tinchester@gmail.com>
Date: Fri, 15 Dec 2023 02:50:58 +0100
Subject: [PATCH] Fixes

---
 src/uapi/django.py         | 2 +-
 tests/flask.py             | 4 ++--
 tests/sessions/conftest.py | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/uapi/django.py b/src/uapi/django.py
index 2eba0bf..b945434 100644
--- a/src/uapi/django.py
+++ b/src/uapi/django.py
@@ -218,7 +218,7 @@ def adapted(
         return res
 
 
-App: TypeAlias = DjangoApp
+App: TypeAlias = DjangoApp[FrameworkResponse]
 
 
 def _make_django_incanter(converter: Converter) -> Incanter:
diff --git a/tests/flask.py b/tests/flask.py
index 00785b2..e79d24b 100644
--- a/tests/flask.py
+++ b/tests/flask.py
@@ -5,7 +5,7 @@
 
 from flask import Response, request
 from uapi import ResponseException
-from uapi.flask import App
+from uapi.flask import App, FlaskApp
 from uapi.status import NoContent
 from uapi.types import Method, RouteName
 
@@ -73,7 +73,7 @@ def request_method_native(req_method: Method) -> Response:
     return app
 
 
-async def run_on_flask(app: App, port: int, shutdown_event: Event):
+async def run_on_flask(app: FlaskApp, port: int, shutdown_event: Event):
     config = Config()
     config.bind = [f"localhost:{port}"]
 
diff --git a/tests/sessions/conftest.py b/tests/sessions/conftest.py
index eea8380..35e60a6 100644
--- a/tests/sessions/conftest.py
+++ b/tests/sessions/conftest.py
@@ -6,7 +6,8 @@
 
 from uapi.aiohttp import App as AiohttpApp
 from uapi.cookies import CookieSettings
-from uapi.flask import FlaskApp
+from uapi.flask import App as FlaskApp
+from uapi.flask import FlaskApp as OriginFlaskApp
 from uapi.quart import App as QuartApp
 from uapi.sessions import Session, configure_secure_sessions
 from uapi.starlette import App as StarletteApp
@@ -25,7 +26,7 @@ def configure_secure_session_app(
         app, "test", settings=CookieSettings(max_age=2, secure=False)
     )
 
-    if isinstance(app, FlaskApp):
+    if isinstance(app, OriginFlaskApp):
 
         @app.get("/")
         def index(session: Session) -> str:
@@ -77,7 +78,7 @@ async def secure_cookie_session_app(
             await t
 
     elif request.param == "flask":
-        flask_app = FlaskApp[None]()
+        flask_app = FlaskApp()
         configure_secure_session_app(flask_app)
         shutdown_event = Event()
         t = create_task(run_on_flask(flask_app, unused_tcp_port, shutdown_event))