service config components might be extra code, not only classes (#239)

oarepo · Nov 1, 2023 · 4deb8e7 · 4deb8e7
1 parent 14711b2
commit 4deb8e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/oarepo_model_builder/invenio/templates/service_config.py.jinja2 b/oarepo_model_builder/invenio/templates/service_config.py.jinja2
@@ -5,10 +5,9 @@
 {{ vars.marshmallow.class|imports }}
 {{ vars.search_options.class|imports }}
 {% for c in vars.service_config.components %}
-{{ c|generate_import }}
+{{ c|code_imports }}
 {% endfor %}
 
-
 class {{ vars.service_config|class_header }}:
     """{{ vars.record.class|base_name }} service config."""
     PERMISSIONS_PRESETS = [{% for p in vars.permissions.presets %}"{{ p }}"{{ ", " if not loop.last else "" }} {% endfor %}]
@@ -30,7 +29,7 @@ class {{ vars.service_config|class_header }}:
     service_id = "{{ vars.service_config.service_id }}"
     {% endif %}
 
-    components = [ {% for b in vars.service_config.base_classes %}*{{ b|base_name }}.components{% if not loop.last %}, {% endif %}{% endfor %}{% for c in vars.service_config.components %}, {{ c|base_name }} {% endfor %}]
+    components = [ {% for b in vars.service_config.base_classes %}*{{ b|base_name }}.components{% if not loop.last %}, {% endif %}{% endfor %}{% for c in vars.service_config.components %}, {{ c|extra_code }} {% endfor %}]
 
     model = "{{ vars.module.qualified }}"
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder
-version = 4.0.62
+version = 4.0.63
 description = A utility library that generates OARepo required data model files from a JSON specification file
 authors = Miroslav Bauer <[email protected]>, Miroslav Simek <[email protected]>
 readme = README.md