oarepo-runtime 1.7.0__tar.gz → 1.7.2__tar.gz

{oarepo_runtime-1.7.0/oarepo_runtime.egg-info → oarepo_runtime-1.7.2}/PKG-INFO

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

{oarepo_runtime-1.7.0 → oarepo_runtime-1.7.2}/oarepo_runtime/records/entity_resolvers/proxies.py

@@ -1,8 +1,10 @@
-from invenio_pidstore.errors import PIDUnregistered
+from invenio_pidstore.errors import PIDUnregistered, PIDDoesNotExistError
 from invenio_records_resources.references.entity_resolvers.records import (
     RecordProxy as InvenioRecordProxy,
 )
 from sqlalchemy.exc import NoResultFound
+from invenio_access.permissions import system_identity
+from invenio_records_resources.references.entity_resolvers.results import ServiceResultProxy as InvenioServiceResultProxy
 
 
 def set_field(result, resolved_dict, field_name):
@@ -35,6 +37,15 @@ class RecordProxy(InvenioRecordProxy):
             },
         }
 
+class WithDeletedServiceResultProxy(InvenioServiceResultProxy):
+    """Resolver proxy for a result item entity."""
+
+    def _resolve(self):
+        """Resolve the result item from the proxy's reference dict."""
+        id_ = self._parse_ref_dict_id()
+        # TODO: Make identity customizable
+        return self.service.read(system_identity, id_, include_deleted=True).to_dict()
+
 
 class DraftProxy(RecordProxy):
     def _resolve(self):

{oarepo_runtime-1.7.0 → oarepo_runtime-1.7.2}/oarepo_runtime/services/custom_fields/mappings.py

@@ -9,17 +9,16 @@ from invenio_records_resources.services.custom_fields.mappings import (
 )
 from invenio_records_resources.services.records.config import RecordServiceConfig
 from invenio_records_resources.services.records.service import RecordService
-from invenio_search import current_search_client
-from invenio_search.engine import dsl, search
-from invenio_search.utils import build_alias_name
-
+from invenio_search.engine import search
 from deepmerge import always_merger
 from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 import json
-import os
 
 from pathlib import Path
 
+from oarepo_runtime.utils.index import prefixed_index
+
+
 class Mapping(InvenioMapping):
     @classmethod
     def properties_for_fields(
@@ -95,21 +94,11 @@ def prepare_cf_index(record_class, config, path=[]):
 
         # upload mapping
         try:
-            record_index = dsl.Index(
-                build_alias_name(
-                    config.record_cls.index._name,
-                ),
-                using=current_search_client,
-            )
+            record_index = prefixed_index(config.record_cls.index)
             update_index(record_index, settings, mapping)
 
             if hasattr(config, "draft_cls"):
-                draft_index = dsl.Index(
-                    build_alias_name(
-                        config.draft_cls.index._name,
-                    ),
-                    using=current_search_client,
-                )
+                draft_index = prefixed_index(config.draft_cls.index)
                 update_index(draft_index, settings, mapping, dynamic_templates)
 
         except search.RequestError as e:
@@ -166,22 +155,12 @@ def prepare_parent_mapping(parent_class, config):
     })
     # upload mapping
     try:
-        record_index = dsl.Index(
-            build_alias_name(
-                config.record_cls.index._name,
-            ),
-            using=current_search_client,
-        )
+        record_index = prefixed_index(config.record_cls.index)
         update_index(record_index, {}, parent_mapping_merged)
 
         if hasattr(config, "draft_cls"):
-            draft_index = dsl.Index(
-                build_alias_name(
-                    config.draft_cls.index._name,
-                ),
-                using=current_search_client,
-            )
-            update_index(record_index, {}, parent_mapping_merged)
+            draft_index = prefixed_index(config.draft_cls.index) # draft index isn't used; this was a bug a suppose
+            update_index(draft_index, {}, parent_mapping_merged)
 
     except search.RequestError as e:
         click.secho("An error occurred while creating parent mapping.", fg="red")

oarepo_runtime-1.7.2/oarepo_runtime/utils/index.py

@@ -0,0 +1,11 @@
+from invenio_search import current_search_client
+from invenio_search.utils import build_alias_name
+from invenio_search.engine import dsl
+
+def prefixed_index(index):
+    return dsl.Index(
+        build_alias_name(
+            index._name,
+        ),
+        using = current_search_client
+    )

{oarepo_runtime-1.7.0 → oarepo_runtime-1.7.2/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.7.0 → oarepo_runtime-1.7.2}/oarepo_runtime.egg-info/SOURCES.txt

@@ -160,6 +160,7 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.mo
 oarepo_runtime/translations/en/LC_MESSAGES/messages.po
 oarepo_runtime/utils/__init__.py
 oarepo_runtime/utils/functools.py
+oarepo_runtime/utils/index.py
 oarepo_runtime/utils/path.py
 tests/marshmallow_to_json/__init__.py
 tests/marshmallow_to_json/test_datacite_ui_schema.py

{oarepo_runtime-1.7.0 → oarepo_runtime-1.7.2}/setup.cfg

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