oarepo-runtime 1.5.39__py3-none-any.whl → 1.5.41__py3-none-any.whl

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/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/services/facets/params.py

@@ -78,6 +78,19 @@ class GroupedFacetsParam(FacetsParam):
 
         return search
 
+    def filter(self, search):
+        """Apply a post filter on the search."""
+        if not self._filters:
+            return search
+
+        filters = list(self._filters.values())
+
+        _filter = filters[0]
+        for f in filters[1:]:
+            _filter &= f
+
+        return search.filter(_filter)
+
     def apply(self, identity, search, params):
         """Evaluate the facets on the search."""
         facets_values = params.pop("facets", {})

{oarepo_runtime-1.5.39.dist-info → oarepo_runtime-1.5.41.dist-info}/METADATA

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

{oarepo_runtime-1.5.39.dist-info → oarepo_runtime-1.5.41.dist-info}/RECORD

@@ -60,7 +60,7 @@ oarepo_runtime/records/systemfields/featured_file.py,sha256=MbSaYR130_o5S9gEObln
 oarepo_runtime/records/systemfields/has_draftcheck.py,sha256=4JkMEefPLpqtPtlTgK3UT0KzTRgyw5_Qtkss2qcz5xk,1643
 oarepo_runtime/records/systemfields/icu.py,sha256=tAwplzy9y7C9Dm7HqcGZsDu2AKqVGXhCbKLsFlgVWg8,5921
 oarepo_runtime/records/systemfields/mapping.py,sha256=tXOK_jkdY1pOUO7_VfChfDNB8UTi21GUXaidpugTnO8,1017
-oarepo_runtime/records/systemfields/owner.py,sha256=uv2eTss0GyMHLXaxDUFwwM_lwbbRBH_0ALxVUOKFCoI,3755
+oarepo_runtime/records/systemfields/owner.py,sha256=U7CD71Ve9midaH72pV4A4_I7AdywqZW0BSRHAK10_qA,3944
 oarepo_runtime/records/systemfields/record_status.py,sha256=U3kem4-JkNsT17e0iAl3HIAZ2MvO5lY_0U757aZvTKE,935
 oarepo_runtime/records/systemfields/selectors.py,sha256=VlbV3FKP2h3PLU7H4-YsI4qrb0UO_SrhJ2dcsTBGoqI,900
 oarepo_runtime/records/systemfields/synthetic.py,sha256=GC7g6BZSQqVV7bFk3x6Y1E4dFgvX7VwHuIFXEDpmuSs,4238
@@ -76,7 +76,7 @@ oarepo_runtime/services/config/__init__.py,sha256=SCqww5sV8qh3gmev6TE8EyJbD58juI
 oarepo_runtime/services/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
 oarepo_runtime/services/config/service.py,sha256=2aq5jobPH22T1QqlJDommvAxJwo9aQGiqK5q-k-l9CA,4668
 oarepo_runtime/services/custom_fields/__init__.py,sha256=xJ7XEyMJHPfIgX5JKpgpwh7SYc9Zee2dC5oC8cm99Qc,2282
-oarepo_runtime/services/custom_fields/mappings.py,sha256=CYJJAGo4k6Bv6D5FLy4Js9EjhWWNThJBkosAMdZIXzI,4600
+oarepo_runtime/services/custom_fields/mappings.py,sha256=d2uWqk-x4nfoxMx7Uw_PGWKba_Wlf_ukpRB5ruU-RPU,7397
 oarepo_runtime/services/expansions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/expansions/expandable_fields.py,sha256=7DWKFL6ml8J7zGI6wm9LO7Xd6R0LSylsuq4lyRumNHQ,745
 oarepo_runtime/services/expansions/service.py,sha256=HaEy76XOhDf__sQ91hi-8iH1hthM9q07pRhOmyZyVrs,144
@@ -87,7 +87,7 @@ oarepo_runtime/services/facets/enum.py,sha256=3LrShQIt9Vt5mkqUkc6FNxXCW5JEFdPwtG
 oarepo_runtime/services/facets/facet_groups_names.py,sha256=RR8eeUmD8d9t966JqfhslZnILn_xDSfYlL0hjyJT92Y,468
 oarepo_runtime/services/facets/max_facet.py,sha256=TZ4KMKKVJHzyU1KgNne4V7IMQPu1ALRpkz61Y0labrc,407
 oarepo_runtime/services/facets/nested_facet.py,sha256=y0xgjx37HsSj2xW7URxNemYTksD8hpPs7kOEfIBw22k,971
-oarepo_runtime/services/facets/params.py,sha256=5z8I4wKdp-7RJK4x6cSKE92fDJI8OkUz5JR5UKWAeYg,3564
+oarepo_runtime/services/facets/params.py,sha256=NJLgqRYyamap6_ecpy6fgPpCl7JkcGPrY8xLl8jIZj8,3872
 oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dtv35LDo7iZeTM,268
 oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8PuR2XKaOGoNHfw,2400
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
@@ -116,9 +116,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.39.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.39.dist-info/METADATA,sha256=RGiou0J7zgp38I8Amo2FdSs2OejAezp8e3j5eqInPPg,4680
-oarepo_runtime-1.5.39.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-oarepo_runtime-1.5.39.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.39.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.39.dist-info/RECORD,,
+oarepo_runtime-1.5.41.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.41.dist-info/METADATA,sha256=Kx5C6qgpAbZSJ0XztooVip_UQC9mTSJtPgrOciV_DsM,4680
+oarepo_runtime-1.5.41.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+oarepo_runtime-1.5.41.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.41.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.41.dist-info/RECORD,,

{oarepo_runtime-1.5.39.dist-info → oarepo_runtime-1.5.41.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any