From 050118999b598d47c92013f0483f9ffa809c8236 Mon Sep 17 00:00:00 2001 From: Christian Monch Date: Wed, 17 Dec 2025 23:07:32 +0100 Subject: [PATCH 1/2] fix the curator output Curator- and Incoming-endpoints now return only the requested record and no additional surrounding structures. --- dump_things_service/curated.py | 5 ++++- dump_things_service/incoming.py | 5 ++++- dump_things_service/tests/test_curated.py | 2 +- dump_things_service/tests/test_incoming.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dump_things_service/curated.py b/dump_things_service/curated.py index adc6d94..bb70aad 100644 --- a/dump_things_service/curated.py +++ b/dump_things_service/curated.py @@ -210,7 +210,10 @@ async def _read_curated_records( model_store, backend = await _get_store_and_backend(collection, api_key) if pid: - return backend.get_record_by_iri(model_store.pid_to_iri(pid)) + record_info = backend.get_record_by_iri(model_store.pid_to_iri(pid)) + if record_info: + return record_info.json_object + return None if class_name: result_list = backend.get_records_of_classes([class_name], matching) else: diff --git a/dump_things_service/incoming.py b/dump_things_service/incoming.py index ed8f6e6..ce123fc 100644 --- a/dump_things_service/incoming.py +++ b/dump_things_service/incoming.py @@ -246,7 +246,10 @@ async def _incoming_read_records( model_store, backend = await _get_store_and_backend(collection, label, api_key) if pid: - return backend.get_record_by_iri(model_store.pid_to_iri(pid)) + record_info = backend.get_record_by_iri(model_store.pid_to_iri(pid)) + if record_info: + return record_info.json_object + return None if class_name: result_list = backend.get_records_of_classes([class_name], matching) else: diff --git a/dump_things_service/tests/test_curated.py b/dump_things_service/tests/test_curated.py index b43896c..b1888c1 100644 --- a/dump_things_service/tests/test_curated.py +++ b/dump_things_service/tests/test_curated.py @@ -88,7 +88,7 @@ def test_curated_delete(fastapi_client_simple): headers={'x-dumpthings-token': 'token_1_xxxxx'}, ) assert response.status_code == HTTP_200_OK - assert response.json()['json_object']['pid'] == 'abc:delete-me' + assert response.json()['pid'] == 'abc:delete-me' response = test_client.delete( '/collection_8/curated/record?pid=abc:delete-me', diff --git a/dump_things_service/tests/test_incoming.py b/dump_things_service/tests/test_incoming.py index 921a37c..f6efb05 100644 --- a/dump_things_service/tests/test_incoming.py +++ b/dump_things_service/tests/test_incoming.py @@ -164,7 +164,7 @@ def test_incoming_delete(fastapi_client_simple): headers={'x-dumpthings-token': 'token_admin'}, ) assert response.status_code == HTTP_200_OK - assert response.json()['json_object']['pid'] == 'abc:delete-me' + assert response.json()['pid'] == 'abc:delete-me' response = test_client.delete( '/collection_7/incoming/admin_common/record?pid=abc:delete-me', -- 2.52.0 From 7052a6ca7c7655d1904456cfda3a9b7f00ad2ab0 Mon Sep 17 00:00:00 2001 From: Christian Monch Date: Thu, 18 Dec 2025 09:15:06 +0100 Subject: [PATCH 2/2] bump version, update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ dump_things_service/__about__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32ed80b..61f927f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 5.3.5 (2025-12-18) + +## Bugfixes + +- Curator- and Incoming-endpoints now return only the requested record and + no additional surrounding structures. + + # 5.3.4 (2025-12-17) ## Bugfixes diff --git a/dump_things_service/__about__.py b/dump_things_service/__about__.py index 77c9eb6..72cf967 100644 --- a/dump_things_service/__about__.py +++ b/dump_things_service/__about__.py @@ -1 +1 @@ -__version__ = '5.3.4' +__version__ = '5.3.5' -- 2.52.0