[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.4
+  rev: v0.8.0
   hooks:
   - id: ruff
     args:

optimade_gateway/models/__init__.py

@@ -39,10 +39,10 @@
     "GatewayResourceAttributes",
     "GatewaysResponse",
     "GatewaysResponseSingle",
+    "QueriesResponse",
+    "QueriesResponseSingle",
     "QueryCreate",
     "QueryResource",
     "QueryState",
-    "QueriesResponse",
-    "QueriesResponseSingle",
     "Search",
 )

optimade_gateway/routers/databases.py

@@ -128,7 +128,7 @@ async def get_database(
         include_fields,
     ) = await collection.afind(params=params)
 
-    if fields or include_fields and result is not None:
+    if fields or (include_fields and result is not None):
         result = handle_response_fields(result, fields, include_fields)
 
     result = result[0] if isinstance(result, list) and data_returned else None

tests/routers/test_databases.py

@@ -66,15 +66,15 @@ async def test_post_databases(client: AsyncGatewayClient) -> None:
     datum = response.data
     assert datum, response
 
-    for field in data:
+    for field, field_value in data.items():
         value = getattr(response.data.attributes, field)
         if isinstance(value, AnyUrl):
-            assert str(value) == data[field], (
+            assert str(value) == field_value, (
                 f"Response: {response.data.attributes.model_dump()!r}\n\n"
                 f"Test data: {data!r}"
             )
         else:
-            assert value == data[field], (
+            assert value == field_value, (
                 f"Response: {response.data.attributes.model_dump()!r}\n\n"
                 f"Test data: {data!r}"
             )
@@ -88,8 +88,10 @@ async def test_post_databases(client: AsyncGatewayClient) -> None:
     mongo_filter = {"_id": ObjectId(datum.id)}
     assert await MONGO_DB["databases"].count_documents(mongo_filter) == 1
     db_datum = await MONGO_DB["databases"].find_one(mongo_filter)
-    for field in data:
-        assert db_datum[field] == data[field]
+    for field, field_value in data.items():
+        assert (
+            db_datum[field] == field_value
+        ), f"Response: {db_datum!r}\n\nTest data: {data!r}"
 
 
 async def test_get_single_database(

tests/routers/test_queries.py

@@ -94,8 +94,8 @@ async def test_post_queries(
     mongo_filter = {"_id": ObjectId(datum.id)}
     assert await MONGO_DB["queries"].count_documents(mongo_filter) == 1
     db_datum = await MONGO_DB["queries"].find_one(mongo_filter)
-    for key in data:
-        assert db_datum[key] == data[key]
+    for key, value in data.items():
+        assert db_datum[key] == value, f"Response: {db_datum!r}\n\nTest data: {data!r}"
 
     await asyncio.sleep(1)  # Ensure mock URL is queried