oarepo-runtime 1.5.104__py3-none-any.whl → 1.5.106__py3-none-any.whl

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

@@ -1,5 +1,6 @@
 import marshmallow as ma
 from oarepo_runtime.services.schema.marshmallow import DictOnlySchema
+from oarepo_vocabularies.services.ui_schema import VocabularyI18nStrUIField
 
 class RDMIdentifierWithSchemaUISchema(ma.Schema):
     scheme = ma.fields.String(
@@ -39,17 +40,17 @@ class RDMRoleVocabularyUISchema(DictOnlySchema):
     class Meta:
         unknown = ma.INCLUDE
 
-    _id = String(data_key="id", attribute="id")
+    _id = ma.fields.String(data_key="id", attribute="id")
 
-    _version = String(data_key="@v", attribute="@v")
+    _version = ma.fields.String(data_key="@v", attribute="@v")
 
 class RDMAwardVocabularyUISchema(DictOnlySchema):
     class Meta:
         unknown = ma.INCLUDE
 
-    _id = String(data_key="id", attribute="id")
+    _id = ma.fields.String(data_key="id", attribute="id")
 
-    _version = String(data_key="@v", attribute="@v")
+    _version = ma.fields.String(data_key="@v", attribute="@v")
 
     title = VocabularyI18nStrUIField()
 
@@ -71,9 +72,9 @@ class RDMFundersUISchema(ma.Schema):
     class Meta:
         unknown = ma.RAISE
 
-    funder = ma_fields.Nested(lambda: RDMFunderVocabularyUISchema())
+    funder = ma.fields.Nested(lambda: RDMFunderVocabularyUISchema())
 
-    award = ma_fields.Nested(lambda: RDMAwardVocabularyUISchema())
+    award = ma.fields.Nested(lambda: RDMAwardVocabularyUISchema())
 
 
 class RDMPersonOrOrganizationUISchema(ma.Schema):
@@ -108,6 +109,6 @@ class RDMCreatorsUISchema(ma.Schema):
 
     role = ma.fields.Nested(lambda: RDMRoleVocabularyUISchema())
 
-    affiliations = ma.fields.List(ma_fields.Nested(lambda: RDMAffiliationVocabularyUISchema()))
+    affiliations = ma.fields.List(ma.fields.Nested(lambda: RDMAffiliationVocabularyUISchema()))
 
-    person_or_org = ma_fields.Nested(RDMPersonOrOrganizationUISchema())
+    person_or_org = ma.fields.Nested(RDMPersonOrOrganizationUISchema())

{oarepo_runtime-1.5.104.dist-info → oarepo_runtime-1.5.106.dist-info}/METADATA

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

{oarepo_runtime-1.5.104.dist-info → oarepo_runtime-1.5.106.dist-info}/RECORD

@@ -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=rAaEfASbERy_LM7gdHMBfpG2sRQThyf1oK6vtr9EfMs,2910
+oarepo_runtime/services/schema/rdm.py,sha256=BDmjWrBQmBN4QbQE9t7EUNUuZ4uCtAAtJ0bQvJWQLtc,1249
+oarepo_runtime/services/schema/rdm_ui.py,sha256=Vs9kOaQ0ZPPZpSqEXlu0vQrt-458Aci9u9T4YONSJLs,3026
 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.104.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.104.dist-info/METADATA,sha256=fcQq0-4iGSSdX-gylDoUeAQ4kNogetyenOB3S6fVBUQ,4721
-oarepo_runtime-1.5.104.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.104.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.104.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.104.dist-info/RECORD,,
+oarepo_runtime-1.5.106.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.106.dist-info/METADATA,sha256=nth_2oEsi3Ee8Ztqan5Tt-b7b72d25C7KrjbhpvL9eU,4721
+oarepo_runtime-1.5.106.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.106.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.106.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.106.dist-info/RECORD,,