oarepo-runtime 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

oarepo_runtime/datastreams/cli.py

@@ -53,8 +53,9 @@ def load(
         def error_callback(entry: StreamEntry):
             pprint(entry.entry)
             for err in entry.errors:
-                print(err.type)
+                print(err.code)
                 print(err.message)
+                print(err.info)
 
     else:
         error_callback = None

oarepo_runtime/relations/errors.py

@@ -0,0 +1,5 @@
+class InvalidRelationError(KeyError):
+    def __init__(self, message, related_id, location):
+        self.related_id = related_id
+        self.location = location
+        super().__init__(message)

oarepo_runtime/relations/pid_relation.py

@@ -1,6 +1,7 @@
 from invenio_db import db
 
 from .base import Relation, RelationResult
+from .errors import InvalidRelationError
 from .lookup import LookupResult
 
 
@@ -8,19 +9,23 @@ class PIDRelationResult(RelationResult):
     def resolve(self, id_):
         """Resolve the value using the record class."""
         # TODO: handle permissions here !!!!!!
-        pid_field = self.field.pid_field.field
-        cache_key = (
-            pid_field._provider.pid_type
-            if pid_field._provider
-            else pid_field._pid_type,
-            id_,
-        )
+        pid_field_context = self.field.pid_field
+        if hasattr(pid_field_context, "pid_type"):
+            pid_type = pid_field_context.pid_type
+        else:
+            pid_field = pid_field_context.field
+            pid_type = (
+                pid_field._provider.pid_type
+                if pid_field._provider
+                else pid_field._pid_type
+            )
+        cache_key = (pid_type, id_)
         if cache_key in self.cache:
             obj = self.cache[cache_key]
             return obj
 
         try:
-            obj = self.field.pid_field.resolve(id_)
+            obj = pid_field_context.resolve(id_)
             # We detach the related record model from the database session when
             # we add it in the cache. Otherwise, accessing the cached record
             # model, will execute a new select query after a db.session.commit.
@@ -28,8 +33,10 @@ class PIDRelationResult(RelationResult):
             self.cache[cache_key] = obj
             return obj
         except Exception as e:
-            raise KeyError(
-                f"Repository object {cache_key} has not been found or there was an exception accessing it"
+            raise InvalidRelationError(
+                f"Repository object {cache_key} has not been found or there was an exception accessing it. Referenced from {self.field.key}.",
+                related_id=id_,
+                location=self.field.key,
             ) from e
 
     def _needs_update_relation_value(self, relation: LookupResult):

{oarepo_runtime-1.4.3.dist-info → oarepo_runtime-1.4.5.dist-info}/METADATA

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

{oarepo_runtime-1.4.3.dist-info → oarepo_runtime-1.4.5.dist-info}/RECORD

@@ -20,7 +20,7 @@ oarepo_runtime/config/service.py,sha256=IDDEQJ3LWYBLTFhE_8jPXiinIDNDY52fI0zigDJ_
 oarepo_runtime/datastreams/__init__.py,sha256=bscO2zTYf1eEppYx74b54-fcb2wz7YUDjGupqafuFc0,724
 oarepo_runtime/datastreams/batch.py,sha256=Xe0kXZigDeHU6Sjvo7w4_zjas8lShc2aTJpaAAQ3Iq0,551
 oarepo_runtime/datastreams/catalogue.py,sha256=TQjH7-qSrKhPEeq-7Q6OxmgGzvlsyrheVQbT_O4fwT8,5393
-oarepo_runtime/datastreams/cli.py,sha256=rats49mrlKwCAHPc-5795syRRghe6pJLsebSUPdO_-Y,2943
+oarepo_runtime/datastreams/cli.py,sha256=heeXcbjqsC7HXK1HKNdkj25qISqdqXBsJQKFLpYhFDA,2975
 oarepo_runtime/datastreams/config.py,sha256=ALq7otBFMHjT3GV59KpkEV-8ZborWrYLXyB3v5-nFGE,1083
 oarepo_runtime/datastreams/datastreams.py,sha256=yzvyE8UzO3GUtaZOPHcIts8x0BPnLGIPjYH-JTCiU3g,8177
 oarepo_runtime/datastreams/errors.py,sha256=ZcwAsmczSTtHXljyDSrgqGhYD7td9rTLXZJvPjr72pA,1627
@@ -60,10 +60,11 @@ oarepo_runtime/i18n/validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wU
 oarepo_runtime/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
 oarepo_runtime/relations/base.py,sha256=YLfZ_AKGv1uf-d22U01e7OwiBgW00lBmsPQbknhTFLI,8329
 oarepo_runtime/relations/components.py,sha256=J9rvzaAoRDbSVuA01hIOlXKQP-OE5VJI5w5xuMsFO70,602
+oarepo_runtime/relations/errors.py,sha256=t-vVyefGPP07-_-YmhWjjGbhXU3GQ3sVtUPt5_IZ-5E,197
 oarepo_runtime/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
 oarepo_runtime/relations/mapping.py,sha256=jwFCWCnW8hb44ZZBeVf96QR79S9FT2hvm4L8EuCBo5U,1277
-oarepo_runtime/relations/pid_relation.py,sha256=OrF0Ihgua3tC7j5VBH116D5zHNHyodoeWux3ThLAZ3c,2063
+oarepo_runtime/relations/pid_relation.py,sha256=SEAZ99x9lOj91EPSIDZuVCTWW1a13A5iv9RrO7GRdUY,2424
 oarepo_runtime/relations/uow.py,sha256=KrN8B-wVbmb0kOErxb7bAhPmOR6-mMRgBr-ab-ir6hQ,151
 oarepo_runtime/resolvers/__init__.py,sha256=kTlvSiympib59YQV7wEKpIXGprPWRuvxLIwmeeQdUec,89
 oarepo_runtime/resolvers/proxies.py,sha256=egtT7uXL91KswWI7gqUIaz1vWIHezdsiI_M-xRKXWww,547
@@ -80,9 +81,9 @@ oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,
 oarepo_runtime/validation/__init__.py,sha256=lU7DgZq8pGD5Pa-QqL9gvLsib3IYtM-Y56k-NwHrPG0,166
 oarepo_runtime/validation/dates.py,sha256=fahqKGDdIYWux5ZeoljrEe8VD2fDZR9VpfvYmTYAmpw,1050
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.4.3.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.4.3.dist-info/METADATA,sha256=thTpLDcWd4zYm0ehmc9YQ9Cy0SYdgklbvYn5jWWeG3s,2694
-oarepo_runtime-1.4.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-oarepo_runtime-1.4.3.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
-oarepo_runtime-1.4.3.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.4.3.dist-info/RECORD,,
+oarepo_runtime-1.4.5.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.4.5.dist-info/METADATA,sha256=bkQGyaHajVGMp4a54aM5O1zr0BuTnUSA33eTkC--G0s,2694
+oarepo_runtime-1.4.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+oarepo_runtime-1.4.5.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
+oarepo_runtime-1.4.5.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.4.5.dist-info/RECORD,,