Merge branch 'develop' into snappy-main

Author: benflexcompute

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:

flow360/cloud/s3_utils.py

@@ -9,12 +9,7 @@
 from datetime import datetime
 from enum import Enum
 
-import boto3
-from boto3.s3.transfer import TransferConfig
-from botocore.config import Config as BotocoreConfig
-
 # pylint: disable=unused-import
-from botocore.exceptions import ClientError as CloudFileNotFoundError
 from pydantic.v1 import BaseModel, Field
 
 from ..environment import Env
@@ -43,9 +38,14 @@ def __call__(self, bytes_chunk_transferred):
         pass
 
 
-def _get_dynamic_upload_config(file_size) -> TransferConfig:
+def _get_dynamic_upload_config(file_size):
     # pylint: disable=invalid-name
     # Constant definition: https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
+
+    from boto3.s3.transfer import (  # pylint: disable=import-outside-toplevel
+        TransferConfig,
+    )
+
     MIN_CHUNK_SIZE = 5 * 1024 * 1024
     MAX_PART_COUNT = 100000
 
@@ -143,6 +143,10 @@ def get_client(self):
         Get s3 client.
         :return:
         """
+        # pylint: disable=import-outside-toplevel
+        from boto3 import client
+        from botocore.config import Config as BotocoreConfig
+
         # pylint: disable=no-member
         kwargs = {
             "region_name": self.user_credential.region,
@@ -155,7 +159,7 @@ def get_client(self):
         if Env.current.s3_endpoint_url is not None:
             kwargs["endpoint_url"] = Env.current.s3_endpoint_url
 
-        return boto3.client("s3", **kwargs)
+        return client("s3", **kwargs)
 
     def is_expired(self):
         """
@@ -335,7 +339,7 @@ def _call_back(bytes_in_chunk):
                     Config=_get_dynamic_upload_config(os.path.getsize(file_name)),
                 )
 
-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments, too-many-locals
     def download_file(
         self,
         resource_id: str,
@@ -357,6 +361,8 @@ def download_file(
         :param progress_callback: provide custom callback for progress
         :return:
         """
+        # pylint: disable=import-outside-toplevel
+        from botocore.exceptions import ClientError as CloudFileNotFoundError
 
         to_file = get_local_filename_and_create_folders(remote_file_name, to_file, to_folder)
         if os.path.exists(to_file) and not overwrite:

flow360/component/case.py

@@ -8,7 +8,7 @@
 import json
 import os
 import tempfile
-from typing import Any, Iterator, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Iterator, List, Optional, Union
 
 import pydantic as pd
 import pydantic.v1 as pd_v1
@@ -20,7 +20,6 @@
     RenameAssetRequestV2,
 )
 from ..cloud.rest_api import RestApi
-from ..cloud.s3_utils import CloudFileNotFoundError
 from ..exceptions import Flow360RuntimeError, Flow360ValidationError, Flow360ValueError
 from ..log import log
 from .folder import Folder
@@ -76,6 +75,9 @@
 from .v1.flow360_params import Flow360Params, UnvalidatedFlow360Params
 from .validator import Validator
 
+if TYPE_CHECKING:
+    from flow360.component.volume_mesh import VolumeMeshV2
+
 
 class CaseBase:
     """
@@ -459,6 +461,8 @@ def get_simulation_params(self):
         """
         returns simulation params
         """
+        # pylint: disable=import-outside-toplevel
+        from botocore.exceptions import ClientError as CloudFileNotFoundError
 
         try:
             params_as_dict = self._parse_json_from_cloud("simulation.json")
@@ -580,7 +584,7 @@ def tags(self) -> List[str]:
         return self._web_api_v2.info.tags
 
     @property
-    def volume_mesh(self) -> "VolumeMeshV2":
+    def volume_mesh(self) -> VolumeMeshV2:
         """
         returns volume mesh
         """

flow360/component/results/base_results.py

@@ -17,10 +17,7 @@
 import pandas
 import pydantic as pd
 
-from flow360.cloud.s3_utils import (
-    CloudFileNotFoundError,
-    get_local_filename_and_create_folders,
-)
+from flow360.cloud.s3_utils import get_local_filename_and_create_folders
 from flow360.component.simulation.entity_info import GeometryEntityInfo
 from flow360.component.simulation.models.surface_models import BoundaryBase
 from flow360.component.simulation.simulation_params import SimulationParams
@@ -420,6 +417,8 @@ def wait(self, timeout_minutes=60):
         """
         Wait until the Case finishes processing, refresh periodically. Useful for postprocessing, eg sectional data
         """
+        # pylint: disable=import-outside-toplevel
+        from botocore.exceptions import ClientError as CloudFileNotFoundError
 
         start_time = time.time()
         while time.time() - start_time < timeout_minutes * 60:

flow360/component/results/case_results.py

@@ -12,7 +12,6 @@
 import numpy as np
 import pydantic as pd
 
-from flow360.cloud.s3_utils import CloudFileNotFoundError
 from flow360.component.results.base_results import (
     _PHYSICAL_STEP,
     _PSEUDO_STEP,
@@ -584,6 +583,8 @@ def download(
         CloudFileNotFoundError
             If the cloud file for the results is not found.
         """
+        # pylint: disable=import-outside-toplevel
+        from botocore.exceptions import ClientError as CloudFileNotFoundError
 
         try:
             super().download(

flow360/component/simulation/models/bet/bet_translator_interface.py

@@ -5,7 +5,6 @@
 from typing import Literal
 
 import numpy as np
-from scipy.interpolate import interp1d
 
 import flow360.component.simulation.units as u
 from flow360.component.simulation.unit_system import AngleType, LengthType
@@ -61,6 +60,9 @@ def parse_in_xfoil_polar(polar_file_content: str):
     ----------
     return: alpha_list, mach_list, cl_list, cd_list
     """
+
+    from scipy.interpolate import interp1d  # pylint: disable=import-outside-toplevel
+
     cl_alphas = []
     cl_values = {}
     cd_values = {}

flow360/component/simulation/primitives.py

@@ -9,7 +9,6 @@
 import numpy as np
 import pydantic as pd
 from pydantic import PositiveFloat
-from scipy.linalg import eig
 from typing_extensions import Self
 
 import flow360.component.simulation.units as u
@@ -367,6 +366,9 @@ def from_principal_axes(
         """
         Construct box from principal axes
         """
+
+        from scipy.linalg import eig  # pylint: disable=import-outside-toplevel
+
         # validate
         x_axis, y_axis = np.array(axes[0]), np.array(axes[1])
         z_axis = np.cross(x_axis, y_axis)

flow360/component/simulation/user_code/core/types.py

@@ -1281,7 +1281,10 @@ def _deserialize(value) -> Self:
                 if value.type_name == "expression":
                     if value.expression is None:
                         raise ValueError("No expression found in the input")
-                    return expr_type(expression=value.expression, output_units=value.output_units)
+                    # Validate via Pydantic so that Expression validators and AfterValidator both run
+                    return pd.TypeAdapter(expr_type).validate_python(
+                        {"expression": value.expression, "output_units": value.output_units}
+                    )
 
             @deprecation_reminder("25.8.0")
             def _handle_legacy_unyt_values(value):

flow360/component/volume_mesh.py

@@ -71,13 +71,6 @@
 from .v1.params_base import params_generic_validator
 from .validator import Validator
 
-try:
-    import h5py
-
-    _H5PY_AVAILABLE = True
-except ImportError:
-    _H5PY_AVAILABLE = False
-
 
 def get_datatype(dataset):
     """
@@ -142,6 +135,8 @@ def get_boundaries_from_file(cgns_file: str, solver_version: str = None):
     :param solver_version:
     :return:
     """
+    import h5py  # pylint: disable=import-outside-toplevel
+
     names = []
     with h5py.File(cgns_file, "r") as h5_file:
         base = h5_file["Base"]

flow360/examples/betEVTOL/disk13.json

@@ -4,7 +4,6 @@
   "entities": {
     "stored_entities": [
       {
-        "private_attribute_registry_bucket_name": "VolumetricEntityType",
         "private_attribute_entity_type_name": "Cylinder",
         "private_attribute_id": "394556ea-d865-488e-9cbc-316af4f0564e",
         "name": "BET 1",
@@ -39,7 +38,6 @@
         }
       },
       {
-        "private_attribute_registry_bucket_name": "VolumetricEntityType",
         "private_attribute_entity_type_name": "Cylinder",
         "private_attribute_id": "27cf7b71-c350-4192-8f79-95c7e8ad794f",
         "name": "BET 3",