oarepo-runtime 1.6.2__py3-none-any.whl → 1.7.1__py3-none-any.whl

oarepo_runtime/records/entity_resolvers/proxies.py

@@ -1,8 +1,10 @@
-from invenio_pidstore.errors import PIDUnregistered
+from invenio_pidstore.errors import PIDUnregistered, PIDDoesNotExistError
 from invenio_records_resources.references.entity_resolvers.records import (
     RecordProxy as InvenioRecordProxy,
 )
 from sqlalchemy.exc import NoResultFound
+from invenio_access.permissions import system_identity
+from invenio_records_resources.references.entity_resolvers.results import ServiceResultProxy as InvenioServiceResultProxy
 
 
 def set_field(result, resolved_dict, field_name):
@@ -35,6 +37,15 @@ class RecordProxy(InvenioRecordProxy):
             },
         }
 
+class WithDeletedServiceResultProxy(InvenioServiceResultProxy):
+    """Resolver proxy for a result item entity."""
+
+    def _resolve(self):
+        """Resolve the result item from the proxy's reference dict."""
+        id_ = self._parse_ref_dict_id()
+        # TODO: Make identity customizable
+        return self.service.read(system_identity, id_, include_deleted=True).to_dict()
+
 
 class DraftProxy(RecordProxy):
     def _resolve(self):

oarepo_runtime/services/schema/rdm.py

@@ -15,6 +15,8 @@ from marshmallow_utils.fields import (
 from marshmallow_utils.fields.nestedattr import NestedAttribute
 from marshmallow_utils.schemas.identifier import IdentifierSchema
 
+from .i18n import MultilingualField
+
 
 class RDMRecordMixin(ma.Schema):
     versions = NestedAttribute(VersionsSchema, dump_only=True)
@@ -60,3 +62,14 @@ class RelatedRecordIdentifierField(IdentifierSet):
             *args,
             **kwargs
         )
+
+
+class RDMSubjectSchema(ma.Schema):
+    """Subject ui schema."""
+
+    class Meta:
+        unknown = ma.RAISE
+
+    _id = ma.fields.String(data_key="id")
+
+    subject = MultilingualField()

oarepo_runtime/services/schema/rdm_ui.py

@@ -4,6 +4,8 @@ from oarepo_vocabularies.services.ui_schema import VocabularyI18nStrUIField
 
 from oarepo_runtime.services.schema.marshmallow import DictOnlySchema
 
+from .i18n_ui import MultilingualUIField
+
 
 class RDMIdentifierWithSchemaUISchema(ma.Schema):
     scheme = ma.fields.String(
@@ -141,3 +143,14 @@ class RDMCreatorsUISchema(ma.Schema):
     )
 
     person_or_org = ma.fields.Nested(RDMPersonOrOrganizationUISchema())
+
+
+class RDMSubjectUISchema(ma.Schema):
+    """Subject ui schema."""
+
+    class Meta:
+        unknown = ma.RAISE
+
+    _id = ma.fields.String(data_key="id")
+
+    subject = MultilingualUIField()

{oarepo_runtime-1.6.2.dist-info → oarepo_runtime-1.7.1.dist-info}/METADATA

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

{oarepo_runtime-1.6.2.dist-info → oarepo_runtime-1.7.1.dist-info}/RECORD

@@ -60,7 +60,7 @@ oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30d
 oarepo_runtime/records/dumpers/edtf_interval.py,sha256=8bE3JlaR7b33rxDc7LW9R8jcwNI66Zb07Jee6YUmlrE,1231
 oarepo_runtime/records/dumpers/multilingual_dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU,1090
 oarepo_runtime/records/entity_resolvers/__init__.py,sha256=UiiIT54pUu9j7qPAPfqVp4UTnXnppp0c_LtKbFnyt6Y,383
-oarepo_runtime/records/entity_resolvers/proxies.py,sha256=R92Cil_sTgX-sHJtdNv82yd-F3SUfsGSNCHdwI9Zfq8,1516
+oarepo_runtime/records/entity_resolvers/proxies.py,sha256=P9c8JeHc25i_v8uXxTMHNlMNTFskET6dTM0VVMfLfyk,2097
 oarepo_runtime/records/mappings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/records/mappings/rdm_parent_mapping.json,sha256=ykgVr-navpy-HlhUN78sZ1ZpcAaduzZ0ESpphLK4b5E,14233
 oarepo_runtime/records/owners/__init__.py,sha256=R4hudCBqLRRzgCnkEjXIL7hSp068z-s6YOwYSkWyuaw,93
@@ -136,8 +136,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=TkWqtMlCosm4mL7nCHUW3RSGUQypk3wViTMwyqz2Ezs,2047
-oarepo_runtime/services/schema/rdm_ui.py,sha256=oXV8wGFChL84Y1xtkhZ89eZ4Ngr6RV8iavf32e4nCVI,3544
+oarepo_runtime/services/schema/rdm.py,sha256=rtyO46CREmBJMQxgm0UenIbELSY6OAj35VbxFflIH_g,2272
+oarepo_runtime/services/schema/rdm_ui.py,sha256=ffjl20tvRcuX3FNINOhGJWX84aTNEzJOqoKZum1s03s,3778
 oarepo_runtime/services/schema/ui.py,sha256=ff2AfK-G0fArlVHHKsDagPhu9NkMj6DPcVK4NycEO8c,8216
 oarepo_runtime/services/schema/validation.py,sha256=aRfeR-2D1XXYqI3_U5FHoFvJrYjZlpM8nB35-M_u3Qs,2300
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
@@ -149,13 +149,13 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=7-5S3iINOSFSI5gVdR
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.6.2.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.7.1.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
 tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.6.2.dist-info/METADATA,sha256=KtPFsqo3VuCjIrCyQxJL7hq84SCRZzIPLBW9VeLmzQg,4788
-oarepo_runtime-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oarepo_runtime-1.6.2.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.6.2.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.6.2.dist-info/RECORD,,
+oarepo_runtime-1.7.1.dist-info/METADATA,sha256=rvL7MLlWJ21OM6vVVDks-Ga6iqUJiqmqEZirtr1OfbA,4788
+oarepo_runtime-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.7.1.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.7.1.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.7.1.dist-info/RECORD,,