oarepo-runtime 2.0.0.dev34__tar.gz → 2.0.0.dev35__tar.gz

{oarepo_runtime-2.0.0.dev34 → oarepo_runtime-2.0.0.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev34
+Version: 2.0.0.dev35
 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 → oarepo_runtime-2.0.0.dev35}/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.0dev35"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

{oarepo_runtime-2.0.0.dev34 → oarepo_runtime-2.0.0.dev35}/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-2.0.0.dev34 → oarepo_runtime-2.0.0.dev35}/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"