alembic

Dockerfile

@@ -7,5 +7,7 @@ RUN pip install --no-cache-dir -r app/requirements.txt
 
 COPY log_config.yaml /app
 
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["uvicorn", "--host", "0.0.0.0", "--port", "8000", "--forwarded-allow-ips", "127.0.0.1,[::1],172.16.0.0/12", "--log-config", "app/log_config.yaml", "app.main:app"]
 EXPOSE 8000

alembic.ini

@@ -0,0 +1,119 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+version_path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = %(DB_URL)s
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = WARNING
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,79 @@
+from logging.config import fileConfig
+import os
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+from app.database.models import SQLModel as Base
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+from app.core.db import engine
+db_url = os.getenv("DB_URL")  # Read from environment
+config.set_main_option("sqlalchemy.url", db_url)
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/versions/b609e2391344_initial_migration.py

@@ -0,0 +1,104 @@
+"""Initial migration
+
+Revision ID: b609e2391344
+Revises: 
+Create Date: 2025-02-20 17:44:08.624964
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b609e2391344'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('auth',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('token_hash', sqlmodel.sql.sqltypes.AutoString(length=64), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_auth_token_hash'), 'auth', ['token_hash'], unique=True)
+    op.create_table('ckey_link_token',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('ckey', sqlmodel.sql.sqltypes.AutoString(length=32), nullable=False),
+    sa.Column('token', sqlmodel.sql.sqltypes.AutoString(length=64), nullable=False),
+    sa.Column('expiration_time', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_ckey_link_token_ckey'), 'ckey_link_token', ['ckey'], unique=True)
+    op.create_index(op.f('ix_ckey_link_token_token'), 'ckey_link_token', ['token'], unique=True)
+    op.create_table('player',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('discord_id', sqlmodel.sql.sqltypes.AutoString(length=32), nullable=False),
+    sa.Column('ckey', sqlmodel.sql.sqltypes.AutoString(length=32), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_player_ckey'), 'player', ['ckey'], unique=True)
+    op.create_index(op.f('ix_player_discord_id'), 'player', ['discord_id'], unique=True)
+    op.create_table('donation',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('player_id', sa.Integer(), nullable=False),
+    sa.Column('tier', sa.Integer(), nullable=False),
+    sa.Column('issue_time', sa.DateTime(), nullable=False),
+    sa.Column('expiration_time', sa.DateTime(), nullable=False),
+    sa.Column('valid', sa.Boolean(), nullable=False),
+    sa.ForeignKeyConstraint(['player_id'], ['player.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_donation_player_id'), 'donation', ['player_id'], unique=False)
+    op.create_table('whitelist',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('player_id', sa.Integer(), nullable=False),
+    sa.Column('wl_type', sqlmodel.sql.sqltypes.AutoString(length=32), nullable=False),
+    sa.Column('admin_id', sa.Integer(), nullable=False),
+    sa.Column('issue_time', sa.DateTime(), nullable=False),
+    sa.Column('expiration_time', sa.DateTime(), nullable=False),
+    sa.Column('valid', sa.Boolean(), nullable=False),
+    sa.ForeignKeyConstraint(['admin_id'], ['player.id'], ),
+    sa.ForeignKeyConstraint(['player_id'], ['player.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_whitelist_player_id'), 'whitelist', ['player_id'], unique=False)
+    op.create_table('whitelist_ban',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('player_id', sa.Integer(), nullable=False),
+    sa.Column('wl_type', sqlmodel.sql.sqltypes.AutoString(length=32), nullable=False),
+    sa.Column('admin_id', sa.Integer(), nullable=False),
+    sa.Column('issue_time', sa.DateTime(), nullable=False),
+    sa.Column('expiration_time', sa.DateTime(), nullable=False),
+    sa.Column('valid', sa.Boolean(), nullable=False),
+    sa.Column('reason', sqlmodel.sql.sqltypes.AutoString(length=1024), nullable=True),
+    sa.ForeignKeyConstraint(['admin_id'], ['player.id'], ),
+    sa.ForeignKeyConstraint(['player_id'], ['player.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_whitelist_ban_player_id'), 'whitelist_ban', ['player_id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_whitelist_ban_player_id'), table_name='whitelist_ban')
+    op.drop_table('whitelist_ban')
+    op.drop_index(op.f('ix_whitelist_player_id'), table_name='whitelist')
+    op.drop_table('whitelist')
+    op.drop_index(op.f('ix_donation_player_id'), table_name='donation')
+    op.drop_table('donation')
+    op.drop_index(op.f('ix_player_discord_id'), table_name='player')
+    op.drop_index(op.f('ix_player_ckey'), table_name='player')
+    op.drop_table('player')
+    op.drop_index(op.f('ix_ckey_link_token_token'), table_name='ckey_link_token')
+    op.drop_index(op.f('ix_ckey_link_token_ckey'), table_name='ckey_link_token')
+    op.drop_table('ckey_link_token')
+    op.drop_index(op.f('ix_auth_token_hash'), table_name='auth')
+    op.drop_table('auth')
+    # ### end Alembic commands ###

app/core/config.py

@@ -46,7 +46,7 @@ class Database(CustomBaseModel):
     needs_rebuild: bool = True
 
 class Redis(CustomBaseModel):
-    connection_string = "redis://127.0.0.1:6379/0"
+    connection_string: str = "redis://127.0.0.1:6379/0"
 
 class OAuth(CustomBaseModel):
     # From discord app's settings

config_example.toml

@@ -12,6 +12,9 @@ pool_pre_ping = true
 # Creates tables if they don't exist
 needs_rebuild = true
 
+[redis]
+connection_string = "redis://default:user@hostname:6379"
+
 [oauth]
 client_secret = "12345678"
 client_id = 12345678

entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+CURRENT=$(alembic current)
+HEADS=$(alembic heads)
+
+if [ "$CURRENT" = "$HEADS" ]; then
+  echo "Database is up to date"
+else
+  echo "Database is not up to date, run alembic upgrade head"
+  exit 1
+fi
+
+
+exec "$@"