oarepo-runtime 1.5.43__tar.gz → 1.5.45__tar.gz

{oarepo_runtime-1.5.43/oarepo_runtime.egg-info → oarepo_runtime-1.5.45}/PKG-INFO

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

{oarepo_runtime-1.5.43 → oarepo_runtime-1.5.45}/oarepo_runtime/datastreams/utils.py

@@ -1,6 +1,8 @@
 from base64 import b64decode
 
 import requests
+from deprecated import deprecated
+from flask import current_app
 from invenio_drafts_resources.services import RecordService as DraftRecordService
 from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services import FileService, RecordService
@@ -12,7 +14,16 @@ from requests.adapters import BaseAdapter
 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)]
+    else:
+        return get_record_service_for_record_deprecated(record)
+
 
+@deprecated(
+    version="1.5.43", reason="Please recompile model to remove this deprecation warning"
+)
+def get_record_service_for_record_deprecated(record):
     if getattr(record, "is_draft", False):
         record_name = "draft_cls"
         expect_draft_service = True

{oarepo_runtime-1.5.43 → oarepo_runtime-1.5.45}/oarepo_runtime/records/systemfields/selectors.py

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

{oarepo_runtime-1.5.43 → oarepo_runtime-1.5.45}/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-1.5.43 → oarepo_runtime-1.5.45}/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-1.5.43 → oarepo_runtime-1.5.45}/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-1.5.45/oarepo_runtime/services/generators.py

@@ -0,0 +1,10 @@
+import warnings
+
+from .permissions import RecordOwners
+
+warnings.warn(
+    "oarepo_runtime.services.generators is deprecated, import RecordOwners from "
+    "oarepo_runtime.services.permissions",
+    DeprecationWarning,
+)
+__all__ = ("RecordOwners",)

oarepo_runtime-1.5.45/oarepo_runtime/services/permissions/__init__.py

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

{oarepo_runtime-1.5.43/oarepo_runtime/services → oarepo_runtime-1.5.45/oarepo_runtime/services/permissions}/generators.py

@@ -1,4 +1,4 @@
-from flask_principal import UserNeed
+from flask_principal import RoleNeed, UserNeed
 from invenio_records_permissions.generators import Generator
 from invenio_search.engine import dsl
 
@@ -22,3 +22,19 @@ class RecordOwners(Generator):
         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.43 → oarepo_runtime-1.5.45/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.43 → oarepo_runtime-1.5.45}/oarepo_runtime.egg-info/SOURCES.txt

@@ -104,6 +104,8 @@ oarepo_runtime/services/facets/year_histogram.py
 oarepo_runtime/services/files/__init__.py
 oarepo_runtime/services/files/components.py
 oarepo_runtime/services/files/service.py
+oarepo_runtime/services/permissions/__init__.py
+oarepo_runtime/services/permissions/generators.py
 oarepo_runtime/services/relations/__init__.py
 oarepo_runtime/services/relations/components.py
 oarepo_runtime/services/relations/errors.py

{oarepo_runtime-1.5.43 → oarepo_runtime-1.5.45}/setup.cfg

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