oarepo-runtime 1.5.111__tar.gz → 1.5.113__tar.gz

{oarepo_runtime-1.5.111/oarepo_runtime.egg-info → oarepo_runtime-1.5.113}/PKG-INFO

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

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113}/oarepo_runtime/records/relations/__init__.py

@@ -4,9 +4,10 @@ from .base import (
     Relation,
     RelationResult,
     RelationsField,
+    UnstrictRelationResult
 )
 from .internal import InternalRelation
-from .pid_relation import PIDRelation
+from .pid_relation import PIDRelation, UnstrictPIDRelation
 
 __all__ = (
     "Relation",
@@ -16,4 +17,6 @@ __all__ = (
     "RelationsField",
     "InternalRelation",
     "PIDRelation",
+    "UnstrictPIDRelation",
+    "UnstrictRelationResult"
 )

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113}/oarepo_runtime/records/relations/base.py

@@ -173,6 +173,32 @@ class RelationResult:
 
     def resolve(self, id_):
         raise NotImplementedError("Please implement this method in your subclass")
+class UnstrictRelationResult(RelationResult):
+
+    def _resolve_lookup_result(self, relation):
+        if not isinstance(relation.value, dict):
+            raise InvalidRelationValue(
+                f"Value at path {relation.path} must be dict, found {relation.value}"
+            )
+        relation_id = self._lookup_id(relation)
+        resolved_object = self.resolve(relation_id, relation.value)
+        if not resolved_object:
+            raise InvalidRelationValue(f"Could not resolve relation id {relation_id}.")
+        return resolved_object
+
+    def _dereference_one(self, relation: LookupResult):
+        """Dereference a single object into a dict."""
+        if not self._needs_update_relation_value(relation):
+            return
+
+        data = relation.value
+        obj = self._resolve_lookup_result(relation)
+        if type(obj) is not dict:
+            self._get_dereferenced_value(data, obj, relation)
+
+        return data
+
+
 
 
 class Relation:

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113}/oarepo_runtime/records/relations/pid_relation.py

@@ -1,12 +1,13 @@
 from invenio_db import db
 
 from oarepo_runtime.services.relations.errors import InvalidRelationError
+from sqlalchemy.exc import NoResultFound
 
-from .base import Relation, RelationResult
+from .base import Relation, RelationResult, UnstrictRelationResult
 from .lookup import LookupResult
 
 class PIDRelationResult(RelationResult):
-    def resolve(self, id_):
+    def resolve(self, id_, data = None):
         """Resolve the value using the record class."""
         # TODO: handle permissions here !!!!!!
         try:
@@ -65,6 +66,15 @@ class PIDRelationResult(RelationResult):
     def _add_version_info(self, data, relation: LookupResult, resolved_object):
         data["@v"] = f"{resolved_object.id}::{resolved_object.revision_id}"
 
+class UnstrictPIDRelationResult(PIDRelationResult, UnstrictRelationResult):
+
+    def resolve(self, id_, data):
+        try:
+            return super().resolve(id_, data)
+        except InvalidRelationError as e:
+            if isinstance(e.__cause__, NoResultFound):
+                return data
+            raise
 
 class PIDRelation(Relation):
     result_cls = PIDRelationResult
@@ -73,6 +83,12 @@ class PIDRelation(Relation):
         super().__init__(key=key, **kwargs)
         self.pid_field = pid_field
 
+class UnstrictPIDRelation(Relation):
+    result_cls = UnstrictPIDRelationResult
+
+    def __init__(self, key=None, pid_field=None, **kwargs):
+        super().__init__(key=key, **kwargs)
+        self.pid_field = pid_field
 
 class MetadataRelationResult(PIDRelationResult):
     def _dereference_one(self, relation: LookupResult):

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113}/oarepo_runtime/services/schema/rdm_ui.py

@@ -1,7 +1,7 @@
 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
 
 class RDMIdentifierWithSchemaUISchema(ma.Schema):
     scheme = ma.fields.String(
@@ -9,6 +9,16 @@ class RDMIdentifierWithSchemaUISchema(ma.Schema):
     )
     identifier = ma.fields.String(required=True)
 
+    @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
+        return value
+
 
 class RDMAwardIdentifierUISchema(ma.Schema):
     identifier = ma.fields.String()

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.111 → oarepo_runtime-1.5.113}/setup.cfg

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