oarepo-runtime 1.9.1__tar.gz → 1.9.3__tar.gz

{oarepo_runtime-1.9.1/oarepo_runtime.egg-info → oarepo_runtime-1.9.3}/PKG-INFO

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

{oarepo_runtime-1.9.1 → oarepo_runtime-1.9.3}/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.1 → oarepo_runtime-1.9.3}/oarepo_runtime/records/dumpers/multilingual_dumper.py

@@ -18,15 +18,17 @@ class MultilingualDumper(SearchDumperExt):
     def dump(self, record, data):
         for path in self.path_traversal.iter(data):
             rec = path[-1].current
-            if rec["lang"] in self.SUPPORTED_LANGS:
-                el_name = path[-1].key + "_" + rec["lang"]
+            lang = rec.get("lang", None)
+            if lang and lang in self.SUPPORTED_LANGS:
+                el_name = path[-1].key + "_" + lang
                 path[-1].parent_data.setdefault(el_name, []).append(rec["value"])
         return data
 
     def load(self, data, record_cls):
         for path in self.path_traversal.iter(data):
             rec = path[-1].current
-            if rec["lang"] in self.SUPPORTED_LANGS:
-                el_name = path[-1].key + "_" + rec["lang"]
+            lang = rec.get("lang", None)
+            if lang and lang in self.SUPPORTED_LANGS:
+                el_name = path[-1].key + "_" + lang
                 path[-1].parent_data.pop(el_name, None)
         return data

{oarepo_runtime-1.9.1 → oarepo_runtime-1.9.3/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.9.1 → oarepo_runtime-1.9.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.9.1
+version = 1.9.3
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md