✨ SQLAlchemy 2.0 compatibility

flama/resources/crud.py

@@ -52,7 +52,7 @@ async def create(
 
             return http.APIResponse(
                 schema=rest_schemas.output.schema,
-                content={**element, **dict(result.inserted_primary_key)},
+                content={**element, **dict(zip([x.name for x in self.model.primary_key], result.inserted_primary_key))},
                 status_code=201,
             )
 
@@ -91,12 +91,12 @@ async def retrieve(
             async with app.sqlalchemy.engine.begin() as connection:
                 query = self.model.select().where(self.model.c[rest_model.primary_key.name] == element_id)
                 result = await connection.execute(query)
-                element = result.fetchone()
+                element = result.first()
 
             if element is None:
                 raise exceptions.HTTPException(status_code=404)
 
-            return dict(element)
+            return element._asdict()
 
         retrieve.__doc__ = f"""
             tags:
@@ -238,7 +238,7 @@ async def filter(self, app, *clauses, **filters) -> t.List[t.Dict]:
                 if where_clauses:
                     query = query.where(sqlalchemy.and_(*where_clauses))
 
-                return [dict(row) async for row in await connection.stream(query)]
+                return [row._asdict() async for row in await connection.stream(query)]
 
         @resource_method("/", methods=["GET"], name=f"{name}-list")
         @paginator.page_number(schema_name=rest_schemas.output.name)

flama/resources/data_structures.py

@@ -4,7 +4,7 @@
 try:
     from sqlalchemy import Table
 except Exception:  # pragma: no cover
-    Table = typing.Any
+    Table = typing.Any  # type: ignore[assignment,misc]
 
 __all__ = ["Model", "PrimaryKey", "Schema", "Metadata", "MethodMetadata"]
 

flama/sqlalchemy.py

@@ -8,8 +8,8 @@
 
     metadata = sqlalchemy.MetaData()
 except Exception:  # pragma: no cover
-    sqlalchemy = None
-    metadata = None
+    sqlalchemy = None  # type: ignore[assignment]
+    metadata = None  # type: ignore[assignment]
 
 __all__ = ["metadata", "SQLAlchemyModule"]
 
@@ -25,7 +25,7 @@ def __init__(self, database: t.Optional[str] = None):
         self._metadata: t.Optional["sqlalchemy.MetaData"] = metadata
 
     @property
-    def engine(self) -> "AsyncEngine":
+    def engine(self) -> t.Optional["AsyncEngine"]:
         assert sqlalchemy is not None, "sqlalchemy[asyncio] must be installed to use SQLAlchemyModule."
         return self._engine
 
@@ -38,7 +38,7 @@ def engine(self):
         self._engine = None
 
     @property
-    def metadata(self) -> "sqlalchemy.MetaData":
+    def metadata(self) -> t.Optional["sqlalchemy.MetaData"]:
         assert sqlalchemy is not None, "sqlalchemy[asyncio] must be installed to use SQLAlchemyModule."
         return self._metadata