oarepo-runtime 1.5.105__py3-none-any.whl → 1.5.107__py3-none-any.whl

oarepo_runtime/records/relations/pid_relation.py

@@ -5,22 +5,29 @@ from oarepo_runtime.services.relations.errors import InvalidRelationError
 from .base import Relation, RelationResult
 from .lookup import LookupResult
 
-
 class PIDRelationResult(RelationResult):
     def resolve(self, id_):
         """Resolve the value using the record class."""
         # TODO: handle permissions here !!!!!!
         try:
             pid_field_context = self.field.pid_field
-            if hasattr(pid_field_context, "pid_type"):
-                pid_type = pid_field_context.pid_type
-            else:
+            try:
+                pid_type = getattr(pid_field_context, "pid_type", None)
+            except:
+                pass
+
+            if pid_type is None:
                 pid_field = pid_field_context.field
-                pid_type = (
-                    pid_field._provider.pid_type
-                    if pid_field._provider
-                    else pid_field._pid_type
-                )
+                if pid_field._provider:
+                    if hasattr(pid_field._provider, "pid_type"):
+                        pid_type = pid_field._provider.pid_type
+                    else:
+                        pid_type = self.field.pid_field.record_cls.__name__
+                else:
+                    if hasattr(pid_field, "_pid_type"):
+                        pid_type = pid_field._pid_type
+                    else:
+                        pid_type = self.field.pid_field.record_cls.__name__
         except Exception as e:
             raise InvalidRelationError(
                 f"PID type for field {self.field.key} has not been found or there was an exception accessing it.",

oarepo_runtime/services/schema/rdm.py

@@ -31,5 +31,5 @@ class MultilingualAwardSchema(AwardRelationSchema):
 class FundingSchema(ma.Schema):
     """Funding schema."""
 
-    funder = fields.Nested(FunderRelationSchema, required=True)
-    award = fields.Nested(MultilingualAwardSchema)
+    funder = ma_fields.Nested(FunderRelationSchema, required=True)
+    award = ma_fields.Nested(MultilingualAwardSchema)

oarepo_runtime/services/schema/rdm_ui.py

@@ -33,7 +33,7 @@ class RDMFunderVocabularyUISchema(DictOnlySchema):
 
     name = VocabularyI18nStrUIField()
 
-    identifier = ma.fields.Nested(RDMIdentifierWithSchemaUISchema())
+    identifiers = ma.fields.List(ma.fields.Nested(RDMIdentifierWithSchemaUISchema()))
 
 
 class RDMRoleVocabularyUISchema(DictOnlySchema):

{oarepo_runtime-1.5.105.dist-info → oarepo_runtime-1.5.107.dist-info}/METADATA

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

{oarepo_runtime-1.5.105.dist-info → oarepo_runtime-1.5.107.dist-info}/RECORD

@@ -65,7 +65,7 @@ oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2
 oarepo_runtime/records/relations/base.py,sha256=XQpRt6-MfIKIClZ0IoGJr0GGl2Ru3RcqMoowOxrFG_E,8981
 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=jKiwUEepJkOc0MRX3Etl5RQJw3t40rY7FOJCIPwOKmg,2932
+oarepo_runtime/records/relations/pid_relation.py,sha256=G8ahoiQgp-PFPjQq0Fqu81z5YM7YKs8e2Hd_xqr3G8U,3290
 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
@@ -126,8 +126,8 @@ oarepo_runtime/services/schema/marshmallow.py,sha256=iAMMH5MlYs59qetXAHOROvERNSc
 oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxWCD_gqJO8-8u1SbaPEFBjDZ5HGgGr0Ow,2027
 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=ckcv_imYCG56_qwxVDZCt04D0tvI8I--NLHQU6iTwVc,1242
-oarepo_runtime/services/schema/rdm_ui.py,sha256=Vs9kOaQ0ZPPZpSqEXlu0vQrt-458Aci9u9T4YONSJLs,3026
+oarepo_runtime/services/schema/rdm.py,sha256=BDmjWrBQmBN4QbQE9t7EUNUuZ4uCtAAtJ0bQvJWQLtc,1249
+oarepo_runtime/services/schema/rdm_ui.py,sha256=zXdaS6-YUaIcTkZDustqLufoHtpVKp5PcgUnwgJ0skE,3043
 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
@@ -143,9 +143,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.105.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.105.dist-info/METADATA,sha256=81-KfaOYNSYy_lY27QN7I2OahhNmt9osw3WPKfv-s3o,4721
-oarepo_runtime-1.5.105.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.105.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.105.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.105.dist-info/RECORD,,
+oarepo_runtime-1.5.107.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.107.dist-info/METADATA,sha256=Z_a-shCynRJPgujCqljVNhXARmPVt8Q6lcJ1Eexd_oQ,4721
+oarepo_runtime-1.5.107.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.107.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.107.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.107.dist-info/RECORD,,