oarepo-runtime 1.5.130__tar.gz → 1.5.132__tar.gz

{oarepo_runtime-1.5.130/oarepo_runtime.egg-info → oarepo_runtime-1.5.132}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 1.5.130
+Version: 1.5.132
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -22,6 +22,7 @@ Requires-Dist: oarepo-tools; extra == "dev"
 Provides-Extra: tests
 Requires-Dist: pytest>=7.1.2; extra == "tests"
 Requires-Dist: psutil; extra == "tests"
+Dynamic: license-file
 
 # OARepo runtime
 

oarepo_runtime-1.5.132/oarepo_runtime/records/pid_providers.py

@@ -0,0 +1,22 @@
+from invenio_pidstore.models import PersistentIdentifier, PIDStatus
+
+
+class UniversalPIDMixin:
+    unpid_pid_type = "unpid"
+    unpid_default_status = PIDStatus.REGISTERED
+
+    @classmethod
+    def create(cls, object_type=None, object_uuid=None, options=None, **kwargs):
+        pid = super().create(
+            object_type=object_type, object_uuid=object_uuid, options=options, **kwargs
+        )
+        assert pid.pid.pid_value is not None
+        control_pid = PersistentIdentifier.create(
+            cls.unpid_pid_type,
+            pid.pid.pid_value,
+            pid_provider=None,
+            object_type=object_type,
+            object_uuid=object_uuid,
+            status=cls.unpid_default_status,
+        )
+        return pid

{oarepo_runtime-1.5.130 → oarepo_runtime-1.5.132}/oarepo_runtime/services/results.py

@@ -1,3 +1,5 @@
+import logging
+
 from invenio_records_resources.errors import _iter_errors_dict
 from invenio_records_resources.services.records.results import (
     RecordItem as BaseRecordItem,
@@ -6,6 +8,8 @@ from invenio_records_resources.services.records.results import (
     RecordList as BaseRecordList,
 )
 
+log = logging.getLogger(__name__)
+
 
 class ResultsComponent:
     def update_data(self, identity, record, projection, expand):
@@ -44,14 +48,12 @@ class RecordItem(BaseRecordItem):
 
 
 def postprocess_error_messages(field_path: str, messages: any):
-    """Postprocess error messages, looking for those that were not correctly processed by marshmallow/invenio.
-
-    """
+    """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) ]
+        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}
@@ -65,11 +67,14 @@ def postprocess_errors(errors: list[dict]):
     converted_errors = []
     for error in errors:
         if error.get("messages"):
-            converted_errors.extend(postprocess_error_messages(error["field"], error["messages"]))
+            converted_errors.extend(
+                postprocess_error_messages(error["field"], error["messages"])
+            )
         else:
             converted_errors.append(error)
     return converted_errors
 
+
 class RecordList(BaseRecordList):
     components = []
 
@@ -101,37 +106,43 @@ class RecordList(BaseRecordList):
         for hit in self._results:
             # Load dump
             hit_dict = hit.to_dict()
-            if hit_dict.get("record_status") == "draft":
-                record = self._service.draft_cls.loads(hit_dict)
-            else:
-                record = self._service.record_cls.loads(hit_dict)
 
-            # Project the record
-            projection = self._schema.dump(
-                record,
-                context=dict(
-                    identity=self._identity,
-                    record=record,
-                ),
-            )
-            if hasattr(self._service.config, "links_search_item"):
-                links_tpl = self._service.config.search_item_links_template(
-                    self._service.config.links_search_item
-                )
-                projection["links"] = links_tpl.expand(self._identity, record)
-            elif self._links_item_tpl:
-                projection["links"] = self._links_item_tpl.expand(
-                    self._identity, record
+            try:
+                # Project the record
+                if hit_dict.get("record_status") == "draft":
+                    record = self._service.draft_cls.loads(hit_dict)
+                else:
+                    record = self._service.record_cls.loads(hit_dict)
+
+                projection = self._schema.dump(
+                    record,
+                    context=dict(
+                        identity=self._identity,
+                        record=record,
+                    ),
                 )
-            # todo optimization viz FieldsResolver
-            for c in self.components:
-                c.update_data(
-                    identity=self._identity,
-                    record=record,
-                    projection=projection,
-                    expand=self._expand,
-                )
-            yield projection
+                if hasattr(self._service.config, "links_search_item"):
+                    links_tpl = self._service.config.search_item_links_template(
+                        self._service.config.links_search_item
+                    )
+                    projection["links"] = links_tpl.expand(self._identity, record)
+                elif self._links_item_tpl:
+                    projection["links"] = self._links_item_tpl.expand(
+                        self._identity, record
+                    )
+                # todo optimization viz FieldsResolver
+                for c in self.components:
+                    c.update_data(
+                        identity=self._identity,
+                        record=record,
+                        projection=projection,
+                        expand=self._expand,
+                    )
+                yield projection
+            except Exception:
+                # ignore record with error, put it to log so that it gets to glitchtip
+                # but don't break the whole search
+                log.exception("Error while dumping record %s", hit_dict)
 
 
 class ArrayRecordItem(RecordItem):

{oarepo_runtime-1.5.130 → oarepo_runtime-1.5.132}/oarepo_runtime/services/schema/rdm_ui.py

@@ -1,7 +1,8 @@
 import marshmallow as ma
-from oarepo_runtime.services.schema.marshmallow import DictOnlySchema
-from oarepo_vocabularies.services.ui_schema import VocabularyI18nStrUIField
 from idutils import to_url
+from oarepo_vocabularies.services.ui_schema import VocabularyI18nStrUIField
+
+from oarepo_runtime.services.schema.marshmallow import DictOnlySchema
 
 
 class RDMIdentifierWithSchemaUISchema(ma.Schema):
@@ -12,12 +13,16 @@ class RDMIdentifierWithSchemaUISchema(ma.Schema):
 
     @ma.post_dump
     def add_url(self, value, **kwargs):
-        if "identifier" in value and "scheme" in value:
-            url = to_url(
-                value["identifier"], value["scheme"].lower(), url_scheme="https"
-            )
-            if url:
-                value["url"] = url
+        try:
+            # ignore errors here
+            if "identifier" in value and "scheme" in value:
+                url = to_url(
+                    value["identifier"], value["scheme"].lower(), url_scheme="https"
+                )
+                if url:
+                    value["url"] = url
+        except Exception:
+            pass
         return value
 
 

{oarepo_runtime-1.5.130 → oarepo_runtime-1.5.132/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 1.5.130
+Version: 1.5.132
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -22,6 +22,7 @@ Requires-Dist: oarepo-tools; extra == "dev"
 Provides-Extra: tests
 Requires-Dist: pytest>=7.1.2; extra == "tests"
 Requires-Dist: psutil; extra == "tests"
+Dynamic: license-file
 
 # OARepo runtime
 

{oarepo_runtime-1.5.130 → oarepo_runtime-1.5.132}/oarepo_runtime.egg-info/SOURCES.txt

@@ -66,6 +66,7 @@ oarepo_runtime/info/permissions/__init__.py
 oarepo_runtime/info/permissions/debug.py
 oarepo_runtime/records/__init__.py
 oarepo_runtime/records/drafts.py
+oarepo_runtime/records/pid_providers.py
 oarepo_runtime/records/dumpers/__init__.py
 oarepo_runtime/records/dumpers/edtf_interval.py
 oarepo_runtime/records/dumpers/multilingual_dumper.py

{oarepo_runtime-1.5.130 → oarepo_runtime-1.5.132}/setup.cfg

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