fix: shorter DB sessions in GET /api/v0/messages.json

Author: odesenfans

src/aleph/services/cache/node_cache.py

@@ -6,7 +6,7 @@
 import aleph.toolkit.json as aleph_json
 from aleph.db.accessors.messages import count_matching_messages
 from aleph.schemas.messages_query_params import MessageQueryParams
-from aleph.types.db_session import DbSession
+from aleph.types.db_session import DbSessionFactory
 
 CacheKey = Any
 CacheValue = bytes
@@ -96,7 +96,7 @@ def _message_filter_id(filters: Dict[str, Any]):
         return sha256(filters_json).hexdigest()
 
     async def count_messages(
-        self, session: DbSession, query_params: MessageQueryParams
+        self, session_factory: DbSessionFactory, query_params: MessageQueryParams
     ) -> int:
         filters = query_params.model_dump(exclude_none=True)
         cache_key = f"message_count:{self._message_filter_id(filters)}"
@@ -106,7 +106,8 @@ async def count_messages(
             return int(cached_result.decode())
 
         # Slow, can take a few seconds
-        n_matches = count_matching_messages(session, **filters)
+        with session_factory() as session:
+            n_matches = count_matching_messages(session, **filters)
 
         await self.set(cache_key, n_matches, expiration=self.message_cache_count_ttl)
 

src/aleph/web/controllers/messages.py

@@ -243,14 +243,15 @@ async def view_messages_list(request: web.Request) -> web.Response:
             include_confirmations=True, **find_filters
         )
         messages = (session.execute(messages_query)).scalars()
-        total_msgs = await node_cache.count_messages(session, query_params)
 
-        return format_response(
-            messages,
-            pagination=pagination_per_page,
-            page=pagination_page,
-            total_messages=total_msgs,
-        )
+    total_msgs = await node_cache.count_messages(session_factory, query_params)
+
+    return format_response(
+        messages,
+        pagination=pagination_per_page,
+        page=pagination_page,
+        total_messages=total_msgs,
+    )
 
 
 async def _send_history_to_ws(