oarepo-runtime 1.5.92__py3-none-any.whl → 1.5.93__py3-none-any.whl

oarepo_runtime/services/permissions/__init__.py

@@ -1,3 +1,3 @@
-from .generators import RecordOwners, UserWithRole
+from .generators import IfDraftType, RecordOwners, UserWithRole
 
-__all__ = ("RecordOwners", "UserWithRole")
+__all__ = ("RecordOwners", "UserWithRole", "IfDraftType")

oarepo_runtime/services/permissions/generators.py

@@ -1,7 +1,14 @@
+from typing import Literal
+
+from flask import current_app
 from flask_principal import RoleNeed, UserNeed
-from invenio_records_permissions.generators import Generator
+from invenio_records_permissions.generators import (
+    ConditionalGenerator,
+    Disable,
+    Generator,
+)
 from invenio_search.engine import dsl
-from flask import current_app
+
 
 class RecordOwners(Generator):
     """Allows record owners."""
@@ -12,7 +19,7 @@ class RecordOwners(Generator):
             # 'record' is required, so if not passed we default to empty array,
             # i.e. superuser-access.
             return []
-        if current_app.config.get('INVENIO_RDM_ENABLED', False):
+        if current_app.config.get("INVENIO_RDM_ENABLED", False):
             owners = getattr(record.parent.access, "owned_by", None)
             if owners is not None:
                 owners_list = owners if isinstance(owners, list) else [owners]
@@ -27,11 +34,12 @@ class RecordOwners(Generator):
         """Filters for current identity as owner."""
         users = [n.value for n in identity.provides if n.method == "id"]
         if users:
-            if current_app.config.get('INVENIO_RDM_ENABLED', False):
+            if current_app.config.get("INVENIO_RDM_ENABLED", False):
                 return dsl.Q("terms", **{"parent.access.owned_by.user": users})
             else:
                 return dsl.Q("terms", **{"parent.owners.user": users})
 
+
 class UserWithRole(Generator):
     def __init__(self, *roles):
         self.roles = roles
@@ -46,3 +54,49 @@ class UserWithRole(Generator):
             if provide.method == "role" and provide.value in self.roles:
                 return dsl.Q("match_all")
         return dsl.Q("match_none")
+
+
+class IfDraftType(ConditionalGenerator):
+    def __init__(
+        self,
+        draft_types: list[
+            Literal["initial"] | Literal["metadata"] | Literal["new_version"]
+        ]
+        | Literal["initial"]
+        | Literal["metadata"]
+        | Literal["new_version"],
+        then_=None,
+        else_=None,
+    ):
+        if not isinstance(draft_types, (list, tuple)):
+            draft_types = [draft_types]
+        self._draft_types = draft_types
+        if not then_:
+            then_ = [Disable()]
+        if not else_:
+            else_ = [Disable()]
+        if not isinstance(then_, (list, tuple)):
+            then_ = [then_]
+        if not isinstance(else_, (list, tuple)):
+            else_ = [else_]
+        super().__init__(then_, else_)
+
+    def _condition(self, record=None, **kwargs):
+        if not record:
+            return False
+
+        index = record.versions.index
+        is_latest = record.versions.is_latest
+        is_draft = record.is_draft
+
+        if not is_draft:
+            return False
+
+        if index == 1 and not is_latest:
+            draft_type = "initial"
+        elif index > 1 and not is_latest:
+            draft_type = "new_version"
+        else:
+            draft_type = "metadata"
+
+        return draft_type in self._draft_types

oarepo_runtime/services/schema/marshmallow.py

@@ -1,10 +1,12 @@
 import typing
 
-import marshmallow as ma
+from invenio_rdm_records.services.schemas.record import RDMRecordSchema
 from invenio_records_resources.services.records.schema import (
     BaseRecordSchema as InvenioBaseRecordSchema,
 )
 
+import marshmallow as ma
+
 
 class BaseRecordSchema(InvenioBaseRecordSchema):
     """Base record schema - in addition to invenio exposes $schema as well."""
@@ -12,6 +14,12 @@ class BaseRecordSchema(InvenioBaseRecordSchema):
     _schema = ma.fields.Str(attribute="$schema", data_key="$schema")
 
 
+class RDMBaseRecordSchema(RDMRecordSchema):
+    """Base record schema - in addition to invenio exposes $schema as well."""
+
+    _schema = ma.fields.Str(attribute="$schema", data_key="$schema")
+
+
 class DictOnlySchema(ma.Schema):
     def get_attribute(self, obj: typing.Any, attr: str, default: typing.Any):
         if not isinstance(attr, int) and "." in attr:

oarepo_runtime/services/search.py

@@ -2,11 +2,18 @@ import dataclasses
 import inspect
 from typing import List
 
+from invenio_rdm_records.services.config import (
+    RDMSearchDraftsOptions as BaseRDMSearchDraftsOptions,
+)
+from invenio_rdm_records.services.config import (
+    RDMSearchOptions as BaseRDMSearchOptions,
+)
 from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.records import (
     SearchOptions as InvenioSearchOptions,
 )
 from invenio_records_resources.services.records.params import (
+    FacetsParam,
     PaginationParam,
     QueryStrParam,
     SortParam,
@@ -17,9 +24,10 @@ from invenio_search.engine import dsl
 # 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 invenio_rdm_records.services.config import RDMSearchOptions, RDMSearchDraftsOptions
+
 try:
     from invenio_i18n import get_locale
 except ImportError:
@@ -47,13 +55,16 @@ class FuzzySuggestQueryParser(SuggestQueryParser):
         return dsl.Q("bool", should=[multi_match_with_bool_prefix, multi_match_fuzzy])
 
 
-class SearchOptions(InvenioSearchOptions):
-    params_interpreters_cls = [
-        QueryStrParam,
-        PaginationParam,
-        SortParam,
-        GroupedFacetsParam,
-    ]
+class SearchOptionsMixin:
+    @class_property
+    def params_interpreters_cls(cls):
+        """Replaces FacetsParam with GroupedFacetsParam."""
+        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
+        return param_interpreters
 
     sort_options = {
         "title": dict(
@@ -75,6 +86,24 @@ class SearchOptions(InvenioSearchOptions):
     }
 
 
+class SearchOptions(SearchOptionsMixin, InvenioSearchOptions):
+    # TODO: should be changed
+    params_interpreters_cls = [
+        QueryStrParam,
+        PaginationParam,
+        SortParam,
+        GroupedFacetsParam,
+    ]
+
+
+class RDMSearchOptions(SearchOptionsMixin, BaseRDMSearchOptions):
+    pass
+
+
+class RDMSearchDraftsOptions(SearchOptionsMixin, BaseRDMSearchDraftsOptions):
+    pass
+
+
 @dataclasses.dataclass
 class SuggestField:
     field: str
@@ -188,14 +217,17 @@ class ICUSortOptions:
             }
         return ret
 
+
 class I18nSearchOptions(SearchOptions):
     extra_sort_options = {}
     record_cls = None
 
+
 class I18nRDMSearchOptions(RDMSearchOptions):
     extra_sort_options = {}
     record_cls = None
 
+
 class I18nRDMDraftsSearchOptions(RDMSearchDraftsOptions):
     extra_sort_options = {}
     record_cls = None

{oarepo_runtime-1.5.92.dist-info → oarepo_runtime-1.5.93.dist-info}/METADATA

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

{oarepo_runtime-1.5.92.dist-info → oarepo_runtime-1.5.93.dist-info}/RECORD

@@ -76,7 +76,7 @@ oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 oarepo_runtime/services/components.py,sha256=h7oQNPueuPqBD6mCRCIr7ZuNvzeliXinHjOyVV3FBvw,10775
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
-oarepo_runtime/services/search.py,sha256=39HR4LB4Q-UiodoOMA4syQTt-q7NvceiL6sGQeIHVfc,6520
+oarepo_runtime/services/search.py,sha256=exCEfRAWlajVfQBZ1Qf1usYEF7Fwp5H8Lb_usOiLRS8,7422
 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
@@ -102,8 +102,8 @@ oarepo_runtime/services/facets/year_histogram.py,sha256=kdfwx1lgw4UmfjdaqqeElJCB
 oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dtv35LDo7iZeTM,268
 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=Cgin2Zr1fpaYr-aZcUotdmv0hsrPTUJVQt8ouvU8tuU,95
-oarepo_runtime/services/permissions/generators.py,sha256=y_jptL-pHDU91xJsLMR0Bfva5EXcZv6JDLZ1x7XxzKQ,1919
+oarepo_runtime/services/permissions/__init__.py,sha256=33zqKGgRQmRfNZI8kAhue1bFoT1deYiVVNinP8Bvv0I,123
+oarepo_runtime/services/permissions/generators.py,sha256=fuG0zp940l5AcAQmjGnOcF8vnCPmGUGKHsPYMOpGsYY,3288
 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
@@ -115,7 +115,7 @@ oarepo_runtime/services/schema/cf.py,sha256=-m9seIH5VYUdxDsJlPVXS0-8f7xkpN7YfW1q
 oarepo_runtime/services/schema/i18n.py,sha256=NACu0SqXWuuwKVpBZdz4K8tVfBaCEI9YpcCtC1l1YGI,1669
 oarepo_runtime/services/schema/i18n_ui.py,sha256=MnEDW0gcZPvEODbJ6XzldxNCJ2suhfmdHQ4wkcAG6zA,2179
 oarepo_runtime/services/schema/i18n_validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wUyKNo,236
-oarepo_runtime/services/schema/marshmallow.py,sha256=LmcSxvbZ9jIhkNHCqqxt1SA2UNijoDmIzqli1MkoTrE,1153
+oarepo_runtime/services/schema/marshmallow.py,sha256=iAMMH5MlYs59qetXAHOROvERNScfVqY9TrEIJejHCuw,1421
 oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxWCD_gqJO8-8u1SbaPEFBjDZ5HGgGr0Ow,2027
 oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg5AC9RHrcB5QDKRq0,6661
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
@@ -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.92.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.92.dist-info/METADATA,sha256=bDlBvtRuH1R-r1HPvL9teVUE_Z6a8grlHYKHLc4YaB8,4720
-oarepo_runtime-1.5.92.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.92.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.92.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.92.dist-info/RECORD,,
+oarepo_runtime-1.5.93.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.93.dist-info/METADATA,sha256=utgiMZHHRhAFIpjCSNUAgZYwr2lwKD_BqHQfvKt7jJo,4720
+oarepo_runtime-1.5.93.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.93.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.93.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.93.dist-info/RECORD,,