oarepo-runtime 1.5.26__py3-none-any.whl → 1.5.28__py3-none-any.whl

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/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/services/schema/__init__.py

@@ -1,3 +1,42 @@
 from .polymorphic import PolymorphicSchema
 
-__all__ = ("PolymorphicSchema",)
+
+def consistent_resolution(*classes):
+    """
+        A helper function to solve resolution order of classes.
+        If the classes are in a correct mro order, it will return
+        them in the same order. Otherwise it will try to reorder
+        them and remove those that are already contained in mro
+        of others.
+    """
+
+    # remove classes that are already in mro of others
+    filtered_classes = []
+    for cls in classes:
+        for other_cls in classes:
+            if cls != other_cls and issubclass(other_cls, cls):
+                break
+        else:
+            if cls not in filtered_classes:
+                filtered_classes.append(cls)
+
+    name = [cls.__name__ for cls in filtered_classes]
+    name = "".join(name) + "ConsistentResolution"
+    try:
+        return type(name, tuple(filtered_classes), {})
+    except TypeError:
+        pass
+
+    filtered_classes.sort(key=lambda cls: -len(cls.mro()))
+    try:
+        return type(name, tuple(filtered_classes), {})
+    except TypeError:
+        pass
+
+    bases = ", ".join(cls.__name__ for cls in filtered_classes)
+    orig_bases = ", ".join(cls.__name__ for cls in classes)
+    raise TypeError(f"Cannot create a consistent method resolution order (MRO) "
+                    f"for bases {orig_bases}, tried {bases}")
+
+
+__all__ = ("PolymorphicSchema", "consistent_resolution")

{oarepo_runtime-1.5.26.dist-info → oarepo_runtime-1.5.28.dist-info}/METADATA

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

{oarepo_runtime-1.5.26.dist-info → oarepo_runtime-1.5.28.dist-info}/RECORD

@@ -10,7 +10,7 @@ oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,54
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=AvC5VHAnwmtCd8R-Caj8v6nCAREKjObTdNtLJ24aJO8,4935
 oarepo_runtime/cli/configuration.py,sha256=cLXoGDtjuA5uv9ZfYFcH0C4wcadj0qWC3P_E4Bf5-z0,1061
-oarepo_runtime/cli/fixtures.py,sha256=bN054QERsMAvkyqVoyPCZYI5D4KajAK8cqK-jtlK6lQ,4402
+oarepo_runtime/cli/fixtures.py,sha256=teMbU-ocrSOmmCJvK-ICl6lMTAOWxJ5Tpkg6JQc0Y0s,5486
 oarepo_runtime/cli/index.py,sha256=H4nSZnClnlCSI8Thlz_jx-uPpgNVVQyagpWIPtQoIr4,7239
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/datastreams/__init__.py,sha256=_i52Ek9J8DMARST0ejZAZPzUKm55xrrlKlCSO7dl6y4,1008
@@ -19,7 +19,7 @@ oarepo_runtime/datastreams/catalogue.py,sha256=D6leq-FPT3RP3SniEAXPm66v3q8ZdQnaU
 oarepo_runtime/datastreams/datastreams.py,sha256=wnMk1UFv-cWXRO0jHwRNoJBO0cbZaHqrLnH7vgfnf78,4485
 oarepo_runtime/datastreams/errors.py,sha256=WyZLU53EdFJTLv6K2ooM_M6ISjLS-U1dDw6B7guOLSc,1540
 oarepo_runtime/datastreams/ext.py,sha256=ivugdVMCqwugK-5SeX14a-dMq6VaTt7DM2wFU357tR4,1406
-oarepo_runtime/datastreams/fixtures.py,sha256=UlvRcgQObm3HfULPwDi_QFh1uzLvZSGKNns-GgnGRQ0,8468
+oarepo_runtime/datastreams/fixtures.py,sha256=hKV3BuIK7TzfOsNPM8VR9qkBAeDLyLOhafP-DZG15uI,8667
 oarepo_runtime/datastreams/json.py,sha256=OAiaH93eqpH5qNQSPKKc8K-hXKAn5lB0PUKwwZFqJSw,153
 oarepo_runtime/datastreams/semi_asynchronous.py,sha256=TJWby2MDKXm5feRocoWB-8OhsShq5R9HoZ74O1rGBOk,2934
 oarepo_runtime/datastreams/synchronous.py,sha256=t5lfnMkLqy3jK5zMl-nIuA0HlMPiHGjwCqZ8XQP-3GM,2595
@@ -94,7 +94,7 @@ oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 oarepo_runtime/services/relations/components.py,sha256=3g0VdnGUM-2yYt50fPi-OADReBGJb4h05vmYHfh-QFs,592
 oarepo_runtime/services/relations/errors.py,sha256=VtlOKq9MEUeJ4IsiZhY7lWoshrusA_RL4SOHe2titno,552
 oarepo_runtime/services/relations/mapping.py,sha256=D7IYk83SXVgTv-0ohSnHOCzvCwbFLXJsayO1eQfQn0U,1285
-oarepo_runtime/services/schema/__init__.py,sha256=XGfNjYk7ha5JhVERuqjl-yDaI1O9dDQItZJEdMzDe4w,77
+oarepo_runtime/services/schema/__init__.py,sha256=gD0II1Lz6fnW1Cgt4gtneZeyKWl_YZ47Wu0gmeKqtH8,1395
 oarepo_runtime/services/schema/cf.py,sha256=-m9seIH5VYUdxDsJlPVXS0-8f7xkpN7YfW1q9E1GacI,475
 oarepo_runtime/services/schema/i18n.py,sha256=myyg0tU8up0BmMt9IESKD91w5KC0V9v8Qa-9fF0ptIs,1341
 oarepo_runtime/services/schema/i18n_ui.py,sha256=18tA6uA067TP_wcit47hTel2M4hz88wYtwBgaeZDrew,1880
@@ -114,9 +114,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.26.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.26.dist-info/METADATA,sha256=P2aE9x8lip8a2G-51JG4-6fCo7sHsXIxsTQKcDBvqIA,4680
-oarepo_runtime-1.5.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.26.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.26.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.26.dist-info/RECORD,,
+oarepo_runtime-1.5.28.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.28.dist-info/METADATA,sha256=ck-L-b49r3ffcCAjvGjsUxW173E2ay8T_-sx7q1LYkY,4680
+oarepo_runtime-1.5.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.28.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.28.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.28.dist-info/RECORD,,