Fixed pre-commit issuesv3

8 files changed, 228 insertions, 149 deletions

diff --git a/db/migrations/README b/db/migrations/README
index 98e4f9c..2500aa1 100644
--- a/db/migrations/README
+++ b/db/migrations/README
@@ -1 +1 @@
-Generic single-database configuration.
\ No newline at end of file
+Generic single-database configuration.
diff --git a/db/migrations/env.py b/db/migrations/env.py
index f1b3156..9c901da 100644
--- a/db/migrations/env.py
+++ b/db/migrations/env.py
@@ -1,9 +1,7 @@
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
 from alembic import context
+from sqlalchemy import engine_from_config, pool
 
 from conf import DATABASE_URL
 from db.models import *
@@ -27,7 +25,7 @@ target_metadata = SQLModel.metadata
 # can be acquired:
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
-config.set_main_option('sqlalchemy.url', DATABASE_URL)
+config.set_main_option("sqlalchemy.url", DATABASE_URL)
 
 
 def run_migrations_offline() -> None:
@@ -68,9 +66,7 @@ def run_migrations_online() -> None:
     )
 
     with connectable.connect() as connection:
-        context.configure(
-            connection=connection, target_metadata=target_metadata
-        )
+        context.configure(connection=connection, target_metadata=target_metadata)
 
         with context.begin_transaction():
             context.run_migrations()
diff --git a/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py b/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py
index 3ccb92d..0bb3076 100644
--- a/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py
+++ b/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py
@@ -1,40 +1,41 @@
 """Added user model
 
 Revision ID: 115caa5a76d0
-Revises: 
+Revises:
 Create Date: 2026-07-02 17:19:07.082841
 
 """
-from typing import Sequence, Union
 
-from alembic import op
+from collections.abc import Sequence
+
 import sqlalchemy as sa
 import sqlmodel
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = '115caa5a76d0'
-down_revision: Union[str, Sequence[str], None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "115caa5a76d0"
+down_revision: str | Sequence[str] | None = None
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('user',
-    sa.Column('id', sa.Uuid(), nullable=False),
-    sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-    sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        "user",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("username", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("email", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
     )
-    op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True)
+    op.create_index(op.f("ix_user_username"), "user", ["username"], unique=True)
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_user_username'), table_name='user')
-    op.drop_table('user')
+    op.drop_index(op.f("ix_user_username"), table_name="user")
+    op.drop_table("user")
     # ### end Alembic commands ###
diff --git a/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py b/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py
index 5498291..b94ffb8 100644
--- a/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py
+++ b/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py
@@ -5,100 +5,116 @@ Revises: 115caa5a76d0
 Create Date: 2026-07-02 17:40:58.968553
 
 """
+
 import json
 import os
-from datetime import datetime, UTC
+from collections.abc import Sequence
+from datetime import UTC, datetime
 from secrets import token_hex
-from random import randbytes
-from typing import Sequence, Union
 from uuid import uuid4, uuid7
 
-from alembic import op
 import sqlalchemy as sa
 import sqlmodel
-from authlib.integrations.sqla_oauth2 import OAuth2ClientMixin
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = 'fc6608d3f9cc'
-down_revision: Union[str, Sequence[str], None] = '115caa5a76d0'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "fc6608d3f9cc"
+down_revision: str | Sequence[str] | None = "115caa5a76d0"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    client_application = op.create_table('clientapplication',
-    sa.Column('id', sa.Uuid(), nullable=False),
-    sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-    sa.Column('client_id', sa.String(length=48), nullable=True),
-    sa.Column('client_secret', sa.String(length=120), nullable=True),
-    sa.Column('client_id_issued_at', sa.Integer(), nullable=False),
-    sa.Column('client_secret_expires_at', sa.Integer(), nullable=False),
-    sa.Column('client_metadata', sa.Text(), nullable=True),
-    sa.PrimaryKeyConstraint('id')
+    client_application = op.create_table(
+        "clientapplication",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+        sa.Column("client_id", sa.String(length=48), nullable=True),
+        sa.Column("client_secret", sa.String(length=120), nullable=True),
+        sa.Column("client_id_issued_at", sa.Integer(), nullable=False),
+        sa.Column("client_secret_expires_at", sa.Integer(), nullable=False),
+        sa.Column("client_metadata", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(
+        op.f("ix_clientapplication_client_id"),
+        "clientapplication",
+        ["client_id"],
+        unique=False,
     )
-    op.create_index(op.f('ix_clientapplication_client_id'), 'clientapplication', ['client_id'], unique=False)
-    op.create_table('authcode',
-    sa.Column('id', sa.Uuid(), nullable=False),
-    sa.Column('user_id', sa.Uuid(), nullable=False),
-    sa.Column('code', sa.String(length=120), nullable=False),
-    sa.Column('client_id', sa.String(length=48), nullable=True),
-    sa.Column('redirect_uri', sa.Text(), nullable=True),
-    sa.Column('response_type', sa.Text(), nullable=True),
-    sa.Column('scope', sa.Text(), nullable=True),
-    sa.Column('nonce', sa.Text(), nullable=True),
-    sa.Column('auth_time', sa.Integer(), nullable=False),
-    sa.Column('acr', sa.Text(), nullable=True),
-    sa.Column('amr', sa.Text(), nullable=True),
-    sa.Column('code_challenge', sa.Text(), nullable=True),
-    sa.Column('code_challenge_method', sa.String(length=48), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('code')
+    op.create_table(
+        "authcode",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("user_id", sa.Uuid(), nullable=False),
+        sa.Column("code", sa.String(length=120), nullable=False),
+        sa.Column("client_id", sa.String(length=48), nullable=True),
+        sa.Column("redirect_uri", sa.Text(), nullable=True),
+        sa.Column("response_type", sa.Text(), nullable=True),
+        sa.Column("scope", sa.Text(), nullable=True),
+        sa.Column("nonce", sa.Text(), nullable=True),
+        sa.Column("auth_time", sa.Integer(), nullable=False),
+        sa.Column("acr", sa.Text(), nullable=True),
+        sa.Column("amr", sa.Text(), nullable=True),
+        sa.Column("code_challenge", sa.Text(), nullable=True),
+        sa.Column("code_challenge_method", sa.String(length=48), nullable=True),
+        sa.ForeignKeyConstraint(["user_id"], ["user.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("code"),
     )
-    op.create_table('authtoken',
-    sa.Column('id', sa.Uuid(), nullable=False),
-    sa.Column('user_id', sa.Uuid(), nullable=False),
-    sa.Column('client_id', sa.String(length=48), nullable=True),
-    sa.Column('token_type', sa.String(length=40), nullable=True),
-    sa.Column('access_token', sa.String(length=255), nullable=False),
-    sa.Column('refresh_token', sa.String(length=255), nullable=True),
-    sa.Column('scope', sa.Text(), nullable=True),
-    sa.Column('issued_at', sa.Integer(), nullable=False),
-    sa.Column('access_token_revoked_at', sa.Integer(), nullable=False),
-    sa.Column('refresh_token_revoked_at', sa.Integer(), nullable=False),
-    sa.Column('expires_in', sa.Integer(), nullable=False),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('access_token')
+    op.create_table(
+        "authtoken",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("user_id", sa.Uuid(), nullable=False),
+        sa.Column("client_id", sa.String(length=48), nullable=True),
+        sa.Column("token_type", sa.String(length=40), nullable=True),
+        sa.Column("access_token", sa.String(length=255), nullable=False),
+        sa.Column("refresh_token", sa.String(length=255), nullable=True),
+        sa.Column("scope", sa.Text(), nullable=True),
+        sa.Column("issued_at", sa.Integer(), nullable=False),
+        sa.Column("access_token_revoked_at", sa.Integer(), nullable=False),
+        sa.Column("refresh_token_revoked_at", sa.Integer(), nullable=False),
+        sa.Column("expires_in", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(["user_id"], ["user.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("access_token"),
+    )
+    op.create_index(
+        op.f("ix_authtoken_refresh_token"), "authtoken", ["refresh_token"], unique=False
     )
-    op.create_index(op.f('ix_authtoken_refresh_token'), 'authtoken', ['refresh_token'], unique=False)
 
-    op.bulk_insert(client_application, [
-        {
-            'id': uuid7(),
-            'name': 'TTUN',
-            'client_id': uuid4().hex,
-            'client_secret': token_hex(32),
-            'client_id_issued_at': datetime.now(tz=UTC).timestamp(),
-            'client_secret_expires_at': datetime.now(tz=UTC).timestamp() + 3600,
-            'client_metadata': json.dumps({
-                'redirect_uris': [
-                    f'//{os.environ['TUNNEL_DOMAIN']}/oauth/callback'
-                ],
-            })
-        }
-    ])
+    op.bulk_insert(
+        client_application,
+        [
+            {
+                "id": uuid7(),
+                "name": "TTUN",
+                "client_id": uuid4().hex,
+                "client_secret": token_hex(32),
+                "client_id_issued_at": datetime.now(tz=UTC).timestamp(),
+                "client_secret_expires_at": datetime.now(tz=UTC).timestamp() + 3600,
+                "client_metadata": json.dumps(
+                    {
+                        "redirect_uris": [
+                            f"//{os.environ['TUNNEL_DOMAIN']}/oauth/callback"
+                        ],
+                    }
+                ),
+            }
+        ],
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_authtoken_refresh_token'), table_name='authtoken')
-    op.drop_table('authtoken')
-    op.drop_table('authcode')
-    op.drop_index(op.f('ix_clientapplication_client_id'), table_name='clientapplication')
-    op.drop_table('clientapplication')
+    op.drop_index(op.f("ix_authtoken_refresh_token"), table_name="authtoken")
+    op.drop_table("authtoken")
+    op.drop_table("authcode")
+    op.drop_index(
+        op.f("ix_clientapplication_client_id"), table_name="clientapplication"
+    )
+    op.drop_table("clientapplication")
     # ### end Alembic commands ###
diff --git a/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py b/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py
index 116d27e..5ad10c9 100644
--- a/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py
+++ b/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py
@@ -5,29 +5,32 @@ Revises: fc6608d3f9cc
 Create Date: 2026-07-02 18:03:17.190700
 
 """
-from typing import Sequence, Union
 
-from alembic import op
+from collections.abc import Sequence
+
 import sqlalchemy as sa
 import sqlmodel
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = 'ac4fbf1fea31'
-down_revision: Union[str, Sequence[str], None] = 'fc6608d3f9cc'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "ac4fbf1fea31"
+down_revision: str | Sequence[str] | None = "fc6608d3f9cc"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user', sa.Column('password', sqlmodel.sql.sqltypes.AutoString(), nullable=False))
+    op.add_column(
+        "user",
+        sa.Column("password", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user', 'password')
+    op.drop_column("user", "password")
     # ### end Alembic commands ###
diff --git a/db/migrations/versions/202607031440-69d8b4938a12_added_more_fields_and_session.py b/db/migrations/versions/202607031440-69d8b4938a12_added_more_fields_and_session.py
index ec5031b..40b8a70 100644
--- a/db/migrations/versions/202607031440-69d8b4938a12_added_more_fields_and_session.py
+++ b/db/migrations/versions/202607031440-69d8b4938a12_added_more_fields_and_session.py
@@ -5,52 +5,101 @@ Revises: ac4fbf1fea31
 Create Date: 2026-07-03 14:40:55.628816
 
 """
-from typing import Sequence, Union
 
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel
+from collections.abc import Sequence
 
+import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = '69d8b4938a12'
-down_revision: Union[str, Sequence[str], None] = 'ac4fbf1fea31'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "69d8b4938a12"
+down_revision: str | Sequence[str] | None = "ac4fbf1fea31"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('session',
-    sa.Column('id', sa.Uuid(), nullable=False),
-    sa.Column('created', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')),
-    sa.Column('updated', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('user_id', sa.Uuid(), nullable=False),
-    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        "session",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.text("now()"),
+        ),
+        sa.Column("updated", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("user_id", sa.Uuid(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["user.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.add_column(
+        "authcode",
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.text("now()"),
+        ),
+    )
+    op.add_column(
+        "authcode", sa.Column("updated", sa.DateTime(timezone=True), nullable=True)
+    )
+    op.add_column(
+        "authtoken",
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.text("now()"),
+        ),
+    )
+    op.add_column(
+        "authtoken", sa.Column("updated", sa.DateTime(timezone=True), nullable=True)
+    )
+    op.add_column(
+        "clientapplication",
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.text("now()"),
+        ),
+    )
+    op.add_column(
+        "clientapplication",
+        sa.Column("updated", sa.DateTime(timezone=True), nullable=True),
+    )
+    op.add_column(
+        "user",
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=sa.text("now()"),
+        ),
+    )
+    op.add_column(
+        "user", sa.Column("updated", sa.DateTime(timezone=True), nullable=True)
     )
-    op.add_column('authcode', sa.Column('created', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')))
-    op.add_column('authcode', sa.Column('updated', sa.DateTime(timezone=True), nullable=True))
-    op.add_column('authtoken', sa.Column('created', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')))
-    op.add_column('authtoken', sa.Column('updated', sa.DateTime(timezone=True), nullable=True))
-    op.add_column('clientapplication', sa.Column('created', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')))
-    op.add_column('clientapplication', sa.Column('updated', sa.DateTime(timezone=True), nullable=True))
-    op.add_column('user', sa.Column('created', sa.DateTime(timezone=True), nullable=False, server_default=sa.text('now()')))
-    op.add_column('user', sa.Column('updated', sa.DateTime(timezone=True), nullable=True))
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user', 'updated')
-    op.drop_column('user', 'created')
-    op.drop_column('clientapplication', 'updated')
-    op.drop_column('clientapplication', 'created')
-    op.drop_column('authtoken', 'updated')
-    op.drop_column('authtoken', 'created')
-    op.drop_column('authcode', 'updated')
-    op.drop_column('authcode', 'created')
-    op.drop_table('session')
+    op.drop_column("user", "updated")
+    op.drop_column("user", "created")
+    op.drop_column("clientapplication", "updated")
+    op.drop_column("clientapplication", "created")
+    op.drop_column("authtoken", "updated")
+    op.drop_column("authtoken", "created")
+    op.drop_column("authcode", "updated")
+    op.drop_column("authcode", "created")
+    op.drop_table("session")
     # ### end Alembic commands ###
diff --git a/db/models.py b/db/models.py
index 8a01c8c..8946bd2 100644
--- a/db/models.py
+++ b/db/models.py
@@ -1,13 +1,16 @@
 import re
-from datetime import datetime, UTC
-from urllib.parse import urlsplit
-from uuid import uuid4, UUID, uuid7
+from datetime import UTC, datetime
+from uuid import UUID, uuid7
 
 from sqlalchemy import DateTime
-from sqlmodel import SQLModel, Field, Relationship
+from sqlmodel import Field, Relationship, SQLModel
 from starlette.authentication import BaseUser
 
-from authentication.mixins import OAuth2ClientMixin, OAuth2AuthorizationCodeMixin, OAuth2TokenMixin
+from authentication.mixins import (
+    OAuth2AuthorizationCodeMixin,
+    OAuth2ClientMixin,
+    OAuth2TokenMixin,
+)
 from authentication.utils import bcrypt_sha256_hash
 
 
@@ -21,7 +24,7 @@ class BaseModel(SQLModel):
         default=None,
         nullable=True,
         sa_column_kwargs={
-            'onupdate': lambda: datetime.now(tz=UTC),
+            "onupdate": lambda: datetime.now(tz=UTC),
         },
         sa_type=DateTime(timezone=True),
     )
@@ -39,10 +42,12 @@ class User(BaseModel, BaseUser, table=True):
     def is_authenticated(self) -> bool:
         return True
 
+
 class Session(BaseModel, table=True):
-    user_id: UUID = Field(foreign_key='user.id', exclude=True)
+    user_id: UUID = Field(foreign_key="user.id", exclude=True)
     user: User = Relationship()
 
+
 class ClientApplication(BaseModel, OAuth2ClientMixin, table=True):
     name: str
 
@@ -52,10 +57,12 @@ class ClientApplication(BaseModel, OAuth2ClientMixin, table=True):
             for pattern in self.redirect_uris
         )
 
+
 class AuthCode(BaseModel, OAuth2AuthorizationCodeMixin, table=True):
     user_id: UUID = Field(foreign_key="user.id", ondelete="CASCADE")
     user: User = Relationship()
 
+
 class AuthToken(BaseModel, OAuth2TokenMixin, table=True):
     user_id: UUID = Field(foreign_key="user.id", ondelete="CASCADE")
     user: User = Relationship()
diff --git a/db/session.py b/db/session.py
index 82c0211..48ef3b6 100644
--- a/db/session.py
+++ b/db/session.py
@@ -1,21 +1,28 @@
 from contextlib import contextmanager
 
-from sqlalchemy.orm import sessionmaker, scoped_session
-from sqlmodel import create_engine
-from sqlmodel import Session
+from sqlalchemy.orm import scoped_session, sessionmaker
+from sqlmodel import Session, create_engine
 
 from conf import DATABASE_URL
 from utils.json import json_serializer
 
-
-engine = create_engine(DATABASE_URL, echo=True, future=True, json_serializer=json_serializer, pool_size=100, pool_recycle=3600)
+engine = create_engine(
+    DATABASE_URL,
+    echo=True,
+    future=True,
+    json_serializer=json_serializer,
+    pool_size=100,
+    pool_recycle=3600,
+)
 session_factory = sessionmaker(engine, class_=Session)
 ScopedSession = scoped_session(session_factory=session_factory)
 
+
 def get_session():
     with ScopedSession() as session:
         yield session
 
+
 @contextmanager
 def get_session_context(autocommit=True):
     session = next(get_session())