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

oarepo_runtime/ext.py

@@ -15,6 +15,7 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any, cast
 
 from flask import current_app
+from invenio_db import db
 from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_pidstore.models import PersistentIdentifier
 from invenio_records.api import Record as RecordBase
@@ -146,20 +147,20 @@ class OARepoRuntime:
 
         If the filter matches multiple services, an error is raised.
         """
-        pids = PersistentIdentifier.query.filter_by(**filter_kwargs).all()
+        pids = db.session.query(PersistentIdentifier).filter_by(**filter_kwargs).all()
 
         filtered_pids = [pid for pid in pids if pid.pid_type in self.record_class_by_pid_type]
         if not filtered_pids:
             raise PIDDoesNotExistError(
-                None,
-                filter_kwargs,
+                "unknown_pid",
+                str(filter_kwargs),
                 "The pid value/record uuid is not associated with any record.",
             )
 
         if len(filtered_pids) > 1:
             raise PIDDoesNotExistError(
-                None,
-                filter_kwargs,
+                "unknown_pid",
+                str(filter_kwargs),
                 f"Multiple records found for pid value/record uuid: {filtered_pids}",
             )
         return filtered_pids[0]

oarepo_runtime/records/pid_providers.py

@@ -28,7 +28,7 @@ class UniversalPIDMixin(RecordIdProviderV2):
     unpid_default_status = PIDStatus.REGISTERED
 
     @classmethod
-    def create(
+    def create(  # type: ignore[override] # as pid type and value are given
         cls,
         object_type: str | None = None,
         object_uuid: str | None = None,
@@ -50,7 +50,7 @@ class UniversalPIDMixin(RecordIdProviderV2):
 
         PersistentIdentifier.create(
             cls.unpid_pid_type,
-            pid.pid.pid_value,
+            cast("str", pid.pid.pid_value),
             pid_provider=None,
             object_type=object_type,
             object_uuid=object_uuid,

oarepo_runtime/services/results.py

@@ -15,7 +15,6 @@ import logging
 from typing import TYPE_CHECKING, Any
 
 from invenio_access.permissions import Identity
-from invenio_records.api import RecordBase
 from invenio_records_resources.errors import _iter_errors_dict
 from invenio_records_resources.services.records.results import (
     RecordItem as BaseRecordItem,
@@ -27,7 +26,7 @@ from invenio_records_resources.services.records.results import (
 if TYPE_CHECKING:
     from invenio_access.permissions import Identity
     from invenio_drafts_resources.records.api import Draft
-    from invenio_records.api import RecordBase
+    from invenio_records_resources.records.api import Record
 
 
 log = logging.getLogger(__name__)
@@ -45,7 +44,7 @@ class ResultComponent:
         self._record_item = record_item
         self._record_list = record_list
 
-    def update_data(self, identity: Identity, record: RecordBase, projection: dict, expand: bool) -> None:
+    def update_data(self, identity: Identity, record: Record, projection: dict, expand: bool) -> None:
         """Update the projection data with additional information.
 
         :param identity: The identity of the user making the request.
@@ -151,7 +150,9 @@ class RecordList(BaseRecordList):
                 # Project the record
                 # TODO: check if this logic is correct
                 versions = hit_dict.get("versions", {})
-                if versions.get("is_latest_draft") and not versions.get("is_latest"):
+                if (versions.get("is_latest_draft") and not versions.get("is_latest")) or (
+                    "publication_status" in hit_dict and hit_dict["publication_status"] == "draft"
+                ):
                     draft_class: type[Draft] | None = getattr(self._service, "draft_cls", None)
                     if draft_class is None:
                         raise RuntimeError("Draft class is not defined in the service")  # pragma: no cover

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev36
+Version: 2.0.0.dev37
 Summary: A set of runtime extensions of Invenio repository
 Project-URL: Homepage, https://github.com/oarepo/oarepo-runtime
 License-Expression: MIT
@@ -8,11 +8,9 @@ License-File: LICENSE
 Requires-Python: <3.14,>=3.13
 Requires-Dist: langcodes>=3.5.0
 Requires-Dist: oarepo-invenio-typing-stubs>=0.1.0
-Requires-Dist: oarepo[rdm,tests]<15,>=13
+Requires-Dist: oarepo[rdm,tests]<15,>=14
 Provides-Extra: dev
 Requires-Dist: pytest>=7.1.2; extra == 'dev'
-Provides-Extra: oarepo13
-Requires-Dist: oarepo[rdm]<14,>=13; extra == 'oarepo13'
 Provides-Extra: oarepo14
 Requires-Dist: oarepo[rdm]<15,>=14; extra == 'oarepo14'
 Provides-Extra: tests

{oarepo_runtime-2.0.0.dev36.dist-info → oarepo_runtime-2.0.0.dev37.dist-info}/RECORD

@@ -1,7 +1,7 @@
-oarepo_runtime/__init__.py,sha256=Y5ZPbHF2q3Fi0ElItUf0wzaM3aP_xOw-MkJntFLkO8E,686
+oarepo_runtime/__init__.py,sha256=JR0f1Ihyrg0u3il_AHkGxW24pISnxnXHCilb58xIoWM,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/ext.py,sha256=hA_OmJJHum6W28iPkjxvFrKHzFwi_Ki_0Fy2Mgzl7UQ,8851
 oarepo_runtime/proxies.py,sha256=x8Y1iTP8QIzSI67s90VR0_5fvXuT1xlJXtAHsaoXFwg,903
 oarepo_runtime/py.typed,sha256=RznSCjXReEUI9zkmD25E8XniG_MvPpLBF6MyNZA8MmE,42
 oarepo_runtime/typing.py,sha256=VtINHm4BZ5OJ4KdRAwnFXPZiAEgPRIYTtPC9fIzK1bU,1876
@@ -12,7 +12,7 @@ oarepo_runtime/info/views.py,sha256=JwESs-KVq163OBeqWVwfy0RU4WXR_MBolVR7W-dGtm0,
 oarepo_runtime/records/__init__.py,sha256=AbWzmVCY7MhrpdEeI0e3lKzeugPMUSo8T08-NBVeig4,339
 oarepo_runtime/records/drafts.py,sha256=b45ROjd9lwy6ratrpAruimcKvQmJradk5JgILoBAHmY,1965
 oarepo_runtime/records/mapping.py,sha256=fn6M208axxBqHtRV6qKQukwUw1z0hq_KF4qfuB2rr98,2630
-oarepo_runtime/records/pid_providers.py,sha256=DE8uW-QmJumA9OqWksDOydezjJ9LLC296CRa0zDrlEc,1747
+oarepo_runtime/records/pid_providers.py,sha256=B7nzj8nUZ3tut8SSkGWbYN-ON7z-5t3V3uhqiXA2Ifo,1820
 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
@@ -23,7 +23,7 @@ oarepo_runtime/resources/__init__.py,sha256=voynQULXoOEviADkbOpekMphZPTAz4IOTg5B
 oarepo_runtime/resources/config.py,sha256=Lbx1QPWAJ8z1truhYntbnhGGWp2OCcwqKm6BuvPJNT0,1330
 oarepo_runtime/services/__init__.py,sha256=OGtBgEeaDTyk2RPDNXuKbU9_7egFBZr42SM0gN5FrF4,341
 oarepo_runtime/services/generators.py,sha256=8Z2QGzob4c2vaaNqhcMZsRybmwtOt30Plgf3EFmcJXw,4622
-oarepo_runtime/services/results.py,sha256=qzoIQW5-ShL1YJDgPjfTlPnsgfEZhojNehhHNTUxRgI,7120
+oarepo_runtime/services/results.py,sha256=EwMW1ed7u6uozgOLZpFa07-NKC89hJlHaVSD8-D5ibU,7211
 oarepo_runtime/services/config/__init__.py,sha256=SX1kfIGk8HkohdLQrNpRQUTltksEyDcCa-kFXxrX4e8,711
 oarepo_runtime/services/config/components.py,sha256=cyU-JeMzLuBL-9JkUKbUQuu527WAq0yptGs6806XSho,23039
 oarepo_runtime/services/config/link_conditions.py,sha256=T1ZZ5SbbvIfujm0oJx73s_ku3WmeFqElAOZJwPFTw2o,4388
@@ -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.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,,
+oarepo_runtime-2.0.0.dev37.dist-info/METADATA,sha256=6Cl9JNhk5K76z8S6JfwJcPywCOVmedvqjbme6kv7PIc,4626
+oarepo_runtime-2.0.0.dev37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev37.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev37.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev37.dist-info/RECORD,,