oarepo-runtime 1.5.27__tar.gz → 1.5.29__tar.gz

{oarepo-runtime-1.5.27/oarepo_runtime.egg-info → oarepo-runtime-1.5.29}/PKG-INFO

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

{oarepo-runtime-1.5.27 → oarepo-runtime-1.5.29}/oarepo_runtime/cli/fixtures.py

@@ -2,6 +2,10 @@ import click
 import tqdm
 from flask import current_app
 from flask.cli import with_appcontext
+from flask_login import login_user
+from flask_principal import Identity, identity_changed, identity_loaded, UserNeed, RoleNeed
+from invenio_access.permissions import system_identity, any_user, authenticated_user
+from invenio_accounts.models import User
 
 from oarepo_runtime.cli import oarepo
 from oarepo_runtime.datastreams import SynchronousDataStream
@@ -35,6 +39,7 @@ def fixtures():
     "will be committed in a single transaction and indexed together",
 )
 @click.option("--batch-size", help="Alias for --bulk-size", type=int)
+@click.option("--identity", help="Email of the identity that will be used to import the data")
 @with_appcontext
 def load(
     fixture_dir=None,
@@ -45,6 +50,7 @@ def load(
     bulk_size=100,
     on_background=False,
     batch_size=None,
+        identity=None
 ):
     """Loads fixtures"""
     if batch_size:
@@ -57,7 +63,26 @@ def load(
     if fixture_dir:
         system_fixtures = False
 
+    if not identity:
+        user = None
+        identity = system_identity
+    else:
+        # identity is user email
+        user = User.query.filter_by(email=identity).one()
+        identity = Identity(user.id)
+
+        # TODO: add provides. How to do it better? It seems that we can not use
+        # flask signals to add these, as they depend on request context that is
+        # not available here
+        identity.provides.add(any_user)
+        identity.provides.add(authenticated_user)
+        identity.provides.add(UserNeed(user.id))
+        for role in getattr(user, 'roles', []):
+            identity.provides.add(RoleNeed(role.name))
+        # TODO: community roles ...
+
     with current_app.wsgi_app.mounts["/api"].app_context():
+
         load_fixtures(
             fixture_dir,
             _make_list(include),
@@ -68,6 +93,7 @@ def load(
             datastreams_impl=(
                 AsynchronousDataStream if on_background else SynchronousDataStream
             ),
+            identity=identity
         )
         if not on_background:
             _show_stats(callback, "Load fixtures")

{oarepo-runtime-1.5.27 → oarepo-runtime-1.5.29}/oarepo_runtime/datastreams/fixtures.py

@@ -6,6 +6,7 @@ import pkg_resources
 import yaml
 from celery import shared_task
 from flask import current_app
+from invenio_access.permissions import system_identity
 from invenio_records_resources.proxies import current_service_registry
 
 from oarepo_runtime.datastreams import (
@@ -34,6 +35,7 @@ def load_fixtures(
     callback: FixturesCallback = None,
     batch_size=100,
     datastreams_impl=SynchronousDataStream,
+    identity=system_identity
 ):
     """
     Loads fixtures. If fixture dir is set, fixtures are loaded from that directory first.
@@ -62,6 +64,7 @@ def load_fixtures(
             callback,
             batch_size=batch_size,
             datastreams_impl=datastreams_impl,
+            identity=identity
         )
 
     if system_fixtures:
@@ -91,11 +94,13 @@ def load_fixtures(
                 callback,
                 batch_size=batch_size,
                 datastreams_impl=datastreams_impl,
+                identity=identity
             )
 
 
 def _load_fixtures_from_catalogue(
-    catalogue, fixtures, include, exclude, callback, batch_size, datastreams_impl
+    catalogue, fixtures, include, exclude, callback, batch_size, datastreams_impl,
+        identity=system_identity
 ):
     for catalogue_datastream in catalogue.get_datastreams():
         if catalogue_datastream.stream_name in fixtures:
@@ -118,7 +123,7 @@ def _load_fixtures_from_catalogue(
             callback=callback,
             batch_size=batch_size,
         )
-        datastream.process()
+        datastream.process(identity=identity)
         if hasattr(callback, "fixture_finished"):
             callback.fixture_finished(catalogue_datastream.stream_name)
 

{oarepo-runtime-1.5.27 → oarepo-runtime-1.5.29}/oarepo_runtime/resources/localized_ui_json_serializer.py

@@ -27,13 +27,15 @@ class LocalizedUIJSONSerializer(MarshmallowSerializer):
         self.object_schema_cls = object_schema_cls
         self.list_schema_cls = list_schema_cls
 
-    def dump_obj(self, obj):
+    def dump_obj(self, obj, *args, **kwargs):
         """Dump the object using object schema class."""
-        return self.object_schema_cls(
-            context={**self.schema_context, "locale": get_locale()}
-        ).dump(obj)
+        ctx = {**self.schema_context, "locale": get_locale()}
+        if "extra_context" in kwargs:
+            ctx |= kwargs["extra_context"]
 
-    def dump_list(self, obj_list):
+        return self.object_schema_cls(context=ctx).dump(obj)
+
+    def dump_list(self, obj_list, *args, **kwargs):
         """Dump the list of objects."""
         ctx = {
             "object_schema_cls": self.object_schema_cls,
@@ -41,6 +43,9 @@ class LocalizedUIJSONSerializer(MarshmallowSerializer):
         ctx.update(self.schema_context)
         ctx["locale"] = get_locale()
 
+        if "extra_context" in kwargs:
+            ctx |= kwargs["extra_context"]
+
         if self.list_schema_cls is None:
             return self.object_schema_cls(context=self.schema_context).dump(
                 obj_list, many=True

{oarepo-runtime-1.5.27 → oarepo-runtime-1.5.29/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo-runtime-1.5.27 → oarepo-runtime-1.5.29}/setup.cfg

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