PyPI - oarepo-runtime - Versions diffs - 1.4.4__tar.gz → 1.4.5__tar.gz - Mend

@@ -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):

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

@@ -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)

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

@@ -72,6 +72,7 @@ oarepo_runtime/i18n/validation.py
 oarepo_runtime/relations/__init__.py
 oarepo_runtime/relations/base.py
 oarepo_runtime/relations/components.py
+oarepo_runtime/relations/errors.py
 oarepo_runtime/relations/internal.py
 oarepo_runtime/relations/lookup.py
 oarepo_runtime/relations/mapping.py

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

oarepo-runtime 1.4.4__tar.gz → 1.4.5__tar.gz

oarepo-runtime 1.4.4tar.gz → 1.4.5tar.gz