oarepo-runtime 2.0.0.dev15__tar.gz → 2.0.0.dev18__tar.gz

{oarepo_runtime-2.0.0.dev15 → oarepo_runtime-2.0.0.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev15
+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.dev15 → oarepo_runtime-2.0.0.dev18}/oarepo_runtime/__init__.py

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

{oarepo_runtime-2.0.0.dev15 → oarepo_runtime-2.0.0.dev18}/oarepo_runtime/ext.py

@@ -29,6 +29,7 @@ if TYPE_CHECKING:  # pragma: no cover
     from flask import Flask
     from invenio_drafts_resources.records.api import Draft
     from invenio_records_resources.services.base.service import Service
+    from invenio_records_resources.services.files.service import FileService
     from invenio_records_resources.services.records import RecordService
 
     from .api import Model
@@ -170,6 +171,16 @@ class OARepoRuntime:
             raise ValueError("Need to pass a record instance, got None")
         return self.get_record_service_for_record_class(type(record))
 
+    def get_file_service_for_record(self, record: Any) -> FileService | None:
+        """Return the file service for the given record (draft or published)."""
+        model = self.models_by_record_class.get(type(record))
+        if not model:
+            raise KeyError(f"No model found for record class '{type(record).__name__}'.")
+        is_draft = getattr(record, "is_draft", False)
+        if is_draft:
+            return model.draft_file_service
+        return model.file_service
+
     def get_record_service_for_record_class(self, record_cls: type[RecordBase]) -> RecordService:
         """Retrieve the service associated with a given record class."""
         for t in record_cls.mro():

{oarepo_runtime-2.0.0.dev15 → oarepo_runtime-2.0.0.dev18}/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]