invenio-vocabularies 6.8.0__py2.py3-none-any.whl → 6.10.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

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

invenio_vocabularies/alembic/3ba812d80559_add_internal_name_id.py

@@ -0,0 +1,36 @@
+#
+# This file is part of Invenio.
+# Copyright (C) 2024 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 internal name ID."""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "3ba812d80559"
+down_revision = "55a700f897b6"
+branch_labels = ()
+depends_on = None
+
+
+def upgrade():
+    """Upgrade database."""
+    op.add_column(
+        "name_metadata", sa.Column("internal_id", sa.String(length=255), nullable=True)
+    )
+    op.create_unique_constraint(
+        op.f("uq_name_metadata_internal_id"), "name_metadata", ["internal_id"]
+    )
+
+
+def downgrade():
+    """Downgrade database."""
+    op.drop_constraint(
+        op.f("uq_name_metadata_internal_id"), "name_metadata", type_="unique"
+    )
+    op.drop_column("name_metadata", "internal_id")

invenio_vocabularies/contrib/affiliations/schema.py

@@ -59,3 +59,13 @@ class AffiliationRelationSchema(ContribVocabularyRelationSchema):
     ftf_name = "name"
     parent_field_name = "affiliations"
     name = SanitizedUnicode()
+    identifiers = IdentifierSet(
+        fields.Nested(
+            partial(
+                IdentifierSchema,
+                allowed_schemes=affiliation_schemes,
+                identifier_required=False,
+            )
+        ),
+        dump_only=True,
+    )

invenio_vocabularies/contrib/names/components.py

@@ -0,0 +1,24 @@
+#
+# This file is part of Invenio.
+# Copyright (C) 2024 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.
+
+"""Names service components."""
+
+from invenio_records_resources.services.records.components import ServiceComponent
+
+
+class InternalIDComponent(ServiceComponent):
+    """Service component for internal id field."""
+
+    field = "internal_id"
+
+    def create(self, identity, data=None, record=None, **kwargs):
+        """Create handler."""
+        setattr(record, self.field, data.pop(self.field, None))
+
+    def update(self, identity, data=None, record=None, **kwargs):
+        """Update handler."""
+        setattr(record, self.field, data.pop(self.field, None))

invenio_vocabularies/contrib/names/config.py

@@ -21,6 +21,7 @@ from invenio_records_resources.services.records.queryparser import (
 from werkzeug.local import LocalProxy
 
 from ...services.components import PIDComponent
+from .components import InternalIDComponent
 
 names_schemes = LocalProxy(lambda: current_app.config["VOCABULARIES_NAMES_SCHEMES"])
 
@@ -67,6 +68,7 @@ class NamesSearchOptions(SearchOptions):
 
 service_components = [
     # Order of components are important!
+    InternalIDComponent,
     DataComponent,
     PIDComponent,
     RelationsComponent,

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

@@ -65,4 +65,4 @@
       "uniqueItems": true
     }
   }
-}
+}

invenio_vocabularies/contrib/names/names.py

@@ -13,7 +13,7 @@ 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.systemfields import ModelField, RelationsField
 from invenio_records_resources.factories.factory import RecordTypeFactory
 from invenio_records_resources.records.systemfields import (
     ModelPIDField,
@@ -47,10 +47,12 @@ record_type = RecordTypeFactory(
         # 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),
+        "internal_id": db.Column(db.String(255), unique=True, nullable=True),
     },
     schema_version="1.0.0",
     schema_path="local://names/name-v1.0.0.json",
     index_name="names-name-v2.0.0",
+    record_cls_attrs={"internal_id": ModelField("internal_id", dump=False)},
     record_relations=name_relations,
     record_dumper=SearchDumper(
         model_fields={"pid": ("id", str)},

invenio_vocabularies/contrib/names/schema.py

@@ -35,6 +35,7 @@ class NameSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
     so it does not inherit from it.
     """
 
+    internal_id = fields.Str(allow_none=True)
     name = SanitizedUnicode()
     given_name = SanitizedUnicode()
     family_name = SanitizedUnicode()
@@ -66,7 +67,7 @@ class NameSchema(BaseVocabularySchema, ModePIDFieldVocabularyMixin):
             raise ValidationError({"family_name": messages})
 
     @validates_schema
-    def validate_affiliatons(self, data, **kwargs):
+    def validate_affiliations(self, data, **kwargs):
         """Validate names."""
         affiliations = data.get("affiliations", [])
         seen_names = set()

invenio_vocabularies/contrib/names/services.py

@@ -42,10 +42,10 @@ class NamesService(record_type.service_cls):
         else:
             results = self._read_many(identity, search_query, max_records=1)
 
-        # cant use the results_item because it returns dicts intead of records
+        # cant use the results_item because it returns dicts instead of records
         total = results.hits.total["value"]
         if total == 0:
-            # Not a PID but trated as such
+            # Not a PID but treated as such
             raise PIDDoesNotExistError(pid_type=id_type, pid_value=id_)
         if many:
             for result in results:

{invenio_vocabularies-6.8.0.dist-info → invenio_vocabularies-6.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 6.8.0
+Version: 6.10.0
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -88,6 +88,14 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version v6.10.0 (released 2024-12-09)
+
+names: add internal id column to the name_metadata db
+
+Version v6.9.0 (released 2024-12-09)
+
+- schema: added identifiers in affiliations relation
+
 Version v6.8.0 (released 2024-12-09)
 
 - names: extract affiliation identifiers from employments

{invenio_vocabularies-6.8.0.dist-info → invenio_vocabularies-6.10.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_vocabularies/__init__.py,sha256=pBiqJjlbk7PPRcqwNa2BknQDAQRkYYKzQkADgnr1gh4,377
+invenio_vocabularies/__init__.py,sha256=yHb21kAVhVXau2roNUmpHTfj5zK9Wwe96Y6cGwAf8vA,378
 invenio_vocabularies/cli.py,sha256=CpXTTIn2GTpUqNfLEMlRAp3JWst8ZjHVxoGYdhuuv_4,5959
 invenio_vocabularies/config.py,sha256=h9Iied753mmZwZZHe5COMqUYvV-zSQtx763EIkUVb1Q,6973
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
@@ -12,6 +12,7 @@ invenio_vocabularies/administration/__init__.py,sha256=0bDp2Aw8aZth7C-q9Xn9rxeCU
 invenio_vocabularies/administration/views/__init__.py,sha256=31DP4jLG6q4HQlzSRiGLPxUjHPUCCl4N34y4XMuPP6g,313
 invenio_vocabularies/administration/views/vocabularies.py,sha256=JyKr1OYF9DO89zvWCNOtNfClO_QptdHdjvgY1kkImnw,1290
 invenio_vocabularies/alembic/17c703ce1eb7_create_names_table.py,sha256=2QGs0Ofi6yd93VzIBqghNi47hrZtuLf0DylKyvVzskI,1572
+invenio_vocabularies/alembic/3ba812d80559_add_internal_name_id.py,sha256=dwurTL2HN2GQK3c62o6xGugJqgn30DZlhq_njyUBa7s,945
 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=w1mmkT7fpTeQJ--YmkIqkwtx7DmaP5cXpKPCJr_0Jko,2381
@@ -51,7 +52,7 @@ invenio_vocabularies/contrib/affiliations/datastreams.py,sha256=sMvkt9XOBTV7Q0we
 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/schema.py,sha256=geORDYdBIWnv81Txl07qdHhB3U_fo9ObVp7UrSlCLRI,2104
 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
@@ -112,17 +113,18 @@ invenio_vocabularies/contrib/funders/mappings/v7/__init__.py,sha256=yFHmi3QYD65Y
 invenio_vocabularies/contrib/funders/mappings/v7/funders/funder-v1.0.0.json,sha256=E7Zp4IHsQGdaxVrksr-SaQtieV7tV0W6-LgGe231G1w,1646
 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=9sb5novWuQYXg_5Egexn52mjgGd1D_D9UKyQ1fmIuh4,1977
+invenio_vocabularies/contrib/names/components.py,sha256=PyYD1lOhmsuNoyDwM_huxkeo7kWd44vkEbJk9gqbDrM,769
+invenio_vocabularies/contrib/names/config.py,sha256=62jh4MP-CygnBpnRBVaCoGySHDEwhBSG1MnlUBumthw,2046
 invenio_vocabularies/contrib/names/datastreams.py,sha256=mmhtdrda6b4c83dRjxVF5JTqtkt92GSEMHTU6TzQtHw,14570
 invenio_vocabularies/contrib/names/models.py,sha256=SYdtDDG-y5Wq_d06YhiVO5n8gfxPW_mx-tECsIcv5H8,308
-invenio_vocabularies/contrib/names/names.py,sha256=_kBJBcPuANgUHlZ8RoVkpfJwzR5qaOQCBIyZusjKoCE,2509
+invenio_vocabularies/contrib/names/names.py,sha256=CSGO5Q7AtFRNfyRMPf9PWMiRZiWY8fts-9yZ3XpDPuE,2676
 invenio_vocabularies/contrib/names/permissions.py,sha256=5xrpYsA3oQUJ5lJpF7wjRAFiW-pM6_yP1k9zllbRwnQ,844
 invenio_vocabularies/contrib/names/resources.py,sha256=Z8XqLKfFKE69zdTTvcTDmpEZ6wqiqjIH5tp0LzXTSwQ,1588
 invenio_vocabularies/contrib/names/s3client.py,sha256=c7B9_NbnXCfE4pE_yMTsT6uQ2hgbcRU-KY6nbWFuFzU,1063
-invenio_vocabularies/contrib/names/schema.py,sha256=0Uyh5l_Pdq54osow1Qs7-JUKLx9MxA5a95O5K7rM8M8,3618
-invenio_vocabularies/contrib/names/services.py,sha256=IyZzZ9fovSQa_tqorWciRaPTrY5yv1clD9PHotdzYOQ,2125
+invenio_vocabularies/contrib/names/schema.py,sha256=TmMel-JswqArUpwmGKFahNFJTx5yqVy_osAxWEgAThY,3665
+invenio_vocabularies/contrib/names/services.py,sha256=ntcGUTM0ZsKnRTxIKvZhKrRuup6Tjv965PATCaJR6Cc,2127
 invenio_vocabularies/contrib/names/jsonschemas/__init__.py,sha256=pdDZdyoxqWbAQ6ngiclhYoDUsGKgRDRPXlIDy0U5Jzg,241
-invenio_vocabularies/contrib/names/jsonschemas/names/name-v1.0.0.json,sha256=SmnQtet_AWZE1uZR8UY01IiO5QVLHRNAQ2cNubfP8-o,1573
+invenio_vocabularies/contrib/names/jsonschemas/names/name-v1.0.0.json,sha256=WlIroNhE9o6oh1Cd13ymBPXuXDOs0NYfjLGtAH417YI,1574
 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=5Ybcq3fUMYx3u1MNKmHh-CWBtATS9MYpdEcwAM8EQ80,1943
@@ -302,10 +304,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-6.8.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-6.8.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-6.8.0.dist-info/METADATA,sha256=dfweT9yd1E3DnY0KnIpL4vbg-5KtXzrhEsw0hExRVl8,12211
-invenio_vocabularies-6.8.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-invenio_vocabularies-6.8.0.dist-info/entry_points.txt,sha256=ud9nfdMlhO_mu3okwmy5vQD48r3-rCU_pSR-lUtLeYE,3180
-invenio_vocabularies-6.8.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-6.8.0.dist-info/RECORD,,
+invenio_vocabularies-6.10.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-6.10.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-6.10.0.dist-info/METADATA,sha256=dNT3BBpMtD-S5lP911V21Bxs5HuVRKw1MFHucTTbUg4,12398
+invenio_vocabularies-6.10.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+invenio_vocabularies-6.10.0.dist-info/entry_points.txt,sha256=ud9nfdMlhO_mu3okwmy5vQD48r3-rCU_pSR-lUtLeYE,3180
+invenio_vocabularies-6.10.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-6.10.0.dist-info/RECORD,,