Migrate from sqlmodel to pure sqlalchemy

packages/sshecret-admin/src/sshecret_admin/auth/authentication.py

@@ -6,9 +6,11 @@ from typing import cast, Any
 
 import bcrypt
 import jwt
-from sqlmodel import Session, select
 
+from sqlalchemy import select
+from sqlalchemy.orm import Session
 from sshecret_admin.core.settings import AdminServerSettings
+
 from .models import User, TokenData
 from .exceptions import AuthenticationFailedError
 
@@ -72,7 +74,7 @@ def check_password(plain_password: str, hashed_password: str) -> None:
 
 def authenticate_user(session: Session, username: str, password: str) -> User | None:
     """Authenticate user."""
-    user = session.exec(select(User).where(User.username == username)).first()
+    user = session.scalars(select(User).where(User.username == username)).first()
     if not user:
         return None
     if not verify_password(password, user.hashed_password):

packages/sshecret-admin/src/sshecret_admin/auth/models.py

@@ -1,8 +1,11 @@
 """Models for authentication."""
 
 from datetime import datetime
+import uuid
 import sqlalchemy as sa
-from sqlmodel import SQLModel, Field
+from pydantic import BaseModel
+
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 
 JWT_ALGORITHM = "HS256"
@@ -12,59 +15,65 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 30
 REFRESH_TOKEN_EXPIRE_HOURS = 6
 
 
-class User(SQLModel, table=True):
+class Base(DeclarativeBase):
+    pass
+
+
+class User(Base):
     """Users."""
 
-    username: str = Field(unique=True, primary_key=True)
-    hashed_password: str
-    disabled: bool = Field(default=False)
-    created_at: datetime | None = Field(
-        default=None,
-        sa_type=sa.DateTime(timezone=True),
-        sa_column_kwargs={"server_default": sa.func.now()},
-        nullable=False,
+    __tablename__: str = "user"
+
+    id: Mapped[uuid.UUID] = mapped_column(
+        sa.Uuid(as_uuid=True), primary_key=True, default=uuid.uuid4
+    )
+    username: Mapped[str] = mapped_column(sa.String)
+    hashed_password: Mapped[str] = mapped_column(sa.String)
+    disabled: Mapped[bool] = mapped_column(sa.BOOLEAN, default=False)
+    created_at: Mapped[datetime] = mapped_column(
+        sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False
     )
 
 
-class PasswordDB(SQLModel, table=True):
+class PasswordDB(Base):
     """Password database."""
 
-    id: int | None = Field(default=None, primary_key=True)
-    encrypted_password: str
+    __tablename__: str = "password_db"
 
-    created_at: datetime | None = Field(
-        default=None,
-        sa_type=sa.DateTime(timezone=True),
-        sa_column_kwargs={"server_default": sa.func.now()},
-        nullable=False,
+    id: Mapped[int] = mapped_column(sa.INT, primary_key=True)
+    encrypted_password: Mapped[str] = mapped_column(sa.String)
+
+    created_at: Mapped[datetime] = mapped_column(
+        sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False
     )
 
-    updated_at: datetime | None = Field(
-        default=None,
-        sa_type=sa.DateTime(timezone=True),
-        sa_column_kwargs={"onupdate": sa.func.now(), "server_default": sa.func.now()},
+    updated_at: Mapped[datetime | None] = mapped_column(
+        sa.DateTime(timezone=True),
+        server_default=sa.func.now(),
+        onupdate=sa.func.now(),
     )
 
 
-
-class TokenData(SQLModel):
+class TokenData(BaseModel):
     """Token data."""
 
     username: str | None = None
 
 
-class Token(SQLModel):
+class Token(BaseModel):
     access_token: str
     token_type: str
 
 
-class LoginError(SQLModel):
+class LoginError(BaseModel):
     """Login Error model."""
+
     # TODO: Remove this.
 
     title: str
     message: str
 
+
 def init_db(engine: sa.Engine) -> None:
     """Create database."""
-    SQLModel.metadata.create_all(engine)
+    Base.metadata.create_all(engine)