Fixed types for old pyhton versions and SQLAlchemy memory leak (#150)

Author: s3rius

fastapi_template/cli.py

@@ -8,7 +8,7 @@
     SKIP_ENTRY,
 )
 from importlib.metadata import version
-from typing import Callable, Optional
+from typing import Callable, List, Optional
 from click import Command, Option
 import re
 
@@ -40,20 +40,20 @@ def disable_orm(ctx: BuilderContext) -> MenuEntry:
     return None
 
 
-def do_not_ask_features_if_quite(ctx: BuilderContext) -> Optional[list[MenuEntry]]:
+def do_not_ask_features_if_quite(ctx: BuilderContext) -> Optional[List[MenuEntry]]:
     if ctx.quite:
         return [SKIP_ENTRY]
     return None
 
 
-def check_db(allowed_values: list[str]) -> Callable[[BuilderContext], bool]:
+def check_db(allowed_values: List[str]) -> Callable[[BuilderContext], bool]:
     def checker(ctx: BuilderContext) -> bool:
         return ctx.db not in allowed_values
 
     return checker
 
 
-def check_orm(allowed_values: list[str]) -> Callable[[BuilderContext], bool]:
+def check_orm(allowed_values: List[str]) -> Callable[[BuilderContext], bool]:
     def checker(ctx: BuilderContext) -> bool:
         return ctx.orm not in allowed_values
 
@@ -499,7 +499,7 @@ def checker(ctx: BuilderContext) -> bool:
 
 
 def handle_cli(
-    menus: list[BaseMenuModel],
+    menus: List[BaseMenuModel],
     callback: Callable[[BuilderContext], None],
 ):
     def inner_callback(**cli_args: Any):
@@ -532,7 +532,7 @@ def inner_callback(**cli_args: Any):
 
 
 def run_command(callback: Callable[[BuilderContext], None]) -> None:
-    menus: "list[BaseMenuModel]" = [
+    menus: "List[BaseMenuModel]" = [
         api_menu,
         db_menu,
         orm_menu,

fastapi_template/input_model.py

@@ -1,5 +1,5 @@
 import enum
-from typing import Optional, Callable, Any
+from typing import List, Optional, Callable, Any
 
 from pydantic import BaseModel
 import click
@@ -54,7 +54,7 @@ def generated_name(self) -> str:
 
 class BaseMenuModel(BaseModel, abc.ABC):
     title: str
-    entries: list[MenuEntry]
+    entries: List[MenuEntry]
     description: str = ""
 
     def _preview(self, current_value: str):
@@ -65,7 +65,7 @@ def _preview(self, current_value: str):
         return "Unknown value"
 
     @abc.abstractmethod
-    def get_cli_options(self) -> list[click.Option]:
+    def get_cli_options(self) -> List[click.Option]:
         pass
 
     @abc.abstractmethod
@@ -91,7 +91,7 @@ class SingularMenuModel(BaseMenuModel):
     ]
     parser: Optional[Callable[[str], Any]]
 
-    def get_cli_options(self) -> list[click.Option]:
+    def get_cli_options(self) -> List[click.Option]:
         cli_name = self.code
         if self.cli_name is not None:
             cli_name = self.cli_name
@@ -168,9 +168,9 @@ def after_ask(self, context: "BuilderContext") -> "BuilderContext":
 
 
 class MultiselectMenuModel(BaseMenuModel):
-    before_ask: Optional[Callable[["BuilderContext"], Optional[list[MenuEntry]]]]
+    before_ask: Optional[Callable[["BuilderContext"], Optional[List[MenuEntry]]]]
 
-    def get_cli_options(self) -> list[click.Option]:
+    def get_cli_options(self) -> List[click.Option]:
         options = []
         for entry in self.entries:
             options.append(

fastapi_template/template/{{cookiecutter.project_name}}/conditional_files.json

@@ -147,7 +147,7 @@
     "Self-hosted swagger": {
         "enabled": "{{cookiecutter.self_hosted_swagger}}",
         "resources": [
-            "{{cookiecutter.project_name}}/web/static",
+            "{{cookiecutter.project_name}}/static/docs",
             "{{cookiecutter.project_name}}/web/api/docs"
         ]
     },
@@ -210,4 +210,4 @@
             "{{cookiecutter.project_name}}/db_tortoise/migrations/models/1_20210928165300_init_dummy_sqlite.sql"
         ]
     }
-}
+}

fastapi_template/template/{{cookiecutter.project_name}}/pyproject.toml

@@ -123,7 +123,7 @@ aiokafka = "^0.8.0"
 [tool.poetry.dev-dependencies]
 pytest = "^7.2.1"
 flake8 = "~4.0.1"
-mypy = "^0.991"
+mypy = "^1.1.1"
 isort = "^5.11.4"
 pre-commit = "^3.0.1"
 wemake-python-styleguide = "^0.17.0"

fastapi_template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/settings.py

@@ -1,7 +1,7 @@
 import enum
 from pathlib import Path
 from tempfile import gettempdir
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseSettings
 from yarl import URL
@@ -111,7 +111,7 @@ class Settings(BaseSettings):
 
     {%- if cookiecutter.enable_kafka == "True" %}
 
-    kafka_bootstrap_servers: list[str] = ["{{cookiecutter.project_name}}-kafka:9092"]
+    kafka_bootstrap_servers: List[str] = ["{{cookiecutter.project_name}}-kafka:9092"]
 
     {%- endif %}
 

fastapi_template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/web/lifetime.py

@@ -77,9 +77,7 @@ async def _setup_db(app: FastAPI) -> None:
 {%- endif %}
 
 {%- if cookiecutter.orm == "sqlalchemy" %}
-from asyncio import current_task
 from sqlalchemy.ext.asyncio import (
-    async_scoped_session,
     create_async_engine,
     async_sessionmaker,
 )
@@ -102,12 +100,9 @@ def _setup_db(app: FastAPI) -> None:  # pragma: no cover
     :param app: fastAPI application.
     """
     engine = create_async_engine(str(settings.db_url), echo=settings.db_echo)
-    session_factory = async_scoped_session(
-        async_sessionmaker(
-            engine,
-            expire_on_commit=False,
-        ),
-        scopefunc=current_task,
+    session_factory = async_sessionmaker(
+        engine,
+        expire_on_commit=False,
     )
     app.state.db_engine = engine
     app.state.db_session_factory = session_factory