oarepo-runtime 1.5.40__tar.gz → 1.5.42__tar.gz

{oarepo_runtime-1.5.40/oarepo_runtime.egg-info → oarepo_runtime-1.5.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.40
+Version: 1.5.42
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.40 → oarepo_runtime-1.5.42}/oarepo_runtime/records/systemfields/icu.py

@@ -146,6 +146,12 @@ class ICUSearchField(ICUField):
             "tokenizer": "standard",
             "filter": ["stemming_filter_en"],
         },
+        "ascii_folding_analyzer": {
+            "tokenizer": "standard",
+            "filter": [
+                "ascii_folding_filter"
+            ]
+        },
     }
 
     default_stemming_filters = {
@@ -159,6 +165,10 @@ class ICUSearchField(ICUField):
             "name": "english",
             "language": "english",
         },
+        "ascii_folding_filter": {
+            "type": "asciifolding",
+            "preserve_original": True
+        }
     }
 
     def __init__(self, source_field, key=None):
@@ -170,11 +180,24 @@ class ICUSearchField(ICUField):
             self.attr_name: {
                 "type": "object",
                 "properties": {
+                    # normal stemming
                     lang: setting.get(
                         "search",
                         {
                             "type": "text",
-                            "analyzer": f"stemming_analyzer_{lang}",
+                            "boost": 1,
+                            "fields": {
+                                "stemmed": {
+                                    "type": "text",
+                                    "analyzer": f"stemming_analyzer_{lang}",
+                                    "boost": 0.5,
+                                },
+                                "ascii_folded": {
+                                    "type": "text",
+                                    "analyzer": "ascii_folding_analyzer",
+                                    "boost": 0.3,
+                                },
+                            }
                         },
                     )
                     for lang, setting in self.languages.items()

{oarepo_runtime-1.5.40 → oarepo_runtime-1.5.42}/oarepo_runtime/records/systemfields/owner.py

@@ -82,6 +82,12 @@ class OwnersField(MappingSystemFieldMixin, SystemField):
         return {
             self.attr_name: {
                 "type": "object",
+                "properties": {
+                    "user": {
+                        "type": "keyword",
+                        "ignore_above": 256
+                    }
+                }
             },
         }
 

{oarepo_runtime-1.5.40 → oarepo_runtime-1.5.42}/oarepo_runtime/services/custom_fields/mappings.py

@@ -19,7 +19,7 @@ from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 class Mapping(InvenioMapping):
     @classmethod
     def properties_for_fields(
-        cls, given_fields_names, available_fields, field_name="custom_fields"
+            cls, given_fields_names, available_fields, field_name="custom_fields"
     ):
         """Prepare search mapping properties for each field."""
 
@@ -34,7 +34,7 @@ class Mapping(InvenioMapping):
 
     @classmethod
     def settings_for_fields(
-        cls, given_fields_names, available_fields, field_name="custom_fields"
+            cls, given_fields_names, available_fields, field_name="custom_fields"
     ):
         """Prepare mapping settings for each field."""
 
@@ -72,10 +72,11 @@ def prepare_cf_indices():
         if record_class:
             prepare_cf_index(record_class, config)
             parent_class = getattr(record_class, "parent_record_cls", None)
-            prepare_cf_index(parent_class, config)
+            prepare_parent_mapping(parent_class, config)
+            prepare_cf_index(parent_class, config, path=["parent", "properties"])
 
 
-def prepare_cf_index(record_class, config):
+def prepare_cf_index(record_class, config, path=[]):
     if not record_class:
         return
 
@@ -85,6 +86,11 @@ def prepare_cf_index(record_class, config):
         settings = fld.mapping_settings
         dynamic_templates = fld.dynamic_templates
 
+        for pth in reversed(path):
+            mapping = {
+                pth: mapping
+            }
+
         # upload mapping
         try:
             record_index = dsl.Index(
@@ -109,6 +115,79 @@ def prepare_cf_index(record_class, config):
             click.secho(e.info["error"]["reason"], fg="red")
 
 
+def prepare_parent_mapping(parent_class, config):
+    if not parent_class:
+        return
+    parent_mapping = {
+        "parent": {
+            "type": "object",
+            "properties": {
+                "created": {
+                    "type": "date",
+                    "format": "strict_date_time||strict_date_time_no_millis||basic_date_time||basic_date_time_no_millis||basic_date||strict_date||strict_date_hour_minute_second||strict_date_hour_minute_second_fraction"
+                },
+                "id": {
+                    "type": "keyword",
+                    "ignore_above": 1024
+                },
+                "pid": {
+                    "properties": {
+                        "obj_type": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        },
+                        "pid_type": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        },
+                        "pk": {
+                            "type": "long"
+                        },
+                        "status": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        }
+                    }
+                },
+                "updated": {
+                    "type": "date",
+                    "format": "strict_date_time||strict_date_time_no_millis||basic_date_time||basic_date_time_no_millis||basic_date||strict_date||strict_date_hour_minute_second||strict_date_hour_minute_second_fraction"
+                },
+                "uuid": {
+                    "type": "keyword",
+                    "ignore_above": 1024
+                },
+                "version_id": {
+                    "type": "long"
+                }
+            }
+        }
+    }
+
+    # upload mapping
+    try:
+        record_index = dsl.Index(
+            build_alias_name(
+                config.record_cls.index._name,
+            ),
+            using=current_search_client,
+        )
+        update_index(record_index, {}, parent_mapping)
+
+        if hasattr(config, "draft_cls"):
+            draft_index = dsl.Index(
+                build_alias_name(
+                    config.draft_cls.index._name,
+                ),
+                using=current_search_client,
+            )
+            update_index(draft_index, {}, parent_mapping)
+
+    except search.RequestError as e:
+        click.secho("An error occurred while creating parent mapping.", fg="red")
+        click.secho(e.info["error"]["reason"], fg="red")
+
+
 def update_index(record_index, settings, mapping, dynamic_templates=None):
     if settings:
         record_index.close()
@@ -125,6 +204,6 @@ def update_index(record_index, settings, mapping, dynamic_templates=None):
 
 def get_mapping_fields(record_class) -> Iterable[MappingSystemFieldMixin]:
     for cfg_name, cfg_value in inspect.getmembers(
-        record_class, lambda x: isinstance(x, MappingSystemFieldMixin)
+            record_class, lambda x: isinstance(x, MappingSystemFieldMixin)
     ):
         yield cfg_value

{oarepo_runtime-1.5.40 → oarepo_runtime-1.5.42/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.40
+Version: 1.5.42
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.40 → oarepo_runtime-1.5.42}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.40
+version = 1.5.42
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md