oarepo-runtime 1.5.108__py3-none-any.whl → 1.5.110__py3-none-any.whl

oarepo_runtime/resources/resource.py

@@ -50,7 +50,7 @@ class BaseRecordResource(RDMRecordResource):
 
         GET /all/records
         """
-        hits = self.service.search_all(
+        hits = self.service.search_all_records(
             identity=g.identity,
             params=resource_requestctx.args,
             search_preference=search_preference(),

oarepo_runtime/services/schema/rdm.py

@@ -10,8 +10,8 @@ from invenio_vocabularies.contrib.awards.schema import AwardRelationSchema
 from invenio_vocabularies.contrib.funders.schema import FunderRelationSchema
 from invenio_i18n.selectors import get_locale
 
-class RDMRecordMixin(ma.Schema):
 
+class RDMRecordMixin(ma.Schema):
     versions = NestedAttribute(VersionsSchema, dump_only=True)
     deletion_status = ma_fields.Nested(DeletionStatusSchema, dump_only=True)
 
@@ -22,7 +22,7 @@ class MultilingualAwardSchema(AwardRelationSchema):
 
     @pre_load()
     def convert_to_multilingual(self, data, many, **kwargs):
-        if "title" in data:
+        if "title" in data and type(data["title"]) is str:
             lang = get_locale()
             data["title"] = {lang: data["title"]}
         return data

oarepo_runtime/services/schema/rdm_ui.py

@@ -2,20 +2,24 @@ 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(
         required=True,
     )
     identifier = ma.fields.String(required=True)
 
+
 class RDMAwardIdentifierUISchema(ma.Schema):
     identifier = ma.fields.String()
 
+
 class RDMAwardSubjectUISchema(ma.Schema):
     _id = ma.fields.String(data_key="id")
 
     subject = ma.fields.String()
 
+
 class RDMAwardOrganizationUISchema(ma.Schema):
     schema = ma.fields.String()
 
@@ -23,6 +27,7 @@ class RDMAwardOrganizationUISchema(ma.Schema):
 
     organization = ma.fields.String()
 
+
 class RDMFunderVocabularyUISchema(DictOnlySchema):
     class Meta:
         unknown = ma.INCLUDE
@@ -31,7 +36,7 @@ class RDMFunderVocabularyUISchema(DictOnlySchema):
 
     _version = ma.fields.String(data_key="@v", attribute="@v")
 
-    name = VocabularyI18nStrUIField()
+    name = ma.fields.String()
 
     identifiers = ma.fields.List(ma.fields.Nested(RDMIdentifierWithSchemaUISchema()))
 
@@ -44,6 +49,7 @@ class RDMRoleVocabularyUISchema(DictOnlySchema):
 
     _version = ma.fields.String(data_key="@v", attribute="@v")
 
+
 class RDMAwardVocabularyUISchema(DictOnlySchema):
     class Meta:
         unknown = ma.INCLUDE
@@ -69,6 +75,7 @@ class RDMAwardVocabularyUISchema(DictOnlySchema):
 
 class RDMFundersUISchema(ma.Schema):
     """Funding ui schema."""
+
     class Meta:
         unknown = ma.RAISE
 
@@ -100,15 +107,19 @@ class RDMAffiliationVocabularyUISchema(DictOnlySchema):
 
     _version = ma.fields.String(data_key="@v", attribute="@v")
 
-    name = VocabularyI18nStrUIField()
+    name = ma.fields.String()
+
 
 class RDMCreatorsUISchema(ma.Schema):
     """Funding ui schema."""
+
     class Meta:
         unknown = ma.RAISE
 
     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/services/service.py

@@ -9,7 +9,7 @@ from invenio_records_resources.services import LinksTemplate
 
 
 class SearchAllRecordsService(RDMRecordService):
-    def search_all(
+    def search_all_records(
         self,
         identity,
         params=None,

{oarepo_runtime-1.5.108.dist-info → oarepo_runtime-1.5.110.dist-info}/METADATA

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

{oarepo_runtime-1.5.108.dist-info → oarepo_runtime-1.5.110.dist-info}/RECORD

@@ -80,13 +80,13 @@ oarepo_runtime/resources/config.py,sha256=GEM3A7lvGgWUdhBR85uJbaQDKg2-Xk5U-Jm4Jm
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
 oarepo_runtime/resources/json_serializer.py,sha256=82_-xQEtxKaPakv8R1oBAFbGnxskF_Ve4tcfcy4PetI,963
 oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX_wKfBp1LmbeForwHyBNYdyha4uQ,1878
-oarepo_runtime/resources/resource.py,sha256=BQ6sxgjHLAdQLtCMUggNG0Fq7NVRJPdVkpiHDH6tvDs,2055
+oarepo_runtime/resources/resource.py,sha256=GK5yGnJIjH60wGqqDoOfwMQQFQDLZhJpU4zBJOmABI8,2063
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=0aqmuNbGCQhfOI22f6mM2DxuKSTqstGOGyisOiqw9KE,15481
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
 oarepo_runtime/services/search.py,sha256=t0WEe2VrbCzZ06-Jgz7C9-pc9y27BqAgTEXldEHskfk,9409
-oarepo_runtime/services/service.py,sha256=A0VJ3jvMu7JTLcYKCAUH2LX7xXVxpm6Wm4rEnG358bU,1885
+oarepo_runtime/services/service.py,sha256=TI2ulEVlSR7HZnfPYltLl8Vf4O9fhJ7rHaV6G4HWbrc,1893
 oarepo_runtime/services/config/__init__.py,sha256=559w4vphVAipa420OwTsxGUP-b7idoqSIX13FSJyVz0,783
 oarepo_runtime/services/config/link_conditions.py,sha256=evPRd5XU76Ok4J-08bBfplbHZ019rl74FpJmO8iM5yg,3298
 oarepo_runtime/services/config/permissions_presets.py,sha256=jV3Ft7xFdBaeShoa3Q3Q-HHWP-wOX4XYDTRzWwUVL7g,7151
@@ -129,8 +129,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=BDmjWrBQmBN4QbQE9t7EUNUuZ4uCtAAtJ0bQvJWQLtc,1249
-oarepo_runtime/services/schema/rdm_ui.py,sha256=zXdaS6-YUaIcTkZDustqLufoHtpVKp5PcgUnwgJ0skE,3043
+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/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
@@ -146,9 +146,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.108.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.108.dist-info/METADATA,sha256=pOE9SKeX_Zr1boKtFOupbeS3T6xxjxHasxx_Ea4Hu0c,4721
-oarepo_runtime-1.5.108.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.108.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.108.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.108.dist-info/RECORD,,
+oarepo_runtime-1.5.110.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.110.dist-info/METADATA,sha256=_cnrjQse_wazsslxvPFW21ep9YEP3BwZcDHXnZjyBUk,4721
+oarepo_runtime-1.5.110.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.110.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.110.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.110.dist-info/RECORD,,