Dependencies updated. Fixed issues with new versions. (#177)

Author: s3rius

.github/workflows/test.yml

@@ -40,4 +40,4 @@ jobs:
           git config --global user.name "fastapi_template"
           git config --global user.email "[email protected]"
       - name: Run tests
-        run: poetry run pytest -vv --exitfirst -n auto
+        run: poetry run pytest -vv

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.17-alpine
+FROM python:3.11.4-slim-bullseye
 
 RUN apk add --no-cache \
   curl \
@@ -11,7 +11,8 @@ RUN apk add --no-cache \
   # For psycopg \
   postgresql-dev \
   # For mysql deps \
-  mariadb-connector-c-dev \
+  default-libmysqlclient-dev \
+  pkg-config \
   # For UI \
   ncurses \
   bash

fastapi_template/__main__.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
-from cookiecutter.exceptions import FailedHookException, OutputDirExistsException
+from cookiecutter.exceptions import (FailedHookException,
+                                     OutputDirExistsException)
 from cookiecutter.main import cookiecutter
 from termcolor import cprint
 

fastapi_template/cli.py

@@ -1,24 +1,19 @@
+import re
 import shutil
-from fastapi_template.input_model import (
-    BuilderContext,
-    MenuEntry,
-    SingularMenuModel,
-    MultiselectMenuModel,
-    BaseMenuModel,
-    Database,
-    SKIP_ENTRY,
-)
 from importlib.metadata import version
-from typing import Callable, List, Optional
-from click import Command, Option
-import re
+from typing import Any, Callable, List, Optional
 
+from click import Command, Option
 from prompt_toolkit import prompt
 from prompt_toolkit.document import Document
 from prompt_toolkit.validation import ValidationError, Validator
-from typing import Any
 from termcolor import colored
 
+from fastapi_template.input_model import (SKIP_ENTRY, BaseMenuModel,
+                                          BuilderContext, Database, MenuEntry,
+                                          MultiselectMenuModel,
+                                          SingularMenuModel)
+
 
 class SnakeCaseValidator(Validator):
     def validate(self, document: Document):
@@ -81,6 +76,7 @@ def checker(ctx: BuilderContext) -> bool:
         MenuEntry(
             code="graphql",
             user_view="GrapQL API",
+            pydantic_v1=True,
             description=(
                 "Choose this option if you want to create a service with {name}.\n"
                 "It's more suitable for services with {reason} and deep nesting.".format(
@@ -245,6 +241,7 @@ def checker(ctx: BuilderContext) -> bool:
         MenuEntry(
             code="ormar",
             user_view="Ormar",
+            pydantic_v1=True,
             description=(
                 "{what} is a great {feature} ORM.\n"
                 "It's compatible with pydantic models and alembic migrator.".format(
@@ -290,6 +287,7 @@ def checker(ctx: BuilderContext) -> bool:
         MenuEntry(
             code="piccolo",
             user_view="Piccolo",
+            pydantic_v1=True,
             is_hidden=check_db(["postgresql", "sqlite"]),
             description=(
                 "{what} is a great ORM for Postgresql and SQLite.\n"

fastapi_template/input_model.py

@@ -1,11 +1,11 @@
+import abc
 import enum
-from typing import List, Optional, Callable, Any
+from collections import UserDict
+from typing import Any, Callable, List, Optional
 
-from pydantic import BaseModel
 import click
-import abc
-from collections import UserDict
 from prompt_toolkit.shortcuts import checkboxlist_dialog, radiolist_dialog
+from pydantic import BaseModel
 
 try:
     from simple_term_menu import TerminalMenu
@@ -15,20 +15,21 @@
 
 class Database(BaseModel):
     name: str
-    image: Optional[str]
-    driver: Optional[str]
-    async_driver: Optional[str]
-    port: Optional[int]
-    driver_short: Optional[str]
+    image: Optional[str] = None
+    driver: Optional[str] = None
+    async_driver: Optional[str] = None
+    port: Optional[int] = None
+    driver_short: Optional[str] = None
 
 
 class MenuEntry(BaseModel):
     code: str
-    cli_name: Optional[str]
+    cli_name: Optional[str] = None
     user_view: str
     description: str
-    is_hidden: Optional[Callable[["BuilderContext"], bool]]
-    additional_info: Any
+    is_hidden: Optional[Callable[["BuilderContext"], bool]] = None
+    additional_info: Any = None
+    pydantic_v1: bool = False
 
     @property
     def generated_name(self) -> str:
@@ -83,13 +84,13 @@ def after_ask(self, context: "BuilderContext") -> "BuilderContext":
 
 class SingularMenuModel(BaseMenuModel):
     code: str
-    cli_name: Optional[str]
+    cli_name: Optional[str] = None
     description: str
-    before_ask_fun: Optional[Callable[["BuilderContext"], Optional[MenuEntry]]]
+    before_ask_fun: Optional[Callable[["BuilderContext"], Optional[MenuEntry]]] = None
     after_ask_fun: Optional[
         Callable[["BuilderContext", "SingularMenuModel"], "BuilderContext"]
-    ]
-    parser: Optional[Callable[[str], Any]]
+    ] = None
+    parser: Optional[Callable[[str], Any]] = None
 
     def get_cli_options(self) -> List[click.Option]:
         cli_name = self.code
@@ -158,6 +159,8 @@ def ask(self, context: "BuilderContext") -> Optional["BuilderContext"]:
             return
 
         setattr(context, self.code, chosen_entry.code)
+        if chosen_entry.pydantic_v1:
+            context.pydanticv1 = True
 
         return context
 
@@ -236,6 +239,10 @@ def ask(self, context: "BuilderContext") -> Optional["BuilderContext"]:
 
         for entry in chosen_entries:
             setattr(context, entry.code, True)
+        
+        for ch_entry in chosen_entries:
+            if ch_entry.pydantic_v1:
+                context.pydanticv1 = True
 
         return context
 

fastapi_template/template/cookiecutter.json

@@ -59,6 +59,9 @@
     "otlp_enabled": {
         "type": "bool"
     },
+    "pydanticv1": {
+        "type": "bool"
+    },
     "_extensions": [
         "cookiecutter.extensions.RandomStringExtension"
     ],

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

@@ -70,6 +70,8 @@ ignore =
   WPS407,
   ; Found too many empty lines in `def`
   WPS473,
+  ; too many no-cover comments.
+  WPS403,
 
 per-file-ignores =
   ; all tests

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

@@ -1,9 +1,10 @@
-FROM python:3.9.6-slim-buster as prod
+FROM python:3.11.4-slim-bullseye as prod
 
 {%- if cookiecutter.db_info.name == "mysql" %}
 RUN apt-get update && apt-get install -y \
   default-libmysqlclient-dev \
   gcc \
+  pkg-config \
   && rm -rf /var/lib/apt/lists/*
 {%- endif %}
 

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

@@ -12,112 +12,117 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-fastapi = "^0.89.1"
-uvicorn = { version = "^0.20.0", extras = ["standard"] }
-pydantic = {version = "^1.10.4", extras = ["dotenv"]}
-yarl = "^1.8.2"
-ujson = "^5.7.0"
+fastapi = "^0.100.0"
+uvicorn = { version = "^0.22.0", extras = ["standard"] }
+{%- if cookiecutter.pydanticv1 == "True" %}
+pydantic = { version = "^1", extras=["dotenv"] }
+{%- else %}
+pydantic = "^2"
+pydantic-settings = "^2"
+{%- endif %}
+yarl = "^1.9.2"
+ujson = "^5.8.0"
 {%- if cookiecutter.orm == "piccolo" %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-piccolo = {version = "^0.105.0", extras = ["postgres"]}
+piccolo = {version = "^0.117.0", extras = ["postgres"]}
 {%- elif cookiecutter.db_info.name == "sqlite" %}
-piccolo = {version = "^0.105.0", extras = ["sqlite"]}
+piccolo = {version = "^0.117.0", extras = ["sqlite"]}
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "sqlalchemy" %}
-SQLAlchemy = {version = "^2.0.0", extras = ["asyncio"]}
+SQLAlchemy = {version = "^2.0.18", extras = ["asyncio"]}
 {%- if cookiecutter.enable_migrations == "True" %}
-alembic = "^1.9.2"
+alembic = "^1.11.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = {version = "^0.27.0", extras = ["sa"]}
+asyncpg = {version = "^0.28.0", extras = ["sa"]}
 {%- elif cookiecutter.db_info.name == "sqlite" %}
-aiosqlite = "^0.18.0"
+aiosqlite = "^0.19.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.1.1"
-mysqlclient = "^2.1.1"
+aiomysql = "^0.2.0"
+mysqlclient = "^2.2.0"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "tortoise" %}
-tortoise-orm = "^0.19.2"
+tortoise-orm = "^0.19.3"
 {%- if cookiecutter.enable_migrations == "True" %}
 aerich = "^0.7.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = "^0.27.0"
+asyncpg = "^0.28.0"
 {%- elif cookiecutter.db_info.name == "sqlite" %}
-aiosqlite = "<0.18.0"
+aiosqlite = "<0.19.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.1.1"
-mysqlclient = "^2.1.1"
-cryptography = "^39.0.0"
+aiomysql = "^0.2.0"
+mysqlclient = "^2.2.0"
+cryptography = "^41.0.1"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "ormar" %}
-ormar = "^0.12.0"
+ormar = "^0.12.2"
 {%- if cookiecutter.enable_migrations == "True" %}
-alembic = "^1.9.2"
+alembic = "^1.11.1"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = "^0.27.0"
-psycopg2-binary = "^2.9.5"
+asyncpg = "^0.28.0"
+psycopg2-binary = "^2.9.6"
 {%- elif cookiecutter.db_info.name == "sqlite" %}
-aiosqlite = "^0.18.0"
+aiosqlite = "^0.19.0"
 {%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.1.1"
-mysqlclient = "^2.1.1"
+aiomysql = "^0.2.0"
+mysqlclient = "^2.2.0"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_redis == "True" %}
-redis = {version = "^4.4.2", extras = ["hiredis"]}
+redis = {version = "^4.6.0", extras = ["hiredis"]}
 {%- endif %}
 {%- if cookiecutter.self_hosted_swagger == 'True' %}
-aiofiles = "^22.1.0"
+aiofiles = "^23.1.0"
 {%- endif %}
 {%- if cookiecutter.orm == "psycopg" %}
-psycopg = { version = "^3.1.8", extras = ["binary", "pool"] }
+psycopg = { version = "^3.1.9", extras = ["binary", "pool"] }
 {%- endif %}
-httptools = "^0.5.0"
+httptools = "^0.6.0"
 {%- if cookiecutter.api_type == "graphql" %}
-strawberry-graphql = { version = "^0.155.2", extras = ["fastapi"] }
+strawberry-graphql = { version = "^0.194.4", extras = ["fastapi"] }
 {%- endif %}
 {%- if cookiecutter.enable_rmq == "True" %}
-aio-pika = "^8.3.0"
+aio-pika = "^9.1.4"
 {%- endif %}
 {%- if cookiecutter.prometheus_enabled == "True" %}
-prometheus-client = "^0.16.0"
-prometheus-fastapi-instrumentator = "5.9.1"
+prometheus-client = "^0.17.0"
+prometheus-fastapi-instrumentator = "6.0.0"
 {%- endif %}
 {%- if cookiecutter.sentry_enabled == "True" %}
-sentry-sdk = "^1.14.0"
+sentry-sdk = "^1.27.1"
 {%- endif %}
 {%- if cookiecutter.otlp_enabled == "True" %}
-opentelemetry-api = "^1.15.0"
-opentelemetry-sdk = "^1.15.0"
-opentelemetry-exporter-otlp = "^1.15.0"
-opentelemetry-instrumentation = "^0.36b0"
-opentelemetry-instrumentation-fastapi = "^0.36b0"
+opentelemetry-api = "^1.18.0"
+opentelemetry-sdk = "^1.18.0"
+opentelemetry-exporter-otlp = "^1.18.0"
+opentelemetry-instrumentation = "^0.39b0"
+opentelemetry-instrumentation-fastapi = "^0.39b0"
 {%- if cookiecutter.enable_loguru != "True" %}
-opentelemetry-instrumentation-logging = "^0.36b0"
+opentelemetry-instrumentation-logging = "^0.39b0"
 {%- endif %}
 {%- if cookiecutter.enable_redis == "True" %}
-opentelemetry-instrumentation-redis = "^0.36b0"
+opentelemetry-instrumentation-redis = "^0.39b0"
 {%- endif %}
 {%- if cookiecutter.db_info.name == "postgresql" and cookiecutter.orm in ["ormar", "tortoise"] %}
-opentelemetry-instrumentation-asyncpg = "^0.36b0"
+opentelemetry-instrumentation-asyncpg = "^0.39b0"
 {%- endif %}
 {%- if cookiecutter.orm == "sqlalchemy" %}
-opentelemetry-instrumentation-sqlalchemy = "^0.36b0"
+opentelemetry-instrumentation-sqlalchemy = "^0.39b0"
 {%- endif %}
 {%- if cookiecutter.enable_rmq == "True" %}
-opentelemetry-instrumentation-aio-pika = "^0.36b0"
+opentelemetry-instrumentation-aio-pika = "^0.39b0"
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_loguru == "True" %}
-loguru = "^0.6.0"
+loguru = "^0.7.0"
 {%- endif %}
 {%- if cookiecutter.enable_kafka == "True" %}
-aiokafka = "^0.8.0"
+aiokafka = "^0.8.1"
 {%- endif %}
 {%- if cookiecutter.enable_taskiq == "True" %}
 taskiq = "^0"
@@ -132,7 +137,7 @@ taskiq-aio-pika = "^0"
     {%- endif %}
 
     {%- if (cookiecutter.enable_rmq or cookiecutter.enable_rmq) != "True" %}
-pyzmq = "^25.0.2"
+pyzmq = "^25"
     {%- endif %}
 
 {%- endif %}
@@ -179,6 +184,9 @@ allow_untyped_decorators = true
 warn_unused_ignores = false
 warn_return_any = false
 namespace_packages = true
+{%- if cookiecutter.api_type == "graphql" %}
+plugins = ["strawberry.ext.mypy_plugin"]
+{%- endif %}
 
 {%- if cookiecutter.enable_redis == "True" %}
 

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

@@ -1,10 +1,9 @@
-import uvicorn
 import os
 import shutil
 
+import uvicorn
 from {{cookiecutter.project_name}}.settings import settings
 
-
 {%- if cookiecutter.prometheus_enabled == "True" %}
 def set_multiproc_dir() -> None:
     """