oarepo-runtime 1.5.96__py3-none-any.whl → 1.5.98__py3-none-any.whl

oarepo_runtime/ext.py

@@ -33,7 +33,7 @@ class OARepoRuntime(object):
     @cached_property
     def rdm_excluded_components(self):
         return [
-            obj_or_import_string(x) for x in self.app.config.get("RDM_EXLUDED_COMPONENTS", [])
+            obj_or_import_string(x) for x in self.app.config.get("RDM_EXCLUDED_COMPONENTS", [])
         ]
         
     def init_config(self, app):

oarepo_runtime/services/config/permissions_presets.py

@@ -80,6 +80,11 @@ class ReadOnlyPermissionPolicy(RecordPermissionPolicy):
     can_add_community = [SystemProcess()]
     can_remove_community = [SystemProcess()]
 
+    can_read_deleted = [SystemProcess()]
+    can_manage_record_access = [SystemProcess()]
+    can_lift_embargo = [SystemProcess()]
+
+
 
 class EveryonePermissionPolicy(RecordPermissionPolicy):
     """record policy for read only repository"""
@@ -119,12 +124,17 @@ class EveryonePermissionPolicy(RecordPermissionPolicy):
     can_add_community = [SystemProcess(), AnyUser()]
     can_remove_community = [SystemProcess(), AnyUser()]
 
+    can_read_deleted = [SystemProcess(), AnyUser()]
+    can_manage_record_access = [SystemProcess(), AnyUser()]
+    can_lift_embargo = [SystemProcess(), AnyUser()]
+
 
 class AuthenticatedPermissionPolicy(RecordPermissionPolicy):
     """record policy for read only repository"""
 
     can_search = [SystemProcess(), AuthenticatedUser()]
     can_read = [SystemProcess(), AnyUser()]
+    can_read_deleted = [SystemProcess(), AnyUser()]
     can_create = [SystemProcess(), AuthenticatedUser()]
     can_update = [SystemProcess(), AuthenticatedUser()]
     can_delete = [SystemProcess(), AuthenticatedUser()]
@@ -136,7 +146,6 @@ class AuthenticatedPermissionPolicy(RecordPermissionPolicy):
     can_commit_files = [SystemProcess(), AuthenticatedUser()]
     can_read_files = [SystemProcess(), AnyUser()]
     can_update_files = [SystemProcess(), AuthenticatedUser()]
-    can_delete_files = [SystemProcess(), AuthenticatedUser()]
     can_list_files = [SystemProcess(), AuthenticatedUser()]
     can_manage_files = [SystemProcess(), AuthenticatedUser()]
 
@@ -157,3 +166,7 @@ class AuthenticatedPermissionPolicy(RecordPermissionPolicy):
 
     can_add_community = [SystemProcess(), AuthenticatedUser()]
     can_remove_community = [SystemProcess(), AuthenticatedUser()]
+
+    can_delete_files = [SystemProcess(), AuthenticatedUser()]
+    can_manage_record_access = [SystemProcess(), AuthenticatedUser()]
+    can_lift_embargo = [SystemProcess(), AuthenticatedUser()]

oarepo_runtime/services/custom_fields/mappings.py

@@ -121,6 +121,9 @@ def prepare_parent_mapping(parent_class, config):
     if not parent_class:
         return
 
+    if not config.record_cls.index._name:
+        return
+
     script_dir = str(Path(__file__).resolve().parent)
     path_parts = script_dir.split('/')
     path_parts = path_parts[:-2]

oarepo_runtime/services/facets/params.py

@@ -1,5 +1,7 @@
 import copy
 import logging
+import operator
+from functools import partial, reduce
 from typing import List
 
 from flask import current_app
@@ -8,6 +10,12 @@ from invenio_access.permissions import system_user_id
 from invenio_app.helpers import obj_or_import_string
 from invenio_records_resources.services.records.facets import FacetsResponse
 from invenio_records_resources.services.records.params import FacetsParam
+from invenio_access.permissions import authenticated_user
+from invenio_records_resources.services.records.params.base import ParamInterpreter
+from invenio_search.engine import dsl
+from invenio_rdm_records.records.systemfields.deletion_status import (
+    RecordDeletionStatusEnum,
+)
 
 log = logging.getLogger(__name__)
 
@@ -96,7 +104,7 @@ class GroupedFacetsParam(FacetsParam):
         for f in filters[1:]:
             _filter &= f
 
-        return search.filter(_filter)
+        return search.filter(_filter).post_filter(_filter)
 
     def apply(self, identity, search, params):
         """Evaluate the facets on the search."""
@@ -129,3 +137,56 @@ class GroupedFacetsParam(FacetsParam):
         for group in groups:
             user_facets.update(self.facet_groups.get(group, {}))
         return user_facets
+
+
+class OARepoAllVersionsParam(ParamInterpreter):
+    """Evaluates the 'allversions' parameter."""
+    def __init__(self, field_names, config):
+        """Construct."""
+        self.field_names = field_names
+        super().__init__(config)
+
+    @classmethod
+    def factory(cls, field_names: list[str]):
+        """Create a new filter parameter."""
+        return partial(cls, field_names)
+
+    def apply(self, identity, search, params):
+        """Evaluate the allversions parameter on the search."""
+        if not params.get("allversions"):
+            queries = [dsl.query.Q("term", **{field_name: True}) for field_name in self.field_names]
+            query = reduce(operator.or_, queries)
+            search = search.filter(query)
+        return search
+
+class OARepoPublishedRecordsParam(ParamInterpreter):
+    """Evaluates the include_deleted parameter."""
+
+    def apply(self, identity, search, params):
+        """Evaluate the include_deleted parameter on the search."""
+
+        value = params.pop("include_deleted", None)
+        # Filter prevents from displaying deleted records on mainsite search
+        # deleted records should appear only in admins panel
+        if value is None:
+            query = dsl.query.Q(
+                "bool",
+                should=[
+                    dsl.query.Q(
+                        "bool",
+                        must=[
+                            dsl.query.Q(
+                                "term",
+                                deletion_status=RecordDeletionStatusEnum.PUBLISHED.value,
+                            )
+                        ],
+                    ),
+                    # Drafts does not have deletion_status so this clause is needed to
+                    # prevent the above clause from filtering out the drafts
+                    dsl.query.Q(
+                        "bool", must_not=[dsl.query.Q("exists", field="deletion_status")]
+                    ),
+                ],
+            )
+            search = search.filter(query)
+        return search

oarepo_runtime/services/search.py

@@ -10,6 +10,7 @@ from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.records import (
     SearchOptions as InvenioSearchOptions,
 )
+from invenio_drafts_resources.services.records.config import SearchDraftsOptions as InvenioSearchDraftsOptions
 from invenio_records_resources.services.records.params import (
     FacetsParam,
     PaginationParam,
@@ -18,14 +19,16 @@ from invenio_records_resources.services.records.params import (
 )
 from invenio_records_resources.services.records.queryparser import SuggestQueryParser
 from invenio_search.engine import dsl
-
+from invenio_drafts_resources.services.records.search_params import AllVersionsParam
 # TODO: integrate this to invenio_records_resources.services.records and remove SearchOptions class
 from oarepo_runtime.i18n import lazy_gettext as _
 from oarepo_runtime.records.systemfields.icu import ICUSuggestField
 from oarepo_runtime.utils.functools import class_property
 
-from .facets.params import GroupedFacetsParam
-
+from .facets.params import GroupedFacetsParam, OARepoAllVersionsParam, OARepoPublishedRecordsParam
+from invenio_drafts_resources.services.records.search_params import AllVersionsParam
+from invenio_rdm_records.services.search_params import PublishedRecordsParam
+from functools import partial
 try:
     from invenio_i18n import get_locale
 except ImportError:
@@ -57,11 +60,19 @@ class SearchOptionsMixin:
     @class_property
     def params_interpreters_cls(cls):
         """Replaces FacetsParam with GroupedFacetsParam."""
+        params_replace_map = {FacetsParam: GroupedFacetsParam, AllVersionsParam:
+            OARepoAllVersionsParam.factory(["versions.is_latest", "versions.is_latest_draft"]),
+                              PublishedRecordsParam: OARepoPublishedRecordsParam}
+
         param_interpreters = [*super(SearchOptionsMixin, cls).params_interpreters_cls]
         # replace FacetsParam with GroupedFacetsParam
         for idx, interpreter in enumerate(param_interpreters):
-            if interpreter == FacetsParam:
-                param_interpreters[idx] = GroupedFacetsParam
+            if interpreter in params_replace_map:
+                param_interpreters[idx] = params_replace_map[interpreter]
+            elif isinstance(interpreter, partial):
+                fn = interpreter.func
+                if fn in params_replace_map:
+                    param_interpreters[idx] = params_replace_map[fn]
         return param_interpreters
 
     sort_options = {
@@ -113,6 +124,7 @@ class SearchOptionsDraftMixin(SearchOptionsMixin):
     }
 
 
+
 class SearchOptions(SearchOptionsMixin, InvenioSearchOptions):
     # TODO: should be changed
     params_interpreters_cls = [
@@ -122,6 +134,16 @@ class SearchOptions(SearchOptionsMixin, InvenioSearchOptions):
         GroupedFacetsParam,
     ]
 
+class SearchDraftsOptions(SearchOptionsMixin, InvenioSearchDraftsOptions):
+    # TODO: should be changed
+    params_interpreters_cls = [
+        QueryStrParam,
+        PaginationParam,
+        SortParam,
+        GroupedFacetsParam,
+        AllVersionsParam.factory("versions.is_latest_draft")
+    ]
+
 
 class RDMSearchOptions(SearchOptionsMixin, BaseRDMSearchOptions):
     pass

{oarepo_runtime-1.5.96.dist-info → oarepo_runtime-1.5.98.dist-info}/METADATA

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

{oarepo_runtime-1.5.96.dist-info → oarepo_runtime-1.5.98.dist-info}/RECORD

@@ -1,5 +1,5 @@
 oarepo_runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/ext.py,sha256=IK08T5hMdI6Wouh_6PsfhgfJ3cv1JCSR3aip7vrQ9Xk,2564
+oarepo_runtime/ext.py,sha256=6w6bpTpNjjj3txgVu0nfpmPa9CnDS6Zl6U2DCNs9Usc,2565
 oarepo_runtime/ext_config.py,sha256=NiXqgag3QJABf06r5NiDYjd9AvoYoRY9UWiplo8Vcg4,2056
 oarepo_runtime/profile.py,sha256=QzrQoZncjoN74ZZnpkEKakNk08KCzBU7m6y42RN8AMY,1637
 oarepo_runtime/proxies.py,sha256=NN_WNj1xuKc-OveoZmzvTFlUonNjSmLIGsv_JUcHGls,285
@@ -76,13 +76,13 @@ oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 oarepo_runtime/services/components.py,sha256=QKrdFmroE1hSrRjRkqinynCTb0KSqBhytTb9FoY0OEE,11023
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
-oarepo_runtime/services/search.py,sha256=mUycojDo26p54ZZPqXcXmdhUrzAP_eKCWls2XYJSM6c,8186
+oarepo_runtime/services/search.py,sha256=t0WEe2VrbCzZ06-Jgz7C9-pc9y27BqAgTEXldEHskfk,9409
 oarepo_runtime/services/config/__init__.py,sha256=559w4vphVAipa420OwTsxGUP-b7idoqSIX13FSJyVz0,783
 oarepo_runtime/services/config/link_conditions.py,sha256=evPRd5XU76Ok4J-08bBfplbHZ019rl74FpJmO8iM5yg,3298
-oarepo_runtime/services/config/permissions_presets.py,sha256=YF99Vjh1fGqSEXNw7qIfcUQFvzpE54_BafqkO6wlYHk,6668
+oarepo_runtime/services/config/permissions_presets.py,sha256=jV3Ft7xFdBaeShoa3Q3Q-HHWP-wOX4XYDTRzWwUVL7g,7151
 oarepo_runtime/services/config/service.py,sha256=s-dVbGkLICpsce6jgu7b5kzYFz9opWjSQFDBgbIhKio,4002
 oarepo_runtime/services/custom_fields/__init__.py,sha256=_gqMcA_I3rdEZcBtCuDjO4wdVCqFML5NzaccuPx5a3o,2565
-oarepo_runtime/services/custom_fields/mappings.py,sha256=Y1d0s9lG_VThkzSNlxAS94_9eOFZe9N2C1hpYDZvnvI,7457
+oarepo_runtime/services/custom_fields/mappings.py,sha256=3CIvjWzVRO3fZ2r-3taK1rwuLH9wj5Lguo-GvsbLBf4,7515
 oarepo_runtime/services/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/entity/config.py,sha256=1jfdPrxSbMuKj7eOUNKRWTCPbBPyRV6MrWE4Vgf9rX0,399
 oarepo_runtime/services/entity/schema.py,sha256=8TBpUFRITaBO7qCMz36cly1Hj4I1nLa9PeSAfWSa2YM,157
@@ -97,7 +97,7 @@ oarepo_runtime/services/facets/enum.py,sha256=3LrShQIt9Vt5mkqUkc6FNxXCW5JEFdPwtG
 oarepo_runtime/services/facets/facet_groups_names.py,sha256=RR8eeUmD8d9t966JqfhslZnILn_xDSfYlL0hjyJT92Y,468
 oarepo_runtime/services/facets/max_facet.py,sha256=TZ4KMKKVJHzyU1KgNne4V7IMQPu1ALRpkz61Y0labrc,407
 oarepo_runtime/services/facets/nested_facet.py,sha256=y0xgjx37HsSj2xW7URxNemYTksD8hpPs7kOEfIBw22k,971
-oarepo_runtime/services/facets/params.py,sha256=IiRKbR0jIm67hucj3fINosUAysZQSSKqhusEXXub-hA,4194
+oarepo_runtime/services/facets/params.py,sha256=270La-A9582aDF3D4_bMSLWv4VsPeMiqbb9jA301Q5w,6585
 oarepo_runtime/services/facets/year_histogram.py,sha256=kdfwx1lgw4UmfjdaqqeElJCB8rAduMH2hy42aZjY37w,6257
 oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dtv35LDo7iZeTM,268
 oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8PuR2XKaOGoNHfw,2400
@@ -135,9 +135,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.96.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.96.dist-info/METADATA,sha256=Icnwu4HU1If11uWxVHRQWl5LFgmzmLi1w_WHD7qU8cw,4720
-oarepo_runtime-1.5.96.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.96.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.96.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.96.dist-info/RECORD,,
+oarepo_runtime-1.5.98.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.98.dist-info/METADATA,sha256=sCqpqYHRhCQQsR22KVqP6s_wTAsK5Th1Lfp-LInuT24,4720
+oarepo_runtime-1.5.98.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.98.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.98.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.98.dist-info/RECORD,,