oarepo-runtime 1.5.116__tar.gz → 1.5.117__tar.gz

{oarepo_runtime-1.5.116/oarepo_runtime.egg-info → oarepo_runtime-1.5.117}/PKG-INFO

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

oarepo_runtime-1.5.117/oarepo_runtime/datastreams/json.py

@@ -0,0 +1,4 @@
+from typing import Union
+
+JSON = Union[str, int, float, bool, None, dict[str, "JSON"], list["JSON"]]
+JSONObject = dict[str, "JSON"]

oarepo_runtime-1.5.117/oarepo_runtime/datastreams/writers/publish.py

@@ -0,0 +1,59 @@
+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,
+        direct_call=False,
+        **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
+        self._direct_call = direct_call
+
+    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):
+        if self._direct_call:
+            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"
+            )
+
+            self._service.read(self._identity, draft["id"])

{oarepo_runtime-1.5.116 → oarepo_runtime-1.5.117}/oarepo_runtime/datastreams/writers/service.py

@@ -4,7 +4,7 @@ from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.uow import UnitOfWork
 
 from ...uow import BulkUnitOfWork
-from ..types import StreamBatch, StreamEntry
+from ..types import StreamBatch, StreamEntry, StreamEntryError
 from . import BaseWriter
 from .utils import record_invenio_exceptions
 
@@ -38,10 +38,26 @@ class ServiceWriter(BaseWriter):
         self._update = update
 
     def _resolve(self, id_):
-        try:
-            return self._service.read(self._identity, id_)
-        except PIDDoesNotExistError:
-            return None
+        if hasattr(self._service, "read_draft"):
+            try:
+                # try to read the draft first
+                return self._service.read_draft(self._identity, id_)
+            except PIDDoesNotExistError:
+                pass
+            try:
+                # if the draft does not exist, read the published record
+                # and create a draft for it
+                rec = self._service.read(self._identity, id_)
+                return self._service.edit(self._identity, id_)
+            except PIDDoesNotExistError:
+                pass
+
+        else:
+            try:
+                return self._service.read(self._identity, id_)
+            except PIDDoesNotExistError:
+                pass
+        return None
 
     def _get_stream_entry_id(self, entry: StreamEntry):
         return entry.id
@@ -92,6 +108,16 @@ class ServiceWriter(BaseWriter):
             stream_entry.id = repository_entry.id
 
             stream_entry.context["revision_id"] = repository_entry._record.revision_id
+            if repository_entry.errors:
+                for err in repository_entry.errors:
+                    field = err.get("field")
+                    messages = err.get("messages")
+                    for message in messages:
+                        stream_entry.errors.append(
+                            StreamEntryError(
+                                code="validation", message=message, location=field
+                            )
+                        )
 
     def try_update(self, entry_id, entry, **service_kwargs):
         current = self._resolve(entry_id)
@@ -99,9 +125,15 @@ class ServiceWriter(BaseWriter):
             updated = dict(current.to_dict(), **entry)
             # might raise exception here but that's ok - we know that the entry
             # exists in db as it was _resolved
-            return self._service.update(
-                self._identity, entry_id, updated, **service_kwargs
-            )
+            if hasattr(self._service, "update_draft"):
+                # try to update draft first
+                return self._service.update_draft(
+                    self._identity, entry_id, updated, **service_kwargs
+                )
+            else:
+                return self._service.update(
+                    self._identity, entry_id, updated, **service_kwargs
+                )
 
     def _delete_entry(self, stream_entry: StreamEntry, uow=None):
         entry_id = self._get_stream_entry_id(stream_entry)
@@ -110,4 +142,25 @@ class ServiceWriter(BaseWriter):
         service_kwargs = {}
         if uow:
             service_kwargs["uow"] = uow
-        self._service.delete(self._identity, entry_id, **service_kwargs)
+        deletion_exceptions = []
+        deletion_tries = 0
+
+        # if the service has drafts, try to delete it first
+        if hasattr(self._service, "delete_draft"):
+            # delete draft
+            deletion_tries += 1
+            try:
+                self._service.delete_draft(self._identity, entry_id, **service_kwargs)
+            except Exception as e:
+                deletion_exceptions.append(e)
+
+        # delete the record if it was published
+        deletion_tries += 1
+        try:
+            self._service.delete(self._identity, entry_id, **service_kwargs)
+        except Exception as e:
+            deletion_exceptions.append(e)
+
+        if len(deletion_exceptions) == deletion_tries:
+            # all deletion attempts failed
+            raise deletion_exceptions[-1]

{oarepo_runtime-1.5.116 → oarepo_runtime-1.5.117}/oarepo_runtime/services/permissions/generators.py

@@ -38,6 +38,7 @@ class RecordOwners(Generator):
                 return dsl.Q("terms", **{"parent.access.owned_by.user": users})
             else:
                 return dsl.Q("terms", **{"parent.owners.user": users})
+        return dsl.Q("match_none")
 
 
 class UserWithRole(Generator):
@@ -59,12 +60,12 @@ class UserWithRole(Generator):
 class IfDraftType(ConditionalGenerator):
     def __init__(
         self,
-        draft_types: list[
-            Literal["initial"] | Literal["metadata"] | Literal["new_version"]
-        ]
-        | Literal["initial"]
-        | Literal["metadata"]
-        | Literal["new_version"],
+        draft_types: (
+            list[Literal["initial"] | Literal["metadata"] | Literal["new_version"]]
+            | Literal["initial"]
+            | Literal["metadata"]
+            | Literal["new_version"]
+        ),
         then_=None,
         else_=None,
     ):

{oarepo_runtime-1.5.116 → oarepo_runtime-1.5.117/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.116 → oarepo_runtime-1.5.117}/setup.cfg

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

oarepo_runtime-1.5.116/oarepo_runtime/datastreams/json.py

@@ -1,4 +0,0 @@
-from typing import List, Mapping, Union
-
-JSON = Union[str, int, float, bool, None, Mapping[str, "JSON"], List["JSON"]]
-JSONObject = Mapping[str, "JSON"]

oarepo_runtime-1.5.116/oarepo_runtime/datastreams/writers/publish.py

@@ -1,49 +0,0 @@
-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"])