oarepo-runtime 1.9.4__py3-none-any.whl → 1.10.1__py3-none-any.whl

oarepo_runtime/datastreams/ext.py

@@ -26,7 +26,10 @@ class OARepoDataStreamsExt:
             if inst.name not in config_classes:
                 raise KeyError(f"'{inst.name}' not found in config {config_name}")
             reader_class = config_classes[inst.name]
-            return reader_class(**(inst.kwargs or {}), **kwargs, identity=identity)
+            all_kwargs = {**(inst.kwargs or {}), **kwargs}
+            if "identity" not in all_kwargs:
+                all_kwargs["identity"] = identity
+            return reader_class(**all_kwargs)
         else:
             return inst
 

oarepo_runtime/datastreams/writers/attachments_service.py

@@ -5,6 +5,7 @@ from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.uow import UnitOfWork
 
 from ...uow import BulkUnitOfWork
+from ...utils.identity_utils import get_user_and_identity
 from ..types import StreamBatch, StreamEntry
 from ..utils import attachments_requests, get_file_service_for_record_service
 from . import BaseWriter
@@ -35,6 +36,10 @@ class AttachmentsServiceWriter(BaseWriter):
         if isinstance(service, str):
             service = current_service_registry.get(service)
 
+        if isinstance(identity, str):
+            _, identity = get_user_and_identity(email=identity)
+        elif isinstance(identity, int):
+            _, identity = get_user_and_identity(user_id=identity)
         self._identity = identity or system_identity
         self._update = update
 

oarepo_runtime/datastreams/writers/publish.py

@@ -5,6 +5,8 @@ from oarepo_runtime.datastreams.types import StreamBatch, StreamEntry
 from oarepo_runtime.datastreams.writers import BaseWriter
 from oarepo_runtime.datastreams.writers.utils import record_invenio_exceptions
 
+from ...utils.identity_utils import get_user_and_identity
+
 
 class PublishWriter(BaseWriter):
     def __init__(
@@ -20,6 +22,10 @@ class PublishWriter(BaseWriter):
             service = current_service_registry.get(service)
 
         self._service = service
+        if isinstance(identity, str):
+            _, identity = get_user_and_identity(email=identity)
+        elif isinstance(identity, int):
+            _, identity = get_user_and_identity(user_id=identity)
         self._identity = identity or system_identity
         self._request_name = request_name
         self._direct_call = direct_call
@@ -37,7 +43,7 @@ class PublishWriter(BaseWriter):
             data = self._service.publish(self._identity, entry.id)
         else:
             data = self._publish_via_request(self._identity, entry.id)
-        
+
         entry.entry = data.to_dict()
 
     def _publish_via_request(self, identity, entry_id):
@@ -61,4 +67,4 @@ class PublishWriter(BaseWriter):
             identity, request.id, "accept"
         )
 
-        return self._service.read(identity, draft["id"])
+        return self._service.read(identity, draft["id"])

oarepo_runtime/datastreams/writers/service.py

@@ -5,6 +5,7 @@ from invenio_records_resources.services.uow import UnitOfWork
 from sqlalchemy.exc import NoResultFound
 
 from ...uow import BulkUnitOfWork
+from ...utils.identity_utils import get_user_and_identity
 from ..types import StreamBatch, StreamEntry, StreamEntryError
 from . import BaseWriter
 from .utils import record_invenio_exceptions
@@ -35,6 +36,10 @@ class ServiceWriter(BaseWriter):
             service = current_service_registry.get(service)
 
         self._service = service
+        if isinstance(identity, str):
+            _, identity = get_user_and_identity(email=identity)
+        elif isinstance(identity, int):
+            _, identity = get_user_and_identity(user_id=identity)
         self._identity = identity or system_identity
         self._update = update
 

oarepo_runtime/utils/identity_utils.py

@@ -0,0 +1,35 @@
+from flask import current_app
+from flask_principal import Identity, UserNeed, identity_loaded
+from invenio_access.models import User
+
+
+def get_user_and_identity(user_id=None, username=None, email=None):
+    def lookup_user():
+        if user_id is not None:
+            return User.query.filter_by(id=user_id).one()
+        elif username is not None:
+            return User.query.filter_by(username=username).one()
+        elif email is not None:
+            return User.query.filter_by(email=email).one()
+        else:
+            raise ValueError(
+                "At least one of user_id, username, or email must be provided."
+            )
+
+    user = lookup_user()
+
+    identity = Identity(user.id)
+    identity.provides.add(UserNeed(user.id))
+    if (
+        hasattr(current_app.wsgi_app, "mounts")
+        and "/api" in current_app.wsgi_app.mounts
+    ):
+        # called from UI
+        api_app = current_app.wsgi_app.mounts["/api"]
+    else:
+        # called from API
+        api_app = current_app
+    with api_app.app_context():
+        with current_app.test_request_context("/api"):
+            identity_loaded.send(api_app, identity=identity)
+    return user, identity

{oarepo_runtime-1.9.4.dist-info → oarepo_runtime-1.10.1.dist-info}/METADATA

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

{oarepo_runtime-1.9.4.dist-info → oarepo_runtime-1.10.1.dist-info}/RECORD

@@ -25,7 +25,7 @@ oarepo_runtime/datastreams/asynchronous.py,sha256=JwT-Hx6P7KwV0vSJlxX6kLSIX5vtse
 oarepo_runtime/datastreams/catalogue.py,sha256=D6leq-FPT3RP3SniEAXPm66v3q8ZdQnaUYJ5XM0dIFY,5021
 oarepo_runtime/datastreams/datastreams.py,sha256=N9XXwIaBTADkPhE-XG6uotMwd-8Kn0vEZOoeV2BnMGI,4679
 oarepo_runtime/datastreams/errors.py,sha256=WyZLU53EdFJTLv6K2ooM_M6ISjLS-U1dDw6B7guOLSc,1540
-oarepo_runtime/datastreams/ext.py,sha256=ivugdVMCqwugK-5SeX14a-dMq6VaTt7DM2wFU357tR4,1406
+oarepo_runtime/datastreams/ext.py,sha256=dLdWK45W366e9Ksmy1bOIfkIg-875kI3DroKddGkILw,1522
 oarepo_runtime/datastreams/fixtures.py,sha256=oc3b1XP7gJmEXVskZTltZUasdeTux-wbgxox66OyIT8,8901
 oarepo_runtime/datastreams/json.py,sha256=OkIkGKUawtYoGelyS5V92DVk7Ei7SlkMMny2Ue2dDWc,132
 oarepo_runtime/datastreams/semi_asynchronous.py,sha256=kNc6BBnV6oFoY9kHgf5l8fd1wibRfI0dwyzLtu4fmUA,2940
@@ -41,9 +41,9 @@ oarepo_runtime/datastreams/readers/service.py,sha256=izIMcrsUr4_qRZXHKQZs7Tyn1Op
 oarepo_runtime/datastreams/readers/yaml.py,sha256=U4nyJQ8ocM_ohp-eUN1RjVoNzYV9z7xQ1XiQKG_B9Kk,408
 oarepo_runtime/datastreams/writers/__init__.py,sha256=PWufWNrixFhXv5wSv3_pzmrimroqVB2DVgTxVtY5FCg,526
 oarepo_runtime/datastreams/writers/attachments_file.py,sha256=kV_IPAWawJ9PX-IfoncmLQXpdTbzRMsJie8uKX1vNp0,3161
-oarepo_runtime/datastreams/writers/attachments_service.py,sha256=g_tbjUA3YnTE5gP21zlG2kIxneZsn0q95EVjlxB8s1M,4152
-oarepo_runtime/datastreams/writers/publish.py,sha256=XUuYjrbLMX77eIvY7I40On8SkrwpLuh2Y4yjltANcfE,2162
-oarepo_runtime/datastreams/writers/service.py,sha256=8oXGG365ro_XEoZUncFltule_6TAbPPbSr-SBgcbWRA,6224
+oarepo_runtime/datastreams/writers/attachments_service.py,sha256=g72781UnSgdYvYvAaDPAB_RqW9cBH7WcOOyTsICZIGY,4418
+oarepo_runtime/datastreams/writers/publish.py,sha256=XHs74_1vJhE82cpImZ7MruGX4F3qN3M0I6tR8AxT7L4,2422
+oarepo_runtime/datastreams/writers/service.py,sha256=IqIPk477vLVxOsFYDxAmqRkk3YuZJ7KdqOia4cFjLLw,6490
 oarepo_runtime/datastreams/writers/utils.py,sha256=Lk_ZLNeXTLuFEn04lw1-6bJ7duG6kwA8X4wf9c_GiL4,1067
 oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4ExpdFYYgBRyENp7_6kVFZM2L-Hy3G8,661
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
@@ -148,15 +148,16 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=tq5pTCpH7cuzdwrQlp
 oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=oWFA5kjT-sBNoZ3UIzYS03GQOvri5VqL9NcYnQnYsyQ,2562
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
+oarepo_runtime/utils/identity_utils.py,sha256=a8nnvkX_Am9iibLa82_iK-3agIl11LTxjiy5qPKBoT4,1183
 oarepo_runtime/utils/index.py,sha256=ArrUUXB-KowUcUksRKqcFpmqct4bn9alO1zd_kX2tmU,292
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.9.4.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.10.1.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
 tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.9.4.dist-info/METADATA,sha256=CVIJjZW7XgCVhHpzqhlMe-ljTHMwsXtm4Tl3u3a1554,4788
-oarepo_runtime-1.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oarepo_runtime-1.9.4.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.9.4.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.9.4.dist-info/RECORD,,
+oarepo_runtime-1.10.1.dist-info/METADATA,sha256=zCwp5S-_WPbVncdCa2Ceonl39ixjvE1YYIaacrXgW20,4789
+oarepo_runtime-1.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.10.1.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.10.1.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.10.1.dist-info/RECORD,,