Fix render output translation logic

Author: andrzej-krupka

flow360/component/simulation/translator/solver_translator.py

@@ -576,7 +576,11 @@ def translate_isosurface_output(
     return translated_output
 
 
-def translate_render_output(output_params: list, injection_function):
+def translate_render_output(
+    input_params: SimulationParams,
+    output_params: list,
+    injection_function
+):
     """Translate render output settings."""
 
     renders = get_all_entries_of_type(output_params, RenderOutput)
@@ -602,14 +606,17 @@ def translate_render_output(output_params: list, injection_function):
                 translation_func=translate_output_fields,
                 to_list=False,
                 entity_injection_func=injection_function,
+                entity_type_to_include=Isosurface,
                 entity_list_attribute_name="isosurfaces",
+                entity_injection_input_params=input_params,
             ),
             "surfaces": translate_setting_and_apply_to_all_entities(
                 [render],
                 RenderOutput,
                 translation_func=translate_output_fields,
                 to_list=False,
-                entity_list_attribute_name="surfaces",
+                entity_type_to_include=Surface,
+                entity_list_attribute_name="surfaces"
             ),
             "camera": remove_units_in_dict(camera),
             "lighting": remove_units_in_dict(lighting),
@@ -989,7 +996,7 @@ def translate_output(input_params: SimulationParams, translated: dict):
 
     ##:: Step6: Get translated["renderOutput"]
     if has_instance_in_list(outputs, RenderOutput):
-        translated["renderOutput"] = translate_render_output(outputs, inject_isosurface_info)
+        translated["renderOutput"] = translate_render_output(input_params, outputs, inject_isosurface_info)
 
     ##:: Step7: Get translated["monitorOutput"]
     probe_output = {}

flow360/component/simulation/translator/utils.py

@@ -287,6 +287,7 @@ def translate_setting_and_apply_to_all_entities(
     use_instance_name_as_key=False,
     use_sub_item_as_key=False,
     entity_type_to_include=None,
+    entity_list_attribute_name="entities",
     **kwargs,
 ):
     """
@@ -369,23 +370,23 @@ def translate_setting_and_apply_to_all_entities(
     # pylint: disable=too-many-nested-blocks
     for obj in obj_list:
         if class_type and is_exact_instance(obj, class_type):
-
             list_of_entities = []
-            if "entities" in obj.__class__.model_fields:
-                if obj.entities is None or (
-                    "stored_entities" in obj.entities.__class__.model_fields
-                    and obj.entities.stored_entities is None
+            if entity_list_attribute_name in obj.__class__.model_fields:
+                entity_list = getattr(obj, entity_list_attribute_name)
+                if entity_list is None or (
+                    "stored_entities" in entity_list.__class__.model_fields
+                    and entity_list.stored_entities is None
                 ):  # unique item list does not allow None "items" for now.
                     continue
-                if isinstance(obj.entities, EntityList):
+                if isinstance(entity_list, EntityList):
                     list_of_entities = (
-                        obj.entities.stored_entities
+                        entity_list.stored_entities
                         if lump_list_of_entities is False
-                        else [obj.entities]
+                        else [entity_list]
                     )
-                elif isinstance(obj.entities, UniqueItemList):
+                elif isinstance(entity_list, UniqueItemList):
                     list_of_entities = (
-                        obj.entities.items if lump_list_of_entities is False else [obj.entities]
+                        entity_list.items if lump_list_of_entities is False else [entity_list]
                     )
             elif "entity_pairs" in obj.__class__.model_fields:
                 # Note: This is only used in Periodic BC and lump_list_of_entities is not relavant