oarepo-runtime 1.5.72__py3-none-any.whl → 1.5.75__py3-none-any.whl

oarepo_runtime/cli/index.py

@@ -7,6 +7,7 @@ from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_records_resources.proxies import current_service_registry
 from invenio_search.proxies import current_search
+import traceback
 from werkzeug.utils import ImportStringError, import_string
 
 try:
@@ -102,9 +103,10 @@ def record_or_service(model):
 @click.option("--verbose/--no-verbose", default=False)
 def reindex(model, bulk_size, verbose):
     if not model:
-        services = current_service_registry._services.keys()
+        services = list(current_service_registry._services.keys())
     else:
         services = [model]
+    services = sort_services(services)
     for service_id in services:
         click.secho(f"Preparing to index {service_id}", file=sys.stderr)
 
@@ -200,14 +202,17 @@ def generate_bulk_data(record_generator, record_indexer, bulk_size):
     data = []
     n = 0
     for record in tqdm(record_generator):
-        index = record_indexer.record_to_index(record)
-        body = record_indexer._prepare_record(record, index)
-        index = record_indexer._prepare_index(index)
-        data.append({"index": {"_index": index, "_id": body["uuid"]}})
-        data.append(body)
-        if len(data) >= bulk_size:
-            yield data
-            data = []
+        try:
+            index = record_indexer.record_to_index(record)
+            body = record_indexer._prepare_record(record, index)
+            index = record_indexer._prepare_index(index)
+            data.append({"index": {"_index": index, "_id": body["uuid"]}})
+            data.append(body)
+            if len(data) >= bulk_size:
+                yield data
+                data = []
+        except:
+            traceback.print_exc()
     if data:
         yield data
 
@@ -240,5 +245,19 @@ def users_record_generator(model_class):
     except Exception as e:
         click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
 
+priorities = [
+    'vocabular',
+    'users',
+    'groups'
+]
+
+def sort_services(services):
+    def idx(x):
+        for idx, p in enumerate(priorities):
+            if p in x:
+                return idx, x
+        return len(priorities), x
+    services.sort(key=idx)
+    return services
 
 RECORD_GENERATORS = {"users": users_record_generator}

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/services/records/__init__.py

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

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/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/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/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/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/translations/messages.pot

@@ -1,50 +1,56 @@
 # Translations template for PROJECT.
-# Copyright (C) 2023 ORGANIZATION
+# Copyright (C) 2024 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
 #, 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"
+"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.13.1\n"
+"Generated-By: Babel 2.15.0\n"
 
-#: oarepo_runtime/services/search.py:39 oarepo_runtime/services/search.py:127
+#: /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 ""
 
-#: oarepo_runtime/services/search.py:43
-#: oarepo_runtime/translations/default_translations.py:5
+#: /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 ""
 
-#: oarepo_runtime/services/search.py:47
-#: oarepo_runtime/translations/default_translations.py:3
+#: /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 ""
 
-#: oarepo_runtime/services/search.py:51
-#: oarepo_runtime/translations/default_translations.py:4
+#: /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 ""
 
-#: oarepo_runtime/services/schema/ui.py:114
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
 msgid "True"
 msgstr ""
 
-#: oarepo_runtime/services/schema/ui.py:114
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
 msgid "False"
 msgstr ""
 
-#: oarepo_runtime/translations/default_translations.py:6
+#: /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.72.dist-info → oarepo_runtime-1.5.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.72
+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.72.dist-info → oarepo_runtime-1.5.75.dist-info}/RECORD

@@ -12,7 +12,7 @@ oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
 oarepo_runtime/cli/configuration.py,sha256=_iMmESs2dd1Oif95gxgpnkSxc13ymwr82_sTJfxlhrM,1091
 oarepo_runtime/cli/fixtures.py,sha256=l6zHpz1adjotrbFy_wcN2TOL8x20i-1jbQmaoEEo-UU,5419
-oarepo_runtime/cli/index.py,sha256=2dZvXtrph527YIgFTCQ8dIVsza-bZou9HBBzYRWAPTY,8243
+oarepo_runtime/cli/index.py,sha256=KH5PArp0fCNbgJI1zSz0pb69U9eyCdnJuy0aMIgf2tg,8685
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/datastreams/__init__.py,sha256=_i52Ek9J8DMARST0ejZAZPzUKm55xrrlKlCSO7dl6y4,1008
 oarepo_runtime/datastreams/asynchronous.py,sha256=JwT-Hx6P7KwV0vSJlxX6kLSIX5vtsekVsA2p_hZpJ_U,7402
@@ -26,7 +26,7 @@ oarepo_runtime/datastreams/semi_asynchronous.py,sha256=kNc6BBnV6oFoY9kHgf5l8fd1w
 oarepo_runtime/datastreams/synchronous.py,sha256=t5lfnMkLqy3jK5zMl-nIuA0HlMPiHGjwCqZ8XQP-3GM,2595
 oarepo_runtime/datastreams/transformers.py,sha256=q5KzHPl2kJg7HP1BtKJ7F_UMqg_7L1ZGDX0O7s8D6UI,521
 oarepo_runtime/datastreams/types.py,sha256=KZjblc3T_UFFW7LrMDmiR8lqVf86V484LAHj6yg05EI,9908
-oarepo_runtime/datastreams/utils.py,sha256=GYpVdwMks0GRdz8DBpErdiV_2aJ-3V1uAkOHyz67bZw,4001
+oarepo_runtime/datastreams/utils.py,sha256=WvYwvCnmS0vrcQ-Fbptu-GvBTMx_8UVhUqs_-BN-p-E,4111
 oarepo_runtime/datastreams/readers/__init__.py,sha256=P1n3llZQ3AFHnSPbeT1VaCJcEtRFz9AbHfjkZv5LG7s,1103
 oarepo_runtime/datastreams/readers/attachments.py,sha256=A7EC1TqyTHG-go5DIaRotlBSOm6o9hGqAKyVVAceCRU,1956
 oarepo_runtime/datastreams/readers/excel.py,sha256=CM8lr8mejN7NgoK5TJb1oXpjq0HxklQKMsuj3uqjTjA,3653
@@ -73,7 +73,7 @@ oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=k--zu1RinwoKzg5qHp4H-Ddp9AFyjMJ97fydQ0DvI-A,4238
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
-oarepo_runtime/services/results.py,sha256=_Din6CxQH7E5TP0TVZjIXJb2vyJRL_o_97jkUQo-GOc,4062
+oarepo_runtime/services/results.py,sha256=HVBEPAMFwwCJDqBhaP3t3ekH1CpNDtE6ovVNKgWxuw8,5409
 oarepo_runtime/services/search.py,sha256=9xGTN5Yg6eTdptQ9qjO_umbacf9ooMuHYGXWYfla4-M,6227
 oarepo_runtime/services/config/__init__.py,sha256=dtlD84pJ6xI77UF22IPrCOt7tHD3g5DAEDApUdjDVFE,406
 oarepo_runtime/services/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
@@ -101,6 +101,8 @@ oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
 oarepo_runtime/services/permissions/__init__.py,sha256=Cgin2Zr1fpaYr-aZcUotdmv0hsrPTUJVQt8ouvU8tuU,95
 oarepo_runtime/services/permissions/generators.py,sha256=YEOBCCvU-RG0BSWMtg76sv8qLcMbXxNu3rRJPDLtvvQ,1371
+oarepo_runtime/services/records/__init__.py,sha256=hIoa2fx1AkDr6c-MgY561U2oN9LFeUCtfbVnetpBUOg,78
+oarepo_runtime/services/records/links.py,sha256=gVe-_hGkLtX7pd6sS6jTbRIhBby2FTn9PXyYPy3yxzs,737
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/relations/components.py,sha256=3g0VdnGUM-2yYt50fPi-OADReBGJb4h05vmYHfh-QFs,592
 oarepo_runtime/services/relations/errors.py,sha256=VtlOKq9MEUeJ4IsiZhY7lWoshrusA_RL4SOHe2titno,552
@@ -116,14 +118,13 @@ oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
 oarepo_runtime/services/schema/rdm.py,sha256=XQ5p72Q_WVRTQkFeJvDiave8F5YSXU05IduTuYFO4gA,574
 oarepo_runtime/services/schema/ui.py,sha256=xQgW-zLyZoHldGw47uVtXQj-5LexVNKTholyq4MiBZo,3777
-oarepo_runtime/services/schema/validation.py,sha256=uIDJ0Phh62tDE0Mme-7Z3R_2TZY7k0MwjB3hrn5be_g,1356
+oarepo_runtime/services/schema/validation.py,sha256=g2lpFwgQygWdLgq5bRvLAjVqXVOJpfVJ7umDp5xEGRU,1849
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
-oarepo_runtime/translations/jinjax_messages.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/translations/messages.pot,sha256=QvwHdrmqwaYpZIsnVTEmsk7MnG8J2Sy32_8aGFyfz_o,1303
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=DtC7lBIWsacoe_chzIVlPYBCNutlXpO5O8bz3NFT4LU,683
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=vGZQo5NlTtj_qsJuDwJqI1kAkcyOM4m7UNWiVpgkmxo,1287
-oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=FKAl1wlg2NhtQ1-9U2dkUwcotR959j5GuUKJygCYpwI,445
-oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=rZ2PGvkcJbmuwrWeFX5edk0zJIzZnL83M9HSAceDP_U,1193
+oarepo_runtime/translations/messages.pot,sha256=jyC7mRH5P9uwVVqz9ycvn-T8gcohr62x__O0sC6g2w4,1846
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=cSTRnVoi8DxfrXD-ImHYUmxdnNQMnxIn2yFRTObwRzI,801
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=bzO7bZlnifHU0E7khXePmP12lGmzYXudjAWVDb87KrE,1508
+oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=b4cLKr5VojJPSuCeQ9T1lJKYMM_o80IgiNNL-iQUL8E,445
+oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=akMJzNcvoZmF9j06Cd_oyQX-tMOfYjG1yRAP7tNDhGA,1370
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
@@ -131,9 +132,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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.5.72.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.72.dist-info/METADATA,sha256=NmVgzl6SJu489vMIebbEad-M3jpzpxTER2qZZEHQ6M4,4720
-oarepo_runtime-1.5.72.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.72.dist-info/entry_points.txt,sha256=0cschM0RHc6UJ1uudhu4EP0hrVStPGpgMO-XEDGRtY4,430
-oarepo_runtime-1.5.72.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.72.dist-info/RECORD,,
+oarepo_runtime-1.5.75.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.75.dist-info/METADATA,sha256=hd71O2EzxcURIGg7qgV2G41KUG1ZBaoazG-lox_VHMw,4720
+oarepo_runtime-1.5.75.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.75.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.75.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.75.dist-info/RECORD,,

{oarepo_runtime-1.5.72.dist-info → oarepo_runtime-1.5.75.dist-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