Update dependencies and address sqlalchemy-bind-manager breaking changes (#144)

Signed-off-by: Federico Busetti <[email protected]>

Author: febus982

poetry.lock

@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel
 from pydantic_settings import BaseSettings, SettingsConfigDict
-from sqlalchemy_bind_manager import SQLAlchemyAsyncConfig
+from sqlalchemy_bind_manager import SQLAlchemyConfig
 
 TYPE_ENVIRONMENT = Literal["local", "test", "staging", "production"]
 
@@ -49,8 +49,8 @@ class AppConfig(BaseSettings):
     CELERY: CeleryConfig = CeleryConfig()
     DEBUG: bool = False
     ENVIRONMENT: TYPE_ENVIRONMENT = "local"
-    SQLALCHEMY_CONFIG: Dict[str, SQLAlchemyAsyncConfig] = dict(
-        default=SQLAlchemyAsyncConfig(
+    SQLALCHEMY_CONFIG: Dict[str, SQLAlchemyConfig] = dict(
+        default=SQLAlchemyConfig(
             engine_url=f"sqlite+aiosqlite:///{Path(__file__).parent.parent.joinpath('sqlite.db')}",
             engine_options=dict(
                 connect_args={
@@ -59,5 +59,6 @@ class AppConfig(BaseSettings):
                 echo=False,
                 future=True,
             ),
+            async_engine=True,
         ),
     )

src/bootstrap/config.py

@@ -1,7 +1,5 @@
 from collections.abc import Iterable, Mapping
-from typing import Any, List, Protocol, Tuple, Union
-
-from sqlalchemy_bind_manager.repository import SortDirection
+from typing import Any, List, Literal, Protocol, Tuple, Union
 
 from domains.books._models import BookModel
 from domains.common.cloudevent_base import BaseEvent
@@ -13,7 +11,9 @@ async def save(self, book: BookModel) -> BookModel: ...
     async def find(
         self,
         search_params: Union[None, Mapping[str, Any]] = None,
-        order_by: Union[None, Iterable[Union[str, Tuple[str, SortDirection]]]] = None,
+        order_by: Union[
+            None, Iterable[Union[str, Tuple[str, Literal["asc", "desc"]]]]
+        ] = None,
     ) -> List[BookModel]: ...
 
 

src/domains/books/_gateway_interfaces.py

@@ -3,16 +3,17 @@
 import pytest
 from bootstrap.storage.SQLAlchemy import init_tables
 from sqlalchemy.orm import clear_mappers
-from sqlalchemy_bind_manager import SQLAlchemyAsyncConfig, SQLAlchemyBindManager
+from sqlalchemy_bind_manager import SQLAlchemyBindManager, SQLAlchemyConfig
 
 
 @pytest.fixture(scope="function")
 async def test_sa_manager() -> AsyncIterator[SQLAlchemyBindManager]:
     clear_mappers()
 
-    db_config = SQLAlchemyAsyncConfig(
+    db_config = SQLAlchemyConfig(
         engine_url="sqlite+aiosqlite://",
         engine_options=dict(connect_args={"check_same_thread": False}),
+        async_engine=True,
     )
     sa_manager = SQLAlchemyBindManager(config=db_config)
     init_tables(sqlalchemy_manager=sa_manager)

tests/storage/conftest.py

@@ -4,7 +4,7 @@
 
 from bootstrap.storage import init_storage
 from bootstrap.storage.SQLAlchemy import TABLE_INIT_REGISTRY, init_tables
-from sqlalchemy_bind_manager import SQLAlchemyAsyncConfig, SQLAlchemyBindManager
+from sqlalchemy_bind_manager import SQLAlchemyBindManager, SQLAlchemyConfig
 
 
 def test_init_tables_calls_only_supported_bind_initialisation():
@@ -13,15 +13,17 @@ def test_init_tables_calls_only_supported_bind_initialisation():
 
     sa_manager = SQLAlchemyBindManager(
         config={
-            "default": SQLAlchemyAsyncConfig(
+            "default": SQLAlchemyConfig(
                 engine_url=f"sqlite+aiosqlite:///{db1_path}",
                 engine_options=dict(connect_args={"check_same_thread": False}),
                 session_options=dict(expire_on_commit=False),
+                async_engine=True,
             ),
-            "not_existing": SQLAlchemyAsyncConfig(
+            "not_existing": SQLAlchemyConfig(
                 engine_url=f"sqlite+aiosqlite:///{db2_path}",
                 engine_options=dict(connect_args={"check_same_thread": False}),
                 session_options=dict(expire_on_commit=False),
+                async_engine=True,
             ),
         }
     )