oarepo-runtime 1.5.111__py3-none-any.whl → 1.5.113__py3-none-any.whl

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

@@ -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.dist-info → oarepo_runtime-1.5.113.dist-info}/RECORD

@@ -62,11 +62,11 @@ oarepo_runtime/records/mappings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 oarepo_runtime/records/mappings/rdm_parent_mapping.json,sha256=9yRjlGs8-TZZiKN9MtAzNhRzYq9AEJFY9E80FN0wYoM,647
 oarepo_runtime/records/owners/__init__.py,sha256=R4hudCBqLRRzgCnkEjXIL7hSp068z-s6YOwYSkWyuaw,93
 oarepo_runtime/records/owners/registry.py,sha256=fYgBuW5nBKn6pyz2OBgfNlynk64_yhQ9J7FzPk8QU1U,795
-oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
-oarepo_runtime/records/relations/base.py,sha256=XQpRt6-MfIKIClZ0IoGJr0GGl2Ru3RcqMoowOxrFG_E,8981
+oarepo_runtime/records/relations/__init__.py,sha256=Zn7JeQrd5f1doWl5IpbNSpO8m8hm1m-oljAW-7WHn-k,477
+oarepo_runtime/records/relations/base.py,sha256=gTXvyxdkKZ_khdoqvShE2mIbPDU91Bf9beTxHwQtyFk,9925
 oarepo_runtime/records/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/records/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
-oarepo_runtime/records/relations/pid_relation.py,sha256=G8ahoiQgp-PFPjQq0Fqu81z5YM7YKs8e2Hd_xqr3G8U,3290
+oarepo_runtime/records/relations/pid_relation.py,sha256=eojw5uIo5zXmJGge_bj6Wj2njCRY5S4o4B_h_HFyaDY,3901
 oarepo_runtime/records/systemfields/__init__.py,sha256=LL1R64RUakA_4r0IkTq9MtwqD5eV-AQaj5u96zkWa74,533
 oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEOblnChq-PVK4xGPGpSCrzwG3cwc,1720
 oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
@@ -131,7 +131,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=KO7UGrejhaFa65CdcQ96K7jpQSdj_35CYa2pwpgxf1s,3051
+oarepo_runtime/services/schema/rdm_ui.py,sha256=x1cWvGbmmB1GNKu4Hyl65tc_j5TiKsyZm8Y2JQyHEB4,3389
 oarepo_runtime/services/schema/ui.py,sha256=hHbj1S-DW1WqgYX31f6UjarY4wrE-qFLpH3oUhvGLyE,6192
 oarepo_runtime/services/schema/validation.py,sha256=VFOKSxQLHwFb7bW8BJAFXWe_iTAZFOfqOnb2Ko_Yxxc,2085
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
@@ -147,9 +147,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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.111.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.111.dist-info/METADATA,sha256=siwU9jj_7KHqtqhGWSUur7Z0LEKf3_h4PXd-3xr0J58,4721
-oarepo_runtime-1.5.111.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.111.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.111.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.111.dist-info/RECORD,,
+oarepo_runtime-1.5.113.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.113.dist-info/METADATA,sha256=UGtsZ8VPgPRyX2EXFUEZEEQV52jL8XeHHXWWhLdbyL8,4721
+oarepo_runtime-1.5.113.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.113.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.113.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.113.dist-info/RECORD,,