From 3bfd79a5ef9abb8f2cf2bf1c0dee11ad142d9177 Mon Sep 17 00:00:00 2001 From: Pal Kerecsenyi Date: Tue, 17 Nov 2026 14:04:16 +0100 Subject: [PATCH] fix(serializer): support list-based meetings in BibTex serializer --- invenio.cfg | 122 ++++++++++++++--------------- site/cds_rdm/serializers/bibtex.py | 41 ++++++++++ 2 files changed, 102 insertions(+), 61 deletions(-) create mode 100644 site/cds_rdm/serializers/bibtex.py diff --git a/invenio.cfg b/invenio.cfg index 2f61b483..14939b8c 100644 --- a/invenio.cfg +++ b/invenio.cfg @@ -6,39 +6,52 @@ This file was automatically generated by 'invenio-cli init'. For the full list of settings and their values, see https://inveniordm.docs.cern.ch/reference/configuration/. """ - from copy import deepcopy from datetime import datetime, timedelta from cds_rdm import schemes +from cds_rdm.api import CDSRDMDraft, CDSRDMRecord +from cds_rdm.clc_sync.services.components import ClcSyncComponent +from cds_rdm.components import ( # PublicationInclusionComponent temporarily disabled + CDSResourcePublication, CommitteeApprovalComponent, + MintAlternateIdentifierComponent, SubjectsValidationComponent) from cds_rdm.custom_fields import CUSTOM_FIELDS, CUSTOM_FIELDS_UI, NAMESPACES -from cds_rdm.permissions import ( - CDSCommunitiesPermissionPolicy, - CDSRDMRecordPermissionPolicy, - CDSRequestsPermissionPolicy, - CDSRDMPreservationSyncPermissionPolicy, - lock_edit_record_published_files, - CDSAuditLogPermissionPolicy, - CDSJobLogsPermissionPolicy, - FileModificationHarvesterPolicy, -) from cds_rdm.files import storage_factory from cds_rdm.inspire_harvester.reader import InspireHTTPReader from cds_rdm.inspire_harvester.transformer import InspireJsonTransformer from cds_rdm.inspire_harvester.writer import InspireWriter +from cds_rdm.notifications.committee_approval import ( + CommitteeApprovalAcceptNotificationBuilder, + CommitteeApprovalDeclineNotificationBuilder, + CommitteeApprovalSubmitNotificationBuilder) +from cds_rdm.permissions import (CDSAuditLogPermissionPolicy, + CDSCommunitiesPermissionPolicy, + CDSJobLogsPermissionPolicy, + CDSRDMPreservationSyncPermissionPolicy, + CDSRDMRecordPermissionPolicy, + CDSRequestsPermissionPolicy, + FileModificationHarvesterPolicy, + lock_edit_record_published_files) +from cds_rdm.pids import validate_optional_doi_transitions +from cds_rdm.requests import CDSCommunityInclusion, CDSCommunitySubmission +from cds_rdm.reviews.policy import CDSRecordVersionReviewPolicy +from cds_rdm.serializers.bibtex import CDSBibTexSerializer from cds_rdm.vcs.handlers import gitlab_account_info_serializer -from cds_rdm.requests import CDSCommunitySubmission, CDSCommunityInclusion -from invenio_app_rdm.config import APP_RDM_ROUTES +from cds_rdm.views import (archive_link_render, frontpage_view_function, + inspire_link_render) +from flask_resources import ResponseHandler +from invenio_app_rdm.config import APP_RDM_RECORD_EXPORTERS as RECORD_EXPORTERS +from invenio_app_rdm.config import APP_RDM_ROUTES, NOTIFICATIONS_BUILDERS from invenio_app_rdm.config import \ STATS_AGGREGATIONS as _APP_RDM_STATS_AGGREGATIONS from invenio_app_rdm.config import STATS_EVENTS as _APP_RDM_STATS_EVENTS -from invenio_app_rdm.config import NOTIFICATIONS_BUILDERS -from cds_rdm.notifications.committee_approval import ( - CommitteeApprovalAcceptNotificationBuilder, - CommitteeApprovalDeclineNotificationBuilder, - CommitteeApprovalSubmitNotificationBuilder, -) -from cds_rdm.api import CDSRDMRecord, CDSRDMDraft +from invenio_app_rdm.config import \ + VOCABULARIES_DATASTREAM_READERS as DEFAULT_VOCABULARIES_DATASTREAM_READERS +from invenio_app_rdm.config import \ + VOCABULARIES_DATASTREAM_TRANSFORMERS as \ + DEFAULT_VOCABULARIES_DATASTREAM_TRANSFORMERS +from invenio_app_rdm.config import \ + VOCABULARIES_DATASTREAM_WRITERS as DEFAULT_VOCABULARIES_DATASTREAM_WRITERS from invenio_cern_sync.sso import cern_keycloak, cern_remote_app_name from invenio_cern_sync.users.profile import CERNUserProfileSchema from invenio_oauthclient.views.client import auto_redirect_login @@ -46,52 +59,32 @@ from invenio_preservation_sync.utils import preservation_info_render from invenio_previewer.config import \ PREVIEWER_PREFERENCE as DEFAULT_PREVIEWER_PREFERENCE from invenio_rdm_records.checks import requests as checks_requests -from invenio_rdm_records.config import (always_valid, RDM_RECORDS_PERSONORG_SCHEMES, - RDM_RECORDS_IDENTIFIERS_SCHEMES as RDM_RECORDS_RELATED_IDENTIFIERS_SCHEMES - ) -from invenio_records_resources.services.records.queryparser import ( - QueryParser, - SearchFieldTransformer, -) -from invenio_rdm_records.proxies import current_rdm_records_service as record_service -from invenio_rdm_records.services.components import DefaultRecordsComponents -from invenio_rdm_records.services.components.vcs import VCSComponent -from invenio_rdm_records.services.vcs.release import RDMVCSRelease -from invenio_rdm_records.config import ( - RDM_PERSISTENT_IDENTIFIERS, - RDM_PARENT_PERSISTENT_IDENTIFIERS, - RDM_SEARCH -) +from invenio_rdm_records.config import (RDM_PARENT_PERSISTENT_IDENTIFIERS, + RDM_PERSISTENT_IDENTIFIERS) +from invenio_rdm_records.config import \ + RDM_RECORDS_IDENTIFIERS_SCHEMES as RDM_RECORDS_RELATED_IDENTIFIERS_SCHEMES +from invenio_rdm_records.config import (RDM_RECORDS_PERSONORG_SCHEMES, + RDM_SEARCH, always_valid) from invenio_rdm_records.notifications.vcs import ( RepositoryReleaseCommunityRequiredNotificationBuilder, RepositoryReleaseCommunitySubmittedNotificationBuilder, RepositoryReleaseFailureNotificationBuilder, RepositoryReleaseSuccessNotificationBuilder) -from invenio_rdm_records.services.request_policies import ( - FileModificationAdminPolicy, -) -from invenio_preservation_sync.utils import preservation_info_render -from invenio_cern_sync.users.profile import CERNUserProfileSchema -from invenio_oauthclient.views.client import auto_redirect_login -from invenio_cern_sync.sso import cern_remote_app_name, cern_keycloak - -from invenio_vocabularies.config import \ - VOCABULARIES_NAMES_SCHEMES as DEFAULT_VOCABULARIES_NAMES_SCHEMES - -from invenio_app_rdm.config import VOCABULARIES_DATASTREAM_READERS as DEFAULT_VOCABULARIES_DATASTREAM_READERS -from invenio_app_rdm.config import \ - VOCABULARIES_DATASTREAM_TRANSFORMERS as DEFAULT_VOCABULARIES_DATASTREAM_TRANSFORMERS -from invenio_app_rdm.config import \ - VOCABULARIES_DATASTREAM_WRITERS as DEFAULT_VOCABULARIES_DATASTREAM_WRITERS -from cds_rdm.clc_sync.services.components import ClcSyncComponent -from cds_rdm.components import CDSResourcePublication, CommitteeApprovalComponent, MintAlternateIdentifierComponent, SubjectsValidationComponent # PublicationInclusionComponent temporarily disabled -from cds_rdm.pids import validate_optional_doi_transitions -from cds_rdm.views import archive_link_render, frontpage_view_function, inspire_link_render -from cds_rdm.reviews.policy import CDSRecordVersionReviewPolicy +from invenio_rdm_records.proxies import \ + current_rdm_records_service as record_service +from invenio_rdm_records.resources.config import record_serializers +from invenio_rdm_records.services.components import DefaultRecordsComponents +from invenio_rdm_records.services.components.vcs import VCSComponent +from invenio_rdm_records.services.request_policies import \ + FileModificationAdminPolicy +from invenio_rdm_records.services.vcs.release import RDMVCSRelease +from invenio_records_resources.resources.records.headers import etag_headers +from invenio_records_resources.services.records.queryparser import ( + QueryParser, SearchFieldTransformer) from invenio_vcs.contrib.github import GitHubProviderFactory from invenio_vcs.contrib.gitlab import GitLabProviderFactory - -from invenio_app_rdm.config import APP_RDM_RECORD_EXPORTERS as RECORD_EXPORTERS +from invenio_vocabularies.config import \ + VOCABULARIES_NAMES_SCHEMES as DEFAULT_VOCABULARIES_NAMES_SCHEMES def _(x): # needed to avoid start time failure with lazy strings @@ -711,6 +704,13 @@ RDM_NAMESPACES = { RDM_CUSTOM_FIELDS = CUSTOM_FIELDS RDM_CUSTOM_FIELDS_UI = CUSTOM_FIELDS_UI +# Override the record serializers everywhere they are used with the CDS-specific +# BibTex serialization. +RDM_RECORDS_SERIALIZERS = { + **record_serializers, + "application/x-bibtex": ResponseHandler(CDSBibTexSerializer(), headers=etag_headers), +} + # Require files for user upload RDM_ALLOW_METADATA_ONLY_RECORDS = False @@ -971,14 +971,14 @@ _RECORD_EXPORTERS = { **RECORD_EXPORTERS, "bibtex": { "name": _("BibTeX (DOI for this version)"), - "serializer": ("invenio_rdm_records.resources.serializers:BibtexSerializer"), + "serializer": "cds_rdm.serializers.bibtex:CDSBibTexSerializer", "params": {}, "content-type": "application/x-bibtex", "filename": "{id}.bib", }, "bibtex-allversions": { "name": _("BibTeX (DOI for all versions)"), - "serializer": ("invenio_rdm_records.resources.serializers:BibtexSerializer"), + "serializer": "cds_rdm.serializers.bibtex:CDSBibTexSerializer", "params": {"schema_context": {"doi_all_versions": True}}, "content-type": "application/x-bibtex", "filename": "{id}-allversions.bib", diff --git a/site/cds_rdm/serializers/bibtex.py b/site/cds_rdm/serializers/bibtex.py new file mode 100644 index 00000000..9c1cfb86 --- /dev/null +++ b/site/cds_rdm/serializers/bibtex.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2026 CERN. +# +# CDS-RDM is free software; you can redistribute it and/or modify it under +# the terms of the GPL-2.0 License; see LICENSE file for more details. + +"""CDS overrides the BibText serializer.""" + +from flask_resources import BaseListSchema, MarshmallowSerializer +from flask_resources.serializers import SimpleSerializer +from invenio_rdm_records.resources.serializers import BibtexSerializer +from invenio_rdm_records.resources.serializers.bibtex.schema import BibTexSchema + + +class CDSBibTexSchema(BibTexSchema): + """CDS-specific BibTex schema.""" + + def get_venue(self, obj): + """Override of the `get_venue` method to support the list-based meeting custom field.""" + meeting = obj.get("custom_fields", {}).get("meeting:meeting", {}) + if isinstance(meeting, list): + if len(meeting) == 0: + return None + meeting = meeting[0] + return meeting.get("place") + + +class CDSBibTexSerializer(BibtexSerializer): + """CDS-specific BibTex serializer for records.""" + + def __init__(self, **options): + """Call MarshmallowSerializer directly (instead of super) to allow overriding object_schema_cls.""" + MarshmallowSerializer.__init__( + self, + format_serializer_cls=SimpleSerializer, + object_schema_cls=CDSBibTexSchema, + list_schema_cls=BaseListSchema, + encoder=self.bibtex_tostring, + **options, + )