[Hotfix Main]: Bump to 25.6.5 and also add default value application to planar tolerance (#1349)

* Bump to 25.6.5 and also add default value application to planar tolerance (#1348)

* Resolve conflict

---------

Co-authored-by: Ben <106089368+benflexcompute@users.noreply.github.com>
Co-authored-by: BenYuan <ben@flexcompute.com>

Author: github-actions[bot]

flow360/component/simulation/framework/updater.py

@@ -286,7 +286,7 @@ def _to_25_6_2(params_as_dict):
     return params_as_dict
 
 
-def _to_25_6_4(params_as_dict):
+def _add_default_planar_face_tolerance(params_as_dict):
     if params_as_dict.get("meshing") is None:
         return params_as_dict
     if "defaults" not in params_as_dict["meshing"]:
@@ -297,6 +297,15 @@ def _to_25_6_4(params_as_dict):
     return params_as_dict
 
 
+def _to_25_6_4(params_as_dict):
+    return _add_default_planar_face_tolerance(params_as_dict)
+
+
+def _to_25_6_5(params_as_dict):
+    # Some 25.6.4 JSONs are also missing the planar_face_tolerance.
+    return _add_default_planar_face_tolerance(params_as_dict)
+
+
 VERSION_MILESTONES = [
     (Flow360Version("24.11.1"), _to_24_11_1),
     (Flow360Version("24.11.7"), _to_24_11_7),
@@ -307,6 +316,7 @@ def _to_25_6_4(params_as_dict):
     (Flow360Version("25.4.1"), _to_25_4_1),
     (Flow360Version("25.6.2"), _to_25_6_2),
     (Flow360Version("25.6.4"), _to_25_6_4),
+    (Flow360Version("25.6.5"), _to_25_6_5),
 ]  # A list of the Python API version tuple with there corresponding updaters.
 
 

pyproject.toml

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

tests/simulation/data/simulation_with_wrong_expr_syntax.json

@@ -1,5 +1,5 @@
 {
-	"version": "25.6.2",
+	"version": "25.6.5",
 	"unit_system": {
 		"name": "SI"
 	},

tests/simulation/test_updater.py

@@ -729,3 +729,21 @@ def test_updater_to_25_6_4():
         root_item_type="Geometry",
     )
     assert params_new
+
+
+def test_updater_to_25_6_5():
+    with open("../data/simulation/simulation_pre_25_4_1.json", "r") as fp:
+        params_as_dict = json.load(fp)
+
+    params_new = updater(
+        version_from="25.4.0b1",
+        version_to=f"25.6.5",
+        params_as_dict=params_as_dict,
+    )
+    assert params_new["meshing"]["defaults"]["planar_face_tolerance"] == 1e-6
+    params_new, _, _ = validate_model(
+        params_as_dict=params_new,
+        validated_by=ValidationCalledBy.LOCAL,
+        root_item_type="Geometry",
+    )
+    assert params_new

tests/simulation/translator/data/simulation_isosurface.json

@@ -1,5 +1,5 @@
 {
-    "version": "25.6.2",
+    "version": "25.6.5",
     "unit_system": {
         "name": "Imperial"
     },