oarepo-runtime 1.10.1__tar.gz → 1.10.3__tar.gz

{oarepo_runtime-1.10.1/oarepo_runtime.egg-info → oarepo_runtime-1.10.3}/PKG-INFO

@@ -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.3/oarepo_runtime/services/schema/rdm.py

@@ -0,0 +1,146 @@
+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.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
+from marshmallow import pre_load
+from marshmallow_utils.fields import (
+    IdentifierSet,
+)
+from marshmallow_utils.fields.nestedattr import NestedAttribute
+from marshmallow_utils.schemas.identifier import IdentifierSchema
+
+from .i18n import MultilingualField
+
+
+class RDMRecordMixin(ma.Schema):
+    versions = NestedAttribute(VersionsSchema, dump_only=True)
+    deletion_status = ma_fields.Nested(DeletionStatusSchema, dump_only=True)
+
+
+class MultilingualAwardSchema(AwardRelationSchema):
+    class Meta:
+        unknown = ma.RAISE
+
+    @pre_load()
+    def convert_to_multilingual(self, data, many, **kwargs):
+        if "title" in data and type(data["title"]) is str:
+            lang = get_locale()
+            data["title"] = {lang: data["title"]}
+        return data
+
+
+class FundingSchema(ma.Schema):
+    """Funding schema."""
+
+    funder = ma_fields.Nested(FunderRelationSchema, required=True)
+    award = ma_fields.Nested(MultilingualAwardSchema)
+
+
+class RecordIdentifierField(IdentifierSet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(
+            ma.fields.Nested(
+                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
+            ),
+            *args,
+            **kwargs,
+        )
+
+
+class RelatedRecordIdentifierField(IdentifierSet):
+    def __init__(self, *args, **kwargs):
+        super().__init__(
+            ma.fields.Nested(
+                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
+            ),
+            *args,
+            **kwargs,
+        )
+
+
+class RDMSubjectSchema(ma.Schema):
+    """Subject ui schema."""
+
+    class Meta:
+        unknown = ma.RAISE
+
+    _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-1.10.1 → oarepo_runtime-1.10.3}/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-1.10.1 → oarepo_runtime-1.10.3}/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-1.10.1 → oarepo_runtime-1.10.3}/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-1.10.1 → oarepo_runtime-1.10.3}/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 → oarepo_runtime-1.10.3/oarepo_runtime.egg-info}/PKG-INFO

@@ -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 → oarepo_runtime-1.10.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.10.1
+version = 1.10.3
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md

oarepo_runtime-1.10.1/oarepo_runtime/services/schema/rdm.py

@@ -1,75 +0,0 @@
-from functools import partial
-
-import marshmallow as ma
-from invenio_i18n.selectors import get_locale
-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_vocabularies.contrib.awards.schema import AwardRelationSchema
-from invenio_vocabularies.contrib.funders.schema import FunderRelationSchema
-from marshmallow import fields as ma_fields
-from marshmallow import pre_load
-from marshmallow_utils.fields import (
-    IdentifierSet,
-)
-from marshmallow_utils.fields.nestedattr import NestedAttribute
-from marshmallow_utils.schemas.identifier import IdentifierSchema
-
-from .i18n import MultilingualField
-
-
-class RDMRecordMixin(ma.Schema):
-    versions = NestedAttribute(VersionsSchema, dump_only=True)
-    deletion_status = ma_fields.Nested(DeletionStatusSchema, dump_only=True)
-
-
-class MultilingualAwardSchema(AwardRelationSchema):
-    class Meta:
-        unknown = ma.RAISE
-
-    @pre_load()
-    def convert_to_multilingual(self, data, many, **kwargs):
-        if "title" in data and type(data["title"]) is str:
-            lang = get_locale()
-            data["title"] = {lang: data["title"]}
-        return data
-
-
-class FundingSchema(ma.Schema):
-    """Funding schema."""
-
-    funder = ma_fields.Nested(FunderRelationSchema, required=True)
-    award = ma_fields.Nested(MultilingualAwardSchema)
-
-
-class RecordIdentifierField(IdentifierSet):
-    def __init__(self, *args, **kwargs):
-        super().__init__(
-            ma.fields.Nested(
-                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
-            ),
-            *args,
-            **kwargs
-        )
-
-
-class RelatedRecordIdentifierField(IdentifierSet):
-    def __init__(self, *args, **kwargs):
-        super().__init__(
-            ma.fields.Nested(
-                partial(IdentifierSchema, allowed_schemes=record_identifiers_schemes)
-            ),
-            *args,
-            **kwargs
-        )
-
-
-class RDMSubjectSchema(ma.Schema):
-    """Subject ui schema."""
-
-    class Meta:
-        unknown = ma.RAISE
-
-    _id = ma.fields.String(data_key="id")
-
-    subject = MultilingualField()