Fix dependency tests

Author: PGijsbers

src/routers/dependencies.py

@@ -26,7 +26,7 @@ async def userdb_connection() -> AsyncGenerator[AsyncConnection, None]:
 async def fetch_user(
     api_key: APIKey | None = None,
     user_data: Annotated[AsyncConnection | None, Depends(userdb_connection)] = None,
-) -> AsyncGenerator[User | None]:
+) -> AsyncGenerator[User | None, None]:
     if not (api_key and user_data):
         yield None
         return

src/routers/openml/study.py

@@ -103,6 +103,7 @@ async def attach_to_study(
         "User {user_id} attached entities to study {study_id}.",
         study_id=study_id,
         entity_ids=entity_ids,
+        user_id=user.user_id,
     )
     return AttachDetachResponse(study_id=study_id, main_entity_type=study.type_)
 
@@ -138,6 +139,7 @@ async def create_study(
     logger.info(
         "User {user_id} created study {study_id}.",
         study_id=study_id,
+        user_id=user.user_id,
     )
     # Make sure that invalid fields raise an error (e.g., "task_ids")
     return {"study_id": study_id}

tests/dependencies/fetch_user_test.py

@@ -1,3 +1,5 @@
+from contextlib import aclosing
+
 import pytest
 from sqlalchemy.ext.asyncio import AsyncConnection
 
@@ -16,19 +18,22 @@
     ],
 )
 async def test_fetch_user(api_key: str, user: User, user_test: AsyncConnection) -> None:
-    db_user = await fetch_user(api_key, user_data=user_test)
+    async with aclosing(fetch_user(api_key, user_data=user_test)) as agen:
+        db_user = await anext(agen)
     assert isinstance(db_user, User)
     assert user.user_id == db_user.user_id
     assert set(await user.get_groups()) == set(await db_user.get_groups())
 
 
 async def test_fetch_user_no_key_no_user() -> None:
-    assert await fetch_user(api_key=None) is None
+    async with aclosing(fetch_user(api_key=None)) as agen:
+        assert await anext(agen) is None
 
 
 async def test_fetch_user_invalid_key_raises(user_test: AsyncConnection) -> None:
     with pytest.raises(AuthenticationFailedError):
-        await fetch_user(api_key=ApiKey.INVALID, user_data=user_test)
+        async with aclosing(fetch_user(api_key=ApiKey.INVALID, user_data=user_test)) as agen:
+            await anext(agen)
 
 
 async def test_fetch_user_or_raise_raises_if_no_user() -> None: