Make Cut2D accept axis specification and no-axis specification. Test …

…both cases.

src/spyral_utils/plot/cut.py

@@ -355,21 +355,21 @@ def deserialize_cut(filepath: Path) -> Cut2D | None:
         with open(filepath, "r") as input:
             buffer = input.read()
             cut_dict = json.loads(buffer)
-            if not (
-                "name" in cut_dict
-                and "vertices" in cut_dict
-                and "xaxis" in cut_dict
-                and "yaxis" in cut_dict
-            ):
+            if not ("name" in cut_dict and "vertices" in cut_dict):
                 print(
                     f"Data in file {filepath} is not the right format for Cut2D, could not load"
                 )
                 return None
+            xaxis = DEFAULT_CUT_AXIS
+            yaxis = DEFAULT_CUT_AXIS
+            if "xaxis" in cut_dict and "yaxis" in cut_dict:
+                xaxis = cut_dict["xaxis"]
+                yaxis = cut_dict["yaxis"]
             return Cut2D(
                 cut_dict["name"],
                 cut_dict["vertices"],
-                x_axis=cut_dict["xaxis"],
-                y_axis=cut_dict["yaxis"],
+                x_axis=xaxis,
+                y_axis=yaxis,
             )
     except Exception as error:
         print(

tests/cut.json

@@ -1,7 +1,7 @@
 {
     "name": "test_cut",
-    "xaxis": "my_x",
-    "yaxis": "my_y",
+    "xaxis": "x",
+    "yaxis": "y",
     "vertices": [
         [
             0.0,

tests/cut_noaxis.json

@@ -0,0 +1,25 @@
+{
+    "name": "test_cut",
+    "vertices": [
+        [
+            0.0,
+            0.0
+        ],
+        [
+            1.0,
+            0.0
+        ],
+        [
+            1.0,
+            1.0
+        ],
+        [
+            0.0,
+            1.0
+        ],
+        [
+            0.0,
+            0.0
+        ]
+    ]
+}

tests/test_cut.py

@@ -10,6 +10,21 @@ def test_cut():
     handler = CutHandler()
     df = pl.DataFrame({"x": [0.4, 0.2], "y": [0.4, 0.2]})
 
+    assert isinstance(cut, Cut2D)
+    assert cut.is_point_inside(0.5, 0.5)
+    assert not cut.is_point_inside(-1.0, -1.0)
+    df_gated = df.filter(
+        pl.struct([cut.get_x_axis(), cut.get_y_axis()]).map_batches(cut.is_cols_inside)
+    )
+    rows = len(df_gated.select("x").to_numpy())
+    assert rows == 2
+
+
+def test_cut_noaxis():
+    cut = deserialize_cut(CUT_JSON_PATH)
+    handler = CutHandler()
+    df = pl.DataFrame({"x": [0.4, 0.2], "y": [0.4, 0.2]})
+
     assert isinstance(cut, Cut2D)
     assert cut.is_point_inside(0.5, 0.5)
     assert not cut.is_point_inside(-1.0, -1.0)