oarepo-runtime 1.4.12__py3-none-any.whl → 1.4.13__py3-none-any.whl

oarepo_runtime/cf/__init__.py

@@ -1,15 +1,45 @@
+from typing import List
+
 from flask import current_app
 from invenio_records.systemfields import DictField, SystemField
+from invenio_records_resources.services.custom_fields import BaseCF
+
+from oarepo_runtime.records import MappingSystemFieldMixin
 
 
-class CustomFieldsMixin:
+class CustomFieldsMixin(MappingSystemFieldMixin):
     def __init__(self, config_key, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.config_key = config_key
 
+    @property
+    def mapping(self):
+        custom_fields: List[BaseCF] = current_app.config[self.config_key]
+        return {cf.name: cf.mapping for cf in custom_fields}
+
+    @property
+    def mapping_settings(self):
+        return {}
+
+    def search_dump(self, data):
+        custom_fields = current_app.config.get(self.config_key, {})
+
+        for cf in custom_fields:
+            cf.dump(data, cf_key=self.key)
+        return data
+
+    def search_load(self, data):
+        custom_fields = current_app.config.get(self.config_key, {})
+
+        for cf in custom_fields:
+            cf.load(data, cf_key=self.key)
+        return data
+
 
 class CustomFields(CustomFieldsMixin, DictField):
-    pass
+    @property
+    def mapping(self):
+        return {self.key: {"type": "object", "properties": super().mapping}}
 
 
 class InlinedCustomFields(CustomFieldsMixin, SystemField):

oarepo_runtime/cf/cli.py

@@ -12,15 +12,6 @@ def cf():
 
 
 @cf.command(name="init", help="Prepare custom fields in indices")
-@click.option(
-    "-f",
-    "--field-name",
-    "field_names",
-    type=str,
-    required=False,
-    multiple=True,
-    help="A custom field name to create. If not provided, all custom fields will be created.",
-)
 @with_appcontext
-def init(field_names):
-    prepare_cf_indices(field_names)
+def init():
+    prepare_cf_indices()

oarepo_runtime/cf/mappings.py

@@ -2,23 +2,18 @@ import inspect
 from typing import Iterable, List
 
 import click
-from flask import current_app
+import deepmerge
 from invenio_records_resources.proxies import current_service_registry
-from invenio_records_resources.services.custom_fields import BaseCF
 from invenio_records_resources.services.custom_fields.mappings import (
     Mapping as InvenioMapping,
 )
-from invenio_records_resources.services.custom_fields.validate import (
-    validate_custom_fields,
-)
 from invenio_records_resources.services.records.config import RecordServiceConfig
 from invenio_records_resources.services.records.service import RecordService
 from invenio_search import current_search_client
 from invenio_search.engine import dsl, search
 from invenio_search.utils import build_alias_name
 
-from oarepo_runtime.cf import CustomFieldsMixin
-import deepmerge
+from oarepo_runtime.records import MappingSystemFieldMixin
 
 
 class Mapping(InvenioMapping):
@@ -69,34 +64,22 @@ class Mapping(InvenioMapping):
 
 # pieces taken from https://github.com/inveniosoftware/invenio-rdm-records/blob/master/invenio_rdm_records/cli.py
 # as cf initialization is not supported directly in plain invenio
-def prepare_cf_indices(field_names: List[str] = None):
+def prepare_cf_indices():
     service: RecordService
     for service in current_service_registry._services.values():
         config: RecordServiceConfig = service.config
-        prepare_cf_index(config, field_names)
+        prepare_cf_index(config)
 
 
-def prepare_cf_index(config: RecordServiceConfig, field_names: List[str] = None):
+def prepare_cf_index(config: RecordServiceConfig):
     record_class = getattr(config, "record_cls", None)
     if not record_class:
         return
 
-    # try to get custom fields from the record class
-    # validate them
-    for field_name, available_fields in get_custom_fields(record_class):
-        validate_custom_fields(
-            given_fields=field_names, available_fields=available_fields, namespaces=[]
-        )
-
+    for fld in get_mapping_fields(record_class):
         # get mapping
-        properties = Mapping.properties_for_fields(
-            field_names, available_fields, field_name=field_name
-        )
-        settings = Mapping.settings_for_fields(
-            field_names, available_fields, field_name=field_name
-        )
-        if not properties:
-            continue
+        mapping = fld.mapping
+        settings = fld.mapping_settings
 
         # upload mapping
         try:
@@ -106,12 +89,7 @@ def prepare_cf_index(config: RecordServiceConfig, field_names: List[str] = None)
                 ),
                 using=current_search_client,
             )
-            if settings:
-                record_index.close()
-                record_index.put_settings(body=settings)
-                record_index.open()
-            if properties:
-                record_index.put_mapping(body={"properties": properties})
+            update_index(record_index, settings, mapping)
 
             if hasattr(config, "draft_cls"):
                 draft_index = dsl.Index(
@@ -120,15 +98,24 @@ def prepare_cf_index(config: RecordServiceConfig, field_names: List[str] = None)
                     ),
                     using=current_search_client,
                 )
-                draft_index.put_mapping(body={"properties": properties})
+                update_index(draft_index, settings, mapping)
 
         except search.RequestError as e:
             click.secho("An error occurred while creating custom fields.", fg="red")
             click.secho(e.info["error"]["reason"], fg="red")
 
 
-def get_custom_fields(record_class) -> Iterable[List[BaseCF]]:
+def update_index(record_index, settings, mapping):
+    if settings:
+        record_index.close()
+        record_index.put_settings(body=settings)
+        record_index.open()
+    if mapping:
+        record_index.put_mapping(body={"properties": mapping})
+
+
+def get_mapping_fields(record_class) -> Iterable[MappingSystemFieldMixin]:
     for cfg_name, cfg_value in inspect.getmembers(
-        record_class, lambda x: isinstance(x, CustomFieldsMixin)
+        record_class, lambda x: isinstance(x, MappingSystemFieldMixin)
     ):
-        yield cfg_value._key, current_app.config[cfg_value.config_key]
+        yield cfg_value

oarepo_runtime/cli/index.py

@@ -1,4 +1,3 @@
-import itertools
 import sys
 
 import click

oarepo_runtime/records/__init__.py

@@ -0,0 +1,29 @@
+import inspect
+
+from invenio_records.dumpers import SearchDumperExt
+
+
+class MappingSystemFieldMixin:
+    @property
+    def mapping(self):
+        return {}
+
+    @property
+    def mapping_settings(self):
+        return {}
+
+
+class SystemFieldDumperExt(SearchDumperExt):
+    def dump(self, record, data):
+        """Dump custom fields."""
+        for cf in inspect.getmembers(
+            record, lambda x: isinstance(x, MappingSystemFieldMixin)
+        ):
+            cf[1].search_dump(data)
+
+    def load(self, data, record_cls):
+        """Load custom fields."""
+        for cf in inspect.getmembers(
+            record_cls, lambda x: isinstance(x, MappingSystemFieldMixin)
+        ):
+            cf[1].search_load(data)

oarepo_runtime/records/icu.py

@@ -0,0 +1,132 @@
+from functools import cached_property
+from typing import Dict
+
+from flask import current_app
+from invenio_records.systemfields import SystemField
+
+from oarepo_runtime.records import MappingSystemFieldMixin
+from oarepo_runtime.relations.lookup import lookup_key
+
+
+class ICUField(SystemField):
+    """
+    A system field that acts as an opensearch "proxy" to another field.
+    It creates a top-level mapping field with the same name and copies
+    content of {another field}.language into {mapping field}.language.
+
+    The language accessor can be modified by overriding get_values method.
+    """
+
+    def __init__(self, *, source_field, key=None):
+        super().__init__(key)
+        self.source_field = source_field
+
+    @cached_property
+    def languages(self) -> Dict[str, Dict]:
+        icu_languages = current_app.config.get("OAREPO_ICU_LANGUAGES", {})
+        if icu_languages:
+            return icu_languages
+
+        primary_language = current_app.config.get("BABEL_DEFAULT_LOCALE", "en")
+        # list of tuples [lang, title], just take lang
+        babel_languages = [x[0] for x in current_app.config.get("I18N_LANGUAGES", [])]
+
+        return {primary_language: {}, **{k: {} for k in babel_languages}}
+
+    def get_values(self, data, language):
+        ret = []
+        for l in lookup_key(data, f"{self.source_field}"):
+            if isinstance(l.value, str):
+                ret.append(l.value)
+            elif isinstance(l.value, dict):
+                val = l.value.get(language)
+                if val:
+                    ret.append(val)
+        return ret
+
+    def search_dump(self, data):
+        ret = {}
+        for lang in self.languages:
+            ret[lang] = self.get_values(data, lang)
+        data[self.attr_name] = ret
+
+    def search_load(self, data):
+        data.pop(self.attr_name, None)
+
+    def __get__(self, instance, owner):
+        return self
+
+
+class ICUSortField(MappingSystemFieldMixin, ICUField):
+    """
+    A field that adds icu sorting field
+    """
+
+    def __init__(self, *, source_field, key=None):
+        super().__init__(source_field=source_field, key=key)
+
+    @property
+    def mapping(self):
+        return {
+            self.attr_name: {
+                "type": "object",
+                "properties": {
+                    lang: {
+                        "type": "icu_collation_keyword",
+                        "index": False,
+                        "language": lang,
+                        **setting.get("collation", {}),
+                    }
+                    for lang, setting in self.languages.items()
+                },
+            },
+        }
+
+
+class ICUSuggestField(MappingSystemFieldMixin, ICUField):
+    """
+    A field that adds icu-aware suggestion field
+    """
+
+    def __init__(self, source_field, key=None):
+        super().__init__(source_field=source_field, key=key)
+
+    @property
+    def mapping(self):
+        return {
+            self.attr_name: {
+                "type": "object",
+                "properties": {
+                    lang: setting.get(
+                        "suggest",
+                        {
+                            "type": "text",
+                            "fields": {
+                                "original": {
+                                    "type": "search_as_you_type",
+                                },
+                                "no_accent": {
+                                    "type": "search_as_you_type",
+                                    "analyzer": "accent_removal_analyzer",
+                                },
+                            },
+                        },
+                    )
+                    for lang, setting in self.languages.items()
+                },
+            },
+        }
+
+    @property
+    def mapping_settings(self):
+        return {
+            "analysis": {
+                "analyzer": {
+                    "accent_removal_analyzer": {
+                        "type": "custom",
+                        "tokenizer": "standard",
+                        "filter": ["lowercase", "asciifolding"],
+                    }
+                }
+            }
+        }

oarepo_runtime/relations/errors.py

@@ -12,5 +12,7 @@ class MultipleInvalidRelationErrors(Exception):
     """
 
     def __init__(self, errors):
-        super().__init__("; ".join([f"{e[0]}: {type(e[1]).__name__}({e[1]})" for e in errors]))
+        super().__init__(
+            "; ".join([f"{e[0]}: {type(e[1]).__name__}({e[1]})" for e in errors])
+        )
         self.errors = errors

oarepo_runtime/services/icu.py

@@ -0,0 +1,160 @@
+import dataclasses
+import inspect
+from typing import List
+
+# TODO: integrate this to invenio_records_resources.services.records and remove SearchOptions class
+from flask_babelex import lazy_gettext as _
+from invenio_records_resources.proxies import current_service_registry
+from invenio_records_resources.services.records import (
+    SearchOptions as InvenioSearchOptions,
+)
+from invenio_records_resources.services.records.queryparser import SuggestQueryParser
+
+from oarepo_runtime.records.icu import ICUSuggestField
+
+try:
+    from invenio_i18n import get_locale
+except ImportError:
+    from invenio_i18n.babel import get_locale
+
+
+class SearchOptions(InvenioSearchOptions):
+    sort_options = {
+        "title": dict(
+            title=_("By Title"),
+            fields=["metadata.title"],  # ES defaults to desc on `_score` field
+        ),
+        "bestmatch": dict(
+            title=_("Best match"),
+            fields=["_score"],  # ES defaults to desc on `_score` field
+        ),
+        "newest": dict(
+            title=_("Newest"),
+            fields=["-created"],
+        ),
+        "oldest": dict(
+            title=_("Oldest"),
+            fields=["created"],
+        ),
+    }
+
+
+@dataclasses.dataclass
+class SuggestField:
+    field: str
+    boost: int
+    use_ngrams: bool = True
+    boost_exact: float = 5
+    boost_2gram: float = 1
+    boost_3gram: float = 1
+    boost_prefix: float = 1
+
+
+class ICUSuggestParser:
+    def __init__(
+        self,
+        record_cls_or_service_name,
+        extra_fields: List[SuggestField] = None,
+        default_fields: List[SuggestField] = None,
+    ):
+        self.record_cls_or_service_name = record_cls_or_service_name
+        self.extra_fields = extra_fields or []
+        self.default_fields = default_fields or []
+
+    @property
+    def record_cls(self):
+        if not isinstance(self.record_cls_or_service_name, str):
+            return self.record_cls_or_service_name
+        return current_service_registry.get(
+            self.record_cls_or_service_name
+        ).config.record_cls
+
+    def __get__(self, instance, owner):
+        search_as_you_type_fields: List[SuggestField] = []
+        locale = get_locale()
+        if locale:
+            language = locale.language
+
+            for fld_name, fld in inspect.getmembers(
+                self.record_cls, lambda x: isinstance(x, ICUSuggestField)
+            ):
+                search_as_you_type_fields.append(
+                    SuggestField(f"{fld_name}.{language}.original", 2)
+                )
+                search_as_you_type_fields.append(
+                    SuggestField(f"{fld_name}.{language}.no_accent", 1)
+                )
+
+        if not search_as_you_type_fields:
+            search_as_you_type_fields.extend(self.default_fields)
+
+        search_as_you_type_fields.extend(self.extra_fields)
+
+        fields = []
+        for fld in search_as_you_type_fields:
+            fields.append(f"{fld.field}^{fld.boost * fld.boost_exact}")
+            if fld.use_ngrams:
+                fields.append(f"{fld.field}._2gram^{fld.boost * fld.boost_2gram}")
+                fields.append(f"{fld.field}._3gram^{fld.boost * fld.boost_3gram}")
+                fields.append(
+                    f"{fld.field}._index_prefix^{fld.boost * fld.boost_prefix}"
+                )
+
+        return SuggestQueryParser.factory(
+            fields=fields,
+        )
+
+
+@dataclasses.dataclass
+class SortField:
+    option_name: str = "title"
+    icu_sort_field: str = "sort"
+    title: str = "Title"
+
+
+class ICUSortOptions:
+    def __init__(self, record_cls_or_service_name, fields: List[SortField] = None):
+        self.record_cls_or_service_name = record_cls_or_service_name
+        self.fields = fields or [SortField()]
+
+    @property
+    def record_cls(self):
+        if not isinstance(self.record_cls_or_service_name, str):
+            return self.record_cls_or_service_name
+        return current_service_registry.get(
+            self.record_cls_or_service_name
+        ).config.record_cls
+
+    def __get__(self, instance, owner):
+        if not inspect.isclass(owner):
+            owner = type(owner)
+        super_options = {}
+        for mro in list(owner.mro())[1:]:
+            if hasattr(mro, "sort_options"):
+                super_options = mro.sort_options
+                break
+
+        ret = {
+            **super_options,
+            **getattr(owner, "extra_sort_options", {}),
+        }
+
+        # transform the sort options by the current language
+        locale = get_locale()
+        if not locale:
+            return ret
+
+        language = locale.language
+
+        for sort_field in self.fields:
+            icu_field = getattr(self.record_cls, sort_field.icu_sort_field)
+            ret[sort_field.option_name] = {
+                "title": sort_field.title,
+                "fields": [f"{icu_field.key}.{language}"],
+            }
+        return ret
+
+
+class I18nSearchOptions(SearchOptions):
+    extra_sort_options = {}
+    record_cls = None

{oarepo_runtime-1.4.12.dist-info → oarepo_runtime-1.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.4.12
+Version: 1.4.13
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -106,71 +106,37 @@ preconfigured permission sets to service config.
 
 To use ICU sort and suggestion custom fields, provide the following configuration
 to `oarepo-model-builder` (or put this stuff to your custom superclasses).
-Please rename those RUNTIME_TEST_XXX to your constants
 
 ```yaml
   record:
     imports:
-      - import: oarepo_runtime.cf.CustomFields
       - import: invenio_records_resources.records.api.Record
         alias: InvenioRecord
-      - import: invenio_records_resources.records.dumpers.CustomFieldsDumperExt
+      - import: oarepo_runtime.records.SystemFieldDumperExt
+      - import: oarepo_runtime.records.icu.ICUSortField
+      - import: oarepo_runtime.records.icu.ICUSuggestField
     extra-code: |-2
           # extra custom fields for testing ICU sorting and suggesting
-          sort = CustomFields(
-              "RUNTIME_TEST_SORT_CF",
-              "sort",
-              clear_none=True,
-              create_if_missing=True,
-          )
-          suggest = CustomFields(
-              "RUNTIME_TEST_SUGGEST_CF",
-              "suggest",
-              clear_none=True,
-              create_if_missing=True,
-          )
+          sort = ICUSortField(source_field="metadata.title")
+          suggest = ICUSuggestField(source_field="metadata.title")
   search-options:
     base-classes:
       - I18nSearchOptions
     imports:
-      - import: oarepo_runtime.services.search.I18nSearchOptions
+      - import: oarepo_runtime.services.icu.I18nSearchOptions
+      - import: oarepo_runtime.services.icu.ICUSuggestParser
+      - import: oarepo_runtime.services.icu.ICUSortOptions
     sort-options-field: extra_sort_options
     extra-code: |-2
-          SORT_CUSTOM_FIELD_NAME = "RUNTIME_TEST_SORT_CF"
-          SUGGEST_CUSTOM_FIELD_NAME = "RUNTIME_TEST_SUGGEST_CF"
+          suggest_parser_cls = ICUSuggestParser("records2")
+          sort_options = ICUSortOptions("records2")
 
   record-dumper:
     extensions:
-      - CustomFieldsDumperExt("RUNTIME_TEST_SORT_CF", "sort")
-      - CustomFieldsDumperExt("RUNTIME_TEST_SUGGEST_CF", "suggest")
+      - SystemFieldDumperExt()
 ```
 
-Then add the constants to your invenio.cfg
-
-```python
-from oarepo_runtime.cf.icu import ICUSortCF, ICUSuggestCF
-
-RUNTIME_TEST_SORT_CF = [
-   ICUSortCF(
-        language = "cs",
-        opensearch_language = "czech",
-        source_field = "metadata.title",
-        # cf_name=None,   # name of generated custom field, default is <language>
-        # country=None,    
-        # variant=None,
-        # sort_option=None, # default is last part of <source_field>
-    )
-]
-RUNTIME_TEST_SUGGEST_CF = [
-   ICUSuggestCF(
-      language="cs", 
-      opensearch_language="czech", 
-      source_field="metadata.title",
-      # cf_name = None    # name of generated custom field, default is <language>
-   )
-]
-```
-
-Then run `invenio oarepo cf init` to initialize custom fields,
-`invenio oarepo index reindex` if you already have data inside the repository
-and from this moment on, `/records?sort=title` 
+Run `invenio oarepo cf init` to initialize custom fields,
+`invenio oarepo index reindex` if you already have data 
+inside the repository and from this moment on, 
+`/records?sort=title` and `/records?suggest=abc` should work

{oarepo_runtime-1.4.12.dist-info → oarepo_runtime-1.4.13.dist-info}/RECORD

@@ -5,15 +5,14 @@ oarepo_runtime/marshmallow.py,sha256=BaRh9Z07h2DznYMyYxiTmSfe4EJaeXvTY8lKVyvVGa4
 oarepo_runtime/polymorphic.py,sha256=CkvXVUiXbrsLWFgoNnjjpUviQyzRMCmpsD3GWfV0WZA,494
 oarepo_runtime/profile.py,sha256=QzrQoZncjoN74ZZnpkEKakNk08KCzBU7m6y42RN8AMY,1637
 oarepo_runtime/uow.py,sha256=TqVYF1N24WTVIjf97mlb-EH-BtIZCVVLNS4bqZt4XLs,3201
-oarepo_runtime/cf/__init__.py,sha256=z6PcNsz2Xtp6ozDeZ25plYjmjKaKHXoovd_uzjKzRFs,1322
-oarepo_runtime/cf/cli.py,sha256=Q4WJKf8fL18Sl1Imbr1viilEnLLsJqcc-us77sCdtEs,552
-oarepo_runtime/cf/icu.py,sha256=DPFOgje9L1a2DmOtDvb-rKmjWezAp_veJFkhfKBU9pg,2920
-oarepo_runtime/cf/mappings.py,sha256=uCLyMEchJPtQLR5jUQKZmuZkWAMRXLk5JnNOH30E3Y0,4901
+oarepo_runtime/cf/__init__.py,sha256=-YhE1JnHrX-qS_IT_1Lh5_OQ2OMbErQyZ3mPxLbiYqw,2241
+oarepo_runtime/cf/cli.py,sha256=gUD4tRV57ixpgQxECN-eporJnC9etBfHE-FNKEOUUsY,316
+oarepo_runtime/cf/mappings.py,sha256=6KKiS93tMPZOcmdBBvfXh3VOAh5Kw8xdXh2ER2PP0Xo,4200
 oarepo_runtime/cli/__init__.py,sha256=-WGXmjHoSqiApR_LvYnZTimuL-frR7SynrsSklnjb3A,221
 oarepo_runtime/cli/assets.py,sha256=XLZTnsGb88O5N8R2D3AYpZqtnO4JrbybUtRLKnL1p3w,2430
 oarepo_runtime/cli/base.py,sha256=xZMsR2rati5Mz0DZzmnlhVI7E6ePCfnOiTayrxT9cWU,259
 oarepo_runtime/cli/check.py,sha256=zQ6txhfN6LWvdWgRa3ZFdOifbuazoRQd-7ml0qwIBWg,2358
-oarepo_runtime/cli/index.py,sha256=fZMMw0Z4vwJ9fe7g8tb4wyoAMKeushxORvIUgxWQA40,4701
+oarepo_runtime/cli/index.py,sha256=bZHxsJDzCv96_6n27lmLE9ssTgx3NViq9lTeRUJBv-4,4684
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
@@ -58,10 +57,12 @@ oarepo_runtime/i18n/dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU
 oarepo_runtime/i18n/schema.py,sha256=wJLyE4Ew4mqEGoMpM6JOsyyqGCV_R4YgWQUm45AHVPU,1184
 oarepo_runtime/i18n/ui_schema.py,sha256=_iMUkHI8fPQT9hJziSMqYRyGmozgJrY5qQo1Y7Fmuo4,2085
 oarepo_runtime/i18n/validation.py,sha256=fyMTi2Rw-KiHv7c7HN61zGxRVa9sAjAEEkAL5wUyKNo,236
+oarepo_runtime/records/__init__.py,sha256=jzKWn4jaVKZvysPZHtqWE_SWExh_4DBz7YSgflFyYoM,721
+oarepo_runtime/records/icu.py,sha256=h8RkqAO8d0LOqj27IVa-B-Bqs08na0lffqczJZHTgUU,4137
 oarepo_runtime/relations/__init__.py,sha256=bDAgxl_LdKsqpGG3qluxAkQnn5u2ItJngnHQKkqzlkE,373
 oarepo_runtime/relations/base.py,sha256=I5XANA-fFbiH3xQ1s7x1NVJFaiSRKCc6-xyNy1LEfpw,8739
 oarepo_runtime/relations/components.py,sha256=J9rvzaAoRDbSVuA01hIOlXKQP-OE5VJI5w5xuMsFO70,602
-oarepo_runtime/relations/errors.py,sha256=n898MgnkF2T7iOG-VJCOV0of27mJrCNCOLqbeKUv2rA,530
+oarepo_runtime/relations/errors.py,sha256=VtlOKq9MEUeJ4IsiZhY7lWoshrusA_RL4SOHe2titno,552
 oarepo_runtime/relations/internal.py,sha256=OTp8iJqyl80sWDk0Q0AK42l6UsxZDABspVU_GwWza9o,1556
 oarepo_runtime/relations/lookup.py,sha256=wi3jPfOedazOmhOMrgu50PUETc1jfSdpmjK0wvOFsEM,848
 oarepo_runtime/relations/mapping.py,sha256=jwFCWCnW8hb44ZZBeVf96QR79S9FT2hvm4L8EuCBo5U,1277
@@ -70,7 +71,7 @@ oarepo_runtime/relations/uow.py,sha256=KrN8B-wVbmb0kOErxb7bAhPmOR6-mMRgBr-ab-ir6
 oarepo_runtime/resolvers/__init__.py,sha256=kTlvSiympib59YQV7wEKpIXGprPWRuvxLIwmeeQdUec,89
 oarepo_runtime/resolvers/proxies.py,sha256=egtT7uXL91KswWI7gqUIaz1vWIHezdsiI_M-xRKXWww,547
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/services/search.py,sha256=eMOosBgDAsscm8YpU7ckhaD9iBNnjE6z7-QWevwV-PI,3692
+oarepo_runtime/services/icu.py,sha256=5uxCHEBIEBlKo8IO4y_GA6InYVPAq6sPmWXWeBOXLA8,4969
 oarepo_runtime/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/tasks/datastreams.py,sha256=_EJZuHg2UoIJCrrOo0J7e8uCSoXIpJsRJnsb8sorWJc,10810
 oarepo_runtime/translations/messages.pot,sha256=NfZakWEYMZE_6HvnKxO7B61UnHnWgtKSvSKMJQ6msK0,971
@@ -84,9 +85,9 @@ oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,
 oarepo_runtime/validation/__init__.py,sha256=lU7DgZq8pGD5Pa-QqL9gvLsib3IYtM-Y56k-NwHrPG0,166
 oarepo_runtime/validation/dates.py,sha256=fahqKGDdIYWux5ZeoljrEe8VD2fDZR9VpfvYmTYAmpw,1050
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.4.12.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.4.12.dist-info/METADATA,sha256=lmrnBtECyezkWgVcZNI_OJT2O7-AFMY9sDf8rERu5Bc,5179
-oarepo_runtime-1.4.12.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-oarepo_runtime-1.4.12.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
-oarepo_runtime-1.4.12.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.4.12.dist-info/RECORD,,
+oarepo_runtime-1.4.13.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.4.13.dist-info/METADATA,sha256=qQgSqdIgdpLdcP8i5I8j9B3b_bhyHLdJGUxZGYu4u3Y,4288
+oarepo_runtime-1.4.13.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+oarepo_runtime-1.4.13.dist-info/entry_points.txt,sha256=C32W4eT-8OypMCfwOO5WREioVKSneDfY51D78Uvdbp0,231
+oarepo_runtime-1.4.13.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.4.13.dist-info/RECORD,,

oarepo_runtime/cf/icu.py

@@ -1,105 +0,0 @@
-from invenio_records_resources.services.custom_fields import BaseCF
-
-from oarepo_runtime.relations.lookup import lookup_key
-
-
-class ICUSortCF(BaseCF):
-    def __init__(
-        self,
-        language,
-        opensearch_language,
-        source_field,
-        cf_name=None,
-        country=None,
-        variant=None,
-        sort_option=None,
-        field_args=None,
-    ):
-        super().__init__(name=cf_name or language, field_args=field_args)
-        self.opensearch_language = opensearch_language
-        self.country = country
-        self.variant = variant
-        self.source_field = source_field
-        self.sort_option = sort_option or source_field.rsplit(".", maxsplit=1)[-1]
-        self.language = language
-
-    @property
-    def mapping(self):
-        ret = {
-            "type": "icu_collation_keyword",
-            "index": False,
-            "language": self.opensearch_language,
-        }
-        if self.country:
-            ret["country"] = self.country
-
-        if self.variant:
-            ret["variant"] = self.variant
-
-        return ret
-
-    @property
-    def field(self):
-        return None
-
-    def dump(self, record, cf_key="custom_fields"):
-        ret = []
-        for l in lookup_key(record, self.source_field):
-            ret.append(l.value)
-        record.setdefault(cf_key, {})[self.name] = ret
-
-    def load(self, record, cf_key="custom_fields"):
-        record.pop(cf_key, None)
-
-
-class ICUSuggestCF(BaseCF):
-    def __init__(
-        self, language, opensearch_language, source_field, cf_name=None, field_args=None
-    ):
-        super().__init__(name=cf_name or language, field_args=field_args)
-        self.opensearch_language = opensearch_language
-        self.source_field = source_field
-        self.language = language
-
-    @property
-    def mapping(self):
-        ret = {
-            "type": "text",
-            "fields": {
-                "original": {
-                    "type": "search_as_you_type",
-                },
-                "no_accent": {
-                    "type": "search_as_you_type",
-                    "analyzer": "accent_removal_analyzer",
-                },
-            },
-        }
-        return ret
-
-    @property
-    def mapping_settings(self):
-        return {
-            "analysis": {
-                "analyzer": {
-                    "accent_removal_analyzer": {
-                        "type": "custom",
-                        "tokenizer": "standard",
-                        "filter": ["lowercase", "asciifolding"],
-                    }
-                }
-            }
-        }
-
-    @property
-    def field(self):
-        return None
-
-    def dump(self, record, cf_key="custom_fields"):
-        ret = []
-        for l in lookup_key(record, self.source_field):
-            ret.append(l.value)
-        record.setdefault(cf_key, {})[self.name] = ret
-
-    def load(self, record, cf_key="custom_fields"):
-        record.pop(cf_key, None)

oarepo_runtime/services/search.py

@@ -1,112 +0,0 @@
-import dataclasses
-from typing import Tuple, List
-
-from invenio_records_resources.services.records import (
-    SearchOptions as InvenioSearchOptions,
-)
-
-# TODO: integrate this to invenio_records_resources.services.records
-from flask_babelex import lazy_gettext as _
-from invenio_records_resources.services.records.queryparser import SuggestQueryParser
-from sqlalchemy.util import classproperty
-from flask import current_app
-
-from oarepo_runtime.cf.icu import ICUSortCF
-
-try:
-    from invenio_i18n import get_locale
-except ImportError:
-    from invenio_i18n.babel import get_locale
-
-
-class SearchOptions(InvenioSearchOptions):
-    sort_options = {
-        "title": dict(
-            title=_("By Title"),
-            fields=["metadata.title"],  # ES defaults to desc on `_score` field
-        ),
-        "bestmatch": dict(
-            title=_("Best match"),
-            fields=["_score"],  # ES defaults to desc on `_score` field
-        ),
-        "newest": dict(
-            title=_("Newest"),
-            fields=["-created"],
-        ),
-        "oldest": dict(
-            title=_("Oldest"),
-            fields=["created"],
-        ),
-    }
-
-
-@dataclasses.dataclass
-class SuggestField:
-    field: str
-    boost: int
-    use_ngrams: bool = True
-    boost_exact: float = 5
-    boost_2gram: float = 1
-    boost_3gram: float = 1
-    boost_prefix: float = 1
-
-
-class I18nSearchOptions(SearchOptions):
-    SORT_CUSTOM_FIELD_NAME = None
-    SUGGEST_CUSTOM_FIELD_NAME = None
-    SUGGEST_SEARCH_AS_YOU_TYPE_FIELDS: Tuple[SuggestField] = (
-        SuggestField("metadata.title", 1, use_ngrams=False),
-        SuggestField("id", 1, use_ngrams=False),
-    )
-    extra_sort_options = {}
-
-    @classproperty
-    def sort_options(clz):
-        ret = {**super().sort_options, **clz.extra_sort_options}
-        if not clz.SORT_CUSTOM_FIELD_NAME:
-            return ret
-
-        # transform the sort options by the current language
-        locale = get_locale()
-        if not locale:
-            return ret
-        language = locale.language
-        cf: ICUSortCF
-        for cf in current_app.config[clz.SORT_CUSTOM_FIELD_NAME]:
-            if cf.language == language:
-                if cf.sort_option not in ret:
-                    ret[cf.sort_option] = {"title": _(cf.sort_option.capitalize())}
-                ret[cf.sort_option]["fields"] = [f"sort.{cf.name}"]
-        return ret
-
-    @classproperty
-    def suggest_parser_cls(clz):
-        search_as_you_type_fields: List[SuggestField] = []
-        locale = get_locale()
-
-        if clz.SUGGEST_CUSTOM_FIELD_NAME and locale:
-            language = locale.language
-            for cf in current_app.config[clz.SUGGEST_CUSTOM_FIELD_NAME]:
-                if cf.language == language:
-                    search_as_you_type_fields.append(
-                        SuggestField(f"suggest.{cf.name}.original", 2)
-                    )
-                    search_as_you_type_fields.append(
-                        SuggestField(f"suggest.{cf.name}.no_accent", 1)
-                    )
-        if not search_as_you_type_fields:
-            search_as_you_type_fields = clz.SUGGEST_SEARCH_AS_YOU_TYPE_FIELDS  # noqa
-
-        fields = []
-        for fld in search_as_you_type_fields:
-            fields.append(f"{fld.field}^{fld.boost * fld.boost_exact}")
-            if fld.use_ngrams:
-                fields.append(f"{fld.field}._2gram^{fld.boost * fld.boost_2gram}")
-                fields.append(f"{fld.field}._3gram^{fld.boost * fld.boost_3gram}")
-                fields.append(
-                    f"{fld.field}._index_prefix^{fld.boost * fld.boost_prefix}"
-                )
-
-        return SuggestQueryParser.factory(
-            fields=fields,
-        )