oarepo-runtime 1.5.25__py3-none-any.whl → 1.5.27__py3-none-any.whl

oarepo_runtime/services/components.py

@@ -1,8 +1,14 @@
 from invenio_accounts.models import User
+
+from oarepo_runtime.services.generators import RecordOwners
+
 try:
     from invenio_drafts_resources.services.records.uow import ParentRecordCommitOp
 except ImportError:
-    from invenio_records_resources.services.uow import RecordCommitOp as ParentRecordCommitOp
+    from invenio_records_resources.services.uow import (
+        RecordCommitOp as ParentRecordCommitOp,
+    )
+
 from invenio_records_resources.services.records.components import ServiceComponent
 
 
@@ -12,16 +18,26 @@ class OwnersComponent(ServiceComponent):
         self.add_owner(identity, record)
 
     def add_owner(self, identity, record, commit=False):
+        if not hasattr(identity, "id") or not isinstance(identity.id, int):
+            return
+
         owners = getattr(record.parent, "owners", None)
         if owners is not None:
             user = User.query.filter_by(id=identity.id).first()
             record.parent.owners.add(user)
             if commit:
                 self.uow.register(ParentRecordCommitOp(record.parent))
+
     def update(self, identity, *, record, **kwargs):
         """Update handler."""
         self.add_owner(identity, record, commit=True)
 
     def update_draft(self, identity, *, record, **kwargs):
         """Update handler."""
-        self.add_owner(identity, record, commit=True)
+        self.add_owner(identity, record, commit=True)
+
+    def search_drafts(self, identity, search, params, **kwargs):
+        new_term = RecordOwners().query_filter(identity)
+        if new_term:
+            return search.filter(new_term)
+        return search

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.25.dist-info → oarepo_runtime-1.5.27.dist-info}/METADATA

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

{oarepo_runtime-1.5.25.dist-info → oarepo_runtime-1.5.27.dist-info}/RECORD

@@ -68,7 +68,7 @@ oarepo_runtime/resources/__init__.py,sha256=v8BGrOTu_FjKzd0eozV7Q4GoGxyfybsL2cI-
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
 oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=4Kle34k-_uu3Y9JJ2vAXcQ9DqYRxXgy-_iZhiFuukmE,1684
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/services/components.py,sha256=Wu-UAQR3AYtne9ZNaHen7hWI9fDdwVEjcHND3_gbeSw,1119
+oarepo_runtime/services/components.py,sha256=9wt9CmoCFA8Utbb8eNA-Mvzo5LCApHT9zHpWIWZNyXY,1506
 oarepo_runtime/services/generators.py,sha256=V582uA813AIXnFhzqUwakmDgBOI1SQe3XZeJtUXNbwM,872
 oarepo_runtime/services/results.py,sha256=F3A0U3MRUOYlxNglJPQeGMKdD8QNq1il106jQZ0c9gQ,1499
 oarepo_runtime/services/search.py,sha256=ywfwGH7oAM44WeOSjlIsY_qoCMZJ1TlTLd_NgE2ow3Y,5296
@@ -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.25.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.25.dist-info/METADATA,sha256=NP21eoZqbsqPigc8QEHotGZS83vb9qtlWPXoKvrWo80,4680
-oarepo_runtime-1.5.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.25.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.25.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.25.dist-info/RECORD,,
+oarepo_runtime-1.5.27.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.27.dist-info/METADATA,sha256=eoNvUBPIChZDm5WvR3uWxNa8dnww3jjZqEHLOsZ11go,4680
+oarepo_runtime-1.5.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+oarepo_runtime-1.5.27.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.27.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.27.dist-info/RECORD,,