invenio-vocabularies 4.1.1__py2.py3-none-any.whl → 4.2.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

@@ -10,6 +10,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "4.1.1"
+__version__ = "4.2.0"
 
 __all__ = ("__version__", "InvenioVocabularies")

invenio_vocabularies/administration/views/vocabularies.py

@@ -8,6 +8,7 @@
 # details.
 
 """Vocabularies admin interface."""
+
 from invenio_administration.views.base import (
     AdminResourceEditView,
     AdminResourceListView,

invenio_vocabularies/cli.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2021 CERN.
+# Copyright (C) 2020-2024 CERN.
 # Copyright (C) 2021 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
@@ -9,7 +9,6 @@
 
 """Commands to create and manage vocabularies."""
 
-
 import click
 from flask.cli import with_appcontext
 from invenio_access.permissions import system_identity
@@ -101,7 +100,10 @@ def update(vocabulary, filepath=None, origin=None):
     config = vc.get_config(filepath, origin)
 
     for w_conf in config["writers"]:
-        w_conf["args"]["update"] = True
+        if w_conf["type"] == "async":
+            w_conf["args"]["writer"]["args"]["update"] = True
+        else:
+            w_conf["args"]["update"] = True
 
     success, errored, filtered = _process_vocab(config)
 

invenio_vocabularies/config.py

@@ -24,7 +24,7 @@ from .datastreams.readers import (
     ZipReader,
 )
 from .datastreams.transformers import XMLTransformer
-from .datastreams.writers import ServiceWriter, YamlWriter
+from .datastreams.writers import AsyncWriter, ServiceWriter, YamlWriter
 from .resources import VocabulariesResourceConfig
 from .services.config import VocabulariesServiceConfig
 
@@ -134,6 +134,7 @@ VOCABULARIES_DATASTREAM_TRANSFORMERS = {
 VOCABULARIES_DATASTREAM_WRITERS = {
     "service": ServiceWriter,
     "yaml": YamlWriter,
+    "async": AsyncWriter,
 }
 """Data Streams writers."""
 

invenio_vocabularies/contrib/affiliations/api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2021-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,7 +8,6 @@
 
 """Vocabulary affiliations."""
 
-
 from .affiliations import record_type
 
 Affiliation = record_type.record_cls

invenio_vocabularies/contrib/affiliations/datastreams.py

@@ -9,11 +9,11 @@
 
 """Affiliations datastreams, transformers, writers and readers."""
 
-from invenio_access.permissions import system_identity
+from flask import current_app
 from invenio_i18n import lazy_gettext as _
 
 from ...datastreams.writers import ServiceWriter
-from .config import affiliation_schemes
+from ..common.ror.datastreams import RORTransformer
 
 
 class AffiliationsServiceWriter(ServiceWriter):
@@ -29,9 +29,35 @@ class AffiliationsServiceWriter(ServiceWriter):
         return entry["id"]
 
 
+class AffiliationsRORTransformer(RORTransformer):
+    """Affiliations ROR Transformer."""
+
+    def __init__(
+        self, *args, vocab_schemes=None, funder_fundref_doi_prefix=None, **kwargs
+    ):
+        """Constructor."""
+        if vocab_schemes is None:
+            vocab_schemes = current_app.config.get("VOCABULARIES_AFFILIATION_SCHEMES")
+        super().__init__(
+            *args,
+            vocab_schemes=vocab_schemes,
+            funder_fundref_doi_prefix=funder_fundref_doi_prefix,
+            **kwargs
+        )
+
+
+VOCABULARIES_DATASTREAM_READERS = {}
+"""Affiliations datastream readers."""
+
 VOCABULARIES_DATASTREAM_WRITERS = {
     "affiliations-service": AffiliationsServiceWriter,
 }
+"""Affiliations datastream writers."""
+
+VOCABULARIES_DATASTREAM_TRANSFORMERS = {
+    "ror-affiliations": AffiliationsRORTransformer,
+}
+"""Affiliations datastream transformers."""
 
 
 DATASTREAM_CONFIG = {
@@ -46,17 +72,16 @@ DATASTREAM_CONFIG = {
     ],
     "transformers": [
         {
-            "type": "ror",
-            "args": {
-                "vocab_schemes": affiliation_schemes,
-            },
+            "type": "ror-affiliations",
         },
     ],
     "writers": [
         {
-            "type": "affiliations-service",
+            "type": "async",
             "args": {
-                "identity": system_identity,
+                "writer": {
+                    "type": "affiliations-service",
+                }
             },
         }
     ],

invenio_vocabularies/contrib/affiliations/services.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2021-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,7 +8,6 @@
 
 """Vocabulary affiliations."""
 
-
 from .affiliations import record_type
 
 AffiliationsServiceConfig = record_type.service_config_cls

invenio_vocabularies/contrib/awards/awards.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022 CERN.
+# Copyright (C) 2022-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
 """Vocabulary awards."""
+
 from flask_resources import (
     BaseListSchema,
     JSONSerializer,

invenio_vocabularies/contrib/awards/datastreams.py

@@ -7,6 +7,7 @@
 # details.
 
 """Awards datastreams, transformers, writers and readers."""
+
 import io
 
 import requests

invenio_vocabularies/contrib/awards/services.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022 CERN.
+# Copyright (C) 2022-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,7 +8,6 @@
 
 """Vocabulary awards."""
 
-
 from .awards import record_type
 
 AwardsServiceConfig = record_type.service_config_cls

invenio_vocabularies/contrib/common/ror/datastreams.py

@@ -10,6 +10,7 @@
 """ROR-related Datastreams Readers/Writers/Transformers module."""
 
 import io
+from datetime import datetime
 
 import requests
 from idutils import normalize_ror
@@ -22,6 +23,11 @@ from invenio_vocabularies.datastreams.transformers import BaseTransformer
 class RORHTTPReader(BaseReader):
     """ROR HTTP Reader returning an in-memory binary stream of the latest ROR data dump ZIP file."""
 
+    def __init__(self, origin=None, mode="r", since=None, *args, **kwargs):
+        """Constructor."""
+        self._since = since
+        super().__init__(origin, mode, *args, **kwargs)
+
     def _iter(self, fp, *args, **kwargs):
         raise NotImplementedError(
             "RORHTTPReader downloads one file and therefore does not iterate through items"
@@ -34,15 +40,41 @@ class RORHTTPReader(BaseReader):
                 "RORHTTPReader does not support being chained after another reader"
             )
 
+        # Follow the DOI to get the link of the linkset
+        dataset_doi_link = "https://doi.org/10.5281/zenodo.6347574"
+        landing_page = requests.get(dataset_doi_link, allow_redirects=True)
+        landing_page.raise_for_status()
+
         # Call the signposting `linkset+json` endpoint for the Concept DOI (i.e. latest version) of the ROR data dump.
         # See: https://github.com/inveniosoftware/rfcs/blob/master/rfcs/rdm-0071-signposting.md#provide-an-applicationlinksetjson-endpoint
-        headers = {"Accept": "application/linkset+json"}
-        api_url = "https://zenodo.org/api/records/6347574"
-        api_resp = requests.get(api_url, headers=headers)
-        api_resp.raise_for_status()
+        if "linkset" not in landing_page.links:
+            raise ReaderError("Linkset not found in the ROR dataset record.")
+        linkset_response = requests.get(
+            landing_page.links["linkset"]["url"],
+            headers={"Accept": "application/linkset+json"},
+        )
+        linkset_response.raise_for_status()
+
+        if self._since:
+            for link in linkset_response.json()["linkset"]:
+                if "type" in link and link["type"] == "application/ld+json":
+                    json_ld_reponse = requests.get(
+                        link["anchor"], headers={"Accept": link["type"]}
+                    )
+                    json_ld_reponse.raise_for_status()
+
+                    # TODO Update to use dateCreated once the field is added to InvenioRDM. (https://github.com/inveniosoftware/invenio-rdm-records/issues/1777)
+                    last_dump_date = json_ld_reponse.json()["datePublished"]
+                    if datetime.fromisoformat(last_dump_date) < datetime.fromisoformat(
+                        self._since
+                    ):
+                        return
+                    break
+            else:
+                raise ReaderError("Couldn't find json-ld in publisher's linkset.")
 
         # Extract the Landing page Link Set Object located as the first (index 0) item.
-        landing_page_linkset = api_resp.json()["linkset"][0]
+        landing_page_linkset = linkset_response.json()["linkset"][0]
 
         # Extract the URL of the only ZIP file linked to the record.
         landing_page_zip_items = [
@@ -164,3 +196,5 @@ class RORTransformer(BaseTransformer):
 VOCABULARIES_DATASTREAM_TRANSFORMERS = {
     "ror": RORTransformer,
 }
+
+VOCABULARIES_DATASTREAM_WRITERS = {}

invenio_vocabularies/contrib/funders/datastreams.py

@@ -9,12 +9,11 @@
 
 """Funders datastreams, transformers, writers and readers."""
 
-from idutils import normalize_ror
-from invenio_access.permissions import system_identity
+from flask import current_app
 from invenio_i18n import lazy_gettext as _
 
 from ...datastreams.writers import ServiceWriter
-from .config import funder_fundref_doi_prefix, funder_schemes
+from ..common.ror.datastreams import RORTransformer
 
 
 class FundersServiceWriter(ServiceWriter):
@@ -30,10 +29,40 @@ class FundersServiceWriter(ServiceWriter):
         return entry["id"]
 
 
+class FundersRORTransformer(RORTransformer):
+    """Funders ROR Transformer."""
+
+    def __init__(
+        self, *args, vocab_schemes=None, funder_fundref_doi_prefix=None, **kwargs
+    ):
+        """Constructor."""
+        if vocab_schemes is None:
+            vocab_schemes = current_app.config.get("VOCABULARIES_FUNDER_SCHEMES")
+        if funder_fundref_doi_prefix is None:
+            funder_fundref_doi_prefix = current_app.config.get(
+                "VOCABULARIES_FUNDER_DOI_PREFIX"
+            )
+        super().__init__(
+            *args,
+            vocab_schemes=vocab_schemes,
+            funder_fundref_doi_prefix=funder_fundref_doi_prefix,
+            **kwargs
+        )
+
+
+VOCABULARIES_DATASTREAM_READERS = {}
+"""Funders datastreams writers."""
+
 VOCABULARIES_DATASTREAM_WRITERS = {
     "funders-service": FundersServiceWriter,
 }
-"""Funders Data Streams transformers."""
+"""Funders datastreams writers."""
+
+
+VOCABULARIES_DATASTREAM_TRANSFORMERS = {
+    "ror-funders": FundersRORTransformer,
+}
+"""Funders datastreams transformers."""
 
 
 DATASTREAM_CONFIG = {
@@ -48,18 +77,16 @@ DATASTREAM_CONFIG = {
     ],
     "transformers": [
         {
-            "type": "ror",
-            "args": {
-                "vocab_schemes": funder_schemes,
-                "funder_fundref_doi_prefix": funder_fundref_doi_prefix,
-            },
+            "type": "ror-funders",
         },
     ],
     "writers": [
         {
-            "type": "funders-service",
+            "type": "async",
             "args": {
-                "identity": system_identity,
+                "writer": {
+                    "type": "funders-service",
+                }
             },
         }
     ],

invenio_vocabularies/contrib/funders/funders.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2022 CERN.
+# Copyright (C) 2022-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 
 """Vocabulary funders."""
+
 from flask_resources import (
     BaseListSchema,
     JSONSerializer,

invenio_vocabularies/datastreams/readers.py

@@ -270,19 +270,38 @@ class OAIPMHReader(BaseReader):
                     self.xml.find(f".//{self._oai_namespace}metadata").getchildren()[0],
                 )
 
-        scythe.class_mapping["ListRecords"] = OAIRecord
-        try:
-            records = scythe.list_records(
-                from_=self._from,
-                until=self._until,
-                metadata_prefix=self._metadata_prefix,
-                set_=self._set,
-                ignore_deleted=True,
-            )
-            for record in records:
-                yield {"record": record}
-        except oaipmh_scythe.NoRecordsMatch:
-            raise ReaderError(f"No records found in OAI-PMH request.")
+        if self._verb == "ListRecords":
+            scythe.class_mapping["ListRecords"] = OAIRecord
+            try:
+                records = scythe.list_records(
+                    from_=self._from,
+                    until=self._until,
+                    metadata_prefix=self._metadata_prefix,
+                    set_=self._set,
+                    ignore_deleted=True,
+                )
+                for record in records:
+                    yield {"record": record}
+            except oaipmh_scythe.NoRecordsMatch:
+                raise ReaderError("No records found in OAI-PMH request.")
+        else:
+            scythe.class_mapping["GetRecord"] = OAIRecord
+            try:
+                headers = scythe.list_identifiers(
+                    from_=self._from,
+                    until=self._until,
+                    metadata_prefix=self._metadata_prefix,
+                    set_=self._set,
+                    ignore_deleted=True,
+                )
+                for header in headers:
+                    record = scythe.get_record(
+                        identifier=header.identifier,
+                        metadata_prefix=self._metadata_prefix,
+                    )
+                    yield {"record": record}
+            except oaipmh_scythe.NoRecordsMatch:
+                raise ReaderError("No records found in OAI-PMH request.")
 
     def read(self, item=None, *args, **kwargs):
         """Reads from item or opens the file descriptor from origin."""

invenio_vocabularies/datastreams/tasks.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2022-2024 CERN.
+#
+# Invenio-Vocabularies is free software; you can redistribute it and/or
+# modify it under the terms of the MIT License; see LICENSE file for more
+# details.
+
+"""Data Streams Celery tasks."""
+
+from celery import shared_task
+
+from ..datastreams import StreamEntry
+from ..datastreams.factories import WriterFactory
+
+
+@shared_task(ignore_result=True)
+def write_entry(writer, entry):
+    """Write an entry.
+
+    :param writer: writer configuration as accepted by the WriterFactory.
+    :param entry: dictionary, StreamEntry is not serializable.
+    """
+    writer = WriterFactory.create(config=writer)
+    writer.write(StreamEntry(entry))

invenio_vocabularies/datastreams/writers.py

@@ -20,6 +20,7 @@ from marshmallow import ValidationError
 
 from .datastreams import StreamEntry
 from .errors import WriterError
+from .tasks import write_entry
 
 
 class BaseWriter(ABC):
@@ -106,3 +107,21 @@ class YamlWriter(BaseWriter):
             yaml.safe_dump([stream_entry.entry], file, allow_unicode=True)
 
         return stream_entry
+
+
+class AsyncWriter(BaseWriter):
+    """Writes the entries asynchronously (celery task)."""
+
+    def __init__(self, writer, *args, **kwargs):
+        """Constructor.
+
+        :param writer: writer to use.
+        """
+        self._writer = writer
+        super().__init__(*args, **kwargs)
+
+    def write(self, stream_entry, *args, **kwargs):
+        """Launches a celery task to write an entry."""
+        write_entry.delay(self._writer, stream_entry.entry)
+
+        return stream_entry

invenio_vocabularies/factories.py

@@ -7,6 +7,7 @@
 # modify it under the terms of the MIT License; see LICENSE file for more
 # details.
 """Generate Vocabulary Config."""
+
 from copy import deepcopy
 
 import yaml

invenio_vocabularies/records/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2021 CERN.
+# Copyright (C) 2020-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -79,9 +79,7 @@ class VocabularyScheme(db.Model):
         """Create a new vocabulary subtype."""
         banned = [",", ":"]
         for b in banned:
-            assert (
-                b not in data["id"]
-            ), f"No '{b}' allowed in VocabularyScheme.id"  # noqa
+            assert b not in data["id"], f"No '{b}' allowed in VocabularyScheme.id"
 
         with db.session.begin_nested():
             obj = cls(**data)

invenio_vocabularies/records/pidprovider.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2021-2024 CERN.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,7 +8,6 @@
 
 """Persistent identifier provider for vocabularies."""
 
-
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.base import BaseProvider
 

invenio_vocabularies/resources/__init__.py

@@ -7,6 +7,7 @@
 # details.
 
 """Resources module."""
+
 from invenio_vocabularies.resources.schema import L10NString, VocabularyL10Schema
 
 from .config import VocabulariesResourceConfig, VocabularyTypeResourceConfig

invenio_vocabularies/resources/schema.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2021 CERN.
+# Copyright (C) 2020-2024 CERN.
 # Copyright (C) 2021 Northwestern University.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
@@ -8,6 +8,7 @@
 # details.
 
 """Vocabulary resource schema."""
+
 from marshmallow import Schema, fields
 
 from invenio_vocabularies.resources.serializer import L10NString

invenio_vocabularies/services/custom_fields/subject.py

@@ -7,6 +7,7 @@
 
 
 """Custom fields."""
+
 from invenio_i18n import lazy_gettext as _
 
 from ...contrib.subjects.api import Subject
@@ -25,7 +26,7 @@ class SubjectCF(VocabularyCF):
             vocabulary_id="subjects",
             schema=SubjectRelationSchema,
             ui_schema=SubjectRelationSchema,
-            **kwargs
+            **kwargs,
         )
         self.pid_field = Subject.pid
 

invenio_vocabularies/services/custom_fields/vocabulary.py

@@ -39,7 +39,7 @@ class VocabularyCF(BaseCF):
         sort_by=None,
         schema=VocabularyRelationSchema,
         ui_schema=VocabularyL10NItemSchema,
-        **kwargs
+        **kwargs,
     ):
         """Constructor."""
         super().__init__(name, **kwargs)

invenio_vocabularies/services/tasks.py

@@ -11,7 +11,6 @@ from celery import shared_task
 from flask import current_app
 
 from ..datastreams.factories import DataStreamFactory
-from ..factories import get_vocabulary_config
 
 
 @shared_task(ignore_result=True)
@@ -27,32 +26,3 @@ def process_datastream(config):
         if result.errors:
             for err in result.errors:
                 current_app.logger.error(err)
-
-
-@shared_task()
-def import_funders():
-    """Import the funders vocabulary.
-
-    Only new records are imported.
-    Existing records are not updated.
-    """
-    vc = get_vocabulary_config("funders")
-    config = vc.get_config()
-
-    # When importing funders via a Celery task, make sure that we are automatically downloading the ROR file,
-    # instead of relying on a local file on the file system.
-    if config["readers"][0]["type"] == "ror-http":
-        readers_config_with_ror_http = config["readers"]
-    else:
-        readers_config_with_ror_http = [{"type": "ror-http"}] + config["readers"]
-
-    ds = DataStreamFactory.create(
-        readers_config=readers_config_with_ror_http,
-        transformers_config=config.get("transformers"),
-        writers_config=config["writers"],
-    )
-
-    for result in ds.process():
-        if result.errors:
-            for err in result.errors:
-                current_app.logger.exception(err)

{invenio_vocabularies-4.1.1.dist-info → invenio_vocabularies-4.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 4.1.1
+Version: 4.2.0
 Summary: "Invenio module for managing vocabularies."
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -78,6 +78,14 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version v4.2.0 (released 2024-07-24)
+
+- ror: check last update; use ld+json for metadata (#367)
+- tasks: remove import funders task
+- funders: add and export custom transformer
+- affiliations: add and export custom transformer
+- datastreams: implement asynchronous writer
+
 Version v4.1.1 (released 2024-07-15)
 
 - installation: use invenio-oaipmh-scythe from PyPI

{invenio_vocabularies-4.1.1.dist-info → invenio_vocabularies-4.2.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-invenio_vocabularies/__init__.py,sha256=IfTJAejqD10k4V3mLdn1Kxt4hLZnARmLmBqRXgIrJ3o,377
-invenio_vocabularies/cli.py,sha256=9Gfm3jjNDX3oQnYXupxSuqwXvWnJmsQ9GmyekJ1h5Kg,5239
-invenio_vocabularies/config.py,sha256=o-SdebM5eZMTnpGjrwoGzeQ60q73anLBJ1n1T3mTO38,4458
+invenio_vocabularies/__init__.py,sha256=fOsOa6766lKWONOkvvx15eYhnKovuRiq9tWwrXh_5HI,377
+invenio_vocabularies/cli.py,sha256=0PpQttop3lTXxM29IpY70MXFFPhb9apbiutdb7WDBvw,5356
+invenio_vocabularies/config.py,sha256=f3J658yL7E0ShFN99Jq2q1b5AJF1lDeiDyzijDmh8qA,4497
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
-invenio_vocabularies/factories.py,sha256=r7rg9JeXe4q0cTYA20beC_2_9mYCKZJZleiU2rtwoY4,2902
+invenio_vocabularies/factories.py,sha256=JBvvhg5f47Cy9cJZ1-OBalh750ErycwstLj1e9Gn4W8,2903
 invenio_vocabularies/fixtures.py,sha256=nNWwH04HFASjfj1oy5kMdcQGKmVjzUuA5wSw-ER1QAg,1585
 invenio_vocabularies/proxies.py,sha256=k7cTUgWfnCoYIuNqAj_VFi1zBN33KNNclRSVnBkObEM,711
 invenio_vocabularies/views.py,sha256=PNJ5nvc3O7ASwNe56xmqy5YaU9n3UYF3W2JwvtE_kYs,1561
 invenio_vocabularies/webpack.py,sha256=aLRm0ut3rXPb8D87pVA9mO_ODq7WOSZdsJQyU4iMLoI,1891
 invenio_vocabularies/administration/__init__.py,sha256=0bDp2Aw8aZth7C-q9Xn9rxeCUQQRoIUxoWWWwPvKbXA,308
 invenio_vocabularies/administration/views/__init__.py,sha256=31DP4jLG6q4HQlzSRiGLPxUjHPUCCl4N34y4XMuPP6g,313
-invenio_vocabularies/administration/views/vocabularies.py,sha256=9TOVAGMsMRufH9RglxQbKG1ylvuGX1ttlLGQ4G48H88,1289
+invenio_vocabularies/administration/views/vocabularies.py,sha256=JyKr1OYF9DO89zvWCNOtNfClO_QptdHdjvgY1kkImnw,1290
 invenio_vocabularies/alembic/17c703ce1eb7_create_names_table.py,sha256=2QGs0Ofi6yd93VzIBqghNi47hrZtuLf0DylKyvVzskI,1572
 invenio_vocabularies/alembic/4a9a4fd235f8_create_vocabulary_schemes.py,sha256=Ywtp8qOFcI3PxUXemHdvy_VwdcUVtMFV1sFgNAmYrms,1054
 invenio_vocabularies/alembic/4f365fced43f_create_vocabularies_tables.py,sha256=jSrr0CLRchYADjkFeod0L-oophq2woXtRwbUU5Vytiw,3039
@@ -44,14 +44,14 @@ invenio_vocabularies/assets/semantic-ui/translations/invenio_vocabularies/script
 invenio_vocabularies/contrib/__init__.py,sha256=C5eDia6tAVBCrbb5hd_KnxmczyBoF87NIBUCLID-Tzc,240
 invenio_vocabularies/contrib/affiliations/__init__.py,sha256=rV8YAzBRoSKsBYcVjCNJh6j7ITuPRfurwj9HJHRjkN8,565
 invenio_vocabularies/contrib/affiliations/affiliations.py,sha256=Ph0z7bT_tudsWDKFaiksCBngsG-eO6Xpbe3KdejfLXI,1591
-invenio_vocabularies/contrib/affiliations/api.py,sha256=-NrA_aYxabvNMofYCnrDZ2bLP15HGDTvvhHTDuXNg-g,322
+invenio_vocabularies/contrib/affiliations/api.py,sha256=5nIOvpfcseuAAg2XgblHc8jb7TAdfU79XOBRpL-p398,326
 invenio_vocabularies/contrib/affiliations/config.py,sha256=u1sHeihy0B0e6w5e3HsbrC9e8A4WTLKCYPXUdcX-ZTs,1605
-invenio_vocabularies/contrib/affiliations/datastreams.py,sha256=tACDv4dHcNr6d9EAi9iyoVH0z-6AakGhMy4_6eUMYYY,1650
+invenio_vocabularies/contrib/affiliations/datastreams.py,sha256=oojLIh9jCE8zr0dj8KFepxPqsOn2SBSXQsX8L3XwFxs,2383
 invenio_vocabularies/contrib/affiliations/facets.py,sha256=w316MGvtdyTpRCPOpCEmMxxLraRkbFFb1VvLkFlEc9o,1229
 invenio_vocabularies/contrib/affiliations/models.py,sha256=JUcj-1ydc2Cw2Rsc24JwXE3TFBJ_6fivhUYhGq4rT8A,329
 invenio_vocabularies/contrib/affiliations/resources.py,sha256=DBEbRxQmp-o-PeZlgFG588Q4sGcruuwIL8L9O-SzCes,435
 invenio_vocabularies/contrib/affiliations/schema.py,sha256=O4s6aHcO1w4_aAfGuYLx_eLS6nctd6ktyIuHB6dMKqw,1842
-invenio_vocabularies/contrib/affiliations/services.py,sha256=C_6cMnh3mnL3-xxdsb16Rvm2aK4FyiaQ_qUTGylCwjo,391
+invenio_vocabularies/contrib/affiliations/services.py,sha256=KJbv46c2LuQOW3xz7KVLtfZjWR8vhMRPHninlUEhrss,395
 invenio_vocabularies/contrib/affiliations/jsonschemas/__init__.py,sha256=ILyZ5kejTr0p50macMBPALQCTJSe4KEE3_cgf2p3zV4,252
 invenio_vocabularies/contrib/affiliations/jsonschemas/affiliations/affiliation-v1.0.0.json,sha256=be-glRNIBtIO87Tcyw8d68OdG4J8-ojjiCj8UJBnckg,1649
 invenio_vocabularies/contrib/affiliations/mappings/__init__.py,sha256=q7hb9lcT9KLRSGr6G7qpL8Top6wZfzj_E4uzGxnraTw,295
@@ -63,14 +63,14 @@ invenio_vocabularies/contrib/affiliations/mappings/v7/__init__.py,sha256=zr9YyyK
 invenio_vocabularies/contrib/affiliations/mappings/v7/affiliations/affiliation-v1.0.0.json,sha256=PaHChFsf9r7xRnZ_7ro8SWNEXpWv4uUYrl32g0QESZs,2096
 invenio_vocabularies/contrib/awards/__init__.py,sha256=KwCmwFalz-3pDs9iTa5TKUidBjLepnUMqpCBXRiQOO8,474
 invenio_vocabularies/contrib/awards/api.py,sha256=OXukE7PLXs45BTtqVrhvGBNqLmQaI-CgXmHTCi36LZk,303
-invenio_vocabularies/contrib/awards/awards.py,sha256=N-BNE2ffUu-IlfKFBjMjfYqxL0vmpO8YMPe4q4e-rTo,2695
+invenio_vocabularies/contrib/awards/awards.py,sha256=FU7XKSsfEIqaQYyCFjPMDbD2z-lwGsicuLXg69HO6oE,2701
 invenio_vocabularies/contrib/awards/config.py,sha256=PlDHabkWDUzwa1Fvk_U2hG83kQYBqM1IyChg8Yg_VlY,1630
-invenio_vocabularies/contrib/awards/datastreams.py,sha256=4BRifAmmEw0fUxo9JK5ZUXfSrSv1wllPvuGVOfick54,8244
+invenio_vocabularies/contrib/awards/datastreams.py,sha256=wQIhLGXSYCIjwXzTofpiaSjnO1XuDpiOlH5TqiGix4c,8245
 invenio_vocabularies/contrib/awards/models.py,sha256=mM-kSNf7kDH3oIbV8epxxbUi7muYqi4JreXxgWXlVzw,318
 invenio_vocabularies/contrib/awards/resources.py,sha256=_9YTqbhz8axFXGhG5y4WyjE27p9n-7e3c6HoBRditPA,411
 invenio_vocabularies/contrib/awards/schema.py,sha256=bg-09nvhEn-ipzaztK1iNbKc59saAM8v8hAW9zpKDAc,2786
 invenio_vocabularies/contrib/awards/serializer.py,sha256=MDnq41EJf_LFu-UT6qlB3-O2S7aEYePIzQ_immMnwag,1139
-invenio_vocabularies/contrib/awards/services.py,sha256=oExHPYgXgege9a7oLCK4LGb8FXCHfY0ekeS9HvTJLxs,367
+invenio_vocabularies/contrib/awards/services.py,sha256=zwOMHqa4SyZuHopGZwEKhfw3kUHrWg73_4zMNo5kOe4,371
 invenio_vocabularies/contrib/awards/jsonschemas/__init__.py,sha256=XB2l9hr53vqTk7o9lmy18FWGhHEUvNHu8D6nMF8Bz4k,246
 invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json,sha256=XKHjWWmv7Ph6v-JxPsP09V_6Pr9QNJcJeZdaU5HZWwU,1117
 invenio_vocabularies/contrib/awards/mappings/__init__.py,sha256=PbM5urjiSrJSx4Ak-H_lJrOOVKGT38MrGgRv61gIbAM,243
@@ -82,13 +82,13 @@ invenio_vocabularies/contrib/awards/mappings/v7/__init__.py,sha256=fERdPp7K7ajao
 invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json,sha256=QJT2gS7SE47YTP2HdU4ESjMwHJBTzAH70JEhWWg9SXM,1528
 invenio_vocabularies/contrib/common/__init__.py,sha256=DdbGYRthEpQtObhY_YK4vOT9Zf7FFagQ6qtUjJOYw-M,247
 invenio_vocabularies/contrib/common/ror/__init__.py,sha256=3u2-fre1SQ-4nz3Ay0nxj3ntmMZ8Ujh_4eV-fyxfmtc,239
-invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=Yb671-LGDmzhhBDYIp0B5eQt56RVnx3Tq1Z_NO3KncM,6359
+invenio_vocabularies/contrib/common/ror/datastreams.py,sha256=joEiJwYawEaUggOZAQF6JrP8jHPfnAHmocK07nLMbO0,7893
 invenio_vocabularies/contrib/funders/__init__.py,sha256=YxFXBDnT7NM8rFwxT_Ge3xXR2n17EM0alknQq7r_Bt8,478
 invenio_vocabularies/contrib/funders/api.py,sha256=QKGGeSnPHSoBfucvpaVruXT_txYidofZ080G3IxFkIo,306
 invenio_vocabularies/contrib/funders/config.py,sha256=BbzCRIcPxSwDllhjnGmdec5A126Zs1I4ZyVUCGi3jRA,1756
-invenio_vocabularies/contrib/funders/datastreams.py,sha256=H-32oCR8BmtT4MRlFZHowT7axwV3dgycrPYKlmsZZec,1779
+invenio_vocabularies/contrib/funders/datastreams.py,sha256=G3UBT_kXei08zAKD44oaeERbkCVkJ9q9pFUoXpk3yiQ,2480
 invenio_vocabularies/contrib/funders/facets.py,sha256=a068TVtt74Ncu0latb177LFK8EdnpbMOWecAKozA04M,1245
-invenio_vocabularies/contrib/funders/funders.py,sha256=nHqUoyRRW9oruN-ghmwzb9QIz_jyBgxNUpk41yvcso8,2292
+invenio_vocabularies/contrib/funders/funders.py,sha256=KtUydQzQZPKtT1YMbBSIRcGc2eBmdkk5Zqavo54zK1E,2298
 invenio_vocabularies/contrib/funders/models.py,sha256=RAU-_YVOUNVCn03_XGJ2czcVwXTaZPk5w7X_bMAgMOk,314
 invenio_vocabularies/contrib/funders/resources.py,sha256=He4gXd737ovdrHL-HB9dX7AGxp1BVJ9QteIO7JWUVSE,415
 invenio_vocabularies/contrib/funders/schema.py,sha256=tEOdMU2i0z_3PkXL1yD1qIJeoAy_8n22xxv8V7iltz0,2480
@@ -143,14 +143,15 @@ invenio_vocabularies/datastreams/__init__.py,sha256=VPefh6k4Q3eYxKIW8I5zXUGucntp
 invenio_vocabularies/datastreams/datastreams.py,sha256=_jSXv2yAvSjt8btMoLJlqXOkqBzYb3Xe9m2GH50Nwag,3987
 invenio_vocabularies/datastreams/errors.py,sha256=IDUZ3gNtYGrhcOgApHCms1gNNJTyJzoMPmG5JtIeYNU,678
 invenio_vocabularies/datastreams/factories.py,sha256=H8a2gAy7KNImtdCdtqpVKC5gIvE3ON6U1Wn1_zaMlQ4,2181
-invenio_vocabularies/datastreams/readers.py,sha256=e-fkgjDqyUUgwpLF8ihxYChaZxGjAFLiA3J39Drt0PU,9978
+invenio_vocabularies/datastreams/readers.py,sha256=9WypPQFGWEIKcrra6oC8yxdGzVG3utd3CtrGx-AUxLM,10834
+invenio_vocabularies/datastreams/tasks.py,sha256=V3bm8ebdaB1tkrZWR1DuCscxSzP-O5maZecPkOF3Dyw,694
 invenio_vocabularies/datastreams/transformers.py,sha256=wspny-kazYMRHjkkyFfRVNIYzJxbjAqokRCBQ_-gXcY,1357
-invenio_vocabularies/datastreams/writers.py,sha256=y8AIYXdwQLmmTjuckVqOnp3KKtKWX2bOabM12LxTvOQ,3635
+invenio_vocabularies/datastreams/writers.py,sha256=UkrPOKyAOu8SsNyxBgdxYelCtPcBab6kbaIw-swVxlw,4153
 invenio_vocabularies/datastreams/xml.py,sha256=HFa-lfxj7kFrr2IjeN1jxSLDfcvpBwO9nZLZF2-BryE,997
 invenio_vocabularies/records/__init__.py,sha256=Uj7O6fYdAtLOkLXUGSAYPADBB7aqP4yVs9b6OAjA158,243
 invenio_vocabularies/records/api.py,sha256=Lynt6Sz4BVN1orh0zgJ5ljhnUobEtcq8c22PmSeUo2U,1494
-invenio_vocabularies/records/models.py,sha256=0zOciiWY3EsEm_lNVtFecip0qgCg9JjhXoJDllrZFnc,2500
-invenio_vocabularies/records/pidprovider.py,sha256=ByUwsZKimRv2QlbMdJmhCejmJd2sIqwt8fISWW6aW8g,3836
+invenio_vocabularies/records/models.py,sha256=36CxObDMe-D9hoGaelAlR4ggZZTyXgRmCWPxZRpWF5w,2460
+invenio_vocabularies/records/pidprovider.py,sha256=uFuo-M0Wqua0QhTS2z17YpzYDySwNfJaOi7rp0S0dPs,3840
 invenio_vocabularies/records/jsonschemas/__init__.py,sha256=qr2BZMyMVvVRSeJzPCI8re2BlGokiDjeqwREkythSrQ,246
 invenio_vocabularies/records/jsonschemas/vocabularies/definitions-v1.0.0.json,sha256=1qTs-Liji01HMitT8768urX3BhYXZmHWUGqV8VmOotU,372
 invenio_vocabularies/records/jsonschemas/vocabularies/vocabulary-v1.0.0.json,sha256=x7kkCkuMNQ6tygb_RWf7QOlOtyG-kqKOH5FNnBn1cqo,1289
@@ -164,10 +165,10 @@ invenio_vocabularies/records/mappings/v7/vocabularies/vocabulary-v1.0.0.json,sha
 invenio_vocabularies/records/systemfields/__init__.py,sha256=MRLoLF3h8VYuqJ9tbbgXjXkTDUniz24pVnujLX-psZI,406
 invenio_vocabularies/records/systemfields/pid.py,sha256=5e2zZD0uHP5r32--KmuzjfHk3B5GXEV3yBuoKeit9mQ,3740
 invenio_vocabularies/records/systemfields/relations.py,sha256=UbaiuxvAZorxNN4t63Y5ePc5OUJ_cYGAxLsFcET3E-g,1528
-invenio_vocabularies/resources/__init__.py,sha256=pbgT2lfm2pihPFk9Zd2dU3URgjWsVMGfPd3yWTfRzkw,663
+invenio_vocabularies/resources/__init__.py,sha256=UpNMJA1JacoJ2U1_dq20sds3lJK1TyMCV4zLOWpfRvI,664
 invenio_vocabularies/resources/config.py,sha256=PooKsBd3KXoApc9zoSk-fkeQhzygYdGU4lH5FgQ3W2Q,3157
 invenio_vocabularies/resources/resource.py,sha256=hJs5GD0XtcBafwgTI9n8FHK5Fb6agx8BgzF81K5vRbU,4229
-invenio_vocabularies/resources/schema.py,sha256=B_Y7uOSfVlogUmiDZfRpa3EWx1VJmbrzTtLachv8yEw,541
+invenio_vocabularies/resources/schema.py,sha256=6stpU9qgLGoeGib3DWnyrHj6XLPxJKbEV7TVoJEK41M,542
 invenio_vocabularies/resources/serializer.py,sha256=pwfckLdkMu1MNDkocyMg1XeX6RhbfeuV4fjDO5xKDxo,1190
 invenio_vocabularies/services/__init__.py,sha256=6mi62EG21Id6x23nx0X193I6sVTakK6jOdYNEKPxXUk,522
 invenio_vocabularies/services/components.py,sha256=d9C-24dEDM63gFm75nU-dXrrjS2zZi7Nfkv40BGnHwM,1941
@@ -178,10 +179,10 @@ invenio_vocabularies/services/querystr.py,sha256=X3JHVF9B0O0iLWrnW3ok_bf_8jA-Cs_
 invenio_vocabularies/services/results.py,sha256=6LZIpzWSbt9wpRNWgjA1uIM4RFooOYTkHcp5-PnIJdU,3767
 invenio_vocabularies/services/schema.py,sha256=mwIBFylpQlWw1M6h_axc-z4Yd7X3Z1S0PxJOlZGpfrQ,4634
 invenio_vocabularies/services/service.py,sha256=rUPeb86Jv2WXzRp-RZDHLWsouCmJcqHpCmgrpLm2Vs4,6387
-invenio_vocabularies/services/tasks.py,sha256=Z_riU6kEsuAo1xdyYcrgPL7Y9hKPOGSMLPWYee49vSo,1776
+invenio_vocabularies/services/tasks.py,sha256=AH0XifkOypsEdh8LyjmlHnPLQK5qqUJC8cNVWGkbqks,788
 invenio_vocabularies/services/custom_fields/__init__.py,sha256=QgvSsn-S1xLzbZ57pjjGTt5oI3HqzXHVjwGTtuPgzN8,421
-invenio_vocabularies/services/custom_fields/subject.py,sha256=k-qXbCjXPTk-Xo_W5sojFpQbkntv50odROiNyJHMzL8,2234
-invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=eCvqrNloMMCCvqR49IQwzk2p4xapx5_bmQhd6ByJZFM,3019
+invenio_vocabularies/services/custom_fields/subject.py,sha256=TrtmRgk3Vj_NxmDhC_7sM8MAIje4AGXBxYIk7nIgt0o,2236
+invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=oQwI8Aoi2Nr9k3eWKnde5H7RXc7qdlATSeI6coy8UR0,3020
 invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/subjects.html,sha256=h9syHkwZ6ltgjWw_0M5UoR6h6Re2imJ7uQ6M6peOyhk,686
 invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/vocabularies-list.html,sha256=-gDwRctqIkSzh9ial8zfbA4o41ARM-Mq-THkcJ87U00,359
 invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/vocabulary-details.html,sha256=2dfQzRFl5RwUwle245sxWGnObwJQXr-e_bBzpe_PkkA,2684
@@ -280,10 +281,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=g1I5aNO8r
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=cqSm8NtMAwrP9O6qbmtkDtRT1e9D93qpsJN5X9_PPVw,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-4.1.1.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-4.1.1.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-4.1.1.dist-info/METADATA,sha256=so4EirpouCKXf84mwYhjdyHsj_iku-y9c16mn112qEc,7894
-invenio_vocabularies-4.1.1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-invenio_vocabularies-4.1.1.dist-info/entry_points.txt,sha256=qHHFkyU3r0COsKm5gCYuhP8tfsioBggxKAiEXNAbbjM,2803
-invenio_vocabularies-4.1.1.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-4.1.1.dist-info/RECORD,,
+invenio_vocabularies-4.2.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-4.2.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-4.2.0.dist-info/METADATA,sha256=2pdaEFZ5Z35PmaNmdeuq-TDu0P1X8KCeyUhZh6NvW-0,8167
+invenio_vocabularies-4.2.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+invenio_vocabularies-4.2.0.dist-info/entry_points.txt,sha256=qHHFkyU3r0COsKm5gCYuhP8tfsioBggxKAiEXNAbbjM,2803
+invenio_vocabularies-4.2.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-4.2.0.dist-info/RECORD,,