refactor: import sort logic from tools/sort_ref_json instead of duplicating

Author: benflexcompute

flow360/_autohooks/sort_json.py

@@ -1,6 +1,6 @@
 """Autohooks plugin: sort keys in staged JSON files under tests/."""
 
-import json
+import importlib.util
 from pathlib import Path
 
 from autohooks.api import ok
@@ -11,32 +11,16 @@
 )
 from autohooks.api.path import match
 
+_TOOLS_DIR = Path(__file__).resolve().parent.parent.parent / "tools"
+_spec = importlib.util.spec_from_file_location("sort_ref_json", _TOOLS_DIR / "sort_ref_json.py")
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+process_file = _module.process_file
+
 DEFAULT_INCLUDE = ("*.json",)
 TESTS_DIR = Path(__file__).resolve().parent.parent.parent / "tests"
 
 
-def _sort_keys(obj):
-    """Recursively sort dictionary keys. List order is preserved."""
-    if isinstance(obj, dict):
-        return {k: _sort_keys(v) for k, v in sorted(obj.items())}
-    if isinstance(obj, list):
-        return [_sort_keys(item) for item in obj]
-    return obj
-
-
-def _sort_file(path: Path) -> bool:
-    """Sort keys in-place. Returns True if file was already sorted."""
-    raw = path.read_text(encoding="utf-8")
-    data = json.loads(raw)
-    sorted_content = json.dumps(_sort_keys(data), indent=4) + "\n"
-
-    if raw == sorted_content:
-        return True
-
-    path.write_text(sorted_content, encoding="utf-8")
-    return False
-
-
 def precommit(config=None, report_progress=None, **kwargs):  # pylint: disable=unused-argument
     """Sort JSON keys in staged test reference files."""
     files = [
@@ -54,14 +38,11 @@ def precommit(config=None, report_progress=None, **kwargs):  # pylint: disable=u
 
     with stash_unstaged_changes(files):
         for f in files:
-            try:
-                already_sorted = _sort_file(f.absolute_path())
-                if already_sorted:
-                    ok(f"Already sorted: {f.path}")
-                else:
-                    ok(f"Sorted keys in: {f.path}")
-            except (json.JSONDecodeError, UnicodeDecodeError):
-                ok(f"Skipped (not valid JSON): {f.path}")
+            already_sorted = process_file(f.absolute_path(), check=False)
+            if already_sorted:
+                ok(f"Already sorted: {f.path}")
+            else:
+                ok(f"Sorted keys in: {f.path}")
 
             if report_progress:
                 report_progress.update()

flow360/component/simulation/models/volume_models.py

@@ -819,6 +819,12 @@ class BETDisk(MultiConstructorBaseModel):
         + "Must be orthogonal to the rotation axis (Cylinder.axis). Only the direction is used—the "
         + "vector need not be unit length. Must be specified for unsteady BET Line (blade_line_chord > 0).",
     )
+    collective_pitch: AngleType = pd.Field(
+        0 * u.deg,
+        description="Collective pitch angle applied as a uniform offset to all blade twist values. "
+        + "Positive value increases the angle of attack at every radial station.",
+        json_schema_extra={"exclude_if_default": True},
+    )
     tip_gap: Union[Literal["inf"], LengthType.NonNegative] = pd.Field(
         "inf",
         description="Dimensional distance between blade tip and solid bodies to "

flow360/component/simulation/translator/solver_translator.py

@@ -1367,10 +1367,11 @@ def bet_disk_translator(model: BETDisk, is_unsteady: bool):
     """BET disk translator"""
     model_dict = convert_tuples_to_lists(remove_units_in_dict(dump_dict(model)))
     model_dict["alphas"] = [alpha.to("degree").value.item() for alpha in model.alphas]
+    collective_pitch_deg = model.collective_pitch.to("degree").value.item()
     model_dict["twists"] = [
         {
             "radius": bet_twist.radius.value.item(),
-            "twist": bet_twist.twist.to("degree").value.item(),
+            "twist": bet_twist.twist.to("degree").value.item() + collective_pitch_deg,
         }
         for bet_twist in model.twists
     ]