oarepo-runtime 1.5.131__py3-none-any.whl → 1.5.132__py3-none-any.whl

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/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.131.dist-info → oarepo_runtime-1.5.132.dist-info}/METADATA

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

{oarepo_runtime-1.5.131.dist-info → oarepo_runtime-1.5.132.dist-info}/RECORD

@@ -88,7 +88,7 @@ oarepo_runtime/resources/responses.py,sha256=Pj-K_r-QO9B2n9STcfqsrBQu1e3iYhdEBFS
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=0aqmuNbGCQhfOI22f6mM2DxuKSTqstGOGyisOiqw9KE,15481
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
-oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
+oarepo_runtime/services/results.py,sha256=MxkoMkquISMKyP6De_xOF-IzQE9wRYtq3d_OFAqqIVo,6156
 oarepo_runtime/services/search.py,sha256=t0WEe2VrbCzZ06-Jgz7C9-pc9y27BqAgTEXldEHskfk,9409
 oarepo_runtime/services/service.py,sha256=TI2ulEVlSR7HZnfPYltLl8Vf4O9fhJ7rHaV6G4HWbrc,1893
 oarepo_runtime/services/config/__init__.py,sha256=aRxCBLN9pqCgdYlF-KJYtDzt2mwJ66npdceOAZkMfa0,888
@@ -135,7 +135,7 @@ oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxW
 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=dBy1KCJ_XYAN_cffoRqLfQVEdZOKwmSpqGdEP4OL64k,1280
-oarepo_runtime/services/schema/rdm_ui.py,sha256=KBTPAv4NkTNuhxIbOGzdBUXkwqKb-2q5EjWH2eTzc84,3430
+oarepo_runtime/services/schema/rdm_ui.py,sha256=oXV8wGFChL84Y1xtkhZ89eZ4Ngr6RV8iavf32e4nCVI,3544
 oarepo_runtime/services/schema/ui.py,sha256=ae75YON8yNGxblywCgqX2OS9ACXHGzcN_adlLKIRUYk,7937
 oarepo_runtime/services/schema/validation.py,sha256=aRfeR-2D1XXYqI3_U5FHoFvJrYjZlpM8nB35-M_u3Qs,2300
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
@@ -147,13 +147,13 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=7-5S3iINOSFSI5gVdR
 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
-oarepo_runtime-1.5.131.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.132.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.5.131.dist-info/METADATA,sha256=L5WjE2XqzWZFq_xhsIJwdo7NwozJhSNbaT-iZpyCjS4,4743
-oarepo_runtime-1.5.131.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-oarepo_runtime-1.5.131.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.131.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.131.dist-info/RECORD,,
+oarepo_runtime-1.5.132.dist-info/METADATA,sha256=N8ZqyVaKnHlbzZMniukRmlW4Jp0U4UlTAEjciSgI7k8,4743
+oarepo_runtime-1.5.132.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+oarepo_runtime-1.5.132.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.132.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.132.dist-info/RECORD,,