refactor(backend): migrate to sqlalchemy 2.0 uuid, declarative base and col

Author: lkstrp

src/pypsa_app/backend/api/deps.py

@@ -177,7 +177,7 @@ def get_accessible_network(
 
     Raises 404 if not found or inaccessible.
     """
-    network = db.query(Network).filter(Network.id == str(network_id)).first()
+    network = db.query(Network).filter(Network.id == network_id).first()
     if not network:
         raise HTTPException(404, "Network not found")
 

src/pypsa_app/backend/api/routes/admin.py

@@ -243,7 +243,7 @@ def update_network_admin(
     network = (
         db.query(Network)
         .options(joinedload(Network.owner))
-        .filter(Network.id == str(network_id))
+        .filter(Network.id == network_id)
         .first()
     )
 
@@ -296,7 +296,7 @@ def delete_network_admin(
     admin: User = Depends(require_permission(Permission.NETWORKS_MANAGE_ALL)),
 ) -> dict:
     """Delete any network (admin only)"""
-    network = db.query(Network).filter(Network.id == str(network_id)).first()
+    network = db.query(Network).filter(Network.id == network_id).first()
     if not network:
         raise HTTPException(404, "Network not found")
 

src/pypsa_app/backend/api/routes/networks.py

@@ -170,7 +170,7 @@ def get_network(
     network = (
         db.query(Network)
         .options(joinedload(Network.owner))
-        .filter(Network.id == str(network_id))
+        .filter(Network.id == network_id)
         .first()
     )
 
@@ -194,7 +194,7 @@ def update_network(
     network = (
         db.query(Network)
         .options(joinedload(Network.owner))
-        .filter(Network.id == str(network_id))
+        .filter(Network.id == network_id)
         .first()
     )
 

src/pypsa_app/backend/database.py

@@ -1,5 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import declarative_base, sessionmaker
+from sqlalchemy.orm import DeclarativeBase, sessionmaker
 
 from pypsa_app.backend.settings import (
     DB_MAX_OVERFLOW,
@@ -30,7 +30,9 @@
 
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
-Base = declarative_base()
+
+class Base(DeclarativeBase):
+    pass
 
 
 from pypsa_app.backend import models  # noqa: E402, F401