Standardised Bases across models

app/db/base.py

@@ -1,8 +1,6 @@
 from app.db.base_class import Base  # noqa: F401
-
-# Import all models so their tables are registered on Base.metadata
-from app.models.user import User         # noqa: F401
-from app.models.server import Server     # noqa: F401
-from app.models.sshkey import SSHKey     # noqa: F401
 from app.models.access_request import AccessRequest  # noqa: F401
-from app.models.audit import AuditEvent   # noqa: F401
+from app.models.audit import AuditEvent  # noqa: F401
+from app.models.server import Server  # noqa: F401
+from app.models.sshkey import SSHKey  # noqa: F401
+from app.models.user import User  # noqa: F401

app/models/access_request.py

@@ -1,9 +1,9 @@
-from datetime import datetime, timezone #noqa
+from datetime import datetime
 
 from sqlalchemy import DateTime, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column
 
-from app.models.user import Base
+from app.db.base_class import Base
 
 
 class AccessRequest(Base):

app/models/audit.py

@@ -3,7 +3,7 @@ from datetime import datetime, timezone
 from sqlalchemy import DateTime, String
 from sqlalchemy.orm import Mapped, mapped_column
 
-from app.models.user import Base
+from app.db.base_class import Base
 
 
 class AuditEvent(Base):

app/models/server.py

@@ -1,7 +1,7 @@
 from sqlalchemy import JSON, Boolean, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
-from app.models.user import Base
+from app.db.base_class import Base
 
 
 class Server(Base):

app/models/sshkey.py

@@ -1,9 +1,9 @@
 from datetime import datetime, timezone  # noqa: F401
 
 from sqlalchemy import Boolean, DateTime, ForeignKey, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship  # noqa: F401
+from sqlalchemy.orm import Mapped, mapped_column
 
-from app.models.user import Base
+from app.db.base_class import Base
 
 
 class SSHKey(Base):

app/models/user.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Boolean, String
 from sqlalchemy.orm import Mapped, mapped_column
 
-from app.db.base_class import Base  # <-- use the shared Base
+from app.db.base_class import Base
 
 
 class User(Base):