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

oarepo_runtime/services/schema/rdm.py

@@ -1,17 +1,10 @@
-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 (
-    CreatorSchema,
-    record_identifiers_schemes,
-)
+from invenio_rdm_records.services.schemas.metadata import 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
@@ -79,68 +72,4 @@ 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
+    subject = MultilingualField()

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

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

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

@@ -136,7 +136,7 @@ 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=tfikqat-I3PH_WOIJSKOruPSlKn2uX8NSG-yqz8ch9w,4952
+oarepo_runtime/services/schema/rdm.py,sha256=TwUuxxHeJZFFptMAfEcquaO-7ss6GBSlNoLDzmy53Ek,2273
 oarepo_runtime/services/schema/rdm_ui.py,sha256=ffjl20tvRcuX3FNINOhGJWX84aTNEzJOqoKZum1s03s,3778
 oarepo_runtime/services/schema/ui.py,sha256=GXOAXF1ZaMU4NPkER-Xrq_xtRfblr5SzZDOZ4snbCh0,8382
 oarepo_runtime/services/schema/validation.py,sha256=aRfeR-2D1XXYqI3_U5FHoFvJrYjZlpM8nB35-M_u3Qs,2300
@@ -151,13 +151,13 @@ oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRU
 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.3.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.10.4.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.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,,
+oarepo_runtime-1.10.4.dist-info/METADATA,sha256=-wlvwmix8KBfIQlEbtsRnyuuG4Ff4Wiug2cqY90JG70,4789
+oarepo_runtime-1.10.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.10.4.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.10.4.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.10.4.dist-info/RECORD,,