oarepo-runtime 1.5.71__py3-none-any.whl → 1.5.73__py3-none-any.whl

oarepo_runtime/cli/index.py

@@ -7,6 +7,7 @@ from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_records_resources.proxies import current_service_registry
 from invenio_search.proxies import current_search
+import traceback
 from werkzeug.utils import ImportStringError, import_string
 
 try:
@@ -102,9 +103,10 @@ def record_or_service(model):
 @click.option("--verbose/--no-verbose", default=False)
 def reindex(model, bulk_size, verbose):
     if not model:
-        services = current_service_registry._services.keys()
+        services = list(current_service_registry._services.keys())
     else:
         services = [model]
+    services = sort_services(services)
     for service_id in services:
         click.secho(f"Preparing to index {service_id}", file=sys.stderr)
 
@@ -200,14 +202,17 @@ def generate_bulk_data(record_generator, record_indexer, bulk_size):
     data = []
     n = 0
     for record in tqdm(record_generator):
-        index = record_indexer.record_to_index(record)
-        body = record_indexer._prepare_record(record, index)
-        index = record_indexer._prepare_index(index)
-        data.append({"index": {"_index": index, "_id": body["uuid"]}})
-        data.append(body)
-        if len(data) >= bulk_size:
-            yield data
-            data = []
+        try:
+            index = record_indexer.record_to_index(record)
+            body = record_indexer._prepare_record(record, index)
+            index = record_indexer._prepare_index(index)
+            data.append({"index": {"_index": index, "_id": body["uuid"]}})
+            data.append(body)
+            if len(data) >= bulk_size:
+                yield data
+                data = []
+        except:
+            traceback.print_exc()
     if data:
         yield data
 
@@ -240,5 +245,19 @@ def users_record_generator(model_class):
     except Exception as e:
         click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
 
+priorities = [
+    'vocabular',
+    'users',
+    'groups'
+]
+
+def sort_services(services):
+    def idx(x):
+        for idx, p in enumerate(priorities):
+            if p in x:
+                return idx, x
+        return len(priorities), x
+    services.sort(key=idx)
+    return services
 
 RECORD_GENERATORS = {"users": users_record_generator}

oarepo_runtime/services/components.py

@@ -9,6 +9,7 @@ from invenio_records import Record
 from oarepo_runtime.services.custom_fields import CustomFieldsMixin, CustomFields, InlinedCustomFields
 from oarepo_runtime.services.generators import RecordOwners
 
+
 try:
     from invenio_drafts_resources.services.records.uow import ParentRecordCommitOp
 except ImportError:
@@ -88,3 +89,29 @@ class CustomFieldsComponent(ServiceComponent):
                 config = current_app.config.get(cf.config_key, {})
                 for c in config:
                     record[c.name] =data.get(c.name)
+
+def process_service_configs(service_configs):
+    """
+    Processes a list of service_config classes. If a class has a `components` attribute,
+    it extends the result with the values in it.
+
+    :param service_config: List of service_config classes to process.
+    :return: A flattened list of processed components.
+    """
+    processed_components = []
+
+    for config in service_configs:
+
+        if hasattr(config, "build"):
+            config = config.build(current_app)
+
+        if hasattr(config, 'components'):
+            component_property = config.components
+            if isinstance(component_property, list):
+                processed_components.extend(component_property)
+            elif isinstance(component_property, tuple):
+                processed_components.extend(list (component_property))
+            else:
+                raise ValueError(f"{config} component's definition is not supported")
+
+    return processed_components

{oarepo_runtime-1.5.71.dist-info → oarepo_runtime-1.5.73.dist-info}/METADATA

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

{oarepo_runtime-1.5.71.dist-info → oarepo_runtime-1.5.73.dist-info}/RECORD

@@ -12,7 +12,7 @@ oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
 oarepo_runtime/cli/configuration.py,sha256=_iMmESs2dd1Oif95gxgpnkSxc13ymwr82_sTJfxlhrM,1091
 oarepo_runtime/cli/fixtures.py,sha256=l6zHpz1adjotrbFy_wcN2TOL8x20i-1jbQmaoEEo-UU,5419
-oarepo_runtime/cli/index.py,sha256=2dZvXtrph527YIgFTCQ8dIVsza-bZou9HBBzYRWAPTY,8243
+oarepo_runtime/cli/index.py,sha256=KH5PArp0fCNbgJI1zSz0pb69U9eyCdnJuy0aMIgf2tg,8685
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/datastreams/__init__.py,sha256=_i52Ek9J8DMARST0ejZAZPzUKm55xrrlKlCSO7dl6y4,1008
 oarepo_runtime/datastreams/asynchronous.py,sha256=JwT-Hx6P7KwV0vSJlxX6kLSIX5vtsekVsA2p_hZpJ_U,7402
@@ -71,7 +71,7 @@ oarepo_runtime/resources/file_resource.py,sha256=Ta3bFce7l0xwqkkOMOEu9mxbB8BbKj5
 oarepo_runtime/resources/json_serializer.py,sha256=82_-xQEtxKaPakv8R1oBAFbGnxskF_Ve4tcfcy4PetI,963
 oarepo_runtime/resources/localized_ui_json_serializer.py,sha256=3V9cJaG_e1PMXKVX_wKfBp1LmbeForwHyBNYdyha4uQ,1878
 oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime/services/components.py,sha256=zaZroTqzV5fz8yVAtRFLbbkTT9iD_dx9jFYANm3JIfI,3285
+oarepo_runtime/services/components.py,sha256=k--zu1RinwoKzg5qHp4H-Ddp9AFyjMJ97fydQ0DvI-A,4238
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=_Din6CxQH7E5TP0TVZjIXJb2vyJRL_o_97jkUQo-GOc,4062
 oarepo_runtime/services/search.py,sha256=9xGTN5Yg6eTdptQ9qjO_umbacf9ooMuHYGXWYfla4-M,6227
@@ -131,9 +131,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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.5.71.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.71.dist-info/METADATA,sha256=AWuYzAfF4eHqe4KwSfk-wbenh4tgwaUl6NEoEdSSLUM,4720
-oarepo_runtime-1.5.71.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-oarepo_runtime-1.5.71.dist-info/entry_points.txt,sha256=0cschM0RHc6UJ1uudhu4EP0hrVStPGpgMO-XEDGRtY4,430
-oarepo_runtime-1.5.71.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.71.dist-info/RECORD,,
+oarepo_runtime-1.5.73.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.73.dist-info/METADATA,sha256=8Bid-R0AnVSDDv-EI6lCJbtTANbDTy8wDGYN60nsWY0,4720
+oarepo_runtime-1.5.73.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+oarepo_runtime-1.5.73.dist-info/entry_points.txt,sha256=0cschM0RHc6UJ1uudhu4EP0hrVStPGpgMO-XEDGRtY4,430
+oarepo_runtime-1.5.73.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.73.dist-info/RECORD,,