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

oarepo_runtime/datastreams/writers/publish.py

@@ -0,0 +1,49 @@
+from invenio_access.permissions import system_identity
+from invenio_records_resources.proxies import current_service_registry
+
+from oarepo_runtime.datastreams.types import StreamBatch, StreamEntry
+from oarepo_runtime.datastreams.writers import BaseWriter
+from oarepo_runtime.datastreams.writers.utils import record_invenio_exceptions
+
+
+class PublishWriter(BaseWriter):
+    def __init__(
+        self, *, service, request_name="publish_draft", identity=None, **kwargs
+    ):
+        if isinstance(service, str):
+            service = current_service_registry.get(service)
+
+        self._service = service
+        self._identity = identity or system_identity
+        self._request_name = request_name
+
+    def write(self, batch: StreamBatch) -> StreamBatch:
+        for entry in batch.ok_entries:
+            if entry.deleted:
+                continue
+
+            with record_invenio_exceptions(entry):
+                self._write_entry(entry)
+
+    def _write_entry(self, entry: StreamEntry):
+        from invenio_requests.proxies import (
+            current_requests_service as current_invenio_requests_service,
+        )
+        from oarepo_requests.proxies import current_oarepo_requests_service
+
+        draft = self._service.read_draft(self._identity, entry.id)
+        request = current_oarepo_requests_service.create(
+            identity=self._identity,
+            data=None,
+            request_type=self._request_name,
+            topic=draft._record,
+        )
+
+        submit_result = current_invenio_requests_service.execute_action(
+            self._identity, request.id, "submit"
+        )
+        accept_result = current_invenio_requests_service.execute_action(
+            self._identity, request.id, "accept"
+        )
+
+        self._service.read(self._identity, draft["id"])

oarepo_runtime/ext_config.py

@@ -9,6 +9,7 @@ from oarepo_runtime.datastreams.writers.attachments_file import AttachmentsFileW
 from oarepo_runtime.datastreams.writers.attachments_service import (
     AttachmentsServiceWriter,
 )
+from oarepo_runtime.datastreams.writers.publish import PublishWriter
 from oarepo_runtime.datastreams.writers.service import ServiceWriter
 from oarepo_runtime.datastreams.writers.yaml import YamlWriter
 from oarepo_runtime.records.entity_resolvers import UserResolver
@@ -50,6 +51,7 @@ DATASTREAMS_WRITERS = {
     "attachments_service": AttachmentsServiceWriter,
     "yaml": YamlWriter,
     "attachments_file": AttachmentsFileWriter,
+    "publish": PublishWriter,
 }
 
 DATASTREAMS_TRANSFORMERS = {}

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

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

{oarepo_runtime-1.5.109.dist-info → oarepo_runtime-1.5.111.dist-info}/RECORD

@@ -1,6 +1,6 @@
 oarepo_runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/ext.py,sha256=6w6bpTpNjjj3txgVu0nfpmPa9CnDS6Zl6U2DCNs9Usc,2565
-oarepo_runtime/ext_config.py,sha256=NiXqgag3QJABf06r5NiDYjd9AvoYoRY9UWiplo8Vcg4,2056
+oarepo_runtime/ext_config.py,sha256=ERpi6uJqDE6OpqebB_vuusmoB3xaAziuKeGVxVI5Q-w,2155
 oarepo_runtime/profile.py,sha256=QzrQoZncjoN74ZZnpkEKakNk08KCzBU7m6y42RN8AMY,1637
 oarepo_runtime/proxies.py,sha256=NN_WNj1xuKc-OveoZmzvTFlUonNjSmLIGsv_JUcHGls,285
 oarepo_runtime/tasks.py,sha256=AciXN1fUq6tzfzNSICh1S6XoHGWiuH76bUqXyzTsOPU,140
@@ -41,6 +41,7 @@ oarepo_runtime/datastreams/readers/yaml.py,sha256=U4nyJQ8ocM_ohp-eUN1RjVoNzYV9z7
 oarepo_runtime/datastreams/writers/__init__.py,sha256=PWufWNrixFhXv5wSv3_pzmrimroqVB2DVgTxVtY5FCg,526
 oarepo_runtime/datastreams/writers/attachments_file.py,sha256=kV_IPAWawJ9PX-IfoncmLQXpdTbzRMsJie8uKX1vNp0,3161
 oarepo_runtime/datastreams/writers/attachments_service.py,sha256=g_tbjUA3YnTE5gP21zlG2kIxneZsn0q95EVjlxB8s1M,4152
+oarepo_runtime/datastreams/writers/publish.py,sha256=rU1HgIR2OO1CyA_QBe1MGHiZmcfKthrLYYlw6Laj9Gk,1795
 oarepo_runtime/datastreams/writers/service.py,sha256=PvCxYASDxOqT6iyL6cjw0aH41LaC1vwob4W3vnE9XmA,3920
 oarepo_runtime/datastreams/writers/utils.py,sha256=Lk_ZLNeXTLuFEn04lw1-6bJ7duG6kwA8X4wf9c_GiL4,1067
 oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4ExpdFYYgBRyENp7_6kVFZM2L-Hy3G8,661
@@ -129,8 +130,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 +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.109.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.109.dist-info/METADATA,sha256=mUMQ-D-mCSYUFtvaX5WL18tv1L4a6JrclX6bua5RncI,4721
-oarepo_runtime-1.5.109.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.109.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.109.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.109.dist-info/RECORD,,
+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,,