oarepo-runtime 2.0.0.dev18__py3-none-any.whl → 2.0.0.dev19__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.0dev18"
+__version__ = "2.0.0dev19"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/records/systemfields/custom_fields.py

@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2025 CESNET z.s.p.o.
+#
+# This file is a part of oarepo-runtime (see http://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.
+#
+"""Module to update the mapping of system fields in a record class."""
+
+from __future__ import annotations
+
+import inspect
+from typing import TYPE_CHECKING
+
+from flask import current_app
+from invenio_records.systemfields.relations import MultiRelationsField
+from invenio_vocabularies.records.systemfields.relations import CustomFieldsRelation
+
+from oarepo_runtime.records.mapping import prefixed_index, update_record_index
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from invenio_records.api import RecordBase
+
+
+def update_record_system_fields_mapping_relation_field(
+    record_class: type[RecordBase],
+) -> None:
+    """Update mapping for system fields in the record class.
+
+    :param record_class: The record class which index mapping should be updated.
+    :raise search.RequestError: If there is an error while updating the mapping.
+    """
+    index = getattr(record_class, "index", None)
+    if not index:
+        return
+
+    for field_name, fld in get_mapping_relation_fields(record_class):
+        custom_fields = current_app.config.get(fld._fields_var, [])  # noqa: SLF001
+
+        props: dict[str, dict] = {}
+        mapping = {field_name: {"type": "object", "properties": props}}
+        for cf in custom_fields:
+            # get mapping
+            props[cf.name] = cf.mapping
+
+        # upload mapping
+        if props:
+            update_record_index(prefixed_index(index), {}, mapping, None)
+
+
+def get_mapping_relation_fields(
+    record_class: type[RecordBase],
+) -> Iterable[tuple[str, CustomFieldsRelation]]:
+    """Get all mapping fields from the record class."""
+    for _, relation_fields in inspect.getmembers(record_class, lambda x: isinstance(x, MultiRelationsField)):
+        yield from (
+            (field_name, relation_field)
+            for field_name, relation_field in relation_fields._original_fields.items()  # noqa: SLF001
+            if isinstance(relation_field, CustomFieldsRelation)
+        )

oarepo_runtime/records/systemfields/selectors.py

@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2025 CESNET z.s.p.o.
+#
+# This file is a part of oarepo-runtime (see http://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.
+#
+"""Selectors for extracting values from records based on specified paths."""
+
+from __future__ import annotations
+
+from typing import Any, Protocol
+
+
+class Selector(Protocol):
+    """Protocol for selectors that extract values from records."""
+
+    def select(self, record: dict) -> list[Any]:  # noqa: ARG002
+        """Select values from the record based on the selector's logic."""
+        return []
+
+
+class PathSelector(Selector):
+    """Selector that extracts values from records based on specified paths."""
+
+    def __init__(self, *paths: str) -> None:
+        """Initialize the PathSelector with given paths."""
+        self.paths = [x.split(".") for x in paths]
+
+    def select(self, record: dict) -> list[Any]:
+        """Select values from the record based on the specified paths."""
+        ret = []
+        for path in self.paths:
+            ret.extend(list(getter(record, path)))
+        return ret
+
+
+def getter(data: list | dict, path: list) -> Any:
+    """Recursively get values from data based on the provided path."""
+    if len(path) == 0:
+        if isinstance(data, list):
+            yield from data
+        else:
+            yield data
+    elif isinstance(data, dict):
+        if path[0] in data:
+            yield from getter(data[path[0]], path[1:])
+    elif isinstance(data, list):
+        for item in data:
+            yield from getter(item, path)

oarepo_runtime/services/records/custom_fields.py

@@ -0,0 +1,44 @@
+#
+# Copyright (c) 2025 CESNET z.s.p.o.
+#
+# This file is a part of oarepo-runtime (see http://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.
+#
+"""Services for updating custom fields mappings in opensearch."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from invenio_records_resources.services.records import (
+    RecordService,
+    RecordServiceConfig,
+)
+
+from oarepo_runtime import current_runtime
+from oarepo_runtime.records.systemfields.custom_fields import (
+    update_record_system_fields_mapping_relation_field,
+)
+
+if TYPE_CHECKING:
+    from invenio_records_resources.services.base import Service
+
+
+def update_all_records_mappings_relation_fields() -> None:
+    """Update all mappings for the registered record classes."""
+    service: Service
+    for service in current_runtime.services.values():
+        if not isinstance(service, RecordService):
+            continue
+
+        config: RecordServiceConfig = service.config
+
+        record_class = getattr(config, "record_cls", None)
+        if record_class:
+            update_record_system_fields_mapping_relation_field(record_class)
+
+        draft_class = getattr(config, "draft_cls", None)
+        if draft_class:
+            update_record_system_fields_mapping_relation_field(draft_class)

oarepo_runtime/typing.py

@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2025 CESNET z.s.p.o.
+#
+# This file is a part of oarepo-runtime (see http://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.
+#
+
+"""Module for typing related functionality."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+
+def require_kwargs(*kwargs_names: str) -> Any:
+    """Wrap function to require specific kwargs in a function call.
+
+    This decorator is used to fix typing errors in inherited classes where the base class defines kwargs and the
+    inherited class needs to access a specific kwarg.
+
+    Example:
+    ```python
+    # base class
+    class ConditionalGenerator(
+        InvenioConditionalGenerator, ABC
+    ):
+        @abstractmethod
+        def _condition(
+            self, **kwargs: Any
+        ) -> bool: ...
+
+
+    # inherited class
+    class IfRecordHasField(
+        ConditionalGenerator
+    ):
+        @override
+        @require_kwargs("field")
+        def _condition(
+            self, *, field, **kwargs: Any
+        ) -> bool: ...
+    ```
+
+    """
+
+    def wrapper(f: Callable) -> Callable:
+        def wrapped_f(*args: Any, **kwargs: Any) -> Any:
+            for kwarg_name in kwargs_names:
+                if kwarg_name not in kwargs:
+                    raise ValueError(f"Keyword argument {kwarg_name} not found in function call.")
+            return f(*args, **kwargs)
+
+        return wrapped_f
+
+    return wrapper

{oarepo_runtime-2.0.0.dev18.dist-info → oarepo_runtime-2.0.0.dev19.dist-info}/METADATA

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

@@ -1,9 +1,10 @@
-oarepo_runtime/__init__.py,sha256=6z9_8CzYNGg5SzI-1U_6PbV9AZfjt6baMAwbuggSoQs,686
+oarepo_runtime/__init__.py,sha256=ELfuJkeP59PnlRE7L7YZP4hwKX8EcHdzurXJYP3b2xs,686
 oarepo_runtime/api.py,sha256=7gPeRS66moT1lIedPRmuK0EnB8PpGO7iD5eRCQOty4U,12552
 oarepo_runtime/config.py,sha256=RUEPFn_5bKp9Wb0OY-Fb3VK30m35vF5IsLjYaQHhP3g,3838
 oarepo_runtime/ext.py,sha256=G9j5IgnVPdE656qaiN4RllpOkdyToP8v9uwas3DdpTY,8451
 oarepo_runtime/proxies.py,sha256=PXaRiBh5qs5-h8M81cJOgtqypFQcYUSjiSn2TLSujRw,648
 oarepo_runtime/py.typed,sha256=RznSCjXReEUI9zkmD25E8XniG_MvPpLBF6MyNZA8MmE,42
+oarepo_runtime/typing.py,sha256=vH8UUb4QTJowuvibwHaOOEwxx8i21LcOeplxJl0Yrew,1594
 oarepo_runtime/cli/__init__.py,sha256=H7GOeOBf0udgKWOdlAQswIMvRrD8BwcEjOVxIqP0Suw,731
 oarepo_runtime/cli/search.py,sha256=4fHkrjltUUPVUzJiuWaiWxTk62rIYxal3_3jRsZVMmI,1175
 oarepo_runtime/records/__init__.py,sha256=AbWzmVCY7MhrpdEeI0e3lKzeugPMUSo8T08-NBVeig4,339
@@ -11,8 +12,10 @@ oarepo_runtime/records/drafts.py,sha256=CS-dUkrylNwscgBGfDyhwGBRCzwsyT6AA3Mhu40S
 oarepo_runtime/records/mapping.py,sha256=SJbSzerT1645a93-3-Fgz_i3anzFNlrZqbjjwW2ctKs,2660
 oarepo_runtime/records/pid_providers.py,sha256=DSpbVB2Z5GxnjhoY7_WJLfUfrr1UsArJye7CXPfEkNI,1773
 oarepo_runtime/records/systemfields/__init__.py,sha256=g-u408qyNnsbUTpDtVVwlcyiJaO68GTjDN0W9rXs9pk,524
+oarepo_runtime/records/systemfields/custom_fields.py,sha256=PEoaCEnvanysFQAaqTtD9-VwaBmnFkoP2pmpCl9ZFfI,2237
 oarepo_runtime/records/systemfields/mapping.py,sha256=66OQavKewJEUMkghymOxvskIO0LUSP2E-MbHryeT5Nk,1968
 oarepo_runtime/records/systemfields/publication_status.py,sha256=1g3VXNPh0FsiPCpe-7ZuaMEF4x8ffrDrt37Rqnjp0ng,2027
+oarepo_runtime/records/systemfields/selectors.py,sha256=ijVDwAXaXTV5NtcXsrALkhddgCogLNe2eEscFr23qyg,1656
 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
@@ -25,13 +28,14 @@ oarepo_runtime/services/config/permissions.py,sha256=9_706Yyz7X6IXhSaRBnkmGOr7c8
 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=Mpohx3xEXTmoodTEHbCih6I97JIofgqa_bf_Ysq4e2g,446
+oarepo_runtime/services/records/custom_fields.py,sha256=Yp3WsLYq1_OPMmJvpxCDtZi9IhuxHsBFPor8q901qn0,1417
 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.dev18.dist-info/METADATA,sha256=pC-YWi379OZ-3-kDzDg20ziCln3aaGO7ehf1auWoZNI,4495
-oarepo_runtime-2.0.0.dev18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oarepo_runtime-2.0.0.dev18.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
-oarepo_runtime-2.0.0.dev18.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-2.0.0.dev18.dist-info/RECORD,,
+oarepo_runtime-2.0.0.dev19.dist-info/METADATA,sha256=5XpM4niZTzcf6Hb-bFN_HeoDQPh7ci-u43PNYw9GleE,4495
+oarepo_runtime-2.0.0.dev19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oarepo_runtime-2.0.0.dev19.dist-info/entry_points.txt,sha256=rOfs8R1oXFN_dLH9zAZ6ydkvr83mDajegc6NBIRsCMQ,318
+oarepo_runtime-2.0.0.dev19.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-2.0.0.dev19.dist-info/RECORD,,