Merge branch 'release/3.3.9'

Author: s3rius

fastapi_template/input_model.py

@@ -52,15 +52,15 @@ class Database(BaseModel):
     ),
     DatabaseType.postgresql: Database(
         name=DatabaseType.postgresql.value,
-        image="postgres:13.6-bullseye",
+        image="postgres:13.8-bullseye",
         async_driver="postgresql+asyncpg",
         driver_short="postgres",
         driver="postgresql",
         port=5432,
     ),
     DatabaseType.mysql: Database(
         name=DatabaseType.mysql.value,
-        image="bitnami/mysql:8.0.28",
+        image="bitnami/mysql:8.0.30",
         async_driver="mysql+aiomysql",
         driver_short="mysql",
         driver="mysql",

fastapi_template/template/{{cookiecutter.project_name}}/.flake8

@@ -68,6 +68,8 @@ ignore =
   DJ11,
   ; Found mutable module constant.
   WPS407,
+  ; Found too many empty lines in `def`
+  WPS473,
 
 per-file-ignores =
   ; all tests

fastapi_template/template/{{cookiecutter.project_name}}/.github/workflows/tests.yml

@@ -62,17 +62,17 @@ jobs:
           POSTGRES_DB: {{ cookiecutter.project_name }}
           {%- endif %}
           {%- if cookiecutter.db_info.name == "mysql" %}
-          MYSQL_PASSWORD: {{ cookiecutter.project_name }}
-          MYSQL_USER: {{ cookiecutter.project_name }}
-          MYSQL_DATABASE: {{ cookiecutter.project_name }}
-          ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_ROOT_PASSWORD: "{{ cookiecutter.project_name }}"
+          MYSQL_ROOT_USER: "{{ cookiecutter.project_name }}"
+          MYSQL_DATABASE: "{{ cookiecutter.project_name }}"
+          MYSQL_AUTHENTICATION_PLUGIN: "mysql_native_password"
           {%- endif %}
         {%- if cookiecutter.db_info.name == "mysql" %}
         options: >-
           --health-cmd="mysqladmin ping -u root"
           --health-interval=15s
           --health-timeout=5s
-          --health-retries=5
+          --health-retries=6
         {%- endif %}
         {%- if cookiecutter.db_info.name == "postgresql" %}
         options: >-

fastapi_template/template/{{cookiecutter.project_name}}/deploy/Dockerfile

@@ -7,6 +7,14 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/*
 {%- endif %}
 
+
+{%- if cookiecutter.db_info.name == "postgresql" %}
+RUN apt-get update && apt-get install -y \
+  gcc \
+  && rm -rf /var/lib/apt/lists/*
+{%- endif %}
+
+
 RUN pip install poetry==1.1.13
 
 # Configuring poetry
@@ -19,7 +27,7 @@ WORKDIR /app/src
 # Installing requirements
 RUN poetry install
 
-{%- if cookiecutter.db_info.name == "mysql" %}
+{%- if cookiecutter.db_info.name == "mysql" or cookiecutter.db_info.name == "postgresql" %}
 # Removing gcc
 RUN apt-get purge -y \
   gcc \

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

@@ -12,105 +12,105 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-fastapi = "^0.75.0"
-uvicorn = { version = "^0.17.0", extras = ["standard"] }
-pydantic = {version = "^1.9.0", extras = ["dotenv"]}
-yarl = "^1.7.2"
-ujson = "^5.1.0"
+fastapi = "^0.85.0"
+uvicorn = { version = "^0.18.3", extras = ["standard"] }
+pydantic = {version = "^1.10.2", extras = ["dotenv"]}
+yarl = "^1.8.1"
+ujson = "^5.5.0"
 {%- if cookiecutter.orm == "piccolo" %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-piccolo = {version = "^0.74.0", extras = ["postgres"]}
+piccolo = {version = "^0.91.0", extras = ["postgres"]}
 {%- elif cookiecutter.db_info.name == "sqlite" %}
-piccolo = {version = "^0.74.0", extras = ["sqlite"]}
+piccolo = {version = "^0.91.0", extras = ["sqlite"]}
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "sqlalchemy" %}
-SQLAlchemy = {version = "^1.4", extras = ["mypy", "asyncio"]}
+SQLAlchemy = {version = "^1.4.41", extras = ["mypy", "asyncio"]}
 {%- if cookiecutter.enable_migrations == "True" %}
-alembic = "^1.7.7"
+alembic = "^1.8.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = {version = "^0.25.0", extras = ["sa"]}
+asyncpg = {version = "^0.26.0", extras = ["sa"]}
 {%- elif cookiecutter.db_info.name == "sqlite" %}
 aiosqlite = "^0.17.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.0.22"
-mysqlclient = "^2.1.0"
+aiomysql = "^0.1.1"
+mysqlclient = "^2.1.1"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "tortoise" %}
-tortoise-orm = "^0.19.0"
+tortoise-orm = "^0.19.2"
 {%- if cookiecutter.enable_migrations == "True" %}
-aerich = "^0.6.2"
+aerich = "^0.7.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = "^0.25.0"
+asyncpg = "^0.26.0"
 {%- elif cookiecutter.db_info.name == "sqlite" %}
 aiosqlite = "^0.17.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.0.21"
-mysqlclient = "^2.0.3"
-cryptography = "^36.0.2"
+aiomysql = "^0.1.1"
+mysqlclient = "^2.1.1"
+cryptography = "^38.0.1"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "ormar" %}
-ormar = "^0.11.0"
+ormar = "^0.11.3"
 {%- if cookiecutter.enable_migrations == "True" %}
-alembic = "^1.7.7"
+alembic = "^1.8.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = "^0.25.0"
+asyncpg = "^0.26.0"
 psycopg2-binary = "^2.9.3"
 {%- elif cookiecutter.db_info.name == "sqlite" %}
 aiosqlite = "^0.17.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.0.22"
-mysqlclient = "^2.1.0"
+aiomysql = "^0.1.1"
+mysqlclient = "^2.1.1"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_redis == "True" %}
-redis = {version = "^4.3.3", extras = ["hiredis"]}
+redis = {version = "^4.3.4", extras = ["hiredis"]}
 {%- endif %}
 {%- if cookiecutter.self_hosted_swagger == 'True' %}
-aiofiles = "^0.8.0"
+aiofiles = "^22.1.0"
 {%- endif %}
 {%- if cookiecutter.orm == "psycopg" %}
-psycopg = { version = "^3.0.11", extras = ["binary", "pool"] }
+psycopg = { version = "^3.1.2", extras = ["binary", "pool"] }
 {%- endif %}
-httptools = "^0.3.0"
+httptools = "^0.5.0"
 {%- if cookiecutter.api_type == "graphql" %}
-strawberry-graphql = { version = "^0.114.2", extras = ["fastapi"] }
+strawberry-graphql = { version = "^0.133.2", extras = ["fastapi"] }
 {%- endif %}
 {%- if cookiecutter.enable_rmq == "True" %}
-aio-pika = "^7.2.0"
+aio-pika = "^8.2.3"
 {%- endif %}
 {%- if cookiecutter.prometheus_enabled == "True" %}
 prometheus-client = "^0.14.1"
-prometheus-fastapi-instrumentator = "5.8.1"
+prometheus-fastapi-instrumentator = "5.9.1"
 {%- endif %}
 {%- if cookiecutter.sentry_enabled == "True" %}
-sentry-sdk = "^1.5.12"
+sentry-sdk = "^1.9.9"
 {%- endif %}
 {%- if cookiecutter.otlp_enabled == "True" %}
-opentelemetry-api = {version = "^1.12.0rc2", allow-prereleases = true}
-opentelemetry-sdk = {version = "^1.12.0rc2", allow-prereleases = true}
-opentelemetry-exporter-otlp = {version = "^1.12.0rc2", allow-prereleases = true}
-opentelemetry-instrumentation = "^0.32b0"
-opentelemetry-instrumentation-fastapi = "^0.32b0"
+opentelemetry-api = "^1.13.0"
+opentelemetry-sdk = "^1.13.0"
+opentelemetry-exporter-otlp = "^1.13.0"
+opentelemetry-instrumentation = "^0.34b0"
+opentelemetry-instrumentation-fastapi = "^0.34b0"
 {%- if cookiecutter.enable_loguru != "True" %}
-opentelemetry-instrumentation-logging = "^0.32b0"
+opentelemetry-instrumentation-logging = "^0.34b0"
 {%- endif %}
 {%- if cookiecutter.enable_redis == "True" %}
-opentelemetry-instrumentation-redis = "^0.32b0"
+opentelemetry-instrumentation-redis = "^0.34b0"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" and cookiecutter.orm in ["ormar", "tortoise"] %}
-opentelemetry-instrumentation-asyncpg = "^0.32b0"
+opentelemetry-instrumentation-asyncpg = "^0.34b0"
 {%- endif %}
 {%- if cookiecutter.orm == "sqlalchemy" %}
-opentelemetry-instrumentation-sqlalchemy = "^0.32b0"
+opentelemetry-instrumentation-sqlalchemy = "^0.34b0"
 {%- endif %}
 {%- if cookiecutter.enable_rmq == "True" %}
-opentelemetry-instrumentation-aio-pika = "^0.32b0"
+opentelemetry-instrumentation-aio-pika = "^0.34b0"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_loguru == "True" %}
@@ -121,29 +121,29 @@ aiokafka = "^0.7.2"
 {%- endif %}
 
 [tool.poetry.dev-dependencies]
-pytest = "^7.0"
-flake8 = "^4.0.1"
-mypy = "^0.961"
+pytest = "^7.1.3"
+flake8 = "~4.0.1"
+mypy = "^0.981"
 isort = "^5.10.1"
-yesqa = "^1.3.0"
-pre-commit = "^2.19.0"
-wemake-python-styleguide = "^0.16.1"
-black = "^22.3.0"
-autoflake = "^1.4"
+yesqa = "^1.4.0"
+pre-commit = "^2.20.0"
+wemake-python-styleguide = "^0.17.0"
+black = "^22.8.0"
+autoflake = "^1.6.1"
 {%- if cookiecutter.orm == "sqlalchemy" %}
-SQLAlchemy = {version = "^1.4", extras = ["mypy"]}
+SQLAlchemy = {version = "^1.4.41", extras = ["mypy"]}
 {%- endif %}
-pytest-cov = "^3.0.0"
+pytest-cov = "^4.0.0"
 anyio = "^3.6.1"
 pytest-env = "^0.6.2"
 {%- if cookiecutter.enable_redis == "True" %}
-fakeredis = "^1.8.1"
+fakeredis = "^1.9.3"
 {%- endif %}
 {%- if cookiecutter.orm == "tortoise" %}
 asynctest = "^0.13.0"
-nest-asyncio = "^1.5.5"
+nest-asyncio = "^1.5.6"
 {%- endif %}
-httpx = "^0.22.0"
+httpx = "^0.23.0"
 
 [tool.isort]
 profile = "black"

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

@@ -16,8 +16,8 @@
 
 {%- if cookiecutter.sentry_enabled == "True" %}
 import sentry_sdk
-from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 from sentry_sdk.integrations.logging import LoggingIntegration
+from sentry_sdk.integrations.fastapi import FastApiIntegration
 {%- if cookiecutter.orm == "sqlalchemy" %}
 from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 {%- endif %}
@@ -47,6 +47,27 @@ def get_app() -> FastAPI:
     {%- if cookiecutter.enable_loguru == "True" %}
     configure_logging()
     {%- endif %}
+    {%- if cookiecutter.sentry_enabled == "True" %}
+    if settings.sentry_dsn:
+        # Enables sentry integration.
+        sentry_sdk.init(
+            dsn=settings.sentry_dsn,
+            traces_sample_rate=settings.sentry_sample_rate,
+            environment=settings.environment,
+            integrations=[
+                FastApiIntegration(transaction_style="endpoint"),
+                LoggingIntegration(
+                    level=logging.getLevelName(
+                        settings.log_level.value,
+                    ),
+                    event_level=logging.ERROR,
+                ),
+                {%- if cookiecutter.orm == "sqlalchemy" %}
+                SqlalchemyIntegration(),
+                {%- endif %}
+            ],
+        )
+    {%- endif %}
     app = FastAPI(
         title="{{cookiecutter.project_name}}",
         description="{{cookiecutter.project_description}}",
@@ -95,26 +116,4 @@ def get_app() -> FastAPI:
     )
     {%- endif %}
 
-    {%- if cookiecutter.sentry_enabled == "True" %}
-    if settings.sentry_dsn:
-        # Enables sentry integration.
-        sentry_sdk.init(
-            dsn=settings.sentry_dsn,
-            traces_sample_rate=settings.sentry_sample_rate,
-            environment=settings.environment,
-            integrations=[
-                LoggingIntegration(
-                    level=logging.getLevelName(
-                        settings.log_level.value,
-                    ),
-                    event_level=logging.ERROR,
-                ),
-                {%- if cookiecutter.orm == "sqlalchemy" %}
-                SqlalchemyIntegration(),
-                {%- endif %}
-            ],
-        )
-        app = SentryAsgiMiddleware(app)  # type: ignore
-    {%- endif %}
-
     return app

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

@@ -136,7 +136,7 @@ async def _create_tables() -> None:  # pragma: no cover
 {%- if cookiecutter.otlp_enabled == "True" %}
 def setup_opentelemetry(app: FastAPI) -> None:  # pragma: no cover
     """
-    Enables opentelemetry instrumetnation.
+    Enables opentelemetry instrumentation.
 
     :param app: current application.
     """