Merge pull request #678 from gerlero/files

Fix serialization of face lists

Author: gerlero

src/foamlib/_files/_serialization.py

@@ -177,32 +177,6 @@ def normalized(
                 return data  # ty: ignore[invalid-return-type]
             return data.astype(float, copy=False)  # ty: ignore[possibly-missing-attribute]
 
-        # Other possible numeric standalone data (n integers or floats)
-        case [Real(), *rest], () if not isinstance(data, tuple) and all(
-            isinstance(r, Real) for r in rest
-        ):
-            return normalized(np.asarray(data), keywords=keywords, format_=format_)
-
-        # Other possible numeric standalone data (n x 3 floats)
-        case [_, *_], () if not isinstance(data, tuple) and all(
-            (
-                isinstance(r, Sequence)
-                and not isinstance(r, tuple)
-                and len(r) == 3
-                and all(isinstance(x, Real) for x in r)
-            )
-            or (
-                isinstance(r, np.ndarray)
-                and r.shape == (3,)
-                and (
-                    np.issubdtype(r.dtype, np.floating)
-                    or np.issubdtype(r.dtype, np.integer)
-                )
-            )
-            for r in data  # ty: ignore[not-iterable]
-        ):
-            return normalized(np.asarray(data), keywords=keywords, format_=format_)
-
         # ASCII faces-like list
         case [*_], () if not isinstance(data, tuple) and all(
             isinstance(e, np.ndarray)
@@ -232,6 +206,32 @@ def normalized(
         ):
             return [np.asarray(e) for e in data]  # ty: ignore[not-iterable]
 
+        # Other possible numeric standalone data (n integers or floats)
+        case [Real(), *rest], () if not isinstance(data, tuple) and all(
+            isinstance(r, Real) for r in rest
+        ):
+            return normalized(np.asarray(data), keywords=keywords, format_=format_)
+
+        # Other possible numeric standalone data (n x 3 floats)
+        case [_, *_], () if not isinstance(data, tuple) and all(
+            (
+                isinstance(r, Sequence)
+                and not isinstance(r, tuple)
+                and len(r) == 3
+                and all(isinstance(x, Real) for x in r)
+            )
+            or (
+                isinstance(r, np.ndarray)
+                and r.shape == (3,)
+                and (
+                    np.issubdtype(r.dtype, np.floating)
+                    or np.issubdtype(r.dtype, np.integer)
+                )
+            )
+            for r in data  # ty: ignore[not-iterable]
+        ):
+            return normalized(np.asarray(data), keywords=keywords, format_=format_)
+
         # Uniform field (scalar)
         case Real(), _common.FIELD_KEYWORDS:
             return float(data)  # ty: ignore[invalid-argument-type]
@@ -487,14 +487,14 @@ def dumps(
                 + b")"
             )
 
-        case np.ndarray(), (_, *_) | None, _:
+        case np.ndarray(), (_, *_) | None, "ascii" | None:
             return dumps(len(data), keywords=None, format_=None) + dumps(  # ty: ignore[invalid-argument-type]
                 data.tolist(),  # ty: ignore[possibly-missing-attribute]
                 keywords=None,
                 format_=format_,
             )
 
-        case np.ndarray(), (), _:
+        case np.ndarray(), (), "ascii" | None:
             return dumps(data.tolist(), keywords=None, format_=format_)  # ty: ignore[invalid-argument-type,possibly-missing-attribute]
 
         case DimensionSet(), _, _:
@@ -552,7 +552,7 @@ def dumps(
                 + b" ".join(
                     dumps(
                         v,  # ty: ignore[invalid-argument-type]
-                        keywords=keywords,
+                        keywords=None,
                         format_=format_,
                         _tuple_is_keyword_entry=True,
                     )

tests/test_files/test_dumps.py

@@ -185,6 +185,10 @@ def test_serialize_file() -> None:
     )
     assert FoamFile.dumps([1, 2, 3], ensure_header=False) == b"(1 2 3)"
     assert FoamFile.dumps([1.0, 2, 3], ensure_header=False) == b"(1.0 2.0 3.0)"
+    assert (
+        FoamFile.dumps([[1, 2, 3], [4, 5.0, 6]], ensure_header=False)
+        == b"((1.0 2.0 3.0) (4.0 5.0 6.0))"
+    )
     assert (
         FoamFile.dumps(
             {
@@ -199,6 +203,18 @@ def test_serialize_file() -> None:
         FoamFile.dumps({"#include": "$FOAM_CASE/simControls"}, ensure_header=False)
         == b"\n#include $FOAM_CASE/simControls\n"
     )
+    assert (
+        FoamFile.dumps([[1, 2, 3, 4], [5, 6, 7, 8]], ensure_header=False)
+        == b"(4(1 2 3 4) 4(5 6 7 8))"
+    )
+    assert (
+        FoamFile.dumps([[1, 2, 3], [4, 5, 6, 7]], ensure_header=False)
+        == b"(3(1 2 3) 4(4 5 6 7))"
+    )
+    assert (
+        FoamFile.dumps([[1, 2, 3], [4, 5, 6]], ensure_header=False)
+        == b"(3(1 2 3) 3(4 5 6))"
+    )
     indices = np.array([0, 3, 7], dtype=np.int32)
     values = np.array(
         [904040, 904479, 924424, 3516631, 3516634, 3516633, 3516632], dtype=np.int32