Fixed some small things.

Author: s3rius

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

@@ -6,7 +6,8 @@ services:
     image: {{cookiecutter.project_name}}:{{"${" }}{{cookiecutter.project_name | upper }}_VERSION:-latest{{"}"}}
     restart: always
     env_file:
-      - .env
+      - path: .env
+        required: false
     {%- if cookiecutter.traefik_labels == "True" %}
     labels:
       # Enables traefik for this container.
@@ -42,6 +43,10 @@ services:
       kafka:
         condition: service_healthy
       {%- endif %}
+      {%- if cookiecutter.enable_migrations == 'True' %}
+      migrator:
+        condition: service_completed_successfully
+      {%- endif %}
     {%- endif %}
     environment:
       {{cookiecutter.project_name | upper }}_HOST: 0.0.0.0
@@ -151,7 +156,7 @@ services:
   {%- if cookiecutter.enable_migrations == 'True' %}
 
   migrator:
-    image: {{cookiecutter.project_name}}:{{"${" }}{{cookiecutter.project_name | upper }}_VERSION:-latest{{"}"}}
+    <<: *main_app
     restart: "no"
     {%- if cookiecutter.orm in ['sqlalchemy', 'ormar'] %}
     command: alembic upgrade head
@@ -160,29 +165,12 @@ services:
     {%- elif cookiecutter.orm == 'piccolo' %}
     command: piccolo migrations forwards all
     {%- endif %}
-    {%- if cookiecutter.db_info.name == "sqlite" %}
-    environment:
-      {{cookiecutter.project_name | upper }}_DB_FILE: /db_data/db.sqlite3
-      {%- if cookiecutter.orm == 'piccolo' %}
-      PICCOLO_CONF: "{{cookiecutter.project_name}}.piccolo_conf"
-      {%- endif %}
-    volumes:
-      - {{cookiecutter.project_name}}-db-data:/db_data/
-    {%- else %}
-    environment:
-      {{cookiecutter.project_name | upper}}_DB_HOST: {{cookiecutter.project_name}}-db
-      {{cookiecutter.project_name | upper}}_DB_PORT: {{cookiecutter.db_info.port}}
-      {{cookiecutter.project_name | upper}}_DB_USER: {{cookiecutter.project_name}}
-      {{cookiecutter.project_name | upper}}_DB_PASS: {{cookiecutter.project_name}}
-      {{cookiecutter.project_name | upper}}_DB_BASE: {{cookiecutter.project_name}}
-    {%- if cookiecutter.orm == 'piccolo' %}
-      PICCOLO_CONF: "{{cookiecutter.project_name}}.piccolo_conf"
-    {%- endif %}
-    {%- endif %}
     {%- if cookiecutter.db_info.name != "sqlite" %}
     depends_on:
       db:
         condition: service_healthy
+    {%- else %}
+    depends_on: {}
     {%- endif %}
   {%- endif %}
 
@@ -204,7 +192,7 @@ services:
   {%- if cookiecutter.enable_rmq == "True" %}
 
   rmq:
-    image: rabbitmq:3.9.16-alpine
+    image: rabbitmq:4.2.1-management-alpine
     hostname: "{{cookiecutter.project_name}}-rmq"
     restart: always
     environment:
@@ -221,23 +209,23 @@ services:
   {%- if cookiecutter.enable_kafka == "True" %}
 
   kafka:
-    image: bitnami/kafka:3.7.1-debian-12-r0
+    image: apache/kafka:4.1.1
     hostname: "{{cookiecutter.project_name}}-kafka"
     environment:
-      KAFKA_CFG_NODE_ID: "0"
-      KAFKA_CFG_PROCESS_ROLES: "controller,broker"
-      KAFKA_CFG_LISTENERS: "PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094"
-      KAFKA_CFG_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094"
-      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT"
-      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: "0@{{cookiecutter.project_name}}-kafka:9093"
-      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
-      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: "true"
-      KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: "1"
+      KAFKA_NODE_ID: "0"
+      KAFKA_PROCESS_ROLES: "controller,broker"
+      KAFKA_LISTENERS: "PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT"
+      KAFKA_CONTROLLER_QUORUM_VOTERS: "0@{{cookiecutter.project_name}}-kafka:9093"
+      KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1"
     # Uncomment it to connect from localhost.
     # ports:
     #   - 9094:9094
     healthcheck:
-      test: kafka-topics.sh --list --bootstrap-server localhost:9092
+      test: /opt/kafka/bin/kafka-topics.sh --list --bootstrap-server localhost:9092
       interval: 1s
       timeout: 3s
       retries: 30

fastapi_template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/db_beanie/models/__init__.py

@@ -5,9 +5,9 @@
 {%- endif %}
 
 from beanie import Document
-from typing import Type, Sequence
+from collections.abc import Sequence
 
-def load_all_models() -> Sequence[Type[Document]]:
+def load_all_models() -> Sequence[type[Document]]:
     """Load all models from this folder.""" # noqa: DAR201
     return [
 {%- if cookiecutter.add_dummy == "True" %}