oarepo-runtime 1.9.4__tar.gz → 1.10.0__tar.gz

{oarepo_runtime-1.9.4/oarepo_runtime.egg-info → oarepo_runtime-1.10.0}/PKG-INFO

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

{oarepo_runtime-1.9.4 → oarepo_runtime-1.10.0}/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-1.9.4 → oarepo_runtime-1.10.0}/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-1.9.4 → oarepo_runtime-1.10.0}/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-1.9.4 → oarepo_runtime-1.10.0}/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-1.10.0/oarepo_runtime/utils/identity_utils.py

@@ -0,0 +1,27 @@
+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))
+    api_app = current_app.wsgi_app.mounts["/api"]
+    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 → oarepo_runtime-1.10.0/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.9.4 → oarepo_runtime-1.10.0}/oarepo_runtime.egg-info/SOURCES.txt

@@ -160,6 +160,7 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.mo
 oarepo_runtime/translations/en/LC_MESSAGES/messages.po
 oarepo_runtime/utils/__init__.py
 oarepo_runtime/utils/functools.py
+oarepo_runtime/utils/identity_utils.py
 oarepo_runtime/utils/index.py
 oarepo_runtime/utils/path.py
 tests/marshmallow_to_json/__init__.py

{oarepo_runtime-1.9.4 → oarepo_runtime-1.10.0}/setup.cfg

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