oarepo-runtime 2.0.0.dev31__py3-none-any.whl → 2.0.0.dev33__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.0dev31"
+__version__ = "2.0.0dev33"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/services/records/links.py

@@ -11,6 +11,8 @@
 
 from __future__ import annotations
 
+from typing import Any, override
+
 from invenio_records_resources.services.base.links import EndpointLink
 
 
@@ -29,15 +31,27 @@ def rdm_pagination_record_endpoint_links(endpoint: str, params: list[str] | None
     called "id" instead of "pid_value". That is why this function is called rdm_...
     """
     params = [*(params or []), "pid_value"]
+
+    class RecordEndpointLinkWithId(EndpointLink):
+        @override
+        @staticmethod
+        def vars(obj: Any, vars: dict[str, Any]) -> None:
+            pid_value = vars.pop("id", None)
+            if pid_value is not None:
+                vars["pid_value"] = pid_value
+
     return {
-        "prev": EndpointLink(
+        "prev": RecordEndpointLinkWithId(
             endpoint,
             when=lambda pagination, _ctx: pagination.has_prev,
             vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.prev_page.page}),
             params=params,
         ),
-        "self": EndpointLink(endpoint, params=params),
-        "next": EndpointLink(
+        "self": RecordEndpointLinkWithId(
+            endpoint,
+            params=params,
+        ),
+        "next": RecordEndpointLinkWithId(
             endpoint,
             when=lambda pagination, _ctx: pagination.has_next,
             vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.next_page.page}),

{oarepo_runtime-2.0.0.dev31.dist-info → oarepo_runtime-2.0.0.dev33.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-oarepo_runtime/__init__.py,sha256=kswOtKLkeTENZ1q_4do3W0XvIcgjL7ZEe6rxHa7M5Gg,686
+oarepo_runtime/__init__.py,sha256=Yyknq93rocqlDSiPoWRbMXKm60R9oaLNgvJ3nO3ABMY,686
 oarepo_runtime/api.py,sha256=tLPgKv1iao2ZeL0tTJeA85019_sMW_dQAleayOeXjgI,14200
 oarepo_runtime/config.py,sha256=RUEPFn_5bKp9Wb0OY-Fb3VK30m35vF5IsLjYaQHhP3g,3838
 oarepo_runtime/ext.py,sha256=NgiRNl_hwTvEWcXnNwVh_XCPJyvwr3dZkdPmkWvN1xo,8785
@@ -35,14 +35,14 @@ oarepo_runtime/services/facets/params.py,sha256=8ZFDeTUPDV3d9cdIIECo5F38KQ28h1eG
 oarepo_runtime/services/facets/utils.py,sha256=z4RcBqM4_QfTSMY-mf8yhL18bhHg5XwzHmqV6mLtzvs,2251
 oarepo_runtime/services/records/__init__.py,sha256=Mpohx3xEXTmoodTEHbCih6I97JIofgqa_bf_Ysq4e2g,446
 oarepo_runtime/services/records/custom_fields.py,sha256=Yp3WsLYq1_OPMmJvpxCDtZi9IhuxHsBFPor8q901qn0,1417
-oarepo_runtime/services/records/links.py,sha256=XzO8zEV7GgbkrhX98x9aq4Jn5v5yWAsh2Gy8rjDcCw0,2729
+oarepo_runtime/services/records/links.py,sha256=KUuRpsH0Mijn5EVSRTqUwIUPTRMv1a7oHIQ6-27UJFk,3113
 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/services/schema/ui.py,sha256=Y_jBO-fowkpOgceWz8aqJSJAUiAnKLGSIuNpjNLnp8Q,4612
-oarepo_runtime-2.0.0.dev31.dist-info/METADATA,sha256=P9qthmoamo_Dr8eSQJQ8LYfvxbQgw9mwTO2wDiqQoM0,4723
-oarepo_runtime-2.0.0.dev31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oarepo_runtime-2.0.0.dev31.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
-oarepo_runtime-2.0.0.dev31.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-2.0.0.dev31.dist-info/RECORD,,
+oarepo_runtime-2.0.0.dev33.dist-info/METADATA,sha256=I1Ojqa6TlUdZEkdhaG4i8CqqzQzvU_ZemZoPGFLLmfk,4723
+oarepo_runtime-2.0.0.dev33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev33.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev33.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev33.dist-info/RECORD,,