Merge branch 'main' into BenY/CentralizedSchema

Author: benflexcompute

flow360/component/project_utils.py

@@ -15,6 +15,7 @@
 )
 from flow360.component.simulation.framework.base_model import Flow360BaseModel
 from flow360.component.simulation.framework.entity_base import EntityList
+from flow360.component.simulation.framework.entity_registry import EntityRegistry
 from flow360.component.simulation.framework.param_utils import AssetCache
 from flow360.component.simulation.outputs.outputs import (
     SurfaceIntegralOutput,
@@ -498,6 +499,31 @@ def _set_up_default_reference_geometry(params: SimulationParams, length_unit: Le
     return params
 
 
+def _build_deduplicated_entity_registry_from_params(params: SimulationParams) -> EntityRegistry:
+    """
+    Build a deduplicated entity registry from params' stored entities.
+
+    params.used_entity_registry may contain duplicates (same entity used in multiple
+    models/outputs). This function deduplicates by (entity_type, identifier), where
+    identifier is private_attribute_id when available, falling back to entity name
+    to avoid collapsing distinct entities that share a None id.
+    """
+    registry = EntityRegistry()
+    seen_keys = set()
+    for entity_type, entities in params.used_entity_registry.internal_registry.items():
+        for entity in entities:
+            identifier = (
+                entity.private_attribute_id
+                if entity.private_attribute_id is not None
+                else entity.name
+            )
+            key = (entity_type, identifier)
+            if key not in seen_keys:
+                registry.register(entity)
+                seen_keys.add(key)
+    return registry
+
+
 def set_up_params_for_uploading(  # pylint: disable=too-many-arguments
     root_asset,
     length_unit: LengthType,
@@ -557,12 +583,13 @@ def set_up_params_for_uploading(  # pylint: disable=too-many-arguments
         # Legacy workflow (without DraftContext): use root_asset.entity_info
         # User may have made modifications to the entities which is recorded in asset's entity registry
         # We need to reflect these changes.
-        root_asset.entity_info.update_persistent_entities(
-            asset_entity_registry=root_asset.internal_registry
+        entity_info = root_asset.entity_info
+        entity_info.update_persistent_entities(
+            asset_entity_registry=_build_deduplicated_entity_registry_from_params(params)
         )
 
         # Check if there are any new draft entities that have been added in the params by the user
-        entity_info = _set_up_params_non_persistent_entity_info(root_asset.entity_info, params)
+        entity_info = _set_up_params_non_persistent_entity_info(entity_info, params)
 
         # If the customer just load the param without re-specify the same set of entity grouping tags,
         # we need to update the entity grouping tags to the ones in the SimulationParams.

flow360/component/simulation/framework/updater.py

@@ -778,6 +778,17 @@ def _rename_in_entity(entity):
     return params_as_dict
 
 
+def _to_25_9_3(params_as_dict):
+    """Rename ``type_name`` to ``wall_function_type`` in ``use_wall_function`` dicts."""
+    for model in params_as_dict.get("models", []):
+        if model.get("type") != "Wall":
+            continue
+        wall_fn = model.get("use_wall_function")
+        if isinstance(wall_fn, dict) and "type_name" in wall_fn:
+            wall_fn["wall_function_type"] = wall_fn.pop("type_name")
+    return params_as_dict
+
+
 VERSION_MILESTONES = [
     (Flow360Version("24.11.1"), _to_24_11_1),
     (Flow360Version("24.11.7"), _to_24_11_7),
@@ -800,6 +811,7 @@ def _rename_in_entity(entity):
     (Flow360Version("25.9.0"), _to_25_9_0),
     (Flow360Version("25.9.1"), _to_25_9_1),
     (Flow360Version("25.9.2"), _to_25_9_2),
+    (Flow360Version("25.9.3"), _to_25_9_3),
 ]  # A list of the Python API version tuple with their corresponding updaters.
 
 

flow360/component/simulation/meshing_param/meshing_validators.py

@@ -0,0 +1,30 @@
+"""Shared validation helpers for meshing parameters."""
+
+import flow360.component.simulation.units as u
+from flow360.component.simulation.meshing_param.volume_params import UniformRefinement
+from flow360.component.simulation.primitives import Box, Cylinder
+
+
+def validate_snappy_uniform_refinement_entities(refinement: UniformRefinement):
+    """Validate that a UniformRefinement's entities are compatible with snappyHexMesh.
+
+    Raises ValueError if any Box has a non-axis-aligned rotation or any Cylinder is hollow.
+    """
+    # pylint: disable=no-member
+    for entity in refinement.entities.stored_entities:
+        if (
+            isinstance(entity, Box)
+            and entity.angle_of_rotation.to("deg") % (360 * u.deg) != 0 * u.deg
+        ):
+            raise ValueError(
+                "UniformRefinement for snappy accepts only Boxes with axes aligned"
+                + " with the global coordinate system (angle_of_rotation=0)."
+            )
+        if (
+            isinstance(entity, Cylinder)
+            and entity.inner_radius is not None
+            and entity.inner_radius.to("m") != 0 * u.m
+        ):
+            raise ValueError(
+                "UniformRefinement for snappy accepts only full cylinders (where inner_radius = 0)."
+            )

flow360/component/simulation/meshing_param/params.py

@@ -22,6 +22,9 @@
     MeshingDefaults,
     VolumeMeshingDefaults,
 )
+from flow360.component.simulation.meshing_param.meshing_validators import (
+    validate_snappy_uniform_refinement_entities,
+)
 from flow360.component.simulation.meshing_param.volume_params import (
     AutomatedFarfield,
     AxisymmetricRefinement,
@@ -589,6 +592,19 @@ def _check_sizing_against_octree_series(self, param_info: ParamsValidationInfo):
 
         return self
 
+    @contextual_model_validator(mode="after")
+    def _check_snappy_uniform_refinement_entities(self, param_info: ParamsValidationInfo):
+        """Validate projected UniformRefinement entities are compatible with snappyHexMesh."""
+        if not param_info.use_snappy:
+            return self
+        for refinement in self.refinements:  # pylint: disable=not-an-iterable
+            if (
+                isinstance(refinement, UniformRefinement)
+                and refinement.project_to_surface is not False
+            ):
+                validate_snappy_uniform_refinement_entities(refinement)
+        return self
+
 
 SurfaceMeshingParams = Annotated[
     Union[snappy.SurfaceMeshingParams], pd.Field(discriminator="type_name")

flow360/component/simulation/meshing_param/snappy/snappy_params.py

@@ -4,9 +4,11 @@
 
 import pydantic as pd
 
-import flow360.component.simulation.units as u
 from flow360.component.simulation.framework.base_model import Flow360BaseModel
 from flow360.component.simulation.meshing_param.meshing_specs import OctreeSpacing
+from flow360.component.simulation.meshing_param.meshing_validators import (
+    validate_snappy_uniform_refinement_entities,
+)
 from flow360.component.simulation.meshing_param.snappy.snappy_mesh_refinements import (
     BodyRefinement,
     RegionRefinement,
@@ -22,7 +24,6 @@
     SurfaceMeshingDefaults,
 )
 from flow360.component.simulation.meshing_param.volume_params import UniformRefinement
-from flow360.component.simulation.primitives import Box, Cylinder
 from flow360.component.simulation.unit_system import LengthType
 from flow360.component.simulation.validation.validation_context import (
     ParamsValidationInfo,
@@ -124,20 +125,7 @@ def _check_uniform_refinement_entities(self):
             return self
         for refinement in self.refinements:
             if isinstance(refinement, UniformRefinement):
-                # No expansion needed since we only allow Draft entities here.
-                for entity in refinement.entities.stored_entities:
-                    if (
-                        isinstance(entity, Box)
-                        and entity.angle_of_rotation.to("deg") % (360 * u.deg) != 0 * u.deg
-                    ):
-                        raise ValueError(
-                            "UniformRefinement for snappy accepts only Boxes with axes aligned"
-                            + " with the global coordinate system (angle_of_rotation=0)."
-                        )
-                    if isinstance(entity, Cylinder) and entity.inner_radius.to("m") != 0 * u.m:
-                        raise ValueError(
-                            "UniformRefinement for snappy accepts only full cylinders (where inner_radius = 0)."
-                        )
+                validate_snappy_uniform_refinement_entities(refinement)
 
         return self
 

flow360/component/simulation/meshing_param/volume_params.py

@@ -103,6 +103,26 @@ def check_entities_used_with_beta_mesher(cls, values, param_info: ParamsValidati
 
         return values
 
+    @contextual_field_validator("entities", mode="after")
+    @classmethod
+    def check_entities_used_with_snappy(cls, values, param_info: ParamsValidationInfo):
+        """Check that only Box, Cylinder, and Sphere entities are used with snappyHexMesh."""
+
+        if values is None:
+            return values
+        if not param_info.use_snappy:
+            return values
+
+        expanded = param_info.expand_entity_list(values)
+        for entity in expanded:
+            if not isinstance(entity, (Box, Cylinder, Sphere)):
+                raise ValueError(
+                    f"`{type(entity).__name__}` entity for `UniformRefinement` is not supported "
+                    "with snappyHexMesh. Only `Box`, `Cylinder`, and `Sphere` are allowed."
+                )
+
+        return values
+
     @contextual_model_validator(mode="after")
     def check_project_to_surface_with_snappy(self, param_info: ParamsValidationInfo):
         """Check that project_to_surface is used only with snappy."""

flow360/component/simulation/models/surface_models.py

@@ -341,13 +341,13 @@ class WallFunction(Flow360BaseModel):
 
       >>> fl.Wall(
       ...     entities=volume_mesh["fluid/wall"],
-      ...     use_wall_function=fl.WallFunction(type_name="InnerLayer"),
+      ...     use_wall_function=fl.WallFunction(wall_function_type="InnerLayer"),
       ... )
 
     ====
     """
 
-    type_name: Literal["BoundaryLayer", "InnerLayer"] = pd.Field(
+    wall_function_type: Literal["BoundaryLayer", "InnerLayer"] = pd.Field(
         "BoundaryLayer",
         description="Type of wall function model. "
         + "'BoundaryLayer' uses integral flat plate boundary layer theory to predict wall shear stress. "
@@ -377,7 +377,7 @@ class Wall(BoundaryBase):
 
       >>> fl.Wall(
       ...     entities=volume_mesh["8"],
-      ...     use_wall_function=fl.WallFunction(type_name="InnerLayer"),
+      ...     use_wall_function=fl.WallFunction(wall_function_type="InnerLayer"),
       ... )
 
     - :code:`Wall` with wall function and wall rotation:

flow360/component/simulation/translator/solver_translator.py

@@ -1592,7 +1592,7 @@ def boundary_spec_translator(model: SurfaceModelTypes, op_acoustic_to_static_pre
     if isinstance(model, Wall):
         if model.use_wall_function is not None:
             boundary["type"] = "WallFunction"
-            boundary["wallModelType"] = model.use_wall_function.type_name
+            boundary["wallModelType"] = model.use_wall_function.wall_function_type
         else:
             boundary["type"] = "NoSlipWall"
         if model.velocity is not None:

flow360/version.py

@@ -2,5 +2,5 @@
 version
 """
 
-__version__ = "25.9.2b1"
+__version__ = "25.9.3b1"
 __solver_version__ = "release-25.8"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flow360"
-version = "v25.9.2b1"
+version = "v25.9.3b1"
 description = "Flow360 Python Client"
 authors = ["Flexcompute <support@flexcompute.com>"]