oarepo-runtime 1.5.84__tar.gz → 1.5.85__tar.gz

{oarepo_runtime-1.5.84/oarepo_runtime.egg-info → oarepo_runtime-1.5.85}/PKG-INFO

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

{oarepo_runtime-1.5.84 → oarepo_runtime-1.5.85}/oarepo_runtime/services/components.py

@@ -8,7 +8,9 @@ from invenio_records import Record
 
 from oarepo_runtime.services.custom_fields import CustomFieldsMixin, CustomFields, InlinedCustomFields
 from oarepo_runtime.services.generators import RecordOwners
-
+from invenio_rdm_records.services.config import RDMRecordServiceConfig
+from invenio_drafts_resources.services.records.config import RecordServiceConfig as DraftsRecordServiceConfig
+from invenio_records_resources.services.records.config import RecordServiceConfig as RecordsRecordServiceConfig
 
 try:
     from invenio_drafts_resources.services.records.uow import ParentRecordCommitOp
@@ -90,16 +92,24 @@ class CustomFieldsComponent(ServiceComponent):
                 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.
+def process_service_configs(service_config):
 
-    :param service_config: List of service_config classes to process.
-    :return: A flattened list of processed components.
-    """
     processed_components = []
+    target_classes = {
+        RDMRecordServiceConfig,
+        DraftsRecordServiceConfig,
+        RecordsRecordServiceConfig,
+    }
+
+    for end_index, cls in enumerate(type(service_config).mro()):
+        if cls in target_classes:
+            break
+
+    # We need this because if the "build" function is present in service_config,
+    # there are two service_config instances in the MRO (Method Resolution Order) output.
+    start_index = 2 if hasattr(service_config, "build") else 1
 
+    service_configs = type(service_config).mro()[start_index:end_index + 1]
     for config in service_configs:
 
         if hasattr(config, "build"):

{oarepo_runtime-1.5.84 → oarepo_runtime-1.5.85/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.84 → oarepo_runtime-1.5.85}/setup.cfg

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