oarepo-runtime 1.5.65__py3-none-any.whl → 1.5.66__py3-none-any.whl

oarepo_runtime/records/systemfields/selectors.py

@@ -1,7 +1,10 @@
-from typing import Any, Callable, List
+import dataclasses
+from typing import Any, Callable, List, Protocol, Tuple
 
+from oarepo_runtime.records.relations.lookup import lookup_key
 
-class Selector:
+
+class Selector(Protocol):
     def select(self, record) -> List[Any]:
         return []
 
@@ -25,6 +28,7 @@ class FirstItemSelector(PathSelector):
         return []
 
 
+@dataclasses.dataclass
 class FilteredSelector(Selector):
     """
     Selector which filters output of another selector
@@ -43,17 +47,9 @@ class FilteredSelector(Selector):
         }
     }
     """
-
-    def __init__(
-        self,
-        selector: Selector,
-        filter: Callable[[Any], bool],
-        projection: Callable[[Any], Any] | str = None,
-    ):
-
-        self.selector = selector
-        self.filter = filter
-        self.projection = projection
+    selector: Selector
+    filter: Callable[[Any], bool]
+    projection: Callable[[Any], Any] | str = None
 
     def select(self, record):
         selected = self.selector.select(record)
@@ -62,10 +58,7 @@ class FilteredSelector(Selector):
             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 = []
+                    result = [x.value for x in lookup_key(select_element, self.projection)]
                 else:
                     result = self.projection(select_element)
                 if isinstance(result, list):
@@ -77,6 +70,7 @@ class FilteredSelector(Selector):
         return ret
 
 
+@dataclasses.dataclass
 class MultiSelector(Selector):
     """Selector concatenating outputs of multiple selectors"""
 

{oarepo_runtime-1.5.65.dist-info → oarepo_runtime-1.5.66.dist-info}/METADATA

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

{oarepo_runtime-1.5.65.dist-info → oarepo_runtime-1.5.66.dist-info}/RECORD

@@ -64,7 +64,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=xQEMhmqiE1M466cMilVO85V2DkELbbM3Xa8oYSCli8o,2959
+oarepo_runtime/records/systemfields/selectors.py,sha256=Q9jE1smSN3heT2LIpK_jB6bIRjll1kX0AW9AhTsIYiU,2830
 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
@@ -121,9 +121,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.65.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.65.dist-info/METADATA,sha256=ZgBG9WKIQEODgFiYua5ZpiwmylRyGKmT2tIXq7mQDGo,4720
-oarepo_runtime-1.5.65.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.65.dist-info/entry_points.txt,sha256=0cschM0RHc6UJ1uudhu4EP0hrVStPGpgMO-XEDGRtY4,430
-oarepo_runtime-1.5.65.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.65.dist-info/RECORD,,
+oarepo_runtime-1.5.66.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.66.dist-info/METADATA,sha256=aWxTnz-qJ8ns7WPbokWgJEHnlw-CcUnlx1VScNmoBOE,4720
+oarepo_runtime-1.5.66.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.66.dist-info/entry_points.txt,sha256=0cschM0RHc6UJ1uudhu4EP0hrVStPGpgMO-XEDGRtY4,430
+oarepo_runtime-1.5.66.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.66.dist-info/RECORD,,