oarepo-runtime 1.5.59__py3-none-any.whl → 1.5.61__py3-none-any.whl

oarepo_runtime/records/relations/pid_relation.py

@@ -35,6 +35,8 @@ class PIDRelationResult(RelationResult):
 
         try:
             obj = pid_field_context.resolve(id_)
+            if hasattr(obj, "relations") and obj.relations and hasattr(obj.relations, "dereference"):
+                obj.relations.dereference()
             # We detach the related record model from the database session when
             # we add it in the cache. Otherwise, accessing the cached record
             # model, will execute a new select query after a db.session.commit.

oarepo_runtime/records/systemfields/selectors.py

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any, Callable, List
 
 
 class Selector:
@@ -25,6 +25,71 @@ class FirstItemSelector(PathSelector):
         return []
 
 
+class FilteredSelector(Selector):
+    """
+    Selector which filters output of another selector
+    Example:
+        FilteredSelector(PathSelector("metadata.creators", "metadata.contributors"),
+                                         filter=lambda x: x["nameType"] == "personal", projection="affiliations")
+
+    selects affiliations of creators with nameType personal from following data
+
+    data = {
+        "metadata": {
+            "creators": [
+                {"name": "hugo", "affiliations": ["uni1", "uni2"], "nameType": "personal"},
+                {"name": "uni3", "nameType": "organizational"},
+            ]
+        }
+    }
+    """
+
+    def __init__(
+        self,
+        selector: Selector,
+        filter: Callable[[Any], bool],
+        projection: Callable[[Any], Any] | str = None,
+    ):
+
+        self.selector = selector
+        self.filter = filter
+        self.projection = projection
+
+    def select(self, record):
+        selected = self.selector.select(record)
+        selected = filter(self.filter, selected)
+        if self.projection:
+            ret = []
+            for select_element in selected:
+                if isinstance(self.projection, str):
+                    if isinstance(select_element, dict) and self.projection in select_element:
+                        result = select_element[self.projection]
+                    else:
+                        result = []
+                else:
+                    result = self.projection(select_element)
+                if isinstance(result, list):
+                    ret += result
+                else:
+                    ret.append(result)
+        else:
+            ret = list(selected)
+        return ret
+
+
+class MultiSelector(Selector):
+    """Selector concatenating outputs of multiple selectors"""
+
+    def __init__(self, *selectors: Selector):
+        self.selectors = selectors
+
+    def select(self, record):
+        ret = []
+        for selector in self.selectors:
+            ret += selector.select(record)
+        return ret
+
+
 def getter(data, path: List):
     if len(path) == 0:
         if isinstance(data, list):
@@ -36,4 +101,4 @@ def getter(data, path: List):
             yield from getter(data[path[0]], path[1:])
     elif isinstance(data, list):
         for item in data:
-            yield from getter(item, path)
+            yield from getter(item, path)

{oarepo_runtime-1.5.59.dist-info → oarepo_runtime-1.5.61.dist-info}/METADATA

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

{oarepo_runtime-1.5.59.dist-info → oarepo_runtime-1.5.61.dist-info}/RECORD

@@ -54,7 +54,7 @@ oarepo_runtime/records/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2
 oarepo_runtime/records/relations/base.py,sha256=XQpRt6-MfIKIClZ0IoGJr0GGl2Ru3RcqMoowOxrFG_E,8981
 oarepo_runtime/records/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/records/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
-oarepo_runtime/records/relations/pid_relation.py,sha256=zJjSf_ocFBViYsOuMMZLbQZpNZeKiOK33dPD4tk74Qo,2786
+oarepo_runtime/records/relations/pid_relation.py,sha256=jKiwUEepJkOc0MRX3Etl5RQJw3t40rY7FOJCIPwOKmg,2932
 oarepo_runtime/records/systemfields/__init__.py,sha256=SPaMWM6t-azz6gZLUKvvXbOyE2_-LW6i_szQk8nhbAc,455
 oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEOblnChq-PVK4xGPGpSCrzwG3cwc,1720
 oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
@@ -62,7 +62,7 @@ oarepo_runtime/records/systemfields/icu.py,sha256=sSGAgi5WhsAY4cCBL7-7nMpvHAuctp
 oarepo_runtime/records/systemfields/mapping.py,sha256=tXOK_jkdY1pOUO7_VfChfDNB8UTi21GUXaidpugTnO8,1017
 oarepo_runtime/records/systemfields/owner.py,sha256=dYRVBinniW7ECHuSnTAjeN6x1KhhJtNR9vxmD1KswMs,3805
 oarepo_runtime/records/systemfields/record_status.py,sha256=U3kem4-JkNsT17e0iAl3HIAZ2MvO5lY_0U757aZvTKE,935
-oarepo_runtime/records/systemfields/selectors.py,sha256=rXNioeyCHLiNGsA_zu8bfoFdu29ACSNN7zHRUm1rJ6Q,928
+oarepo_runtime/records/systemfields/selectors.py,sha256=xQEMhmqiE1M466cMilVO85V2DkELbbM3Xa8oYSCli8o,2959
 oarepo_runtime/records/systemfields/synthetic.py,sha256=UustvhzcDGuaNZLDeHbWwshoxQR-qRIuHDCct5RXmrI,4287
 oarepo_runtime/resources/__init__.py,sha256=v8BGrOTu_FjKzd0eozV7Q4GoGxyfybsL2cI-tbP5Pys,185
 oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5HUHRHmidhnl8,414
@@ -119,9 +119,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.59.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.59.dist-info/METADATA,sha256=GcU89QZPX8iUv8YGhG_VbIp-k0xvccf6WJ-WkfSrtJQ,4720
-oarepo_runtime-1.5.59.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.59.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.59.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.59.dist-info/RECORD,,
+oarepo_runtime-1.5.61.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.61.dist-info/METADATA,sha256=HYDxnXTbb5364OERpt42GknlVXparLbK0fTws6JkS4A,4720
+oarepo_runtime-1.5.61.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.61.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.61.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.61.dist-info/RECORD,,