oarepo-runtime 2.0.0.dev16__py3-none-any.whl → 2.0.0.dev18__py3-none-any.whl

oarepo_runtime/__init__.py

@@ -19,6 +19,6 @@ from .api import Model
 from .ext import OARepoRuntime
 from .proxies import current_runtime
 
-__version__ = "2.0.0dev16"
+__version__ = "2.0.0dev18"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/services/generators.py

@@ -10,20 +10,21 @@
 
 from __future__ import annotations
 
-from abc import abstractmethod
+from abc import ABC, abstractmethod
+from itertools import chain
 from typing import TYPE_CHECKING, Any, override
 
 from invenio_records_permissions.generators import (
     ConditionalGenerator as InvenioConditionalGenerator,
 )
 from invenio_records_permissions.generators import Generator as InvenioGenerator
+from invenio_search.engine import dsl
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
     from flask_principal import Need
     from invenio_records_resources.records.api import Record
-    from invenio_search.engine import dsl
 
 
 class Generator(InvenioGenerator):
@@ -45,7 +46,7 @@ class Generator(InvenioGenerator):
         return super().query_filter(**kwargs)  # type: ignore[no-any-return]
 
 
-class ConditionalGenerator(InvenioConditionalGenerator):
+class ConditionalGenerator(InvenioConditionalGenerator, ABC):
     """Typed conditional generator.
 
     This class will be removed when invenio has proper type stubs.
@@ -58,7 +59,7 @@ class ConditionalGenerator(InvenioConditionalGenerator):
     @abstractmethod
     def _condition(self, **kwargs: Any) -> bool:
         """Condition to choose generators set."""
-        raise NotImplementedError  # pragma: nocover
+        raise NotImplementedError  # pragma: no cover
 
     def _generators(self, record: Record, **kwargs: Any) -> Sequence[InvenioGenerator]:
         """Get the "then" or "else" generators."""
@@ -72,6 +73,52 @@ class ConditionalGenerator(InvenioConditionalGenerator):
     def excludes(self, **kwargs: Any) -> Sequence[Need]:  # type: ignore[override]
         return super().excludes(**kwargs)  # type: ignore[no-any-return]
 
+    @abstractmethod
+    def _query_instate(self, **context: Any) -> dsl.query.Query:
+        raise NotImplementedError  # pragma: no cover
+
     @override
-    def query_filter(self, **kwargs: Any) -> dsl.query.Query:  # type: ignore[reportIncompatibleMethodOverride]
-        return super().query_filter(**kwargs)  # type: ignore[no-any-return]
+    def query_filter(self, **context: Any) -> dsl.query.Query:  # type: ignore[reportIncompatibleMethodOverride]
+        """Apply then or else filter."""
+        then_query = super()._make_query(self.then_, **context)
+        else_query = super()._make_query(self.else_, **context)
+
+        q_instate = self._query_instate(**context)
+        q_outstate = ~q_instate
+
+        if then_query and else_query:
+            ret = (q_instate & then_query) | (q_outstate & else_query)
+        elif then_query:
+            ret = q_instate & then_query
+        elif else_query:
+            ret = q_outstate & else_query
+        else:
+            ret = dsl.Q("match_none")
+
+        return ret
+
+
+class AggregateGenerator(Generator, ABC):
+    """Superclass for generators aggregating multiple generators."""
+
+    @abstractmethod
+    def _generators(self, **context: Any) -> Sequence[InvenioGenerator]:
+        """Return the generators."""
+        raise NotImplementedError  # pragma: no cover
+
+    @override
+    def needs(self, **context: Any) -> Sequence[Need]:
+        """Get the needs from the policy."""
+        needs = [generator.needs(**context) for generator in self._generators(**context)]
+        return list(chain.from_iterable(needs))
+
+    @override
+    def excludes(self, **context: Any) -> Sequence[Need]:
+        """Get the excludes from the policy."""
+        excludes = [generator.excludes(**context) for generator in self._generators(**context)]
+        return list(chain.from_iterable(excludes))
+
+    @override
+    def query_filter(self, **context: Any) -> dsl.query.Query:
+        """Search filters."""
+        return ConditionalGenerator._make_query(self._generators(**context), **context)  # noqa SLF001 # type: ignore[reportReturnType]

{oarepo_runtime-2.0.0.dev16.dist-info → oarepo_runtime-2.0.0.dev18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev16
+Version: 2.0.0.dev18
 Summary: A set of runtime extensions of Invenio repository
 Project-URL: Homepage, https://github.com/oarepo/oarepo-runtime
 License-Expression: MIT

{oarepo_runtime-2.0.0.dev16.dist-info → oarepo_runtime-2.0.0.dev18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-oarepo_runtime/__init__.py,sha256=EYMIFqYilaHmxa2EXZEYbZsoBTsdit088W4sOV_VlrY,686
+oarepo_runtime/__init__.py,sha256=6z9_8CzYNGg5SzI-1U_6PbV9AZfjt6baMAwbuggSoQs,686
 oarepo_runtime/api.py,sha256=7gPeRS66moT1lIedPRmuK0EnB8PpGO7iD5eRCQOty4U,12552
 oarepo_runtime/config.py,sha256=RUEPFn_5bKp9Wb0OY-Fb3VK30m35vF5IsLjYaQHhP3g,3838
 oarepo_runtime/ext.py,sha256=G9j5IgnVPdE656qaiN4RllpOkdyToP8v9uwas3DdpTY,8451
@@ -16,7 +16,7 @@ oarepo_runtime/records/systemfields/publication_status.py,sha256=1g3VXNPh0FsiPCp
 oarepo_runtime/resources/__init__.py,sha256=voynQULXoOEviADkbOpekMphZPTAz4IOTg5BF9xPwTM,453
 oarepo_runtime/resources/config.py,sha256=hJewyZ2FlEm4TtYnQS9JsnKnA6hhtSbvo1PC24-7f7Y,980
 oarepo_runtime/services/__init__.py,sha256=OGtBgEeaDTyk2RPDNXuKbU9_7egFBZr42SM0gN5FrF4,341
-oarepo_runtime/services/generators.py,sha256=B_4GXzKS8RUDGVzR_EZOYSD2uAC7P-xpmoYxo_52BTw,2888
+oarepo_runtime/services/generators.py,sha256=DCzqL00x4PCqHySITU1RZgZ__kL_mav46dfrgUxtswI,4618
 oarepo_runtime/services/results.py,sha256=fk-Enx_LwZLbw81yZ7CXVTku86vd3_fjprnb8l5sFHk,6657
 oarepo_runtime/services/config/__init__.py,sha256=SX1kfIGk8HkohdLQrNpRQUTltksEyDcCa-kFXxrX4e8,711
 oarepo_runtime/services/config/components.py,sha256=cyU-JeMzLuBL-9JkUKbUQuu527WAq0yptGs6806XSho,23039
@@ -30,8 +30,8 @@ oarepo_runtime/services/records/mapping.py,sha256=y3oeToKEnaRYpMV3q2-2cXNzyzyL3X
 oarepo_runtime/services/schema/__init__.py,sha256=jgAPI_uKC6Ug4KQWnwQVg3-aNaw-eHja323AUFo5ELo,351
 oarepo_runtime/services/schema/i18n.py,sha256=9D1zOQaPKAnYzejB0vO-m2BJYnam0N0Lrq4jID7twfE,3174
 oarepo_runtime/services/schema/i18n_ui.py,sha256=DbusphhGDeaobTt4nuwNgKZ6Houlu4Sv3SuMGkdjRRY,3582
-oarepo_runtime-2.0.0.dev16.dist-info/METADATA,sha256=FW8t5tWe50gjPnvnTiK9MOkERwCstTehTor07Bh5r5g,4495
-oarepo_runtime-2.0.0.dev16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oarepo_runtime-2.0.0.dev16.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
-oarepo_runtime-2.0.0.dev16.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-2.0.0.dev16.dist-info/RECORD,,
+oarepo_runtime-2.0.0.dev18.dist-info/METADATA,sha256=pC-YWi379OZ-3-kDzDg20ziCln3aaGO7ehf1auWoZNI,4495
+oarepo_runtime-2.0.0.dev18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev18.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev18.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev18.dist-info/RECORD,,