oarepo-runtime 1.10.1__py3-none-any.whl → 1.10.3__py3-none-any.whl

oarepo_runtime/services/schema/rdm.py

@@ -1,10 +1,17 @@
+import re
 from functools import partial
 
 import marshmallow as ma
+from invenio_access.permissions import system_identity
+from invenio_i18n import gettext as _
 from invenio_i18n.selectors import get_locale
-from invenio_rdm_records.services.schemas.metadata import record_identifiers_schemes
+from invenio_rdm_records.services.schemas.metadata import (
+    CreatorSchema,
+    record_identifiers_schemes,
+)
 from invenio_rdm_records.services.schemas.tombstone import DeletionStatusSchema
 from invenio_rdm_records.services.schemas.versions import VersionsSchema
+from invenio_records_resources.proxies import current_service_registry
 from invenio_vocabularies.contrib.awards.schema import AwardRelationSchema
 from invenio_vocabularies.contrib.funders.schema import FunderRelationSchema
 from marshmallow import fields as ma_fields
@@ -49,7 +56,7 @@ class RecordIdentifierField(IdentifierSet):
                 partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
             ),
             *args,
-            **kwargs
+            **kwargs,
         )
 
 
@@ -60,7 +67,7 @@ class RelatedRecordIdentifierField(IdentifierSet):
                 partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
             ),
             *args,
-            **kwargs
+            **kwargs,
         )
 
 
@@ -73,3 +80,67 @@ class RDMSubjectSchema(ma.Schema):
     _id = ma.fields.String(data_key="id")
 
     subject = MultilingualField()
+
+
+class RDMNTKCreatorsSchema(CreatorSchema):
+    """NTK version of RDM creators schema.
+
+    This version makes sure that organizations are selected from the
+    list of organizations in the system. Record will not be valid if
+    organization is not in the system.
+    """
+
+    @ma.validates_schema
+    def check_organization_or_affiliation(self, data, **kwargs):
+        """Check if organization is in the system."""
+        person_or_org = data.get("person_or_org", {})
+        if person_or_org.get("type") == "personal":
+            affiliations = data.get("affiliations", [])
+            for affiliation in affiliations:
+                if not self.from_vocabulary(affiliation):
+                    raise ma.ValidationError(
+                        _(
+                            "It is necessary to choose organization from the controlled vocabulary. "
+                            "To add organization, please go to "
+                            "https://nusl.techlib.cz/cs/migrace-nusl/navrh-novych-hesel/"
+                        ),
+                        field_name="affiliations",
+                    )
+        else:
+            # organization
+            name = person_or_org.get("name")
+            affiliations = current_service_registry.get("affiliations")
+            found = [
+                x["name"]
+                for x in affiliations.search(
+                    system_identity,
+                    q=f'name.suggest:"{escape_opensearch_query(name)}"',
+                    size=100,
+                ).hits
+            ]
+            if name not in found:
+                raise ma.ValidationError(
+                    _(
+                        "It is necessary to choose organization from the controlled vocabulary. "
+                        "To add organization, please go to "
+                        "https://nusl.techlib.cz/cs/migrace-nusl/navrh-novych-hesel/"
+                    ),
+                    field_name="person_or_org",
+                )
+        return data
+
+    def from_vocabulary(self, affiliation):
+        """Check if affiliation is from the vocabulary."""
+        if "id" not in affiliation:
+            return False
+        return True
+
+
+def escape_opensearch_query(value: str) -> str:
+    """
+    Escapes special characters in a string for safe use in OpenSearch query syntax.
+    """
+    # Escape each special character with a backslash
+    escaped = re.sub(r'([\\+\-=&|><!(){}\[\]^"~*?:/])', r"\\\1", value)
+
+    return escaped

oarepo_runtime/services/schema/ui.py

@@ -16,7 +16,7 @@ from invenio_rdm_records.services.schemas.parent import RDMParentSchema
 from invenio_rdm_records.services.schemas.pids import PIDSchema
 from invenio_rdm_records.services.schemas.record import validate_scheme
 from invenio_rdm_records.services.schemas.versions import VersionsSchema
-from marshmallow.fields import Dict, Nested
+from marshmallow.fields import Dict, Nested, Raw
 from marshmallow_utils.fields import (
     BabelGettextDictField,
     FormatDate,
@@ -239,6 +239,8 @@ class InvenioRDMUISchema(InvenioUISchema, RDMBaseRecordSchema):
         values=Nested(PIDSchema),
     )
     parent = ma.fields.Nested(InvenioRDMParentUISchema)
+    access = ma.fields.Raw(attribute="access", data_key="access", dump_only=True)
+    files = ma.fields.Raw(attribute="files", data_key="files", dump_only=True)
 
     def hide_tombstone(self, data):
         """Hide tombstone info if the record isn't deleted and metadata if it is."""

oarepo_runtime/translations/cs/LC_MESSAGES/messages.po

@@ -83,3 +83,13 @@ msgstr ""
 #: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/i18n.py:28
 msgid "Both language and text must be provided."
 msgstr "Musí být vyplněn jazyk i hodnota."
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:103
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:127
+msgid ""
+"It is necessary to choose organization from the controlled vocabulary. To "
+"add organization, please go to https://nusl.techlib.cz/cs/migrace-"
+"nusl/navrh-novych-hesel/"
+msgstr ""
+"Organizaci je nutné vybrat ze slovníku. Pro doplnění nové, vyplňte formulář "
+"na https://nusl.techlib.cz/cs/migrace-nusl/navrh-novych-hesel/"

oarepo_runtime/translations/en/LC_MESSAGES/messages.po

@@ -87,3 +87,11 @@ msgstr ""
 #: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/i18n.py:28
 msgid "Both language and text must be provided."
 msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:103
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:127
+msgid ""
+"It is necessary to choose organization from the controlled vocabulary. To "
+"add organization, please go to https://nusl.techlib.cz/cs/migrace-"
+"nusl/navrh-novych-hesel/"
+msgstr ""

oarepo_runtime/translations/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-07-29 15:53+0200\n"
+"POT-Creation-Date: 2025-08-05 11:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,9 +53,18 @@ msgid "Version"
 msgstr ""
 
 #: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/i18n.py:28
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/i18n.py:29
 msgid "Both language and text must be provided."
 msgstr ""
 
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:103
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/rdm.py:127
+msgid ""
+"It is necessary to choose organization from the controlled vocabulary. To"
+" add organization, please go to https://nusl.techlib.cz/cs/migrace-nusl"
+"/navrh-novych-hesel/"
+msgstr ""
+
 #: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:155
 msgid "True"
 msgstr ""

{oarepo_runtime-1.10.1.dist-info → oarepo_runtime-1.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 1.10.1
+Version: 1.10.3
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.10.1.dist-info → oarepo_runtime-1.10.3.dist-info}/RECORD

@@ -136,28 +136,28 @@ oarepo_runtime/services/schema/marshmallow.py,sha256=iAMMH5MlYs59qetXAHOROvERNSc
 oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxWCD_gqJO8-8u1SbaPEFBjDZ5HGgGr0Ow,2027
 oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg5AC9RHrcB5QDKRq0,6661
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
-oarepo_runtime/services/schema/rdm.py,sha256=rtyO46CREmBJMQxgm0UenIbELSY6OAj35VbxFflIH_g,2272
+oarepo_runtime/services/schema/rdm.py,sha256=tfikqat-I3PH_WOIJSKOruPSlKn2uX8NSG-yqz8ch9w,4952
 oarepo_runtime/services/schema/rdm_ui.py,sha256=ffjl20tvRcuX3FNINOhGJWX84aTNEzJOqoKZum1s03s,3778
-oarepo_runtime/services/schema/ui.py,sha256=ff2AfK-G0fArlVHHKsDagPhu9NkMj6DPcVK4NycEO8c,8216
+oarepo_runtime/services/schema/ui.py,sha256=GXOAXF1ZaMU4NPkER-Xrq_xtRfblr5SzZDOZ4snbCh0,8382
 oarepo_runtime/services/schema/validation.py,sha256=aRfeR-2D1XXYqI3_U5FHoFvJrYjZlpM8nB35-M_u3Qs,2300
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
-oarepo_runtime/translations/messages.pot,sha256=7Sf8l_70GjmKnXKYioUFp8Z65qtW57BgR9N9NlwmiNU,3013
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=OxKvpWhjhv6WfhamLBrJ315vq7w1qVAhDoWRIk1qhAc,1138
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=BtgVxnFb2xMl0j5vnSDHjQmTnDfuV5zEqcwJpHs9bTc,2568
+oarepo_runtime/translations/messages.pot,sha256=Erv-fsNpX846dTWRsJrNui_40vmHPuSNWX0DDZvekKs,3440
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=NB-_iWSXHDZNQ8P53MRkq4NmGOdaYqufaKTVO2QVNBA,1466
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=b8aRnPdDGED2WaDDzQlE2xSrPIB7vI_xpVhNr_Sl5e0,3069
 oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=tq5pTCpH7cuzdwrQlpTMjS1jlnoV0dWDlK9mGcKT338,673
-oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=oWFA5kjT-sBNoZ3UIzYS03GQOvri5VqL9NcYnQnYsyQ,2562
+oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=XzuYdpAjXrd_LOiYpQJEcSPwUk94FlpAnuSyO4adAmE,2911
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/identity_utils.py,sha256=a8nnvkX_Am9iibLa82_iK-3agIl11LTxjiy5qPKBoT4,1183
 oarepo_runtime/utils/index.py,sha256=ArrUUXB-KowUcUksRKqcFpmqct4bn9alO1zd_kX2tmU,292
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.10.1.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.10.3.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
 tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.10.1.dist-info/METADATA,sha256=zCwp5S-_WPbVncdCa2Ceonl39ixjvE1YYIaacrXgW20,4789
-oarepo_runtime-1.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oarepo_runtime-1.10.1.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.10.1.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.10.1.dist-info/RECORD,,
+oarepo_runtime-1.10.3.dist-info/METADATA,sha256=rZfL4RhgaBADpTcJCK0iIOSVfnUzh4_CD2o3Yv1ayXA,4789
+oarepo_runtime-1.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.10.3.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.10.3.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.10.3.dist-info/RECORD,,