oarepo-runtime 2.0.0.dev34__py3-none-any.whl → 2.0.0.dev36__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.0dev34"
+__version__ = "2.0.0dev36"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/records/systemfields/mapping.py

@@ -10,20 +10,15 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, override
+from typing import TYPE_CHECKING
 
 from invenio_records.api import Record
 
-from .base import TypedSystemField
-
 if TYPE_CHECKING:
     from invenio_records.dumpers import Dumper
-    from invenio_records.systemfields import SystemField
-else:
-    SystemField = object
 
 
-class MappingSystemFieldMixin[R: Record = Record, V: Any = Any](TypedSystemField[R, V]):
+class MappingSystemFieldMixin[R: Record = Record]:
     """Mixin class that provides default mapping, mapping settings, and dynamic templates for system fields."""
 
     @property
@@ -42,18 +37,14 @@ class MappingSystemFieldMixin[R: Record = Record, V: Any = Any](TypedSystemField
         return []
 
     # The following methods are added just for typing purposes.
-    @override
     def pre_dump(self, record: R, data: dict, dumper: Dumper | None = None) -> None:
         """Dump record to the data - pre-dump phase."""
 
-    @override
     def post_dump(self, record: R, data: dict, dumper: Dumper | None = None) -> None:
         """Dump record to the data - post-dump phase."""
 
-    @override
     def pre_load(self, data: dict, loader: Dumper | None = None) -> None:
         """Load record from the data - pre-load phase."""
 
-    @override
     def post_load(self, record: R, data: dict, loader: Dumper | None = None) -> None:
         """Load record from the data - post-load phase."""

oarepo_runtime/records/systemfields/publication_status.py

@@ -10,17 +10,18 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, override
+from typing import TYPE_CHECKING, Self, override
 
 from invenio_records.api import Record
 
+from .base import TypedSystemField
 from .mapping import MappingSystemFieldMixin
 
 if TYPE_CHECKING:
     from invenio_records.dumpers import Dumper
 
 
-class PublicationStatusSystemField(MappingSystemFieldMixin[Record, str]):
+class PublicationStatusSystemField(MappingSystemFieldMixin, TypedSystemField[Record, str]):
     """A system field to track the status of a record (either 'draft' or 'published').
 
     The default key for this field is 'publication_status', but it can be customized.
@@ -45,16 +46,15 @@ class PublicationStatusSystemField(MappingSystemFieldMixin[Record, str]):
 
     @override
     def post_dump(self, record: Record, data: dict, dumper: Dumper | None = None) -> None:
-        if self.key is None:
-            return  # pragma: no cover
         if not self.attr_name:
             raise ValueError(  # pragma: no cover
                 "attr_name must be set for PublicationStatusSystemField"
             )
         data[self.key] = getattr(record, self.attr_name)
 
-    def __get__(self, record: Record | None, owner: Any = None) -> Any:
+    @override
+    def __get__(self, instance: Record | None, owner: type[Record]) -> Self | str:  # type: ignore[override]
         """Access the attribute."""
-        if record is None:
+        if instance is None:
             return self
-        return "draft" if getattr(record, "is_draft", False) else "published"
+        return "draft" if getattr(instance, "is_draft", False) else "published"

oarepo_runtime/typing.py

@@ -16,6 +16,9 @@ from typing import TYPE_CHECKING, Any
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+    from invenio_records_resources.records.api import Record
+    from invenio_records_resources.services.records.results import RecordItem
+
 
 def require_kwargs(*kwargs_names: str) -> Any:
     """Wrap function to require specific kwargs in a function call.
@@ -58,3 +61,8 @@ def require_kwargs(*kwargs_names: str) -> Any:
         return wrapped_f
 
     return wrapper
+
+
+def record_from_result(result: RecordItem) -> Record:
+    """Convert a RecordItem to a Record."""
+    return result._record  # noqa: SLF001

{oarepo_runtime-2.0.0.dev34.dist-info → oarepo_runtime-2.0.0.dev36.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
-oarepo_runtime/__init__.py,sha256=1s8_0r4mP7KwNdjxpvOFL2O-NObepsa8Ye1USLhrnVc,686
+oarepo_runtime/__init__.py,sha256=Y5ZPbHF2q3Fi0ElItUf0wzaM3aP_xOw-MkJntFLkO8E,686
 oarepo_runtime/api.py,sha256=6AHyFnf0Cg1nfhGaQFMPjynVvrp1UURo8vX5vb5LvC4,14169
 oarepo_runtime/config.py,sha256=RUEPFn_5bKp9Wb0OY-Fb3VK30m35vF5IsLjYaQHhP3g,3838
 oarepo_runtime/ext.py,sha256=NgiRNl_hwTvEWcXnNwVh_XCPJyvwr3dZkdPmkWvN1xo,8785
 oarepo_runtime/proxies.py,sha256=x8Y1iTP8QIzSI67s90VR0_5fvXuT1xlJXtAHsaoXFwg,903
 oarepo_runtime/py.typed,sha256=RznSCjXReEUI9zkmD25E8XniG_MvPpLBF6MyNZA8MmE,42
-oarepo_runtime/typing.py,sha256=vH8UUb4QTJowuvibwHaOOEwxx8i21LcOeplxJl0Yrew,1594
+oarepo_runtime/typing.py,sha256=VtINHm4BZ5OJ4KdRAwnFXPZiAEgPRIYTtPC9fIzK1bU,1876
 oarepo_runtime/cli/__init__.py,sha256=H7GOeOBf0udgKWOdlAQswIMvRrD8BwcEjOVxIqP0Suw,731
 oarepo_runtime/cli/search.py,sha256=4fHkrjltUUPVUzJiuWaiWxTk62rIYxal3_3jRsZVMmI,1175
 oarepo_runtime/info/__init__.py,sha256=qRG3mSyoiw7sKm9StiuBJs6l15HrdAQ4sphsAQsJtQc,336
@@ -16,8 +16,8 @@ oarepo_runtime/records/pid_providers.py,sha256=DE8uW-QmJumA9OqWksDOydezjJ9LLC296
 oarepo_runtime/records/systemfields/__init__.py,sha256=tJzOOQ8dBlCyD8tCAriIUZggZ73UjMyMOp6IlSV-Tb4,594
 oarepo_runtime/records/systemfields/base.py,sha256=EWSdVsWePkdwksRQ9yaMMk9Mrhicw-ZE0vdApn2EjWQ,1602
 oarepo_runtime/records/systemfields/custom_fields.py,sha256=PEoaCEnvanysFQAaqTtD9-VwaBmnFkoP2pmpCl9ZFfI,2237
-oarepo_runtime/records/systemfields/mapping.py,sha256=FPvGZH-pTJejr2qiYerXSrNpIti5r66gDas5nBK-ib4,1932
-oarepo_runtime/records/systemfields/publication_status.py,sha256=Q2Pa1wJiNiEWrAEDVwVU9IjFPo1agBXQ-1uCcNDZStg,1954
+oarepo_runtime/records/systemfields/mapping.py,sha256=GcNp_-Ho3G8nk4-SXgoWWk_IPdGsM0LZ-DBl5fnYJvE,1699
+oarepo_runtime/records/systemfields/publication_status.py,sha256=5D8L_-Wsf-Or-Er7EhuOnwzXfGY28TRPTg1XmMEKxM8,1995
 oarepo_runtime/records/systemfields/selectors.py,sha256=ijVDwAXaXTV5NtcXsrALkhddgCogLNe2eEscFr23qyg,1656
 oarepo_runtime/resources/__init__.py,sha256=voynQULXoOEviADkbOpekMphZPTAz4IOTg5BF9xPwTM,453
 oarepo_runtime/resources/config.py,sha256=Lbx1QPWAJ8z1truhYntbnhGGWp2OCcwqKm6BuvPJNT0,1330
@@ -42,8 +42,8 @@ oarepo_runtime/services/schema/__init__.py,sha256=jgAPI_uKC6Ug4KQWnwQVg3-aNaw-eH
 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.dev34.dist-info/METADATA,sha256=w1wReJPYVkTR6iFXH1dzdcbExSD4ImSbPkQg2wjdpHc,4707
-oarepo_runtime-2.0.0.dev34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oarepo_runtime-2.0.0.dev34.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
-oarepo_runtime-2.0.0.dev34.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-2.0.0.dev34.dist-info/RECORD,,
+oarepo_runtime-2.0.0.dev36.dist-info/METADATA,sha256=4wSsN4WdUaamDR4j3jrH-uj9K8b_NYhhpE_BA6TTh90,4707
+oarepo_runtime-2.0.0.dev36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev36.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev36.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev36.dist-info/RECORD,,