oarepo-runtime 1.5.44__py3-none-any.whl → 1.5.46__py3-none-any.whl

oarepo_runtime/datastreams/utils.py

@@ -15,7 +15,8 @@ def get_record_service_for_record(record):
     if not record:
         return None
     if "OAREPO_PRIMARY_RECORD_SERVICE" in current_app.config:
-        return current_app.config["OAREPO_PRIMARY_RECORD_SERVICE"][type(record)]
+        service_id = current_app.config["OAREPO_PRIMARY_RECORD_SERVICE"][type(record)]
+        return current_service_registry.get(service_id)
     else:
         return get_record_service_for_record_deprecated(record)
 

oarepo_runtime/records/systemfields/selectors.py

@@ -1,4 +1,4 @@
-from typing import List, Any
+from typing import Any, List
 
 
 class Selector:

oarepo_runtime/records/systemfields/synthetic.py

@@ -70,7 +70,9 @@ class SyntheticSystemField(MappingSystemFieldMixin, SystemField):
            ```
     """
 
-    def __init__(self, selector: Selector=None, filter=None, map=None, key=None, **kwargs):
+    def __init__(
+        self, selector: Selector = None, filter=None, map=None, key=None, **kwargs
+    ):
         self.selector = selector
         self.map = map
         self.filter = filter

oarepo_runtime/services/config/__init__.py

@@ -4,11 +4,10 @@ from .permissions_presets import (
     OaiHarvesterPermissionPolicy,
     ReadOnlyPermissionPolicy,
 )
-from .service import PermissionsPresetsConfigMixin, UserWithRole
+from .service import PermissionsPresetsConfigMixin
 
 __all__ = (
     "PermissionsPresetsConfigMixin",
-    "UserWithRole",
     "OaiHarvesterPermissionPolicy",
     "ReadOnlyPermissionPolicy",
     "EveryonePermissionPolicy",

oarepo_runtime/services/config/service.py

@@ -3,10 +3,7 @@ import re
 from typing import List, Type
 
 from flask import current_app
-from flask_principal import RoleNeed
 from invenio_records_permissions import BasePermissionPolicy
-from invenio_records_permissions.generators import Generator
-from invenio_search.engine import dsl
 
 from oarepo_runtime.utils.functools import class_property
 
@@ -103,19 +100,3 @@ class PermissionsPresetsConfigMixin:
             name = name[:-6]
         name = re.sub(r"(?<!^)(?=[A-Z])", "_", name).upper()
         return f"{name}_PERMISSIONS_PRESETS"
-
-
-class UserWithRole(Generator):
-    def __init__(self, *roles):
-        self.roles = roles
-
-    def needs(self, **kwargs):
-        return [RoleNeed(role) for role in self.roles]
-
-    def query_filter(self, identity=None, **kwargs):
-        if not identity:
-            return dsl.Q("match_none")
-        for provide in identity.provides:
-            if provide.method == "role" and provide.value in self.roles:
-                return dsl.Q("match_all")
-        return dsl.Q("match_none")

oarepo_runtime/services/generators.py

@@ -1,24 +1,10 @@
-from flask_principal import UserNeed
-from invenio_records_permissions.generators import Generator
-from invenio_search.engine import dsl
+import warnings
 
+from .permissions import RecordOwners
 
-class RecordOwners(Generator):
-    """Allows record owners."""
-
-    def needs(self, record=None, **kwargs):
-        """Enabling Needs."""
-        if record is None:
-            # 'record' is required, so if not passed we default to empty array,
-            # i.e. superuser-access.
-            return []
-        owners = getattr(record.parent, "owners", None)
-        if owners is not None:
-            return [UserNeed(owner.id) for owner in owners]
-        return []
-
-    def query_filter(self, identity=None, **kwargs):
-        """Filters for current identity as owner."""
-        users = [n.value for n in identity.provides if n.method == "id"]
-        if users:
-            return dsl.Q("terms", **{"parent.owners.user": users})
+warnings.warn(
+    "oarepo_runtime.services.generators is deprecated, import RecordOwners from "
+    "oarepo_runtime.services.permissions",
+    DeprecationWarning,
+)
+__all__ = ("RecordOwners",)

oarepo_runtime/services/permissions/__init__.py

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

oarepo_runtime/services/permissions/generators.py

@@ -0,0 +1,40 @@
+from flask_principal import RoleNeed, UserNeed
+from invenio_records_permissions.generators import Generator
+from invenio_search.engine import dsl
+
+
+class RecordOwners(Generator):
+    """Allows record owners."""
+
+    def needs(self, record=None, **kwargs):
+        """Enabling Needs."""
+        if record is None:
+            # 'record' is required, so if not passed we default to empty array,
+            # i.e. superuser-access.
+            return []
+        owners = getattr(record.parent, "owners", None)
+        if owners is not None:
+            return [UserNeed(owner.id) for owner in owners]
+        return []
+
+    def query_filter(self, identity=None, **kwargs):
+        """Filters for current identity as owner."""
+        users = [n.value for n in identity.provides if n.method == "id"]
+        if users:
+            return dsl.Q("terms", **{"parent.owners.user": users})
+
+
+class UserWithRole(Generator):
+    def __init__(self, *roles):
+        self.roles = roles
+
+    def needs(self, **kwargs):
+        return [RoleNeed(role) for role in self.roles]
+
+    def query_filter(self, identity=None, **kwargs):
+        if not identity:
+            return dsl.Q("match_none")
+        for provide in identity.provides:
+            if provide.method == "role" and provide.value in self.roles:
+                return dsl.Q("match_all")
+        return dsl.Q("match_none")

{oarepo_runtime-1.5.44.dist-info → oarepo_runtime-1.5.46.dist-info}/METADATA

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

{oarepo_runtime-1.5.44.dist-info → oarepo_runtime-1.5.46.dist-info}/RECORD

@@ -25,7 +25,7 @@ oarepo_runtime/datastreams/semi_asynchronous.py,sha256=TJWby2MDKXm5feRocoWB-8Ohs
 oarepo_runtime/datastreams/synchronous.py,sha256=t5lfnMkLqy3jK5zMl-nIuA0HlMPiHGjwCqZ8XQP-3GM,2595
 oarepo_runtime/datastreams/transformers.py,sha256=q5KzHPl2kJg7HP1BtKJ7F_UMqg_7L1ZGDX0O7s8D6UI,521
 oarepo_runtime/datastreams/types.py,sha256=KZjblc3T_UFFW7LrMDmiR8lqVf86V484LAHj6yg05EI,9908
-oarepo_runtime/datastreams/utils.py,sha256=PAUVyL6AuD20PtESJcUEXsUeeSnxxKUB9LzxqwAgx9U,3939
+oarepo_runtime/datastreams/utils.py,sha256=GYpVdwMks0GRdz8DBpErdiV_2aJ-3V1uAkOHyz67bZw,4001
 oarepo_runtime/datastreams/readers/__init__.py,sha256=P1n3llZQ3AFHnSPbeT1VaCJcEtRFz9AbHfjkZv5LG7s,1103
 oarepo_runtime/datastreams/readers/attachments.py,sha256=A7EC1TqyTHG-go5DIaRotlBSOm6o9hGqAKyVVAceCRU,1956
 oarepo_runtime/datastreams/readers/excel.py,sha256=CM8lr8mejN7NgoK5TJb1oXpjq0HxklQKMsuj3uqjTjA,3653
@@ -62,19 +62,19 @@ oarepo_runtime/records/systemfields/icu.py,sha256=sSGAgi5WhsAY4cCBL7-7nMpvHAuctp
 oarepo_runtime/records/systemfields/mapping.py,sha256=tXOK_jkdY1pOUO7_VfChfDNB8UTi21GUXaidpugTnO8,1017
 oarepo_runtime/records/systemfields/owner.py,sha256=dYRVBinniW7ECHuSnTAjeN6x1KhhJtNR9vxmD1KswMs,3805
 oarepo_runtime/records/systemfields/record_status.py,sha256=U3kem4-JkNsT17e0iAl3HIAZ2MvO5lY_0U757aZvTKE,935
-oarepo_runtime/records/systemfields/selectors.py,sha256=8e8LaepwU5hrft8UDDJ1_FkxeZxBW0-JJKgUnqWHOx4,928
-oarepo_runtime/records/systemfields/synthetic.py,sha256=6Le2lHMIPXY2JKW31ymPlYRZtIRriyxDp2xKPFbTK3o,4271
+oarepo_runtime/records/systemfields/selectors.py,sha256=rXNioeyCHLiNGsA_zu8bfoFdu29ACSNN7zHRUm1rJ6Q,928
+oarepo_runtime/records/systemfields/synthetic.py,sha256=UustvhzcDGuaNZLDeHbWwshoxQR-qRIuHDCct5RXmrI,4287
 oarepo_runtime/resources/__init__.py,sha256=v8BGrOTu_FjKzd0eozV7Q4GoGxyfybsL2cI-tbP5Pys,185
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
 oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX_wKfBp1LmbeForwHyBNYdyha4uQ,1878
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/components.py,sha256=FkqyFe6-5HZKJDqglQ-Smm_AIsDZ-LyWcOr1u2yGu3k,1836
-oarepo_runtime/services/generators.py,sha256=V582uA813AIXnFhzqUwakmDgBOI1SQe3XZeJtUXNbwM,872
+oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=gPmQ7DzX4da5zuvqQE7u-AUn_Yvz-YHt8W8DaxPbQ-M,2706
 oarepo_runtime/services/search.py,sha256=9xGTN5Yg6eTdptQ9qjO_umbacf9ooMuHYGXWYfla4-M,6227
-oarepo_runtime/services/config/__init__.py,sha256=SCqww5sV8qh3gmev6TE8EyJbD58juIEDCm_7MEHxtSg,440
+oarepo_runtime/services/config/__init__.py,sha256=dtlD84pJ6xI77UF22IPrCOt7tHD3g5DAEDApUdjDVFE,406
 oarepo_runtime/services/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
-oarepo_runtime/services/config/service.py,sha256=CJNBbFJmXEdEpLGrefQSGJVGRcJAtf-619Xdm1iK5_A,4627
+oarepo_runtime/services/config/service.py,sha256=s-dVbGkLICpsce6jgu7b5kzYFz9opWjSQFDBgbIhKio,4002
 oarepo_runtime/services/custom_fields/__init__.py,sha256=xJ7XEyMJHPfIgX5JKpgpwh7SYc9Zee2dC5oC8cm99Qc,2282
 oarepo_runtime/services/custom_fields/mappings.py,sha256=tg9CAdxGOkd_n6RB5Z2_wSwo_A0wqEey8RMcZ79AHo0,6906
 oarepo_runtime/services/expansions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,6 +92,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=YEOBCCvU-RG0BSWMtg76sv8qLcMbXxNu3rRJPDLtvvQ,1371
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/relations/components.py,sha256=3g0VdnGUM-2yYt50fPi-OADReBGJb4h05vmYHfh-QFs,592
 oarepo_runtime/services/relations/errors.py,sha256=VtlOKq9MEUeJ4IsiZhY7lWoshrusA_RL4SOHe2titno,552
@@ -117,9 +119,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.44.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.44.dist-info/METADATA,sha256=pDJg1hNUd-gXeg2V2bhwmr0aIofecKPJb_43bXQF4RQ,4680
-oarepo_runtime-1.5.44.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-oarepo_runtime-1.5.44.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.44.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.44.dist-info/RECORD,,
+oarepo_runtime-1.5.46.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.46.dist-info/METADATA,sha256=qSraV8TexG2hMsNg1VcQW77Px24z_3A5njdIodRPp30,4680
+oarepo_runtime-1.5.46.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+oarepo_runtime-1.5.46.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.46.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.46.dist-info/RECORD,,