oarepo-runtime 1.5.73__tar.gz → 1.5.75__tar.gz

{oarepo_runtime-1.5.73/oarepo_runtime.egg-info → oarepo_runtime-1.5.75}/PKG-INFO

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

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime/datastreams/utils.py

@@ -15,12 +15,16 @@ def get_record_service_for_record(record):
     if not record:
         return None
     if "OAREPO_PRIMARY_RECORD_SERVICE" in current_app.config:
-        service_id = current_app.config["OAREPO_PRIMARY_RECORD_SERVICE"][type(record)]
-        return current_service_registry.get(service_id)
+        return get_record_service_for_record_class(type(record))
     else:
         return get_record_service_for_record_deprecated(record)
 
 
+def get_record_service_for_record_class(record_cls):
+    service_id = current_app.config["OAREPO_PRIMARY_RECORD_SERVICE"][record_cls]
+    return current_service_registry.get(service_id)
+
+
 @deprecated(
     version="1.5.43", reason="Please recompile model to remove this deprecation warning"
 )

oarepo_runtime-1.5.75/oarepo_runtime/services/records/__init__.py

@@ -0,0 +1,3 @@
+from .links import pagination_links_html
+
+__all__ = ("pagination_links_html",)

oarepo_runtime-1.5.75/oarepo_runtime/services/records/links.py

@@ -0,0 +1,21 @@
+from invenio_records_resources.services.base.links import Link
+
+def pagination_links_html(tpl: str)->dict[str, Link]:
+    """Create pagination links (prev/selv/next) from the same template."""
+    return {
+        "prev_html": Link(
+            tpl,
+            when=lambda pagination, ctx: pagination.has_prev,
+            vars=lambda pagination, vars: vars["args"].update(
+                {"page": pagination.prev_page.page}
+            ),
+        ),
+        "self_html": Link(tpl),
+        "next_html": Link(
+            tpl,
+            when=lambda pagination, ctx: pagination.has_next,
+            vars=lambda pagination, vars: vars["args"].update(
+                {"page": pagination.next_page.page}
+            ),
+        ),
+    }

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime/services/results.py

@@ -1,3 +1,4 @@
+from invenio_records_resources.errors import _iter_errors_dict
 from invenio_records_resources.services.records.results import (
     RecordItem as BaseRecordItem,
 )
@@ -30,6 +31,44 @@ class RecordItem(BaseRecordItem):
             )
         return _data
 
+    @property
+    def errors(self):
+        return postprocess_errors(self._errors)
+
+    def to_dict(self):
+        """Get a dictionary for the record."""
+        res = self.data
+        if self._errors:
+            res["errors"] = self.errors
+        return res
+
+
+def postprocess_error_messages(field_path: str, messages: any):
+    """Postprocess error messages, looking for those that were not correctly processed by marshmallow/invenio.
+
+    """
+    if not isinstance(messages, list):
+        yield {"field": field_path, "messages": messages}
+    else:
+        str_messages = [ msg for msg in messages if isinstance(msg, str) ]
+        non_str_messages = [ msg for msg in messages if not isinstance(msg, str) ]
+
+        if str_messages:
+            yield {"field": field_path, "messages": str_messages}
+        else:
+            for non_str_msg in non_str_messages:
+                yield from _iter_errors_dict(non_str_msg, field_path)
+
+
+def postprocess_errors(errors: list[dict]):
+    """Postprocess errors."""
+    converted_errors = []
+    for error in errors:
+        if error.get("messages"):
+            converted_errors.extend(postprocess_error_messages(error["field"], error["messages"]))
+        else:
+            converted_errors.append(error)
+    return converted_errors
 
 class RecordList(BaseRecordList):
     components = []

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime/services/schema/validation.py

@@ -6,14 +6,24 @@ from idutils import normalize_pid
 from marshmallow.exceptions import ValidationError
 from marshmallow_utils.fields.edtfdatestring import EDTFValidator
 
+from invenio_i18n import gettext as _
+
 
 def validate_identifier(value):
     try:
-        value["identifier"] = normalize_pid(
+        original_identifier = (value["identifier"] or '').strip()
+        normalized_identifier = normalize_pid(
             value["identifier"], value["scheme"].lower()
         )
+        if original_identifier and not normalized_identifier:
+            # the normalize_pid library has problems with isbn - does not raise an exception
+            # but returns an empty string
+            raise ValueError()
+        value["identifier"] = normalized_identifier
     except:
-        raise ValidationError(f"Invalid {value['scheme']} value {value['identifier']}")
+        raise ValidationError({
+            "identifier": _("Invalid value %(identifier)s of identifier type %(type)s") % {"identifier": value['identifier'], "type": value['scheme']}
+        })
     return value
 
 

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime/translations/cs/LC_MESSAGES/messages.po

@@ -46,3 +46,8 @@ msgstr "Dle názvu"
 #: oarepo_runtime/services/schema/ui.py:114
 msgid "False"
 msgstr "Ne"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/validation.py:19
+#, python-format
+msgid "Invalid value %(identifier)s of identifier type %(type)s"
+msgstr "%(type)s: Neplatná hodnota '%(identifier)s'"

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime/translations/en/LC_MESSAGES/messages.po

@@ -45,3 +45,8 @@ msgstr ""
 #: oarepo_runtime/services/schema/ui.py:114
 msgid "False"
 msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/validation.py:19
+#, python-format
+msgid "Invalid value %(identifier)s of identifier type %(type)s"
+msgstr ""

oarepo_runtime-1.5.75/oarepo_runtime/translations/messages.pot

@@ -0,0 +1,56 @@
+# Translations template for PROJECT.
+# Copyright (C) 2024 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2024-11-28 10:16+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:60
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:146
+msgid "By Title"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:64
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:5
+msgid "Best match"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:68
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:3
+msgid "Newest"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:72
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:4
+msgid "Oldest"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
+msgid "True"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
+msgid "False"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/validation.py:19
+#, python-format
+msgid "Invalid value %(identifier)s of identifier type %(type)s"
+msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:6
+msgid "Contact"
+msgstr ""
+

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime.egg-info/SOURCES.txt

@@ -113,6 +113,8 @@ oarepo_runtime/services/files/components.py
 oarepo_runtime/services/files/service.py
 oarepo_runtime/services/permissions/__init__.py
 oarepo_runtime/services/permissions/generators.py
+oarepo_runtime/services/records/__init__.py
+oarepo_runtime/services/records/links.py
 oarepo_runtime/services/relations/__init__.py
 oarepo_runtime/services/relations/components.py
 oarepo_runtime/services/relations/errors.py
@@ -130,7 +132,6 @@ oarepo_runtime/services/schema/rdm.py
 oarepo_runtime/services/schema/ui.py
 oarepo_runtime/services/schema/validation.py
 oarepo_runtime/translations/default_translations.py
-oarepo_runtime/translations/jinjax_messages.jinja
 oarepo_runtime/translations/messages.pot
 oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo
 oarepo_runtime/translations/cs/LC_MESSAGES/messages.po

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/oarepo_runtime.egg-info/entry_points.txt

@@ -11,3 +11,6 @@ oarepo_runtime_info = oarepo_runtime.info.views:create_wellknown_blueprint
 [invenio_celery.tasks]
 oarepo_runtime_check = oarepo_runtime.tasks
 oarepo_runtime_datastreams = oarepo_runtime.datastreams
+
+[invenio_i18n.translations]
+oarepo_runtime = oarepo_runtime

{oarepo_runtime-1.5.73 → oarepo_runtime-1.5.75}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.73
+version = 1.5.75
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md
@@ -54,15 +54,8 @@ invenio_celery.tasks =
 invenio_base.blueprints = 
 	oarepo_runtime_info = oarepo_runtime.info.views:create_wellknown_blueprint
 	oarepo_runtime_check = oarepo_runtime.info.check:blueprint
-
-[oarepo.i18n]
-languages = 
-	cs
-	en
-babel_source_paths = 
-	oarepo_runtime
-babel_output_translations = 
-	oarepo_runtime/translations
+invenio_i18n.translations = 
+	oarepo_runtime = oarepo_runtime
 
 [egg_info]
 tag_build = 

oarepo_runtime-1.5.73/oarepo_runtime/translations/messages.pot

@@ -1,50 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2023 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-11-21 14:39+0100\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.13.1\n"
-
-#: oarepo_runtime/services/search.py:39 oarepo_runtime/services/search.py:127
-msgid "By Title"
-msgstr ""
-
-#: oarepo_runtime/services/search.py:43
-#: oarepo_runtime/translations/default_translations.py:5
-msgid "Best match"
-msgstr ""
-
-#: oarepo_runtime/services/search.py:47
-#: oarepo_runtime/translations/default_translations.py:3
-msgid "Newest"
-msgstr ""
-
-#: oarepo_runtime/services/search.py:51
-#: oarepo_runtime/translations/default_translations.py:4
-msgid "Oldest"
-msgstr ""
-
-#: oarepo_runtime/services/schema/ui.py:114
-msgid "True"
-msgstr ""
-
-#: oarepo_runtime/services/schema/ui.py:114
-msgid "False"
-msgstr ""
-
-#: oarepo_runtime/translations/default_translations.py:6
-msgid "Contact"
-msgstr ""
-