invenio-vocabularies 1.6.0__py2.py3-none-any.whl → 2.0.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

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

invenio_vocabularies/alembic/55a700f897b6_add_names_and_afiliations_pid_column.py

@@ -0,0 +1,96 @@
+#
+# This file is part of Invenio.
+# Copyright (C) 2023 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Add "pid" column to names and affiliations tables."""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "55a700f897b6"
+down_revision = "e1146238edd3"
+branch_labels = ()
+depends_on = None
+
+
+pids_table = sa.sql.table(
+    "pidstore_pid",
+    sa.sql.column("pid_type"),
+    sa.sql.column("pid_value"),
+    sa.sql.column("object_uuid"),
+    sa.sql.column("object_type"),
+)
+names_table = sa.sql.table(
+    "name_metadata",
+    sa.sql.column("id"),
+    sa.sql.column("pid"),
+)
+affiliations_table = sa.sql.table(
+    "affiliation_metadata",
+    sa.sql.column("id"),
+    sa.sql.column("pid"),
+)
+
+
+def upgrade():
+    """Upgrade database."""
+    op.add_column(
+        "name_metadata",
+        sa.Column("pid", sa.String(255), nullable=True),
+    )
+    # populate from PIDStore
+    op.execute(
+        names_table.update()
+        .where(
+            names_table.c.id == pids_table.c.object_uuid,
+            pids_table.c.object_type == "rec",
+            pids_table.c.pid_type == "names",
+        )
+        .values(pid=pids_table.c.pid_value)
+    )
+    op.create_unique_constraint(
+        op.f("uq_name_metadata_pid"),
+        "name_metadata",
+        ["pid"],
+    )
+
+    op.add_column(
+        "affiliation_metadata",
+        sa.Column("pid", sa.String(255), nullable=True),
+    )
+    # populate from PIDStore
+    op.execute(
+        affiliations_table.update()
+        .where(
+            affiliations_table.c.id == pids_table.c.object_uuid,
+            pids_table.c.object_type == "rec",
+            pids_table.c.pid_type == "aff",
+        )
+        .values(pid=pids_table.c.pid_value)
+    )
+
+    op.create_unique_constraint(
+        op.f("uq_affiliation_metadata_pid"),
+        "affiliation_metadata",
+        ["pid"],
+    )
+
+
+def downgrade():
+    """Downgrade database."""
+    op.drop_constraint(
+        op.f("uq_name_metadata_pid"),
+        "name_metadata",
+        type_="unique",
+    )
+    op.drop_constraint(
+        op.f("uq_affiliation_metadata_pid"),
+        "affiliation_metadata",
+        type_="unique",
+    )
+    op.drop_column("name_metadata", "pid")
+    op.drop_column("affiliation_metadata", "pid")

invenio_vocabularies/config.py

@@ -62,15 +62,18 @@ VOCABULARIES_AWARD_SCHEMES = {
 """Awards allowed identifier schemes."""
 
 VOCABULARIES_AWARDS_OPENAIRE_FUNDERS = {
-    "anr_________": "00rbzpz17",
     "aka_________": "05k73zm37",
+    "anr_________": "00rbzpz17",
     "arc_________": "05mmh0f86",
+    "asap________": "03zj4c476",
     "cihr________": "01gavpb45",
     "corda_______": "00k4n6c32",
+    "corda_____he": "00k4n6c32",
     "corda__h2020": "00k4n6c32",
     "euenvagency_": "02k4b9v70",
     "fct_________": "00snfqn58",
     "fwf_________": "013tf3c58",
+    "inca________": "03m8vkq32",
     "irb_hr______": "03n51vw80",
     "mestd_______": "01znas443",
     "nhmrc_______": "011kf5r70",
@@ -78,12 +81,12 @@ VOCABULARIES_AWARDS_OPENAIRE_FUNDERS = {
     "nserc_______": "01h531d29",
     "nsf_________": "021nxhr62",
     "nwo_________": "04jsz6e67",
-    "rcuk________": "10.13039/501100000690",
-    "ukri________": "001aqnf71",
+    "rcuk________": "00dq2kk65",  # deprecated funder org
     "sfi_________": "0271asj38",
     "snsf________": "00yjd3n13",
     "sshrc_______": "006cvnv84",
     "tubitakf____": "04w9kkr77",
+    "ukri________": "001aqnf71",
     "wt__________": "029chgv08",
 }
 """Mapping of OpenAIRE and ROR funder codes."""

invenio_vocabularies/contrib/affiliations/affiliations.py

@@ -8,12 +8,12 @@
 
 """Vocabulary affiliations."""
 
+from invenio_db import db
 from invenio_records.dumpers import SearchDumper
 from invenio_records.dumpers.indexedat import IndexedAtDumperExt
 from invenio_records_resources.factories.factory import RecordTypeFactory
+from invenio_records_resources.records.systemfields import ModelPIDField
 
-from ...records.pidprovider import PIDProviderFactory
-from ...records.systemfields import BaseVocabularyPIDFieldContext
 from ...services.permissions import PermissionPolicy
 from .config import AffiliationsSearchOptions, service_components
 from .schema import AffiliationSchema
@@ -21,17 +21,22 @@ from .schema import AffiliationSchema
 record_type = RecordTypeFactory(
     "Affiliation",
     # Data layer
+    pid_field_cls=ModelPIDField,
     pid_field_kwargs={
-        "create": False,
-        "provider": PIDProviderFactory.create(pid_type="aff"),
-        "context_cls": BaseVocabularyPIDFieldContext,
+        "model_field_name": "pid",
+    },
+    model_cls_attrs={
+        # cannot set to nullable=False because it would fail at
+        # service level when create({}), see records-resources.
+        "pid": db.Column(db.String(255), unique=True),
     },
     schema_version="1.0.0",
     schema_path="local://affiliations/affiliation-v1.0.0.json",
     record_dumper=SearchDumper(
+        model_fields={"pid": ("id", str)},
         extensions=[
             IndexedAtDumperExt(),
-        ]
+        ],
     ),
     # Service layer
     service_id="affiliations",

invenio_vocabularies/contrib/affiliations/jsonschemas/affiliations/affiliation-v1.0.0.json

@@ -10,9 +10,6 @@
     "acronym": {
       "type": "string"
     },
-    "id": {
-      "$ref": "local://definitions-v1.0.0.json#/identifier"
-    },
     "identifiers": {
       "description": "Alternate identifiers for the record.",
       "type": "array",
@@ -22,9 +19,6 @@
     "name": {
       "type": "string"
     },
-    "pid": {
-      "$ref": "local://definitions-v1.0.0.json#/internal-pid"
-    },
     "title": {
       "$ref": "local://vocabularies/definitions-v1.0.0.json#/title"
     }

invenio_vocabularies/contrib/affiliations/schema.py

@@ -15,11 +15,15 @@ from marshmallow import fields
 from marshmallow_utils.fields import IdentifierSet, SanitizedUnicode
 from marshmallow_utils.schemas import IdentifierSchema
 
-from ...services.schema import BaseVocabularySchema, ContribVocabularyRelationSchema
+from ...services.schema import (
+    BaseVocabularySchema,
+    ContribVocabularyRelationSchema,
+    ModePIDFieldVocabularyMixin,
+)
 from .config import affiliation_schemes
 
 
-class AffiliationSchema(BaseVocabularySchema):
+class AffiliationSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
     """Service schema for affiliations."""
 
     acronym = SanitizedUnicode()

invenio_vocabularies/contrib/awards/datastreams.py

@@ -52,6 +52,15 @@ class OpenAIREProjectTransformer(BaseTransformer):
 
         award["id"] = f"{funder_id}::{code}"
 
+        funding = next(iter(record.get("funding", [])), None)
+        if funding:
+            funding_stream_id = funding.get("funding_stream", {}).get("id", "")
+            # Example funding stream ID: `EC::HE::HORIZON-AG-UN`. We need the `EC`
+            # string, i.e. the second "part" of the identifier.
+            program = next(iter(funding_stream_id.split("::")[1:2]), "")
+            if program:
+                award["program"] = program
+
         identifiers = []
         if funder_id == awards_ec_ror_id:
             identifiers.append(

invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json

@@ -36,6 +36,9 @@
     },
     "acronym": {
       "type": "string"
+    },
+    "program": {
+      "type": "string"
     }
   }
 }

invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json

@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

invenio_vocabularies/contrib/awards/mappings/os-v2/awards/award-v1.0.0.json

@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json

@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

invenio_vocabularies/contrib/awards/schema.py

@@ -10,26 +10,21 @@
 
 from functools import partial
 
-from attr import attr
 from invenio_i18n import lazy_gettext as _
-from marshmallow import (
-    Schema,
-    ValidationError,
-    fields,
-    post_load,
-    pre_dump,
-    validate,
-    validates_schema,
-)
+from marshmallow import Schema, ValidationError, fields, validate, validates_schema
 from marshmallow_utils.fields import IdentifierSet, SanitizedUnicode
 from marshmallow_utils.schemas import IdentifierSchema
 
-from ...services.schema import BaseVocabularySchema, i18n_strings
+from ...services.schema import (
+    BaseVocabularySchema,
+    ModePIDFieldVocabularyMixin,
+    i18n_strings,
+)
 from ..funders.schema import FunderRelationSchema
 from .config import award_schemes
 
 
-class AwardSchema(BaseVocabularySchema):
+class AwardSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
     """Award schema."""
 
     identifiers = IdentifierSet(
@@ -49,32 +44,12 @@ class AwardSchema(BaseVocabularySchema):
 
     acronym = SanitizedUnicode()
 
+    program = SanitizedUnicode()
+
     id = SanitizedUnicode(
         validate=validate.Length(min=1, error=_("PID cannot be blank."))
     )
 
-    @validates_schema
-    def validate_id(self, data, **kwargs):
-        """Validates ID."""
-        is_create = "record" not in self.context
-        if is_create and "id" not in data:
-            raise ValidationError(_("Missing PID."), "id")
-        if not is_create:
-            data.pop("id", None)
-
-    @post_load(pass_many=False)
-    def move_id(self, data, **kwargs):
-        """Moves id to pid."""
-        if "id" in data:
-            data["pid"] = data.pop("id")
-        return data
-
-    @pre_dump(pass_many=False)
-    def extract_pid_value(self, data, **kwargs):
-        """Extracts the PID value."""
-        data["id"] = data.pid.pid_value
-        return data
-
 
 class AwardRelationSchema(Schema):
     """Award relation schema."""
@@ -92,6 +67,7 @@ class AwardRelationSchema(Schema):
         )
     )
     acronym = SanitizedUnicode()
+    program = SanitizedUnicode()
 
     @validates_schema
     def validate_data(self, data, **kwargs):

invenio_vocabularies/contrib/awards/serializer.py

@@ -35,5 +35,6 @@ class AwardL10NItemSchema(Schema):
     description = L10NString(data_key="description_l10n")
     number = fields.String(dump_only=True)
     acronym = fields.String(dump_only=True)
+    program = fields.String(dump_only=True)
     funder = fields.Nested(FunderRelationSchema, dump_only=True)
     identifiers = fields.List(fields.Nested(IdentifierSchema), dump_only=True)

invenio_vocabularies/contrib/names/datastreams.py

@@ -9,12 +9,9 @@
 """Names datastreams, transformers, writers and readers."""
 
 from invenio_access.permissions import system_identity
-from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_records.dictutils import dict_lookup
-from marshmallow import ValidationError
 
-from ...datastreams import StreamEntry
-from ...datastreams.errors import TransformerError, WriterError
+from ...datastreams.errors import TransformerError
 from ...datastreams.readers import SimpleHTTPReader
 from ...datastreams.transformers import BaseTransformer
 from ...datastreams.writers import ServiceWriter
@@ -40,13 +37,14 @@ class OrcidTransformer(BaseTransformer):
         """Applies the transformation to the stream entry."""
         record = stream_entry.entry
         person = record["person"]
-        orcid_id = record["orcid-identifier"]["uri"]
+        orcid_id = record["orcid-identifier"]["path"]
 
         name = person.get("name")
         if name is None:
             raise TransformerError(f"Name not found in ORCiD entry.")
 
         entry = {
+            "id": orcid_id,
             "given_name": name.get("given-names"),
             "family_name": name.get("family-name"),
             "identifiers": [{"scheme": "orcid", "identifier": orcid_id}],
@@ -79,41 +77,14 @@ class OrcidTransformer(BaseTransformer):
 class NamesServiceWriter(ServiceWriter):
     """Names service writer."""
 
-    def __init__(self, *args, scheme_id="orcid", **kwargs):
+    def __init__(self, *args, **kwargs):
         """Constructor."""
         service_or_name = kwargs.pop("service_or_name", "names")
         super().__init__(service_or_name=service_or_name, *args, **kwargs)
-        self._scheme_id = scheme_id
 
     def _entry_id(self, entry):
         """Get the id from an entry."""
-        for identifier in entry.get("identifiers"):
-            if identifier.get("scheme") == self._scheme_id:
-                return identifier["identifier"]
-
-    def _resolve(self, id_):
-        """Resolve an entry given an id."""
-        return self._service.resolve(self._identity, id_=id_, id_type=self._scheme_id)
-
-    def write(self, stream_entry, *args, **kwargs):
-        """Writes the input entry using a given service."""
-        entry = stream_entry.entry
-        try:
-            vocab_id = self._entry_id(entry)
-            # it is resolved before creation to avoid duplicates since
-            # the pid is recidv2 not e.g. the orcid
-            current = self._resolve(vocab_id)
-            if not self._update:
-                raise WriterError([f"Vocabulary entry already exists: {entry}"])
-            updated = dict(current.to_dict(), **entry)
-            return StreamEntry(
-                self._service.update(self._identity, current.id, updated)
-            )
-        except PIDDoesNotExistError:
-            return StreamEntry(self._service.create(self._identity, entry))
-
-        except ValidationError as err:
-            raise WriterError([{"ValidationError": err.messages}])
+        return entry["id"]
 
 
 VOCABULARIES_DATASTREAM_READERS = {

invenio_vocabularies/contrib/names/jsonschemas/names/name-v1.0.0.json

@@ -8,13 +8,6 @@
     "$schema": {
       "$ref": "local://definitions-v1.0.0.json#/$schema"
     },
-    "id": {
-      "description": "URI or classification code as identifier - globally unique among all names schemes.",
-      "$ref": "local://definitions-v1.0.0.json#/identifier"
-    },
-    "pid": {
-      "$ref": "local://definitions-v1.0.0.json#/internal-pid"
-    },
     "scheme": {
       "description": "Identifier of the name scheme.",
       "$ref": "local://definitions-v1.0.0.json#/identifier"

invenio_vocabularies/contrib/names/names.py

@@ -8,16 +8,17 @@
 
 """Vocabulary names."""
 
-from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
+from invenio_db import db
 from invenio_records.dumpers import SearchDumper
 from invenio_records.dumpers.indexedat import IndexedAtDumperExt
 from invenio_records.dumpers.relations import RelationDumperExt
 from invenio_records.systemfields import RelationsField
 from invenio_records_resources.factories.factory import RecordTypeFactory
-from invenio_records_resources.records.systemfields import PIDListRelation
+from invenio_records_resources.records.systemfields import (
+    ModelPIDField,
+    PIDListRelation,
+)
 
-from ...records.pidprovider import PIDProviderFactory
-from ...records.systemfields import BaseVocabularyPIDFieldContext
 from ...services.permissions import PermissionPolicy
 from ..affiliations.api import Affiliation
 from .config import NamesSearchOptions, service_components
@@ -35,21 +36,24 @@ name_relations = RelationsField(
 record_type = RecordTypeFactory(
     "Name",
     # Data layer
+    pid_field_cls=ModelPIDField,
     pid_field_kwargs={
-        "create": False,
-        "provider": PIDProviderFactory.create(
-            pid_type="names", base_cls=RecordIdProviderV2
-        ),
-        "context_cls": BaseVocabularyPIDFieldContext,
+        "model_field_name": "pid",
+    },
+    model_cls_attrs={
+        # cannot set to nullable=False because it would fail at
+        # service level when create({}), see records-resources.
+        "pid": db.Column(db.String(255), unique=True),
     },
     schema_version="1.0.0",
     schema_path="local://names/name-v1.0.0.json",
     record_relations=name_relations,
     record_dumper=SearchDumper(
+        model_fields={"pid": ("id", str)},
         extensions=[
             RelationDumperExt("relations"),
             IndexedAtDumperExt(),
-        ]
+        ],
     ),
     # Service layer
     service_id="names",

invenio_vocabularies/contrib/names/schema.py

@@ -11,16 +11,16 @@
 from functools import partial
 
 from invenio_i18n import lazy_gettext as _
-from invenio_records_resources.services.records.schema import BaseRecordSchema
 from marshmallow import ValidationError, fields, post_load, validates_schema
 from marshmallow_utils.fields import IdentifierSet, SanitizedUnicode
 from marshmallow_utils.schemas import IdentifierSchema
 
+from ...services.schema import BaseVocabularySchema, ModePIDFieldVocabularyMixin
 from ..affiliations.schema import AffiliationRelationSchema
 from .config import names_schemes
 
 
-class NameSchema(BaseRecordSchema):
+class NameSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
     """Service schema for names.
 
     Note that this vocabulary is very different from the base vocabulary

invenio_vocabularies/services/custom_fields/vocabulary.py

@@ -30,7 +30,13 @@ class VocabularyCF(BaseCF):
     """
 
     def __init__(
-        self, name, vocabulary_id, multiple=False, dump_options=True, **kwargs
+        self,
+        name,
+        vocabulary_id,
+        multiple=False,
+        dump_options=True,
+        sort_by=None,
+        **kwargs
     ):
         """Constructor."""
         super().__init__(name, **kwargs)
@@ -38,6 +44,7 @@ class VocabularyCF(BaseCF):
         self.vocabulary_id = vocabulary_id
         self.dump_options = dump_options
         self.multiple = multiple
+        self.sort_by = sort_by
 
     @property
     def mapping(self):
@@ -78,6 +85,7 @@ class VocabularyCF(BaseCF):
                 identity,
                 fields=self.field_keys,
                 type=self.vocabulary_id,
+                sort=self.sort_by,
             )
             options = []
             for vocab in vocabs:

invenio_vocabularies/services/schema.py

@@ -14,6 +14,8 @@ from marshmallow import (
     Schema,
     ValidationError,
     fields,
+    post_load,
+    pre_dump,
     pre_load,
     validate,
     validates_schema,
@@ -98,6 +100,32 @@ class VocabularySchema(BaseVocabularySchema):
     type = fields.Str(attribute="type.id", required=True)
 
 
+class ModePIDFieldVocabularyMixin:
+    """Mixin for vocabularies using a model field for their PID."""
+
+    @validates_schema
+    def validate_id(self, data, **kwargs):
+        """Validates ID."""
+        is_create = "record" not in self.context
+        if is_create and "id" not in data:
+            raise ValidationError(_("Missing PID."), "id")
+        if not is_create:
+            data.pop("id", None)
+
+    @post_load(pass_many=False)
+    def move_id(self, data, **kwargs):
+        """Moves id to pid."""
+        if "id" in data:
+            data["pid"] = data.pop("id")
+        return data
+
+    @pre_dump(pass_many=False)
+    def extract_pid_value(self, data, **kwargs):
+        """Extracts the PID value."""
+        data["id"] = data.pid.pid_value
+        return data
+
+
 class DatastreamObject(Schema):
     """Datastream object (reader, transformer, writer)."""
 

{invenio_vocabularies-1.6.0.dist-info → invenio_vocabularies-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 1.6.0
+Version: 2.0.0
 Summary: "Invenio module for managing vocabularies."
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -74,6 +74,15 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version 2.0.0 (2023-09-14)
+
+- contrib-awards: add "program" to schema fields
+- global: switch names and affiliations to model PID field
+- ci: update matrix
+- awards: add "program" field
+- config: update awards funders mapping
+- service: add sort option to load vocabs
+
 Version 1.6.0 (2023-09-12)
 
 - awards: add acronym to schema

{invenio_vocabularies-1.6.0.dist-info → invenio_vocabularies-2.0.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-invenio_vocabularies/__init__.py,sha256=qQttzVKNd9Bm6YntCrVuzR3ONsgCEsxwVifPi1RN8Ls,377
+invenio_vocabularies/__init__.py,sha256=cK-Bn52JUjx9MdWs9tU-GMpaoLRcnJVbB42lmI7DjdQ,377
 invenio_vocabularies/cli.py,sha256=Ymuy0l846eJXIA4UybunSqq7P9m2N0OdTtj6nEgd1-0,6355
-invenio_vocabularies/config.py,sha256=TAY5PJUe3NFlGGNSs43VhWgYPKnRym-zoUYttxVu6m4,3627
+invenio_vocabularies/config.py,sha256=S6Ra5aIey9_K0Rw7qqGsV6TEi7t8iLzNoVu4R6hKuu4,3739
 invenio_vocabularies/ext.py,sha256=wMJfv3GG4ZOp-c4ePVrNhxi9KyWAb874b9_D23K1orU,3805
 invenio_vocabularies/fixtures.py,sha256=nNWwH04HFASjfj1oy5kMdcQGKmVjzUuA5wSw-ER1QAg,1585
 invenio_vocabularies/proxies.py,sha256=H_bcJXPTwGbErx-pF89ChayOZcXJXJGZW7O0xkJkYQ4,693
@@ -9,6 +9,7 @@ invenio_vocabularies/webpack.py,sha256=7A1DkwwTw0NRn-aZNvh_rBEx5o_Eyx6NiMXw31y2B
 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
+invenio_vocabularies/alembic/55a700f897b6_add_names_and_afiliations_pid_column.py,sha256=IKV7IW84R-Rcy_53VFWN51NJlqUIbgHCSp-TQDj3KX4,2371
 invenio_vocabularies/alembic/6312f33645c1_create_affiliations_table.py,sha256=0rg7ODaMG4YoHOiOMXKOgPK7QryyLGfgrdJjtn6JPsY,1600
 invenio_vocabularies/alembic/676dd587542d_create_funders_vocabulary_table.py,sha256=4y0jihIQ1s93k7EoqC4vZFrR-tXvuxa678u9hKcu0z0,1791
 invenio_vocabularies/alembic/8ff82dfb0be8_create_vocabularies_branch.py,sha256=RnyKQ38Pkubf_DU2rH9pRdufoAvABdnaP9b9S4-y4Vw,586
@@ -38,15 +39,15 @@ invenio_vocabularies/assets/semantic-ui/translations/invenio_vocabularies/script
 invenio_vocabularies/assets/semantic-ui/translations/invenio_vocabularies/scripts/initCatalog.js,sha256=ghTi5iOIhT8AJoFGlxnBrHWiw2ts21dKwY_vWxmkiCE,682
 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=n_0aCyo6cm-gVTDBSEONyorRJec9Ko-KolKiTHO95zQ,1430
+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/config.py,sha256=ZUVANL9oU0DS4QAObQlh3_ucAkxX-CrJyJI4o0Mt4zc,1683
 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=07c-6VUDAKKuH4mWwST6QNobUfSmG0dchElYld18W_w,1247
+invenio_vocabularies/contrib/affiliations/schema.py,sha256=cUlE_8NehMJnlC9nzQzoN6fyZS8xJ1GfWDMPMr1n2rY,1322
 invenio_vocabularies/contrib/affiliations/services.py,sha256=C_6cMnh3mnL3-xxdsb16Rvm2aK4FyiaQ_qUTGylCwjo,391
 invenio_vocabularies/contrib/affiliations/jsonschemas/__init__.py,sha256=ILyZ5kejTr0p50macMBPALQCTJSe4KEE3_cgf2p3zV4,252
-invenio_vocabularies/contrib/affiliations/jsonschemas/affiliations/affiliation-v1.0.0.json,sha256=fplTNgJtZMFXKFPln-YhixlkHCYbqK7LVU0gF0ZZQDc,838
+invenio_vocabularies/contrib/affiliations/jsonschemas/affiliations/affiliation-v1.0.0.json,sha256=dNzPBRoEGD_xPznFzPW_mDGR0sk8zsmixiGmciHXEgQ,677
 invenio_vocabularies/contrib/affiliations/mappings/__init__.py,sha256=q7hb9lcT9KLRSGr6G7qpL8Top6wZfzj_E4uzGxnraTw,295
 invenio_vocabularies/contrib/affiliations/mappings/os-v1/__init__.py,sha256=uEiG5rFrjhpFxg5pD5j5E96_xrPojsla9PhtlOqSCw4,256
 invenio_vocabularies/contrib/affiliations/mappings/os-v1/affiliations/affiliation-v1.0.0.json,sha256=oHJiDYnfsJhb4HCbUeDm7FNfiisX_HBeyg5x-DLk83s,1723
@@ -58,21 +59,21 @@ invenio_vocabularies/contrib/awards/__init__.py,sha256=KwCmwFalz-3pDs9iTa5TKUidB
 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/config.py,sha256=ESVzPAOU5wMmAAEyUdOIK7hS9getJO200ri7HOw-CQY,1675
-invenio_vocabularies/contrib/awards/datastreams.py,sha256=JNtxgzBcME0BpZPuowfMbxqzfsyFJ6b7MTk5m9LQym0,3397
+invenio_vocabularies/contrib/awards/datastreams.py,sha256=lJDokc72MA6s5YvfwExBVNdqVnnIVajFzagB9YitQxk,3847
 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=fdazc6vaE_ciY8tNUUXpY3veF1mNbFE3t1VcY6ye4DY,3392
-invenio_vocabularies/contrib/awards/serializer.py,sha256=z92SsjEf6vf6LX1egwGiRY1AHU2qRxCaWyWVUXPwqag,1095
+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/jsonschemas/__init__.py,sha256=XB2l9hr53vqTk7o9lmy18FWGhHEUvNHu8D6nMF8Bz4k,246
-invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json,sha256=Vi_FM8yeqYWkfsk-HvuRIl8b2B7YN3pgGC2PicUQmmw,982
+invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json,sha256=kNw4djIuqo7Ing9O5w4k3n_HIejX4f5hpApnmJpDt7A,1029
 invenio_vocabularies/contrib/awards/mappings/__init__.py,sha256=PbM5urjiSrJSx4Ak-H_lJrOOVKGT38MrGgRv61gIbAM,243
 invenio_vocabularies/contrib/awards/mappings/os-v1/__init__.py,sha256=r8IZvjorG9SVz32Hv1fncoqLfz-5Ml0Ph3jiYWCHBPk,250
-invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json,sha256=vAbmJnkr4By7VD6UdG-npE7rMIMs8-9Ukbd2_ue0IZo,1354
+invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json,sha256=pjbqzEc2q0t7VQBqVjU5DjsKcLaFWd5f7xSA6B9_HZc,1408
 invenio_vocabularies/contrib/awards/mappings/os-v2/__init__.py,sha256=9gRLFRtjhNJcbop3qz8iRpQVEng_wudDTbOFsS-gxjk,250
-invenio_vocabularies/contrib/awards/mappings/os-v2/awards/award-v1.0.0.json,sha256=vAbmJnkr4By7VD6UdG-npE7rMIMs8-9Ukbd2_ue0IZo,1354
+invenio_vocabularies/contrib/awards/mappings/os-v2/awards/award-v1.0.0.json,sha256=pjbqzEc2q0t7VQBqVjU5DjsKcLaFWd5f7xSA6B9_HZc,1408
 invenio_vocabularies/contrib/awards/mappings/v7/__init__.py,sha256=fERdPp7K7ajaoUu_4_HVLfF-WD_qcl7QgST6yGb68s4,253
-invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json,sha256=vAbmJnkr4By7VD6UdG-npE7rMIMs8-9Ukbd2_ue0IZo,1354
+invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json,sha256=pjbqzEc2q0t7VQBqVjU5DjsKcLaFWd5f7xSA6B9_HZc,1408
 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=sJjnGpUmwhbPQ7fI2EyvzNdDrguBwlJeAORXBSZrILs,1748
@@ -96,14 +97,14 @@ invenio_vocabularies/contrib/funders/mappings/v7/funders/funder-v1.0.0.json,sha2
 invenio_vocabularies/contrib/names/__init__.py,sha256=DBfsM7JMETZGaV5QmXEwE7zhCaAXvc2SZN6uXnW_V-c,451
 invenio_vocabularies/contrib/names/api.py,sha256=sEPn_jFX3gyoxgbdEUSIvOoPCUI8pocI6qCZO6mzCgQ,300
 invenio_vocabularies/contrib/names/config.py,sha256=hKDTEEBYGYOY6sMOArZjjkq2HJ6MJtRZp1geGLAFgRg,1735
-invenio_vocabularies/contrib/names/datastreams.py,sha256=pXP_lMauUmJKB4008M8CKPd--ysqvk-xN0-_5y7nEZ8,5014
+invenio_vocabularies/contrib/names/datastreams.py,sha256=qcNgCLT57M99IL2yZxyfEIdi5AbkBGOMmSoE0e4vEJM,3661
 invenio_vocabularies/contrib/names/models.py,sha256=SYdtDDG-y5Wq_d06YhiVO5n8gfxPW_mx-tECsIcv5H8,308
-invenio_vocabularies/contrib/names/names.py,sha256=gsvUfhOPRtVjvJNHc4xyhMDKc2smuLC0FR1tYFZ7-_4,1994
+invenio_vocabularies/contrib/names/names.py,sha256=fRNZW3yTmIE3FBB8zAcTdt1CXH6O8p6Ggz_7k9e8QTk,1987
 invenio_vocabularies/contrib/names/resources.py,sha256=Z8XqLKfFKE69zdTTvcTDmpEZ6wqiqjIH5tp0LzXTSwQ,1588
-invenio_vocabularies/contrib/names/schema.py,sha256=LxnoEFTzMGpAtlNopmBO6LYJeZ5mScQJqcfd9O7gwdk,2283
+invenio_vocabularies/contrib/names/schema.py,sha256=3PKji7JYl0BNPPjoaY6YjrkbrdMctphrNNmdeqNKYPE,2318
 invenio_vocabularies/contrib/names/services.py,sha256=1viM-L8VEojmQWMisIOhDyl8KInPPCZEIf6tU8G07As,1763
 invenio_vocabularies/contrib/names/jsonschemas/__init__.py,sha256=pdDZdyoxqWbAQ6ngiclhYoDUsGKgRDRPXlIDy0U5Jzg,241
-invenio_vocabularies/contrib/names/jsonschemas/names/name-v1.0.0.json,sha256=eKmfHVRXKG6FnLIApqg6cdoGwz_g2gq_9iaLlwNVWo0,1439
+invenio_vocabularies/contrib/names/jsonschemas/names/name-v1.0.0.json,sha256=vAqnz9LbRuhRg2Vdg9Ygc_s07VqZh_gdQP4Ch5Eztsw,1170
 invenio_vocabularies/contrib/names/mappings/__init__.py,sha256=l5hYJmrj83lds5GupnwCcwQn7cdJo6_4H4YYzrnBa54,242
 invenio_vocabularies/contrib/names/mappings/os-v1/__init__.py,sha256=CKtF-xflE4QGF5P82Lj1ifEP1c7ekR24fc3SiTAkhsY,249
 invenio_vocabularies/contrib/names/mappings/os-v1/names/name-v1.0.0.json,sha256=XtrCBgvEwlhu_kyitiZ-ZRVn8ImK17rFuRVSV4gjHvw,1892
@@ -162,11 +163,11 @@ invenio_vocabularies/services/components.py,sha256=d9C-24dEDM63gFm75nU-dXrrjS2zZ
 invenio_vocabularies/services/facets.py,sha256=9v8lYSPL_aHMZelZhfVbLwrocD6XB8-pczyeCNDABjQ,2778
 invenio_vocabularies/services/permissions.py,sha256=one3NvNFYq-q15e6xxf85OkH1bWZ5OsvJqMnNbm3Qms,696
 invenio_vocabularies/services/querystr.py,sha256=X3JHVF9B0O0iLWrnW3ok_bf_8jA-Cs_oAcYYkGOm3Uw,1829
-invenio_vocabularies/services/schema.py,sha256=le29X8SO320cTepTNClTzaqyGgGT6cY9NryTKuO1MLo,3501
+invenio_vocabularies/services/schema.py,sha256=ShnnH_ILHZGxE546J6Jsdwdeix6jLubSRomzf472DK8,4307
 invenio_vocabularies/services/service.py,sha256=W3wtKOttQjOr8Nkaus6m3KRuCMBqBsWUCAVv7Dj8bvM,7392
 invenio_vocabularies/services/tasks.py,sha256=zTAWdnI5celWBKrF986wQzCmkOTGOwTghtN7U5FMZ5Q,783
 invenio_vocabularies/services/custom_fields/__init__.py,sha256=1emONO3aiE7TanAoyUSkWE6gwZiBwjzzJ5y8jeomOLc,310
-invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=p5e1_vSgI_RmO-kC6mNeC5lxNfu9fedSYSKoDyTWbf0,2690
+invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=zLh-igEVoPa4svCZPNsBuvoQ4a5CTFAKJzX8ndLVWE4,2818
 invenio_vocabularies/translations/messages.pot,sha256=IzTTWdWknzmKKtl1UNUxPOwHjfBB_iidm_eeEY2kV-M,3907
 invenio_vocabularies/translations/af/LC_MESSAGES/messages.mo,sha256=Tq2jiOLpIEsJN7K27mp4qfMU0Uih7fu_glHWMsYifBs,523
 invenio_vocabularies/translations/af/LC_MESSAGES/messages.po,sha256=XXoiqCtGELaxl6hxRj31D3DCdgBUrz0oD3MYJUpcklM,3976
@@ -262,10 +263,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=B1ysk8DOW
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=1fiYIHoTDv1OS_Y6_KHQ0tlogc6a4LsuAIWIWISGp58,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-1.6.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-1.6.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-1.6.0.dist-info/METADATA,sha256=3spgWtuRiwJ0_l5zn32-ryIUf1XP7BeYVyndYbMprHU,4450
-invenio_vocabularies-1.6.0.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-invenio_vocabularies-1.6.0.dist-info/entry_points.txt,sha256=cBazxlQQIn53RNdPI8edCL5v1k-6fE7UU4O0QssUoBE,2309
-invenio_vocabularies-1.6.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-1.6.0.dist-info/RECORD,,
+invenio_vocabularies-2.0.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-2.0.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-2.0.0.dist-info/METADATA,sha256=FzG_Md-zho3gUsBgYZw6XYljxUS8ZdgyHiVWCIxQxkI,4719
+invenio_vocabularies-2.0.0.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+invenio_vocabularies-2.0.0.dist-info/entry_points.txt,sha256=cBazxlQQIn53RNdPI8edCL5v1k-6fE7UU4O0QssUoBE,2309
+invenio_vocabularies-2.0.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-2.0.0.dist-info/RECORD,,