oarepo-runtime 1.5.116__py3-none-any.whl → 1.5.118__py3-none-any.whl

oarepo_runtime/cli/index.py

@@ -1,4 +1,5 @@
 import sys
+import traceback
 from io import StringIO
 
 import click
@@ -7,7 +8,6 @@ from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_records_resources.proxies import current_service_registry
 from invenio_search.proxies import current_search
-import traceback
 from werkzeug.utils import ImportStringError, import_string
 
 try:
@@ -157,7 +157,7 @@ def reindex(model, bulk_size, verbose):
                 count += len(bulk) // 2
                 for index_item_result in index_result["items"]:
                     result = index_item_result["index"]
-                    if result["status"] != 200:
+                    if result["status"] not in (200, 201):
                         errors += 1
                         click.secho(
                             f"Error indexing record with id {result['_id']}",
@@ -245,11 +245,9 @@ def users_record_generator(model_class):
     except Exception as e:
         click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
 
-priorities = [
-    'vocabular',
-    'users',
-    'groups'
-]
+
+priorities = ["vocabular", "users", "groups"]
+
 
 def sort_services(services):
     def idx(x):
@@ -257,7 +255,9 @@ def sort_services(services):
             if p in x:
                 return idx, x
         return len(priorities), x
+
     services.sort(key=idx)
     return services
 
+
 RECORD_GENERATORS = {"users": users_record_generator}

oarepo_runtime/datastreams/json.py

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

oarepo_runtime/datastreams/writers/publish.py

@@ -8,7 +8,13 @@ from oarepo_runtime.datastreams.writers.utils import record_invenio_exceptions
 
 class PublishWriter(BaseWriter):
     def __init__(
-        self, *, service, request_name="publish_draft", identity=None, **kwargs
+        self,
+        *,
+        service,
+        request_name="publish_draft",
+        identity=None,
+        direct_call=False,
+        **kwargs
     ):
         if isinstance(service, str):
             service = current_service_registry.get(service)
@@ -16,6 +22,7 @@ class PublishWriter(BaseWriter):
         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:
@@ -26,24 +33,27 @@ class PublishWriter(BaseWriter):
                 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"])
+        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/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/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.dist-info → oarepo_runtime-1.5.118.dist-info}/METADATA

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

{oarepo_runtime-1.5.116.dist-info → oarepo_runtime-1.5.118.dist-info}/RECORD

@@ -12,7 +12,7 @@ oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
 oarepo_runtime/cli/configuration.py,sha256=M_19zrS0vo-7uHi047a3i4rQsK6pmp4QS0IEBAxMLZ0,2039
 oarepo_runtime/cli/fixtures.py,sha256=l6zHpz1adjotrbFy_wcN2TOL8x20i-1jbQmaoEEo-UU,5419
-oarepo_runtime/cli/index.py,sha256=KH5PArp0fCNbgJI1zSz0pb69U9eyCdnJuy0aMIgf2tg,8685
+oarepo_runtime/cli/index.py,sha256=9Dqbe1dVrz-TcZkXCGYe4qm4sVxJRWnTzzr9OEaIko8,8686
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/cli/permissions/__init__.py,sha256=2qufYdUoCb9kG7Zy0gKNW5lpRyqbVQSNsf7shLwrThM,198
 oarepo_runtime/cli/permissions/base.py,sha256=USzA5LNFPpR7tvM_uan70GI7oO6FrGlHzODU_Z4Tl6c,744
@@ -26,7 +26,7 @@ oarepo_runtime/datastreams/datastreams.py,sha256=N9XXwIaBTADkPhE-XG6uotMwd-8Kn0v
 oarepo_runtime/datastreams/errors.py,sha256=WyZLU53EdFJTLv6K2ooM_M6ISjLS-U1dDw6B7guOLSc,1540
 oarepo_runtime/datastreams/ext.py,sha256=ivugdVMCqwugK-5SeX14a-dMq6VaTt7DM2wFU357tR4,1406
 oarepo_runtime/datastreams/fixtures.py,sha256=LTzRLoS3hkdP7a7wX3fCNWplaxh0DQQjxGto3p1_Luk,8691
-oarepo_runtime/datastreams/json.py,sha256=OAiaH93eqpH5qNQSPKKc8K-hXKAn5lB0PUKwwZFqJSw,153
+oarepo_runtime/datastreams/json.py,sha256=OkIkGKUawtYoGelyS5V92DVk7Ei7SlkMMny2Ue2dDWc,132
 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
@@ -41,8 +41,8 @@ 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/publish.py,sha256=Fq2GJ6-We_CMzft_kegQYt7bEYCN-2knMCX_B8Z6McI,2078
+oarepo_runtime/datastreams/writers/service.py,sha256=GUnXVuRlJaBo19s7oeSG-vpFenah-NTursrX08UP-B4,6010
 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
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
@@ -115,7 +115,7 @@ oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dt
 oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8PuR2XKaOGoNHfw,2400
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
 oarepo_runtime/services/permissions/__init__.py,sha256=33zqKGgRQmRfNZI8kAhue1bFoT1deYiVVNinP8Bvv0I,123
-oarepo_runtime/services/permissions/generators.py,sha256=fuG0zp940l5AcAQmjGnOcF8vnCPmGUGKHsPYMOpGsYY,3288
+oarepo_runtime/services/permissions/generators.py,sha256=XjirYTCk2dNZTf5wrRdKaCxYNj9GVYBPiMPR0pkt_Eo,3337
 oarepo_runtime/services/records/__init__.py,sha256=hIoa2fx1AkDr6c-MgY561U2oN9LFeUCtfbVnetpBUOg,78
 oarepo_runtime/services/records/links.py,sha256=gVe-_hGkLtX7pd6sS6jTbRIhBby2FTn9PXyYPy3yxzs,737
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,9 +148,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.116.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.116.dist-info/METADATA,sha256=LNOfs1J6JK78j9wPKZqLc1lH1Ggm2hTQK3sP4ST-Dpo,4721
-oarepo_runtime-1.5.116.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.116.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.116.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.116.dist-info/RECORD,,
+oarepo_runtime-1.5.118.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.118.dist-info/METADATA,sha256=F9CQ65sKMqAO61j9a623e4aFTgYO708b3lClSUAahA0,4721
+oarepo_runtime-1.5.118.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.118.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.118.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.118.dist-info/RECORD,,