[FXC-3494] Text expression [WIP][25.8]

flow360/component/results/base_results.py

@@ -19,6 +19,9 @@
 
 from flow360.cloud.s3_utils import get_local_filename_and_create_folders
 from flow360.component.simulation.entity_info import GeometryEntityInfo
+from flow360.component.simulation.framework.entity_expansion_utils import (
+    expand_entity_list_in_context,
+)
 from flow360.component.simulation.models.surface_models import BoundaryBase
 from flow360.component.simulation.simulation_params import SimulationParams
 from flow360.component.v1.flow360_params import Flow360Params
@@ -673,7 +676,6 @@ def full_name_pattern(word: str) -> re.Pattern:
             return rf"^(?:{re.escape(word)}|[^/]+/{re.escape(word)})$"
 
         self.reload_data()  # Remove all the imposed filters
-        print(">> _x_columns =", self._x_columns)
         raw_values = {}
         for x_column in self._x_columns:
             raw_values[x_column] = np.array(self.raw_values[x_column])
@@ -712,9 +714,8 @@ def by_boundary_condition(self, params: SimulationParams) -> PerEntityResultCSVM
             if not isinstance(model, BoundaryBase):
                 continue
             boundary_name = model.name if model.name is not None else model.type
-            entity_groups[boundary_name].extend(
-                [entity.name for entity in model.entities.stored_entities]
-            )
+            entity_names = expand_entity_list_in_context(model.entities, params, return_names=True)
+            entity_groups[boundary_name].extend(entity_names)
         self_copy = copy.deepcopy(self)  # Shield from modifying the current instance
         # pylint: disable=protected-access
         return self_copy._create_forces_group(entity_groups=entity_groups)

flow360/component/results/results_utils.py

@@ -218,6 +218,7 @@ def _collect_disk_axes_and_centers(
     for model in params.models:
         if model.type != model_type:
             continue
+        # No draft entity (cylinder) selector so it is fine.
         for cyl in model.entities.stored_entities:
             # Axis is assumed normalized by the inputs
             # pylint:disable=protected-access
@@ -475,6 +476,7 @@ def format_headers(
 
         diskCount = 0
         for disk in bet_disks:
+            # No draft entity (cylinder) selector so it is fine.
             for disk_local_index, cylinder in enumerate(disk.entities.stored_entities):
                 new_name = pattern.replace("$BETName", disk.name)
                 new_name = new_name.replace("$CylinderName", cylinder.name)

flow360/component/simulation/entity_info.py

@@ -625,14 +625,3 @@ def parse_entity_info_model(data) -> EntityInfoUnion:
     parse entity info data and return one of [GeometryEntityInfo, VolumeMeshEntityInfo, SurfaceMeshEntityInfo]
     """
     return pd.TypeAdapter(EntityInfoUnion).validate_python(data)
-
-
-def get_entity_info_type_from_str(entity_type: str) -> type[EntityInfoModel]:
-    """Get EntityInfo type from the asset type from the project tree"""
-    entity_info_type = None
-    if entity_type == "Geometry":
-        entity_info_type = GeometryEntityInfo
-    if entity_type == "VolumeMesh":
-        entity_info_type = VolumeMeshEntityInfo
-
-    return entity_info_type

flow360/component/simulation/framework/base_model.py

@@ -12,11 +12,11 @@
 import rich
 import unyt as u
 import yaml
-from pydantic import ConfigDict
 from pydantic._internal._decorators import Decorator, FieldValidatorDecoratorInfo
 from pydantic_core import InitErrorDetails
 
 from flow360.component.simulation.conversion import need_conversion
+from flow360.component.simulation.framework.base_model_config import base_model_config
 from flow360.component.simulation.validation import validation_context
 from flow360.error_messages import do_not_modify_file_manually_msg
 from flow360.exceptions import Flow360FileError
@@ -60,34 +60,6 @@ def _preprocess_nested_list(value, required_by, params, exclude, flow360_unit_sy
     return new_list
 
 
-def snake_to_camel(string: str) -> str:
-    """
-    Convert a snake_case string to camelCase.
-
-    This function takes a snake_case string as input and converts it to camelCase.
-    It splits the input string by underscores, capitalizes the first letter of
-    each subsequent component (after the first one), and joins them together.
-
-    Parameters:
-    string (str): The input string in snake_case format.
-
-    Returns:
-    str: The converted string in camelCase format.
-
-    Example:
-    >>> snake_to_camel("example_snake_case")
-    'exampleSnakeCase'
-    """
-    components = string.split("_")
-
-    camel_case_string = components[0]
-
-    for component in components[1:]:
-        camel_case_string += component[0].upper() + component[1:]
-
-    return camel_case_string
-
-
 class Conflicts(pd.BaseModel):
     """
     Wrapper for handling fields that cannot be specified simultaneously
@@ -153,26 +125,7 @@ def __pydantic_init_subclass__(cls, **kwargs) -> None:
             cls.model_rebuild(force=True)
         super().__pydantic_init_subclass__(**kwargs)  # Correct use of super
 
-    model_config = ConfigDict(
-        ##:: Pydantic kwargs
-        arbitrary_types_allowed=True,  # ?
-        extra="forbid",
-        frozen=False,
-        populate_by_name=True,
-        validate_assignment=True,
-        validate_default=True,
-        ##:: Custom keys
-        require_one_of=[],
-        allow_but_remove=[],
-        conflicting_fields=[],
-        include_hash=False,
-        include_defaults_in_schema=True,
-        # pylint: disable=fixme
-        # TODO: Remove alias_generator since it is only for translator
-        alias_generator=pd.AliasGenerator(
-            serialization_alias=snake_to_camel,
-        ),
-    )
+    model_config = base_model_config
 
     def __setattr__(self, name, value):
         # pylint: disable=unsupported-membership-test,  unsubscriptable-object

flow360/component/simulation/framework/base_model_config.py

@@ -0,0 +1,55 @@
+"""
+Sharing the config for base models to reduce unnecessary inheritance from Flow360BaseModel.
+"""
+
+import pydantic as pd
+
+
+def snake_to_camel(string: str) -> str:
+    """
+    Convert a snake_case string to camelCase.
+
+    This function takes a snake_case string as input and converts it to camelCase.
+    It splits the input string by underscores, capitalizes the first letter of
+    each subsequent component (after the first one), and joins them together.
+
+    Parameters:
+    string (str): The input string in snake_case format.
+
+    Returns:
+    str: The converted string in camelCase format.
+
+    Example:
+    >>> snake_to_camel("example_snake_case")
+    'exampleSnakeCase'
+    """
+    components = string.split("_")
+
+    camel_case_string = components[0]
+
+    for component in components[1:]:
+        camel_case_string += component[0].upper() + component[1:]
+
+    return camel_case_string
+
+
+base_model_config = pd.ConfigDict(
+    ##:: Pydantic kwargs
+    arbitrary_types_allowed=True,  # ?
+    extra="forbid",
+    frozen=False,
+    populate_by_name=True,
+    validate_assignment=True,
+    validate_default=True,
+    ##:: Custom keys
+    require_one_of=[],
+    allow_but_remove=[],
+    conflicting_fields=[],
+    include_hash=False,
+    include_defaults_in_schema=True,
+    # pylint: disable=fixme
+    # TODO: Remove alias_generator since it is only for translator
+    alias_generator=pd.AliasGenerator(
+        serialization_alias=snake_to_camel,
+    ),
+)