oarepo-runtime 1.7.1__py3-none-any.whl → 1.7.2__py3-none-any.whl

oarepo_runtime/services/custom_fields/mappings.py

@@ -9,17 +9,16 @@ from invenio_records_resources.services.custom_fields.mappings import (
 )
 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 invenio_search.engine import search
 from deepmerge import always_merger
 from oarepo_runtime.records.systemfields.mapping import MappingSystemFieldMixin
 import json
-import os
 
 from pathlib import Path
 
+from oarepo_runtime.utils.index import prefixed_index
+
+
 class Mapping(InvenioMapping):
     @classmethod
     def properties_for_fields(
@@ -95,21 +94,11 @@ def prepare_cf_index(record_class, config, path=[]):
 
         # upload mapping
         try:
-            record_index = dsl.Index(
-                build_alias_name(
-                    config.record_cls.index._name,
-                ),
-                using=current_search_client,
-            )
+            record_index = prefixed_index(config.record_cls.index)
             update_index(record_index, settings, mapping)
 
             if hasattr(config, "draft_cls"):
-                draft_index = dsl.Index(
-                    build_alias_name(
-                        config.draft_cls.index._name,
-                    ),
-                    using=current_search_client,
-                )
+                draft_index = prefixed_index(config.draft_cls.index)
                 update_index(draft_index, settings, mapping, dynamic_templates)
 
         except search.RequestError as e:
@@ -166,22 +155,12 @@ def prepare_parent_mapping(parent_class, config):
     })
     # upload mapping
     try:
-        record_index = dsl.Index(
-            build_alias_name(
-                config.record_cls.index._name,
-            ),
-            using=current_search_client,
-        )
+        record_index = prefixed_index(config.record_cls.index)
         update_index(record_index, {}, parent_mapping_merged)
 
         if hasattr(config, "draft_cls"):
-            draft_index = dsl.Index(
-                build_alias_name(
-                    config.draft_cls.index._name,
-                ),
-                using=current_search_client,
-            )
-            update_index(record_index, {}, parent_mapping_merged)
+            draft_index = prefixed_index(config.draft_cls.index) # draft index isn't used; this was a bug a suppose
+            update_index(draft_index, {}, parent_mapping_merged)
 
     except search.RequestError as e:
         click.secho("An error occurred while creating parent mapping.", fg="red")

oarepo_runtime/utils/index.py

@@ -0,0 +1,11 @@
+from invenio_search import current_search_client
+from invenio_search.utils import build_alias_name
+from invenio_search.engine import dsl
+
+def prefixed_index(index):
+    return dsl.Index(
+        build_alias_name(
+            index._name,
+        ),
+        using = current_search_client
+    )

{oarepo_runtime-1.7.1.dist-info → oarepo_runtime-1.7.2.dist-info}/METADATA

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

{oarepo_runtime-1.7.1.dist-info → oarepo_runtime-1.7.2.dist-info}/RECORD

@@ -98,7 +98,7 @@ oarepo_runtime/services/config/link_conditions.py,sha256=5hDEtCaQt1tzjb9gGdeimsm
 oarepo_runtime/services/config/permissions_presets.py,sha256=b1wm3JjL8KgkaH7VMkNfdMk5fXtf3X87rB7gkvaNxns,7369
 oarepo_runtime/services/config/service.py,sha256=KS1eKXjRzusD_UAKanzKezua2lmo9vObwqd63dky1ik,4593
 oarepo_runtime/services/custom_fields/__init__.py,sha256=_gqMcA_I3rdEZcBtCuDjO4wdVCqFML5NzaccuPx5a3o,2565
-oarepo_runtime/services/custom_fields/mappings.py,sha256=3CIvjWzVRO3fZ2r-3taK1rwuLH9wj5Lguo-GvsbLBf4,7515
+oarepo_runtime/services/custom_fields/mappings.py,sha256=U43noOuANohgoZt7YoAT3B6NgDCLKIRVKigPHzsreQU,6970
 oarepo_runtime/services/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/entity/config.py,sha256=1jfdPrxSbMuKj7eOUNKRWTCPbBPyRV6MrWE4Vgf9rX0,399
 oarepo_runtime/services/entity/schema.py,sha256=8TBpUFRITaBO7qCMz36cly1Hj4I1nLa9PeSAfWSa2YM,157
@@ -148,14 +148,15 @@ oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=tq5pTCpH7cuzdwrQlp
 oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=7-5S3iINOSFSI5gVdRvT5S2rbGScrheJiUJQH_fqXmY,1914
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
+oarepo_runtime/utils/index.py,sha256=ArrUUXB-KowUcUksRKqcFpmqct4bn9alO1zd_kX2tmU,292
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
-oarepo_runtime-1.7.1.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.7.2.dist-info/licenses/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
 tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.7.1.dist-info/METADATA,sha256=rvL7MLlWJ21OM6vVVDks-Ga6iqUJiqmqEZirtr1OfbA,4788
-oarepo_runtime-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oarepo_runtime-1.7.1.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.7.1.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.7.1.dist-info/RECORD,,
+oarepo_runtime-1.7.2.dist-info/METADATA,sha256=zgNr97N1sEuZ23n7YI99fqBLKHIRKdQdxwp9vS9DtLo,4788
+oarepo_runtime-1.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oarepo_runtime-1.7.2.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.7.2.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.7.2.dist-info/RECORD,,