diff --git a/copier.yml b/copier.yml index fafe0a4..e0f5ed6 100644 --- a/copier.yml +++ b/copier.yml @@ -71,7 +71,7 @@ taskiq_broker: choices: in-memory: memory Redis: redis - PostgreSQL (taskiq-pg): + PostgreSQL (taskiq-postgres): value: postgres validator: "{% if database != 'postgres' %}Requires the PostgreSQL database{% endif %}" default: memory diff --git a/template/{{ part_dir }}/pyproject.toml.jinja b/template/{{ part_dir }}/pyproject.toml.jinja index a50444b..2ebedfd 100644 --- a/template/{{ part_dir }}/pyproject.toml.jinja +++ b/template/{{ part_dir }}/pyproject.toml.jinja @@ -4,7 +4,7 @@ {%- if 'aiogram_bot' in backend_services %}{% set _ = deps.append("aiogram>=3.29.0") %}{% endif -%} {%- if include_payments %}{% set _ = deps.append("aiosend>=3.0.7") %}{% endif -%} {%- if 'kurigram_userbot' in backend_services %}{% set _ = deps.append("anyio>=4.0.0") %}{% set _ = deps.append("kurigram>=2.2.15") %}{% set _ = deps.append("tgcrypto>=1.2.5") %}{% set _ = deps.append("uvloop>=0.21.0") %}{% endif -%} -{%- if 'taskiq_worker' in backend_services %}{% set _ = deps.append("taskiq>=0.12.4") %}{% if taskiq_broker == 'redis' %}{% set _ = deps.append("taskiq-redis>=1.2.3") %}{% endif %}{% if taskiq_broker == 'postgres' %}{% set _ = deps.append("taskiq-pg>=0.2.0") %}{% endif %}{% endif -%} +{%- if 'taskiq_worker' in backend_services %}{% set _ = deps.append("taskiq>=0.13.0") %}{% if taskiq_broker == 'redis' %}{% set _ = deps.append("taskiq-redis>=1.2.3") %}{% endif %}{% if taskiq_broker == 'postgres' %}{% set _ = deps.append("taskiq-postgres[asyncpg]>=0.9.1") %}{% endif %}{% endif -%} {%- if 'scheduler' in backend_services %}{% set _ = deps.append("apscheduler>=3.11.0") %}{% endif -%} {%- if database == 'mongo' %}{% set _ = deps.append("beanie>=2.0.1") %}{% endif -%} {%- if database == 'postgres' %}{% set _ = deps.append("sqlmodel>=0.0.39") %}{% set _ = deps.append("asyncpg>=0.31.0") %}{% set _ = deps.append("alembic>=1.18.5") %}{% set _ = deps.append("greenlet>=3.5.3") %}{% endif -%} diff --git a/template/{{ part_dir }}/src/{% if 'taskiq_worker' in backend_services %}worker{% endif %}/broker.py.jinja b/template/{{ part_dir }}/src/{% if 'taskiq_worker' in backend_services %}worker{% endif %}/broker.py.jinja index 0ad7ce1..0fde1a3 100644 --- a/template/{{ part_dir }}/src/{% if 'taskiq_worker' in backend_services %}worker{% endif %}/broker.py.jinja +++ b/template/{{ part_dir }}/src/{% if 'taskiq_worker' in backend_services %}worker{% endif %}/broker.py.jinja @@ -43,7 +43,7 @@ setup_dishka(container, broker) {% if use_dishka %}from dishka.integrations.taskiq import setup_dishka {% endif %}{% if 'scheduler' in backend_services %}from taskiq import TaskiqScheduler from taskiq.schedule_sources import LabelScheduleSource -{% endif %}from taskiq_pg import AsyncpgBroker, AsyncpgResultBackend +{% endif %}from taskiq_pg.asyncpg import AsyncpgBroker, AsyncpgResultBackend {% if use_dishka %}from dependencies.container import container {% endif %}from utils.env import env