oarepo-runtime 1.9.0__py3-none-any.whl → 1.9.2__py3-none-any.whl

oarepo_runtime/datastreams/types.py

@@ -236,10 +236,14 @@ class DataStreamCallback:
         self.log_error_entry = log_error_entry
 
     def batch_started(self, batch):
-        log.info("Batch started: %s", batch)
+        log.info("Batch started: %s", batch.seq)
+        if log.isEnabledFor(logging.DEBUG):
+            log.debug("Content: %s", batch)
 
     def batch_finished(self, batch: StreamBatch):
         log.info("Batch finished: %s", batch.seq)
+        if log.isEnabledFor(logging.DEBUG):
+            log.debug("Content: %s", batch)
         for err in batch.errors:
             log.error("Failed batch: %s: %s", err, batch.seq)
         if self.log_error_entry:

oarepo_runtime/datastreams/writers/publish.py

@@ -13,7 +13,7 @@ class PublishWriter(BaseWriter):
         service,
         request_name="publish_draft",
         identity=None,
-        direct_call=False,
+        direct_call=True,
         **kwargs
     ):
         if isinstance(service, str):
@@ -34,27 +34,31 @@ class PublishWriter(BaseWriter):
 
     def _write_entry(self, entry: StreamEntry):
         if self._direct_call:
-            self._service.publish(self._identity, entry.id)
+            data = self._service.publish(self._identity, entry.id)
         else:
-            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"
-            )
-
-            data = self._service.read(self._identity, draft["id"])
-            entry.entry = data.to_dict()
+            data = self._publish_via_request(self._identity, entry.id)
+        
+        entry.entry = data.to_dict()
+
+    def _publish_via_request(self, identity, entry_id):
+        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(identity, entry_id)
+        request = current_oarepo_requests_service.create(
+            identity=identity,
+            data=None,
+            request_type=self._request_name,
+            topic=draft._record,
+        )
+
+        submit_result = current_invenio_requests_service.execute_action(
+            identity, request.id, "submit"
+        )
+        accept_result = current_invenio_requests_service.execute_action(
+            identity, request.id, "accept"
+        )
+
+        return self._service.read(identity, draft["id"])

{oarepo_runtime-1.9.0.dist-info → oarepo_runtime-1.9.2.dist-info}/METADATA

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

{oarepo_runtime-1.9.0.dist-info → oarepo_runtime-1.9.2.dist-info}/RECORD

@@ -31,7 +31,7 @@ oarepo_runtime/datastreams/json.py,sha256=OkIkGKUawtYoGelyS5V92DVk7Ei7SlkMMny2Ue
 oarepo_runtime/datastreams/semi_asynchronous.py,sha256=kNc6BBnV6oFoY9kHgf5l8fd1wibRfI0dwyzLtu4fmUA,2940
 oarepo_runtime/datastreams/synchronous.py,sha256=t5lfnMkLqy3jK5zMl-nIuA0HlMPiHGjwCqZ8XQP-3GM,2595
 oarepo_runtime/datastreams/transformers.py,sha256=q5KzHPl2kJg7HP1BtKJ7F_UMqg_7L1ZGDX0O7s8D6UI,521
-oarepo_runtime/datastreams/types.py,sha256=ZeXX5rVPwCpzJ0drl5ApgN1l43G-aSjStQbt_vdJgRk,9950
+oarepo_runtime/datastreams/types.py,sha256=pAxb1R9tJyatkX7Zo9IYi-Dm8c6DOdvh0_XMix4yZyg,10130
 oarepo_runtime/datastreams/utils.py,sha256=w24qRRw1ZawPFbgqtxhpYnxPnghSn0pp49JLLy8wTms,4280
 oarepo_runtime/datastreams/readers/__init__.py,sha256=P1n3llZQ3AFHnSPbeT1VaCJcEtRFz9AbHfjkZv5LG7s,1103
 oarepo_runtime/datastreams/readers/attachments.py,sha256=A7EC1TqyTHG-go5DIaRotlBSOm6o9hGqAKyVVAceCRU,1956
@@ -42,7 +42,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=x_ipun8TQiYNvGokVnEppYw9ko1AyrSzHu3D8b3ZWzI,2126
+oarepo_runtime/datastreams/writers/publish.py,sha256=XUuYjrbLMX77eIvY7I40On8SkrwpLuh2Y4yjltANcfE,2162
 oarepo_runtime/datastreams/writers/service.py,sha256=8oXGG365ro_XEoZUncFltule_6TAbPPbSr-SBgcbWRA,6224
 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
@@ -150,13 +150,13 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/index.py,sha256=ArrUUXB-KowUcUksRKqcFpmqct4bn9alO1zd_kX2tmU,292
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.9.0.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.9.2.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.9.0.dist-info/METADATA,sha256=PNBhOPkZ-HmVABJk4k9cb5up2HStMFInTy0ZSw0NEZs,4788
-oarepo_runtime-1.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oarepo_runtime-1.9.0.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.9.0.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.9.0.dist-info/RECORD,,
+oarepo_runtime-1.9.2.dist-info/METADATA,sha256=o-rT5Q2aByveCjJPC48lEVUE4GRgo_gLBom6k_gAExA,4788
+oarepo_runtime-1.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.9.2.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.9.2.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.9.2.dist-info/RECORD,,