tortoise 제거

Author: manuel71sj

README.md

@@ -45,7 +45,7 @@ docker run --rm -it -v "$(pwd):/projects" s3rius/fastapi_template
 One of the coolest features is that this project is extremely configurable.
 You can choose between different databases and even ORMs, or
 you can even generate a project without a database!
-Currently SQLAlchemy 2.0, TortoiseORM, and Piccolo are supported.
+Currently SQLAlchemy 2.0, and Piccolo are supported.
 
 This project can run as TUI or CLI and has excellent code documentation.
 
@@ -85,7 +85,7 @@ Options:
   --quite                         Do not ask for features during generation
   --api-type [rest]               Select API type for your application
   --db [none|mysql|postgresql]    Select a database for your app
-  --orm [none|sqlalchemy|tortoise|psycopg|piccolo]
+  --orm [none|sqlalchemy|psycopg|piccolo]
                                   Choose Object–Relational Mapper lib
   --ci [none|gitlab_ci]    Select a CI for your app
   --redis                         Add redis support

fastapi_template/cli.py

@@ -221,18 +221,6 @@ def checker(ctx: BuilderContext) -> bool:
                 )
             ),
         ),
-        MenuEntry(
-            code="tortoise",
-            user_view="Tortoise",
-            description=(
-                "{what} is a great {feature} ORM.\n"
-                "It's easy to use, it has it's own migration tooling.".format(
-                    what=colored("Tortoise", color="green"),
-                    feature=colored("fully-async", color="cyan"),
-                )
-            ),
-            is_hidden=always_hidden(),
-        ),
         MenuEntry(
             code="psycopg",
             user_view="PsycoPG",

fastapi_template/template/{{cookiecutter.project_name}}/README.md

@@ -161,9 +161,6 @@ alembic upgrade "<revision_id>"
 
 # To perform all pending migrations.
 alembic upgrade "head"
-{%- elif cookiecutter.orm == 'tortoise' %}
-# Upgrade database to the last migration.
-aerich upgrade
 
 {%- elif cookiecutter.orm == 'piccolo' %}
 # You have to set a PICCOLO_CONF variable
@@ -183,8 +180,6 @@ alembic downgrade <revision_id>
 
 # Revert everything.
  alembic downgrade base
-{%- elif cookiecutter.orm == 'tortoise' %}
-aerich downgrade
 {%- endif %}
 ```
 
@@ -198,8 +193,6 @@ alembic revision --autogenerate
 
 # For empty file generation.
 alembic revision
-{%- elif cookiecutter.orm == 'tortoise' %}
-aerich migrate
 {%- endif %}
 ```
 {%- endif %}

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

@@ -62,7 +62,6 @@
         "resources": [
             "alembic.ini",
             "{{cookiecutter.project_name}}/db_sa/migrations",
-            "{{cookiecutter.project_name}}/db_tortoise/migrations",
             "{{cookiecutter.project_name}}/db_piccolo/migrations"
         ]
     },
@@ -111,16 +110,12 @@
             "{{cookiecutter.project_name}}/web/api/dummy",
             "{{cookiecutter.project_name}}/db_sa/dao",
             "{{cookiecutter.project_name}}/db_sa/models/dummy_model.py",
-            "{{cookiecutter.project_name}}/db_tortoise/dao",
-            "{{cookiecutter.project_name}}/db_tortoise/models/dummy_model.py",
             "{{cookiecutter.project_name}}/db_psycopg/dao",
             "{{cookiecutter.project_name}}/db_psycopg/models/dummy_model.py",
             "{{cookiecutter.project_name}}/tests/test_dummy.py",
             "{{cookiecutter.project_name}}/db_piccolo/dao",
             "{{cookiecutter.project_name}}/db_piccolo/models/dummy_model.py",
             "{{cookiecutter.project_name}}/db_sa/migrations/versions/2021-08-16-16-55_2b7380507a71.py",
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/1_20210928165300_init_dummy_pg.sql",
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/1_20210928165300_init_dummy_mysql.sql",
             "{{cookiecutter.project_name}}/db_piccolo/migrations/2022-04-16T17-38-51-672827.py"
         ]
     },
@@ -137,12 +132,6 @@
             "{{cookiecutter.project_name}}/db_sa"
         ]
     },
-    "Tortoise ORM": {
-        "enabled": "{{cookiecutter.orm == 'tortoise'}}",
-        "resources": [
-            "{{cookiecutter.project_name}}/db_tortoise"
-        ]
-    },
     "PsycoPG": {
         "enabled": "{{cookiecutter.orm == 'psycopg'}}",
         "resources": [
@@ -156,20 +145,6 @@
             "{{cookiecutter.project_name}}/piccolo_conf.py"
         ]
     },
-    "Postgresql DB": {
-        "enabled": "{{cookiecutter.db_info.name == 'postgresql'}}",
-        "resources": [
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/0_20210928165300_init_pg.sql",
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/1_20210928165300_init_dummy_pg.sql"
-        ]
-    },
-    "MySQL DB": {
-        "enabled": "{{cookiecutter.db_info.name == 'mysql'}}",
-        "resources": [
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/0_20210928165300_init_mysql.sql",
-            "{{cookiecutter.project_name}}/db_tortoise/migrations/models/1_20210928165300_init_dummy_mysql.sql"
-        ]
-    },
     "Opentelemetry support": {
         "enabled": "{{cookiecutter.otlp_enabled}}",
         "resources": [

fastapi_template/template/{{cookiecutter.project_name}}/deploy/docker-compose.yml

@@ -120,8 +120,6 @@ services:
     restart: "no"
     {%- if cookiecutter.orm in ['sqlalchemy'] %}
     command: alembic upgrade head
-    {%- elif cookiecutter.orm == 'tortoise' %}
-    command: aerich upgrade
     {%- elif cookiecutter.orm == 'piccolo' %}
     command: piccolo migrations forwards all
     {%- endif %}

fastapi_template/template/{{cookiecutter.project_name}}/deploy/kube/db.yml

@@ -71,9 +71,6 @@ spec:
           - "alembic"
           - "upgrade"
           - "head"
-          {%- elif cookiecutter.orm == 'tortoise' %}
-          - "aerich"
-          - "upgrade"
           {%- elif cookiecutter.orm == 'piccolo' %}
           - "piccolo"
           - "migrations"

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

@@ -18,49 +18,36 @@ uvicorn = { version = "^0.25.0", extras = ["standard"] }
 gunicorn = "^21.2.0"
 {%- endif %}
 {%- if cookiecutter.add_users == "True" %}
-{%- if cookiecutter.orm == "sqlalchemy" %}
+    {%- if cookiecutter.orm == "sqlalchemy" %}
 fastapi-users = "^12.1.2"
 httpx-oauth = "^0.13.1"
 fastapi-users-db-sqlmodel = "^0.3.0"
-{%- endif %}
+    {%- endif %}
 {%- endif %}
 {%- if cookiecutter.pydanticv1 == "True" %}
 pydantic = { version = "^1", extras=["dotenv"] }
-{%- else %}
+    {%- 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" %}
+    {%- if cookiecutter.db_info.name == "postgresql" %}
 piccolo = {version = "^0.117.0", extras = ["postgres"]}
-{%- endif %}
+    {%- endif %}
 {%- endif %}
 {%- if cookiecutter.orm == "sqlalchemy" %}
 SQLAlchemy = {version = "^2.0.18", extras = ["asyncio"]}
-{%- if cookiecutter.enable_migrations == "True" %}
+    {%- if cookiecutter.enable_migrations == "True" %}
 alembic = "^1.11.1"
-{%- endif %}
-{%- if cookiecutter.db_info.name == "postgresql" %}
+    {%- endif %}
+    {%- if cookiecutter.db_info.name == "postgresql" %}
 asyncpg = {version = "^0.29.0", extras = ["sa"]}
-{%- elif cookiecutter.db_info.name == "mysql" %}
+    {%- elif cookiecutter.db_info.name == "mysql" %}
 aiomysql = "^0.2.0"
 mysqlclient = "^2.2.1"
-{%- endif %}
-{%- endif %}
-{%- if cookiecutter.orm == "tortoise" %}
-tortoise-orm = "^0.19.3"
-{%- if cookiecutter.enable_migrations == "True" %}
-aerich = "^0.7.1"
-{%- endif %}
-{%- if cookiecutter.db_info.name == "postgresql" %}
-asyncpg = "^0.29.0"
-{%- elif cookiecutter.db_info.name == "mysql" %}
-aiomysql = "^0.2.0"
-mysqlclient = "^2.2.0"
-cryptography = "^41.0.1"
-{%- endif %}
+    {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_redis == "True" %}
 redis = {version = "^5.0.1", extras = ["hiredis"]}
@@ -88,21 +75,21 @@ opentelemetry-sdk = "^1.22.0"
 opentelemetry-exporter-otlp = "^1.22.0"
 opentelemetry-instrumentation = "^0.43b0"
 opentelemetry-instrumentation-fastapi = "^0.43b0"
-{%- if cookiecutter.enable_loguru != "True" %}
+    {%- if cookiecutter.enable_loguru != "True" %}
 opentelemetry-instrumentation-logging = "^0.43b0"
-{%- endif %}
-{%- if cookiecutter.enable_redis == "True" %}
+    {%- endif %}
+    {%- if cookiecutter.enable_redis == "True" %}
 opentelemetry-instrumentation-redis = "^0.43b0"
-{%- endif %}
-{%- if cookiecutter.db_info.name == "postgresql" %}
+    {%- endif %}
+    {%- if cookiecutter.db_info.name == "postgresql" %}
 opentelemetry-instrumentation-asyncpg = "^0.43b0"
-{%- endif %}
-{%- if cookiecutter.orm == "sqlalchemy" %}
+    {%- endif %}
+    {%- if cookiecutter.orm == "sqlalchemy" %}
 opentelemetry-instrumentation-sqlalchemy = "^0.43b0"
-{%- endif %}
-{%- if cookiecutter.enable_rmq == "True" %}
+    {%- endif %}
+    {%- if cookiecutter.enable_rmq == "True" %}
 opentelemetry-instrumentation-aio-pika = "^0.43b0"
-{%- endif %}
+    {%- endif %}
 {%- endif %}
 {%- if cookiecutter.enable_loguru == "True" %}
 loguru = "^0.7.0"
@@ -114,19 +101,15 @@ aiokafka = "^0.10.0"
 {%- if cookiecutter.enable_taskiq == "True" %}
 taskiq = "^0"
 taskiq-fastapi = "^0"
-
     {%- if cookiecutter.enable_redis == "True" %}
 taskiq-redis = "^0"
     {%- endif %}
-
     {%- if cookiecutter.enable_rmq == "True" %}
 taskiq-aio-pika = "^0"
     {%- endif %}
-
     {%- if (cookiecutter.enable_rmq or cookiecutter.enable_rmq) != "True" %}
 pyzmq = "^25"
     {%- endif %}
-
 {%- endif %}
 stackprinter = "^0.2.11"
 
@@ -146,10 +129,6 @@ pytest-env = "^1.1.3"
 {%- if cookiecutter.enable_redis == "True" %}
 fakeredis = "^2.5.0"
 {%- endif %}
-{%- if cookiecutter.orm == "tortoise" %}
-asynctest = "^0.13.0"
-nest-asyncio = "^1.5.6"
-{%- endif %}
 httpx = "^0.25.2"
 {%- if cookiecutter.enable_taskiq == "True" %}
 taskiq = { version = "^0", extras = ["reload"] }
@@ -218,20 +197,12 @@ extend-exclude = '''
 )
 '''
 
-{%- if cookiecutter.orm == "tortoise" %}
-{%- if cookiecutter.enable_migrations == "True" %}
-[tool.aerich]
-tortoise_orm = "{{cookiecutter.project_name}}.db.config.TORTOISE_CONFIG"
-location = "./{{cookiecutter.project_name}}/db/migrations"
-src_folder = "./{{cookiecutter.project_name}}"
-{%- endif %}
-{%- endif %}
 
 [fastapi-template.options]
 {%- for key, value in cookiecutter.items() %}
-{%- if not key.startswith("_") and not key == "db_info" %}
+    {%- if not key.startswith("_") and not key == "db_info" %}
 {{key}} = "{{value}}"
-{%- endif %}
+    {%- endif %}
 {%- endfor %}
 
 [build-system]

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

@@ -1,7 +1,6 @@
 {
     "{{cookiecutter.project_name}}/db": [
         "{{cookiecutter.project_name}}/db_sa",
-        "{{cookiecutter.project_name}}/db_tortoise",
         "{{cookiecutter.project_name}}/db_psycopg",
         "{{cookiecutter.project_name}}/db_piccolo"
     ]

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

@@ -43,14 +43,6 @@
 from {{cookiecutter.project_name}}.db.dependencies import get_db_session
 from {{cookiecutter.project_name}}.db.utils import create_database, drop_database
 
-{%- elif cookiecutter.orm == "tortoise" %}
-import nest_asyncio
-from tortoise import Tortoise
-from tortoise.contrib.test import finalizer, initializer
-from {{cookiecutter.project_name}}.db.config import MODELS_MODULES, TORTOISE_CONFIG
-
-nest_asyncio.apply()
-
 {%- elif cookiecutter.orm == "psycopg" %}
 from psycopg import AsyncConnection
 from psycopg_pool import AsyncConnectionPool
@@ -130,27 +122,6 @@ async def dbsession(
         await trans.rollback()
         await connection.close()
 
-{%- elif cookiecutter.orm == "tortoise" %}
-
-@pytest.fixture(autouse=True)
-async def initialize_db() -> AsyncGenerator[None, None]:
-    """
-    Initialize models and database.
-
-    :yields: Nothing.
-    """
-    initializer(
-        MODELS_MODULES,
-        db_url=str(settings.db_url),
-        app_label="models",
-    )
-    await Tortoise.init(config=TORTOISE_CONFIG)
-
-    yield
-
-    await Tortoise.close_connections()
-    finalizer()
-
 {%- elif cookiecutter.orm == "psycopg" %}
 
 async def drop_db() -> None: