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

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

@@ -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 → oarepo-runtime-1.5.27}/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-1.5.27/oarepo_runtime/services/schema/__init__.py

@@ -0,0 +1,42 @@
+from .polymorphic import 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 → oarepo-runtime-1.5.27/oarepo_runtime.egg-info}/PKG-INFO

@@ -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 → oarepo-runtime-1.5.27}/setup.cfg

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

oarepo-runtime-1.5.25/oarepo_runtime/services/schema/__init__.py

@@ -1,3 +0,0 @@
-from .polymorphic import PolymorphicSchema
-
-__all__ = ("PolymorphicSchema",)