oarepo-runtime 1.10.2__py3-none-any.whl → 2.0.0.dev3__py3-none-any.whl

oarepo_runtime/__init__.py

@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+"""OARepo Runtime package.
+
+This package provides support for custom fields identification and iteration and `invenio oarepo cf init`
+initialization tool for customfields.
+"""
+
+from __future__ import annotations
+
+from .api import Model
+from .ext import OARepoRuntime
+from .proxies import current_runtime
+
+__version__ = "2.0.0dev3"
+
+__all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

oarepo_runtime/api.py

@@ -0,0 +1,111 @@
+#
+# 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.
+#
+
+"""Runtime API classes that are returned from the current_runtime instance."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
+from invenio_records_resources.proxies import current_service_registry
+
+if TYPE_CHECKING:
+    from flask_babel.speaklater import LazyString
+    from invenio_drafts_resources.records.api import Draft
+    from invenio_records_resources.records.api import RecordBase
+    from invenio_records_resources.services import RecordService, RecordServiceConfig
+
+
+class Model[
+    S: RecordService = RecordService,
+    C: RecordServiceConfig = RecordServiceConfig,
+    R: RecordBase = RecordBase,
+    D: Draft = Draft,
+]:
+    """Model configuration.
+
+    Every model in oarepo repository must have this configuration which must be
+    registered in the `oarepo.runtime` extension via the OAREPO_MODELS config
+    variable.
+    """
+
+    name: str | LazyString
+    version: str
+    description: str | LazyString | None = None
+    global_search_enabled: bool = False
+
+    def __init__(  # noqa: PLR0913 more attributes as we are creating a config
+        self,
+        name: str | LazyString,
+        version: str,
+        service: str | S,
+        # params with default values
+        service_config: C | None = None,
+        description: str | LazyString | None = None,
+        record: type[R] | None = None,
+        draft: type[D] | None = None,
+        global_search_enabled: bool = True,
+    ):
+        """Initialize the model configuration.
+
+        :param name: Name of the model, human readable.
+        :param version: Version of the model, should be a valid semantic version.
+        :param description: Description of the model, human readable.
+        :param service: Name of the service inside the `current_service_registry` or
+            a configured service instance.
+        :param service_config: Service configuration, if not provided,
+            if will be taken from the service.
+        :param record: Record class, if not provided, it will be taken from the service
+            configuration.
+        :param draft: Draft class, if not provided, it will be taken from the service
+            configuration.
+        """
+        self.name = name
+        self.version = version
+        self.description = description
+        self.global_search_enabled = global_search_enabled
+
+        # lazy getters ...
+        self._record = record
+        self._draft = draft
+        self._service = service
+        self._service_config = service_config
+
+    @property
+    def service(self) -> S:
+        """Get the service."""
+        if isinstance(self._service, str):
+            return cast(
+                "S",
+                current_service_registry.get(self._service),  # type: ignore[attr-defined]
+            )
+        return self._service
+
+    @property
+    def service_config(self) -> C:
+        """Get the service configuration."""
+        if self._service_config is not None:
+            return self._service_config
+        return cast("C", self.service.config)
+
+    @property
+    def record_cls(self) -> type[R]:
+        """Get the record class."""
+        if self._record is None:
+            return cast("type[R]", self.service.config.record_cls)
+        return self._record
+
+    @property
+    def draft_cls(self) -> type[D] | None:
+        """Get the draft class."""
+        if self._draft is None:
+            if hasattr(self.service.config, "draft_cls"):
+                return cast("type[D]", self.service.config.draft_cls)
+            return None
+        return self._draft

oarepo_runtime/cli/__init__.py

@@ -1,22 +1,11 @@
-from .assets import assets
-from .base import as_command, oarepo
-from .cf import cf
-from .check import check
-from .configuration import configuration_command
-from .fixtures import fixtures
-from .index import index
-from .permissions import permissions
-from .validate import validate
+#
+# 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.
+#
+"""OAREPO Runtime CLI module."""
 
-__all__ = (
-    "oarepo",
-    "index",
-    "as_command",
-    "assets",
-    "check",
-    "validate",
-    "fixtures",
-    "configuration_command",
-    "permissions",
-    "cf",
-)
+from __future__ import annotations

oarepo_runtime/cli/search.py

@@ -0,0 +1,34 @@
+#
+# 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.
+#
+"""OARepo extensions to the index command."""
+
+from __future__ import annotations
+
+import click
+from flask.cli import with_appcontext
+from invenio_search.cli import index, search_version_check
+from invenio_search.cli import init as original_init
+
+from oarepo_runtime.services.records.mapping import update_all_records_mappings
+
+
+@index.command()
+@click.option("--force", is_flag=True, default=False)
+@with_appcontext
+@search_version_check
+@click.pass_context
+def init(ctx: click.Context, force: bool) -> None:
+    """Initialize registered aliases and mappings.
+
+    This command initializes the search indices by creating templates, component templates,
+    index templates, and the actual indices. It will also create all dynamic mappings
+    defined inside the models.
+    """
+    ctx.invoke(original_init, force=force)
+    update_all_records_mappings()

oarepo_runtime/config.py

@@ -1,19 +1,92 @@
-from typing import Any, cast
+#
+# 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.
+#
 
-from flask import Flask
+"""Config module."""
 
+from __future__ import annotations
 
-def build_config[T: type](config_class: T, app: Flask, *args: Any, **kwargs: Any) -> T:
-    """
-    Builds the configuration for the service
+from typing import TYPE_CHECKING, Any
+
+from invenio_vocabularies import __version__ as vocabularies_version
+
+from .api import Model
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from flask import Flask
 
-    This function is used to build the configuration for the service
+
+def build_config[T](config_class: type[T], app: Flask, *args: Any, **kwargs: Any) -> T:
+    """Build the configuration for the service.
+
+    This function is used to build the configuration for the service.
     """
-    if hasattr(config_class, "build") and callable(config_class.build):
+    build_config: Callable[[Flask], T] | None = getattr(config_class, "build", None)
+    if build_config is not None and callable(build_config):
         if args or kwargs:
-            raise ValueError(
-                "Can not pass extra arguments when invenio ConfigMixin is used"
-            )
-        return cast(T, config_class.build(app))
-    else:
-        return config_class(*args, **kwargs)
+            raise ValueError("Can not pass extra arguments when invenio ConfigMixin is used")
+        return build_config(app)
+    return config_class(*args, **kwargs)
+
+
+#
+# Configuration for the extension.
+#
+
+OAREPO_MODELS: dict[str, Model] = {
+    # default invenio vocabularies
+    "vocabularies": Model(
+        name="vocabularies",
+        version=vocabularies_version,
+        service="vocabularies",
+        description="Base (non-specialized) invenio vocabularies",
+        global_search_enabled=False,
+    ),
+    # affiliations
+    "affiliations": Model(
+        name="affiliations",
+        version=vocabularies_version,
+        service="affiliations",
+        description="Affiliations vocabulary",
+        global_search_enabled=False,
+    ),
+    # funders
+    "funders": Model(
+        name="funders",
+        version=vocabularies_version,
+        service="funders",
+        description="Funders vocabulary",
+        global_search_enabled=False,
+    ),
+    # awards
+    "awards": Model(
+        name="awards",
+        version=vocabularies_version,
+        service="awards",
+        description="Awards vocabulary",
+        global_search_enabled=False,
+    ),
+    # names
+    "names": Model(
+        name="names",
+        version=vocabularies_version,
+        service="names",
+        description="Names vocabulary",
+        global_search_enabled=False,
+    ),
+    # subjects
+    "subjects": Model(
+        name="subjects",
+        version=vocabularies_version,
+        service="subjects",
+        description="Subjects vocabulary",
+        global_search_enabled=False,
+    ),
+}

oarepo_runtime/ext.py

@@ -1,102 +1,84 @@
-from functools import cached_property
+#
+# 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.
+#
+
+"""Extension preset for runtime module."""
 
-import pytz
-from flask import current_app, session
-from invenio_accounts.models import User
-from invenio_base.utils import obj_or_import_string
+from __future__ import annotations
 
-from .cli import oarepo as oarepo_cmd
-from .datastreams.ext import OARepoDataStreamsExt
-from .proxies import current_timezone
+from functools import cached_property
+from typing import TYPE_CHECKING, Any, cast
 
+from flask import current_app
+from invenio_records_resources.proxies import current_service_registry
+from invenio_records_resources.records.api import RecordBase
 
-def set_timezone():
-    if "timezone" in session:
-        current_timezone.set(pytz.timezone(session["timezone"]))
-    else:
-        default_user_timezone = current_app.config.get("BABEL_DEFAULT_TIMEZONE")
-        if default_user_timezone:
-            current_timezone.set(pytz.timezone(default_user_timezone))
-        else:
-            current_timezone.set(None)
+from . import config
 
+if TYPE_CHECKING:  # pragma: no cover
+    from flask import Flask
+    from invenio_records_resources.services.base.service import Service
+    from invenio_records_resources.services.records import RecordService
 
-def on_identity_changed(sender, identity):
-    if "timezone" not in session and "_user_id" in session:
-        user = User.query.filter_by(id=session["_user_id"]).first()
-        if user and "timezone" in user.preferences:
-            session["timezone"] = user.preferences["timezone"]
-    set_timezone()
+    from .api import Model
 
 
-class OARepoRuntime(object):
-    """OARepo extension of Invenio-Vocabularies."""
+class OARepoRuntime:
+    """OARepo base of invenio oarepo client."""
 
-    def __init__(self, app=None):
+    def __init__(self, app: Flask | None = None):
         """Extension initialization."""
         if app:
             self.init_app(app)
 
-    def init_app(self, app):
+    def init_app(self, app: Flask) -> None:
         """Flask application initialization."""
-        self.init_config(app)
         self.app = app
+        self.init_config(app)
         app.extensions["oarepo-runtime"] = self
-        app.extensions["oarepo-datastreams"] = OARepoDataStreamsExt(app)
-        app.cli.add_command(oarepo_cmd)
-
-        from flask_principal import identity_changed
 
-        identity_changed.connect(on_identity_changed, self.app)
-        app.before_request(set_timezone)
+    def init_config(self, app: Flask) -> None:
+        """Initialize the configuration for the extension."""
+        app.config.setdefault("OAREPO_MODELS", {})
+        for k, v in config.OAREPO_MODELS.items():
+            if k not in app.config["OAREPO_MODELS"]:
+                app.config["OAREPO_MODELS"][k] = v
 
-    @cached_property
-    def owner_entity_resolvers(self):
-        return [
-            obj_or_import_string(x) for x in self.app.config["OWNER_ENTITY_RESOLVERS"]
-        ]
+    @property
+    def models(self) -> dict[str, Model]:
+        """Return the models registered in the extension."""
+        return cast("dict[str, Model]", current_app.config["OAREPO_MODELS"])
 
     @cached_property
-    def rdm_excluded_components(self):
-        return [
-            obj_or_import_string(x)
-            for x in self.app.config.get("RDM_EXCLUDED_COMPONENTS", [])
-        ]
-
-    def init_config(self, app):
-        """Initialize configuration."""
-        from . import ext_config
-
-        if "OAREPO_PERMISSIONS_PRESETS" not in app.config:
-            app.config["OAREPO_PERMISSIONS_PRESETS"] = {}
-
-        for k in ext_config.OAREPO_PERMISSIONS_PRESETS:
-            if k not in app.config["OAREPO_PERMISSIONS_PRESETS"]:
-                app.config["OAREPO_PERMISSIONS_PRESETS"][k] = (
-                    ext_config.OAREPO_PERMISSIONS_PRESETS[k]
-                )
-
-        for k in dir(ext_config):
-            if k == "DEFAULT_DATASTREAMS_EXCLUDES":
-                app.config.setdefault(k, []).extend(getattr(ext_config, k))
-
-            elif k.startswith("DATASTREAMS_"):
-                val = getattr(ext_config, k)
-                if isinstance(val, dict):
-                    self.add_non_existing(app.config.setdefault(k, {}), val)
-                else:
-                    app.config.setdefault(k, val)
-
-            elif k == "HAS_DRAFT_CUSTOM_FIELD":
-                app.config.setdefault(k, getattr(ext_config, k))
-
-            elif k == "OAREPO_FACET_GROUP_NAME":
-                app.config.setdefault(k, getattr(ext_config, k))
-
-            elif k == "OWNER_ENTITY_RESOLVERS":
-                app.config.setdefault(k, []).extend(getattr(ext_config, k))
-
-    def add_non_existing(self, target, source):
-        for val_k, val_value in source.items():
-            if val_k not in target:
-                target[val_k] = val_value
+    def models_by_record_class(self) -> dict[type[RecordBase], Model]:
+        """Return a mapping of record classes to their models."""
+        ret = {model.record_cls: model for model in self.models.values() if model.record_cls is not None}
+        ret.update({model.draft_cls: model for model in self.models.values() if model.draft_cls is not None})
+        return ret
+
+    @property
+    def services(self) -> dict[str, Service]:
+        """Return the services registered in the extension."""
+        _services = current_service_registry._services  # type: ignore[attr-defined]  # noqa: SLF001
+        return cast("dict[str, Service]", _services)
+
+    def get_record_service_for_record(self, record: Any) -> RecordService:
+        """Retrieve the associated service for a given record."""
+        if record is None:
+            raise ValueError("Need to pass a record instance, got None")
+        return self.get_record_service_for_record_class(type(record))
+
+    def get_record_service_for_record_class(self, record_cls: type[RecordBase]) -> RecordService:
+        """Retrieve the service associated with a given record class."""
+        for t in record_cls.mro():
+            if t is RecordBase:
+                break
+            if t in self.models_by_record_class:
+                model = self.models_by_record_class[t]
+                return model.service
+        raise KeyError(f"No service found for record class '{record_cls.__name__}'.")

oarepo_runtime/proxies.py

@@ -1,8 +1,24 @@
+#
+# 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.
+#
+
+"""Proxies."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from flask import current_app
 from werkzeug.local import LocalProxy
-from contextvars import ContextVar
 
-current_timezone = ContextVar('timezone') #idk how or exactly why to use the LocalProxy here
-current_datastreams = LocalProxy(lambda: current_app.extensions["oarepo-datastreams"])
-current_oarepo = LocalProxy(lambda: current_app.extensions["oarepo-runtime"])
-"""Helper proxy to get the current datastreams."""
+if TYPE_CHECKING:
+    from oarepo_runtime.ext import OARepoRuntime
+
+    current_runtime: OARepoRuntime
+
+current_runtime = LocalProxy(lambda: current_app.extensions["oarepo-runtime"])  # type: ignore[assignment]

oarepo_runtime/records/__init__.py

@@ -1,50 +1,11 @@
-from typing import Type
-
-from deprecated import deprecated
-from invenio_records_resources.records import Record
-
-
-def select_record_for_update(record_cls: Type[Record], persistent_identifier):
-    """Select a record for update."""
-    resolved_record = record_cls.pid.resolve(persistent_identifier)
-    model_id = resolved_record.model.id
-    obj = record_cls.model_cls.query.filter_by(id=model_id).with_for_update().one()
-    return record_cls(obj.data, model=obj)
-
-
-@deprecated("Moved to oarepo_runtime.services.config.link_conditions")
-def is_published_record_function():
-    """Shortcut for links to determine if record is a published.
-
-    This function is deprecated. Use oarepo_runtime.services.config.is_published_record instead.
-    """
-    from oarepo_runtime.services.config.link_conditions import is_published_record
-
-    return is_published_record()
-
-
-@deprecated("Moved to oarepo_runtime.services.config.link_conditions")
-def is_draft_record_function():
-    """Shortcut for links to determine if record is a draft record.
-
-    This function is deprecated. Use oarepo_runtime.services.config.is_draft_record instead.
-    """
-    from oarepo_runtime.services.config.link_conditions import is_draft_record
-
-    return is_draft_record()
-
-
-@deprecated("Moved to oarepo_runtime.services.config.link_conditions")
-def has_draft_function():
-    """Shortcut for links to determine if record is either a draft or a published one with a draft associated.
-
-    This function is deprecated. Use oarepo_runtime.services.config.has_draft instead.
-    """
-    from oarepo_runtime.services.config.link_conditions import has_draft
-
-    return has_draft()
-
-
-is_published_record = is_published_record_function()
-is_draft = is_draft_record_function()
-has_draft = has_draft_function()
+#
+# 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.
+#
+"""Records module."""
+
+from __future__ import annotations

oarepo_runtime/records/drafts.py

@@ -1,13 +1,29 @@
-from invenio_records_resources.records.api import Record
+#
+# 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.
+#
+"""Record drafts."""
 
-from oarepo_runtime.datastreams.utils import get_record_service_for_record
+from __future__ import annotations
 
+from typing import TYPE_CHECKING
 
-def has_draft(record: Record) -> bool:
+if TYPE_CHECKING:
+    from invenio_records_resources.records.api import RecordBase
+
+from oarepo_runtime.proxies import current_runtime
+
+
+def has_draft(record: RecordBase) -> bool:
+    """Check if record has draft."""
     return get_draft(record) is not None
 
 
-def get_draft(record: Record) -> Record | None:
+def get_draft(record: RecordBase) -> RecordBase | None:
     """Get the draft of a published record, if it exists.
 
     A record can have a draft if:
@@ -19,24 +35,14 @@ def get_draft(record: Record) -> Record | None:
     """
     if getattr(record, "is_draft", False):
         return record
-    if not hasattr(record, "parent"):
-        return None
-    if not hasattr(record, "has_draft"):
+    if not hasattr(record, "parent") or not hasattr(record, "has_draft"):
         return None
 
-    record_service = get_record_service_for_record(record)
-    if not record_service:
-        return None
+    record_service = current_runtime.get_record_service_for_record(record)
 
     try:
-        # if there is no record service, we cannot check for draft
-        if not record_service:
-            return None
-        return next(
-            record_service.config.draft_cls.get_records_by_parent(
-                record.parent, with_deleted=False
-            )
-        )
+        parent = getattr(record, "parent", None)
+        return next(record_service.config.draft_cls.get_records_by_parent(parent, with_deleted=False))
     except StopIteration:
         # no draft found
         return None