oarepo-runtime 2.0.0.dev13__py3-none-any.whl → 2.0.0.dev14__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.0dev13"
+__version__ = "2.0.0dev14"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/services/config/components.py

@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2025 CESNET z.s.p.o.
 #
-# This file is a part of oarepo-runtime (see http://github.com/oarepo/oarepo-runtime).
+# This file is a part of oarepo-runtime (see https://github.com/oarepo/oarepo-runtime).
 #
 # oarepo-runtime is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.

oarepo_runtime/services/generators.py

@@ -0,0 +1,77 @@
+#
+# Copyright (c) 2025 CESNET z.s.p.o.
+#
+# This file is a part of oarepo-runtime (see https://github.com/oarepo/oarepo-runtime).
+#
+# oarepo-runtime is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+#
+"""Typed invenio generators."""
+
+from __future__ import annotations
+
+from abc import abstractmethod
+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
+
+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):
+    """Custom generator for the service.
+
+    This class will be removed when invenio has proper type stubs.
+    """
+
+    @override
+    def needs(self, **kwargs: Any) -> Sequence[Need]:  # type: ignore[reportIncompatibleMethodOverride]
+        return super().needs(**kwargs)  # type: ignore[no-any-return]
+
+    @override
+    def excludes(self, **kwargs: Any) -> Sequence[Need]:  # type: ignore[reportIncompatibleMethodOverride]
+        return super().excludes(**kwargs)  # type: ignore[no-any-return]
+
+    @override
+    def query_filter(self, **kwargs: Any) -> dsl.query.Query:  # type: ignore[reportIncompatibleMethodOverride]
+        return super().query_filter(**kwargs)  # type: ignore[no-any-return]
+
+
+class ConditionalGenerator(InvenioConditionalGenerator):
+    """Typed conditional generator.
+
+    This class will be removed when invenio has proper type stubs.
+    """
+
+    def __init__(self, then_: Sequence[InvenioGenerator], else_: Sequence[InvenioGenerator]) -> None:
+        """Initialize the conditional generator."""
+        super().__init__(then_=then_, else_=else_)
+
+    @abstractmethod
+    def _condition(self, **kwargs: Any) -> bool:
+        """Condition to choose generators set."""
+        raise NotImplementedError  # pragma: nocover
+
+    def _generators(self, record: Record, **kwargs: Any) -> Sequence[InvenioGenerator]:
+        """Get the "then" or "else" generators."""
+        return super()._generators(record=record, **kwargs)  # type: ignore[no-any-return]
+
+    @override
+    def needs(self, **kwargs: Any) -> Sequence[Need]:  # type: ignore[override]
+        return super().needs(**kwargs)  # type: ignore[no-any-return]
+
+    @override
+    def excludes(self, **kwargs: Any) -> Sequence[Need]:  # type: ignore[override]
+        return super().excludes(**kwargs)  # type: ignore[no-any-return]
+
+    @override
+    def query_filter(self, **kwargs: Any) -> dsl.query.Query:  # type: ignore[reportIncompatibleMethodOverride]
+        return super().query_filter(**kwargs)  # type: ignore[no-any-return]

oarepo_runtime/services/records/__init__.py

@@ -11,6 +11,6 @@
 
 from __future__ import annotations
 
-from .links import pagination_links_html
+from .links import pagination_endpoint_links_html
 
-__all__ = ("pagination_links_html",)
+__all__ = ("pagination_endpoint_links_html",)

oarepo_runtime/services/records/links.py

@@ -11,21 +11,25 @@
 
 from __future__ import annotations
 
-from invenio_records_resources.services.base.links import Link
+from typing import Any
 
+from invenio_records_resources.services.base.links import EndpointLink
 
-def pagination_links_html(tpl: str) -> dict[str, Link]:
-    """Create pagination links (prev/self/next) from the same template."""
+
+def pagination_endpoint_links_html(endpoint: str, params: dict[str, Any] | None = None) -> dict[str, EndpointLink]:
+    """Create pagination links (prev/self/next) from the same endpoint."""
     return {
-        "prev_html": Link(
-            tpl,
-            when=lambda pagination, _context: pagination.has_prev,
-            vars=lambda pagination, variables: variables["args"].update({"page": pagination.prev_page.page}),
+        "prev_html": EndpointLink(
+            endpoint,
+            when=lambda pagination, _ctx: pagination.has_prev,
+            vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.prev_page.page}),
+            params=params,
         ),
-        "self_html": Link(tpl),
-        "next_html": Link(
-            tpl,
-            when=lambda pagination, _context: pagination.has_next,
-            vars=lambda pagination, variables: variables["args"].update({"page": pagination.next_page.page}),
+        "self_html": EndpointLink(endpoint, params=params),
+        "next_html": EndpointLink(
+            endpoint,
+            when=lambda pagination, _ctx: pagination.has_next,
+            vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.next_page.page}),
+            params=params,
         ),
     }

{oarepo_runtime-2.0.0.dev13.dist-info → oarepo_runtime-2.0.0.dev14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev13
+Version: 2.0.0.dev14
 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.dev13.dist-info → oarepo_runtime-2.0.0.dev14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-oarepo_runtime/__init__.py,sha256=r894xBe1prO_y5KF6ypvmNXdCVah_cg9sw78ozxkhZI,686
+oarepo_runtime/__init__.py,sha256=JwxRF8hZCrcuc6EyZKISir_JbAV8dOb6Fptw2UcekyM,686
 oarepo_runtime/api.py,sha256=b4v9YTPLK5EsEXzKuEqnymh148GwxCKNpy34kpxWYrI,11842
 oarepo_runtime/config.py,sha256=RUEPFn_5bKp9Wb0OY-Fb3VK30m35vF5IsLjYaQHhP3g,3838
 oarepo_runtime/ext.py,sha256=CtUb3tkXsJv7l7lDq9yOeP1rDKaPhM2ULMIwqoJrBKo,7887
@@ -16,21 +16,22 @@ 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/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=t6zPWcwsL4d_U4PelmHQ50ymDAY_N4YcgVnM6aklktY,23038
+oarepo_runtime/services/config/components.py,sha256=cyU-JeMzLuBL-9JkUKbUQuu527WAq0yptGs6806XSho,23039
 oarepo_runtime/services/config/link_conditions.py,sha256=raqf4yaBNLqNYgBxVNblo8MRJneVIFkwVNW7IW3AVYI,4309
 oarepo_runtime/services/config/permissions.py,sha256=9_706Yyz7X6IXhSaRBnkmGOr7c8kLnEXNkGZxxgNafE,4138
 oarepo_runtime/services/facets/__init__.py,sha256=k39ZYt1dMVOW01QRSTgx3CfuTYwvEWmL0VYTR3huVsE,349
 oarepo_runtime/services/facets/params.py,sha256=BxAmPmHlPs5ILQsKR98jZUFOWBSeiF454vOSIVIJj40,4697
-oarepo_runtime/services/records/__init__.py,sha256=c0n4vcMcJhSUWsKz0iyV4TTlGG8oLlJp0YEN0QGCZ8U,428
-oarepo_runtime/services/records/links.py,sha256=lqvnXabquL4DqWV93cdUYNUVYHx7T5Q0EXXuWAHM33A,1078
+oarepo_runtime/services/records/__init__.py,sha256=Mpohx3xEXTmoodTEHbCih6I97JIofgqa_bf_Ysq4e2g,446
+oarepo_runtime/services/records/links.py,sha256=oTKE9HXByQWEy8J6vT4KGjneeM_16MStwlXXglnnQSo,1254
 oarepo_runtime/services/records/mapping.py,sha256=y3oeToKEnaRYpMV3q2-2cXNzyzyL3XXGvY26BifybpE,1332
 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.dev13.dist-info/METADATA,sha256=BAoNogu0Ldkm0lqjQGostFVEKm7pzhFSJaB1SOa8u2g,4495
-oarepo_runtime-2.0.0.dev13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oarepo_runtime-2.0.0.dev13.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
-oarepo_runtime-2.0.0.dev13.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-2.0.0.dev13.dist-info/RECORD,,
+oarepo_runtime-2.0.0.dev14.dist-info/METADATA,sha256=r9YSaqRKd3AA6uXS4FiuQQD3hkJZjgN1yV3hRfdJltE,4495
+oarepo_runtime-2.0.0.dev14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev14.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev14.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev14.dist-info/RECORD,,