components property refactor

oarepo · Jan 15, 2025 · 6d49e43 · 6d49e43
1 parent a6f0679
commit 6d49e43
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/oarepo_model_builder/invenio/templates/service_config.py.jinja2 b/oarepo_model_builder/invenio/templates/service_config.py.jinja2
@@ -45,25 +45,18 @@ class {{ vars.service_config|class_header }}:
     @property
     def components(self):
         components_list = []
-        target_classes = [
-            'invenio_rdm_records.services.config.RDMRecordServiceConfig',
-            'invenio_drafts_resources.services.records.config.RecordServiceConfig',
-            'invenio_records_resources.services.records.config.RecordServiceConfig'
-        ]
 
-        for index, cls in enumerate(type(self).mro()):
-            if cls.__module__ + '.' + cls.__name__ in target_classes:
-                break
-        components_list.extend(process_service_configs(type(self).mro()[2:index+1]))
+        components_list.extend(process_service_configs(self))
 
         additional_components = [{% for c in vars.service_config.components %}{{ c|extra_code }}{% if not loop.last %}, {% endif %}{% endfor %}]
         components_list.extend(additional_components)
         seen = set()
         unique_components = []
         for component in components_list:
-            if component not in seen:
+            identifier = (component.__module__, component.__name__)
+            if identifier not in seen:
                 unique_components.append(component)
-                seen.add(component)
+                seen.add(identifier)
 
         return unique_components
 

diff --git a/run-tests.sh b/run-tests.sh
@@ -9,7 +9,7 @@ cd "$(dirname "$0")"
 export BUILDER_VENV=.venv
 export TEST_VENV=.venv-tests
 export SERVER_VENV=.venv-server
-export PYTHON_VERSION=${PYTHON_VERSION:-python3.12}
+export PYTHON_VERSION=${PYTHON_VERSION:-python3}
 
 OAREPO_VERSION=${OAREPO_VERSION:-12}
 

diff --git a/tests/test_simple_builders.py b/tests/test_simple_builders.py
@@ -428,24 +428,18 @@ class TestServiceConfig(PermissionsPresetsConfigMixin, InvenioRecordServiceConfi
     @property
     def components(self):
         components_list = []
-        target_classes = [
-            'invenio_rdm_records.services.config.RDMRecordServiceConfig',
-            'invenio_drafts_resources.services.records.config.RecordServiceConfig',
-            'invenio_records_resources.services.records.config.RecordServiceConfig'
-        ]
-
-        for index, cls in enumerate(type(self).mro()):
-            if cls.__module__ + '.' + cls.__name__ in target_classes:
-                break
-        components_list.extend(process_service_configs(type(self).mro()[2:index+1]))
+        
+        components_list.extend(process_service_configs(self))
+        
         additional_components = []
         components_list.extend(additional_components)
         seen = set()
         unique_components = []
         for component in components_list:
-            if component not in seen:
+            identifier = (component.__module__, component.__name__)
+            if identifier not in seen:
                 unique_components.append(component)
-                seen.add(component)
+                seen.add(identifier)
     
         return unique_components