Handle tuples, test

Author: dweindl

src/ccompass/core.py

@@ -770,6 +770,9 @@ def series_representer(dumper, data):
             def float64_representer(dumper, data):
                 return dumper.represent_float(float(data))
 
+            def tuple_representer(dumper, data):
+                return dumper.represent_sequence("!tuple", data)
+
             yaml.add_representer(
                 np.float64, float64_representer, Dumper=yaml.SafeDumper
             )
@@ -782,6 +785,9 @@ def float64_representer(dumper, data):
             yaml.add_representer(
                 pd.Series, series_representer, Dumper=yaml.SafeDumper
             )
+            yaml.add_representer(
+                tuple, tuple_representer, Dumper=yaml.SafeDumper
+            )
 
             with open(temp_dir / "session.yaml", "w") as f:
                 yaml.safe_dump(self.model_dump(), f)
@@ -820,6 +826,7 @@ def ndarray_constructor(loader, node):
             def series_constructor(loader, node):
                 """Custom YAML constructor for pandas Series."""
                 file_path = temp_dir / loader.construct_scalar(node)
+                print(file_path, type(file_path))
                 df = pd.read_csv(
                     file_path,
                     sep="\t",
@@ -828,8 +835,12 @@ def series_constructor(loader, node):
                     float_precision="round_trip",
                 )
                 assert df.shape[1] == 1
+                print(df.iloc[:, 0], type(df.iloc[:, 0]))
                 return df.iloc[:, 0]
 
+            def tuple_constructor(loader, node):
+                return tuple(loader.construct_sequence(node))
+
             yaml.add_constructor(
                 "!pandas.DataFrame",
                 dataframe_constructor,
@@ -841,6 +852,9 @@ def series_constructor(loader, node):
             yaml.add_constructor(
                 "!pandas.Series", series_constructor, Loader=yaml.SafeLoader
             )
+            yaml.add_constructor(
+                "!tuple", tuple_constructor, Loader=yaml.SafeLoader
+            )
 
             with open(temp_dir / "session.yaml") as f:
                 data = yaml.safe_load(f)

tests/test_full_analysis.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 import numpy as np
+from test_session_model import assert_session_equal
 
 from ccompass._testing.synthetic_data import (
     SyntheticDataConfig,
@@ -201,3 +202,13 @@ def test_full():
 
     ...
     sess.to_numpy(Path(__file__).parent / "session_test_full.npy")
+    sess.to_zip(Path(__file__).parent / "session_test_full.ccompass")
+
+    sess2 = SessionModel.from_numpy(
+        Path(__file__).parent / "session_test_full.npy"
+    )
+    assert_session_equal(sess, sess2)
+    sess2 = SessionModel.from_zip(
+        Path(__file__).parent / "session_test_full.ccompass"
+    )
+    assert_session_equal(sess, sess2)

tests/test_session_model.py

@@ -3,7 +3,9 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+import numpy as np
 import pandas as pd
+import pydantic
 
 from ccompass.main_gui import SessionModel
 
@@ -22,6 +24,11 @@ def test_serialization():
 
 def assert_equal(obj1, obj2):
     """Check if two objects are equal."""
+    if isinstance(obj1, pydantic.BaseModel):
+        assert isinstance(obj2, pydantic.BaseModel)
+        assert_equal(obj1.model_dump(), obj2.model_dump())
+        return
+
     if isinstance(obj1, dict):
         for key in obj1:
             assert key in obj2
@@ -33,6 +40,8 @@ def assert_equal(obj1, obj2):
         pd.testing.assert_frame_equal(obj1, obj2, check_dtype=False)
     elif isinstance(obj1, pd.Series):
         pd.testing.assert_series_equal(obj1, obj2)
+    elif isinstance(obj1, np.ndarray):
+        np.testing.assert_almost_equal(obj1, obj2)
     elif isinstance(obj1, float) and pd.isna(obj1):
         assert pd.isna(obj2)
     else: