Refactor: unit test to use AsyncDb instead of Sync

Author: 1yam

tests/api/conftest.py

@@ -24,13 +24,13 @@
 from aleph.jobs.process_pending_messages import PendingMessageProcessor
 from aleph.storage import StorageService
 from aleph.toolkit.timestamp import timestamp_to_datetime, utc_now
-from aleph.types.db_session import DbSessionFactory
+from aleph.types.db_session import AsyncDbSessionFactory
 from aleph.types.message_status import MessageStatus
 
 
 # TODO: remove the raw parameter, it's just to avoid larger refactorings
 async def _load_fixtures(
-    session_factory: DbSessionFactory, filename: str, raw: bool = True
+    session_factory: AsyncDbSessionFactory, filename: str, raw: bool = True
 ) -> Sequence[Dict[str, Any]]:
     fixtures_dir = Path(__file__).parent / "fixtures"
     fixtures_file = fixtures_dir / filename
@@ -41,7 +41,7 @@ async def _load_fixtures(
     messages = []
     tx_hashes = set()
 
-    with session_factory() as session:
+    async with session_factory() as session:
         for message_dict in messages_json:
             message_db = MessageDb.from_message_dict(message_dict)
             messages.append(message_db)
@@ -53,8 +53,8 @@ async def _load_fixtures(
                     tx_hashes.add(tx_hash)
                     session.add(chain_tx_db)
 
-                session.flush()
-                session.execute(
+                await session.flush()
+                await session.execute(
                     insert(message_confirmations).values(
                         item_hash=message_db.item_hash, tx_hash=tx_hash
                     )
@@ -67,14 +67,14 @@ async def _load_fixtures(
             )
             session.add(message_status)
 
-        session.commit()
+        await session.commit()
 
     return messages_json if raw else messages
 
 
 @pytest_asyncio.fixture
 async def fixture_messages(
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
 ) -> Sequence[Dict[str, Any]]:
     return await _load_fixtures(session_factory, "fixture_messages.json")
 
@@ -94,23 +94,23 @@ def make_aggregate_element(message: MessageDb) -> AggregateElementDb:
 
 @pytest_asyncio.fixture
 async def fixture_aggregate_messages(
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
 ) -> Sequence[MessageDb]:
     messages = await _load_fixtures(
         session_factory, "fixture_aggregates.json", raw=False
     )
     aggregate_keys = set()
-    with session_factory() as session:
+    async with session_factory() as session:
         for message in messages:
             aggregate_element = make_aggregate_element(message)  # type: ignore
             session.add(aggregate_element)
             aggregate_keys.add((aggregate_element.owner, aggregate_element.key))
-        session.commit()
+        await session.commit()
 
         for owner, key in aggregate_keys:
-            refresh_aggregate(session=session, owner=owner, key=key)
+            await refresh_aggregate(session=session, owner=owner, key=key)
 
-        session.commit()
+        await session.commit()
 
     return messages  # type: ignore
 
@@ -131,14 +131,14 @@ def make_post_db(message: MessageDb) -> PostDb:
 
 @pytest_asyncio.fixture
 async def fixture_posts(
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
 ) -> Sequence[PostDb]:
     messages = await _load_fixtures(session_factory, "fixture_posts.json", raw=False)
     posts = [make_post_db(message) for message in messages]  # type: ignore
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(posts)
-        session.commit()
+        await session.commit()
 
     return posts
 
@@ -222,7 +222,9 @@ def amended_post_with_refs_and_tags(
 
 
 @pytest.fixture
-def message_processor(mocker, mock_config: Config, session_factory: DbSessionFactory):
+def message_processor(
+    mocker, mock_config: Config, session_factory: AsyncDbSessionFactory
+):
     storage_engine = InMemoryStorageEngine(files={})
     storage_service = StorageService(
         storage_engine=storage_engine,

tests/api/test_get_message.py

@@ -2,6 +2,7 @@
 from typing import Any, Mapping, Sequence
 
 import pytest
+import pytest_asyncio
 import pytz
 from aleph_message.models import Chain, ItemType, MessageType
 
@@ -20,7 +21,7 @@
 )
 from aleph.toolkit.timestamp import timestamp_to_datetime
 from aleph.types.channel import Channel
-from aleph.types.db_session import DbSessionFactory
+from aleph.types.db_session import AsyncDbSessionFactory
 from aleph.types.message_status import ErrorCode, MessageStatus
 
 MESSAGE_URI = "/api/v0/messages/{}"
@@ -30,9 +31,9 @@
 RECEPTION_DATETIME = pytz.utc.localize(dt.datetime(2023, 1, 1))
 
 
-@pytest.fixture
-def fixture_messages_with_status(
-    session_factory: DbSessionFactory,
+@pytest_asyncio.fixture
+async def fixture_messages_with_status(
+    session_factory: AsyncDbSessionFactory,
 ) -> Mapping[MessageStatus, Sequence[Any]]:
 
     pending_messages = [
@@ -171,7 +172,7 @@ def fixture_messages_with_status(
         MessageStatus.REJECTED: rejected_messages,
     }
 
-    with session_factory() as session:
+    async with session_factory() as session:
         for status, messages in messages_dict.items():
             for message in messages:
                 session.add(message)
@@ -182,7 +183,7 @@ def fixture_messages_with_status(
                         reception_time=RECEPTION_DATETIME,
                     )
                 )
-        session.commit()
+        await session.commit()
 
     return messages_dict
 

tests/api/test_list_messages.py

@@ -22,7 +22,7 @@
 from aleph.db.models.messages import MessageStatusDb
 from aleph.toolkit.timestamp import timestamp_to_datetime, utc_now
 from aleph.types.channel import Channel
-from aleph.types.db_session import DbSessionFactory
+from aleph.types.db_session import AsyncDbSessionFactory
 from aleph.types.message_status import MessageStatus
 
 from .utils import get_messages_by_keys
@@ -172,7 +172,7 @@ async def test_get_messages_multiple_hashes(fixture_messages, ccn_api_client):
 async def test_get_messages_filter_by_tags(
     fixture_messages,
     ccn_api_client,
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
     post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
     amended_post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
 ):
@@ -184,11 +184,11 @@ async def test_get_messages_filter_by_tags(
     message_db, _, message_status_db = post_with_refs_and_tags
     amend_message_db, _, amend_message_status_db = amended_post_with_refs_and_tags
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(
             [message_db, message_status_db, amend_message_db, amend_message_status_db]
         )
-        session.commit()
+        await session.commit()
 
     # Matching tag for both messages
     response = await ccn_api_client.get(MESSAGES_URI, params={"tags": "mainnet"})
@@ -564,13 +564,13 @@ def instance_message_fixture() -> Tuple[MessageDb, MessageStatusDb]:
 async def test_get_instance(
     ccn_api_client,
     instance_message_fixture: Tuple[MessageDb, MessageStatusDb],
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
 ):
 
     message_db, status_db = instance_message_fixture
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all([message_db, status_db])
-        session.commit()
+        await session.commit()
 
     response = await ccn_api_client.get(
         MESSAGES_URI, params={"hashes": message_db.item_hash}

tests/api/test_new_metric.py

@@ -4,7 +4,7 @@
 import pytest
 import pytest_asyncio
 
-from aleph.types.db_session import DbSessionFactory
+from aleph.types.db_session import AsyncDbSessionFactory
 
 from .conftest import _load_fixtures
 
@@ -15,7 +15,7 @@ def _generate_uri(node_type: str, node_id: str) -> str:
 
 @pytest_asyncio.fixture
 async def fixture_metrics_messages(
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
 ) -> Sequence[Dict[str, Any]]:
     return await _load_fixtures(session_factory, "test-metric.json")
 

tests/api/test_posts.py

@@ -6,7 +6,7 @@
 from aleph.db.models import MessageDb
 from aleph.db.models.messages import MessageStatusDb
 from aleph.db.models.posts import PostDb
-from aleph.types.db_session import DbSessionFactory
+from aleph.types.db_session import AsyncDbSessionFactory
 
 POSTS_URI = "/api/v1/posts.json"
 
@@ -57,16 +57,16 @@ async def test_get_posts(ccn_api_client, fixture_posts: Sequence[PostDb]):
 @pytest.mark.asyncio
 async def test_get_posts_refs(
     ccn_api_client,
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
     fixture_posts: Sequence[PostDb],
     post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
 ):
     message_db, post_db, message_status_db = post_with_refs_and_tags
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(fixture_posts)
         session.add_all([message_db, post_db, message_status_db])
-        session.commit()
+        await session.commit()
 
     # Match the ref
     response = await ccn_api_client.get(
@@ -111,7 +111,7 @@ async def test_get_posts_refs(
 @pytest.mark.asyncio
 async def test_get_amended_posts_refs(
     ccn_api_client,
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
     fixture_posts: Sequence[PostDb],
     post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
     amended_post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
@@ -125,13 +125,13 @@ async def test_get_amended_posts_refs(
 
     original_post_db.latest_amend = amend_post_db.item_hash
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(fixture_posts)
         session.add_all(
             [original_message_db, original_post_db, original_message_status_db]
         )
         session.add_all([amend_message_db, amend_post_db, amend_message_status_db])
-        session.commit()
+        await session.commit()
 
     # Match the ref
     response = await ccn_api_client.get(
@@ -176,16 +176,16 @@ async def test_get_amended_posts_refs(
 @pytest.mark.asyncio
 async def test_get_posts_tags(
     ccn_api_client,
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
     fixture_posts: Sequence[PostDb],
     post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
 ):
     message_db, post_db, message_status_db = post_with_refs_and_tags
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(fixture_posts)
         session.add_all([message_db, post_db, message_status_db])
-        session.commit()
+        await session.commit()
 
     # Match one tag
     response = await ccn_api_client.get(
@@ -245,7 +245,7 @@ async def test_get_posts_tags(
 @pytest.mark.asyncio
 async def test_get_amended_posts_tags(
     ccn_api_client,
-    session_factory: DbSessionFactory,
+    session_factory: AsyncDbSessionFactory,
     fixture_posts: Sequence[PostDb],
     post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
     amended_post_with_refs_and_tags: Tuple[MessageDb, PostDb, MessageStatusDb],
@@ -259,13 +259,13 @@ async def test_get_amended_posts_tags(
 
     original_post_db.latest_amend = amend_post_db.item_hash
 
-    with session_factory() as session:
+    async with session_factory() as session:
         session.add_all(fixture_posts)
         session.add_all(
             [original_message_db, original_post_db, original_message_status_db]
         )
         session.add_all([amend_message_db, amend_post_db, amend_message_status_db])
-        session.commit()
+        await session.commit()
 
     # Match one tag
     response = await ccn_api_client.get("/api/v0/posts.json", params={"tags": "amend"})