[Hotfix Main]: [FXC-5125] fix(): Use inline model without private_attribute_id for computing processor hash (#1751)

Co-authored-by: Angran Li <[email protected]>

Author: github-actions[bot]

flow360/component/simulation/translator/solver_translator.py

@@ -13,6 +13,7 @@
     compute_udf_dimensionalization_factor,
 )
 from flow360.component.simulation.framework.entity_base import EntityList
+from flow360.component.simulation.framework.updater_utils import recursive_remove_key
 from flow360.component.simulation.models.material import Sutherland
 from flow360.component.simulation.models.solver_numerics import NoneSolver
 from flow360.component.simulation.models.surface_models import (
@@ -1693,13 +1694,32 @@ def require_external_postprocessing(params: SimulationParams):
 
 def calculate_monitor_semaphore_hash(params: SimulationParams):
     """Get the hash for monitor processor's semaphore"""
+
+    def get_force_output_models(force_output: ForceOutput, params: SimulationParams):
+        force_output_model_ids = {
+            (model.private_attribute_id if hasattr(model, "private_attribute_id") else model)
+            for model in force_output.models
+        }
+        force_output_models = [
+            model for model in params.models if model.private_attribute_id in force_output_model_ids
+        ]
+        return force_output_models
+
     json_string_list = []
     if params.outputs:
         for output in params.outputs:
             if not isinstance(output, get_args(get_args(MonitorOutputType)[0])):
                 continue
             if isinstance(output, ForceOutput):
-                json_string_list.extend(list(sorted(output.models)))
+                force_output_models = get_force_output_models(output, params)
+                force_output_models_dict = []
+                for model in force_output_models:
+                    model_dict = dump_dict(model)
+                    recursive_remove_key(
+                        model_dict, "privateAttributeId", "privateAttributeInputCache"
+                    )
+                    force_output_models_dict.append(json.dumps(model_dict))
+                json_string_list.extend(force_output_models_dict)
                 json_string_list.extend(output.output_fields.items)
             if output.moving_statistic is not None:
                 json_string_list.append(json.dumps(dump_dict(output.moving_statistic)))

tests/simulation/translator/data/simulation_stopping_criterion.json

@@ -247,6 +247,33 @@
                 ]
             },
             "name": "Freestream"
+        },
+        {
+            "type": "Wall",
+            "entities": {
+                "stored_entities": [
+                    {
+                        "private_attribute_entity_type_name": "Surface",
+                        "name": "4",
+                        "private_attribute_id": "ef389961-e941-4a0a-a910-55c6d303f7e5",
+                        "private_attribute_sub_components": []
+                    }
+                ]
+            },
+            "private_attribute_id": "209302bf-9eeb-449b-b7c4-a4e5c04a5b17",
+            "name": "wing",
+            "use_wall_function": false,
+            "heat_spec": {
+                "value": {
+                    "value": 0.0,
+                    "units": "W/m**2"
+                },
+                "type_name": "HeatFlux"
+            },
+            "roughness_height": {
+                "value": 0.0,
+                "units": "m"
+            }
         }
     ],
     "time_stepping": {
@@ -432,7 +459,7 @@
             "private_attribute_id": "33333",
             "name": "force_wallBC",
             "models": [
-                "wallBC"
+                "209302bf-9eeb-449b-b7c4-a4e5c04a5b17"
             ],
             "moving_statistic": {
                 "moving_window_size": 10,

tests/simulation/translator/ref/Flow360_om6wing_stopping_criterion_and_moving_statistic.json

@@ -10,6 +10,11 @@
         },
         "3": {
             "type": "Freestream"
+        },
+        "4": {
+            "heatFlux": 0.0,
+            "roughnessHeight": 0.0,
+            "type": "NoSlipWall"
         }
     },
     "freestream": {
@@ -97,7 +102,7 @@
     },
     "runControl": {
         "externalProcessMonitorOutput": true,
-        "monitorProcessorHash": "bc5ac70ee2692e2a051b0867dad9c0057ac1b6d58995389d41ca850fb6c39b5b",
+        "monitorProcessorHash": "396038f897af72de2eb89b96a33c0d8d954bff330ce054f0714b06fe669c0744",
         "stoppingCriteria": [
             {
                 "monitoredColumn": "point_legacy1_Point1_Helicity_mean",

tests/simulation/translator/test_solver_translator.py

@@ -1,6 +1,7 @@
 import json
 import os
 import unittest
+import uuid
 
 import numpy as np
 import pytest
@@ -472,7 +473,7 @@ def test_om6wing_with_stopping_criterion_and_moving_statistic(get_om6Wing_tutori
         monitor_field=mass_flow_rate,
         tolerance_window_size=3,
     )
-    wallBC = Wall(name="wing", surfaces=[Surface(name="1")], private_attribute_id="wallBC")
+    wallBC = Wall(name="wing", surfaces=[Surface(name="4", private_attribute_id=str(uuid.uuid4()))])
     force_output = ForceOutput(
         name="force_wallBC",
         models=[wallBC],
@@ -486,10 +487,11 @@ def test_om6wing_with_stopping_criterion_and_moving_statistic(get_om6Wing_tutori
         monitor_output=force_output,
         monitor_field="CL",
     )
+    params.models.append(wallBC)
     params.run_control = RunControl(stopping_criteria=[criterion1, criterion2, criterion3])
     params.outputs.extend([probe_output, mass_flow_rate_integral, force_output])
     translate_and_compare(
-        get_om6Wing_tutorial_param,
+        params,
         mesh_unit=0.8059 * u.m,
         ref_json_file="Flow360_om6wing_stopping_criterion_and_moving_statistic.json",
         debug=False,