foamlib 0.9.4__tar.gz → 0.9.5__tar.gz

{foamlib-0.9.4 → foamlib-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foamlib
-Version: 0.9.4
+Version: 0.9.5
 Summary: A Python interface for interacting with OpenFOAM
 Project-URL: Homepage, https://github.com/gerlero/foamlib
 Project-URL: Repository, https://github.com/gerlero/foamlib

{foamlib-0.9.4 → foamlib-0.9.5}/foamlib/__init__.py

@@ -1,6 +1,6 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.9.4"
+__version__ = "0.9.5"
 
 from ._cases import (
     AsyncFoamCase,

{foamlib-0.9.4 → foamlib-0.9.5}/foamlib/_files/_parsing.py

@@ -363,11 +363,14 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
 _DIRECTIVE = Word("#", _IDENTBODYCHARS)
 _TOKEN = dbl_quoted_string | _DIRECTIVE | _IDENTIFIER
 _DATA = Forward()
+_DATA_ENTRY = Forward()
 _KEYWORD_ENTRY = _keyword_entry_of(
-    _TOKEN | _list_of(_IDENTIFIER), Opt(_DATA, default="")
+    _TOKEN | _list_of(_IDENTIFIER),
+    Opt(_DATA, default=""),
+    directive=_DIRECTIVE,
+    data_entry=_DATA_ENTRY,
 )
 _DICT = _dict_of(_TOKEN, _DATA)
-_DATA_ENTRY = Forward()
 _LIST_ENTRY = _DICT | _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
 _NUMBER = (

{foamlib-0.9.4 → foamlib-0.9.5}/foamlib/_files/_serialization.py

@@ -87,7 +87,7 @@ def normalize_data(
                 if arr.ndim == 1 or (arr.ndim == 2 and arr.shape[1] in (3, 6, 9)):
                     return arr  # type: ignore [return-value]
 
-            return [normalize_data(d) for d in data]  # type: ignore [arg-type]
+            return [normalize_data(d) for d in data]  # type: ignore [arg-type, misc]
 
         if isinstance(data, int):
             return float(data)
@@ -112,7 +112,7 @@ def normalize_data(
     if keywords is None and isinstance(data, tuple) and len(data) == 2:
         k, v = data
         assert not isinstance(k, Mapping)
-        return (
+        return (  # type: ignore [return-value]
             normalize_keyword(k),  # type: ignore [arg-type]
             normalize_data(v) if not isinstance(v, Mapping) else v,  # type: ignore [arg-type, misc]
         )
@@ -122,10 +122,10 @@ def normalize_data(
         and not isinstance(data, DimensionSet)
         and not isinstance(data, tuple)
     ):
-        return [normalize_data(d) for d in data]  # type: ignore [arg-type]
+        return [normalize_data(d) for d in data]  # type: ignore [arg-type, misc]
 
     if isinstance(data, tuple) and not isinstance(data, DimensionSet):
-        return tuple(normalize_data(d) for d in data)
+        return tuple(normalize_data(d) for d in data)  # type: ignore [misc]
 
     if isinstance(data, str):
         s = loads(data)
@@ -247,7 +247,8 @@ def dumps(
     if isinstance(data, tuple):
         if tuple_is_entry:
             k, v = data
-            ret = dumps(k)
+            ret = b"\n" if isinstance(k, str) and k[0] == "#" else b""
+            ret += dumps(k)
             val = dumps(
                 v,
                 keywords=(*keywords, k)
@@ -256,7 +257,9 @@ def dumps(
             )
             if val:
                 ret += b" " + val
-            if not isinstance(v, Mapping):
+            if isinstance(k, str) and k[0] == "#":
+                ret += b"\n"
+            elif not isinstance(v, Mapping):
                 ret += b";"
             return ret
 

{foamlib-0.9.4 → foamlib-0.9.5}/foamlib/_files/_types.py

@@ -199,25 +199,38 @@ FieldLike = Union[
 ]
 
 
-Data = Union[
+DataEntry = Union[
     str,
     int,
     float,
     bool,
     Dimensioned,
     DimensionSet,
-    Tuple["Data", ...],
-    List[Union["Data", Tuple["Data", Union["Data", "SubDict"]]]],
+    List[Union["DataEntry", Tuple["DataEntry", Union["DataEntry", "SubDict"]]]],
     Field,
 ]
 
-DataLike = Union[
-    Data,
-    Tuple["DataLike", ...],
-    Sequence[Union["DataLike", Tuple["DataLike", Union["DataLike", "SubDictLike"]]]],
+DataEntryLike = Union[
+    DataEntry,
+    Sequence[
+        Union[
+            "DataEntryLike",
+            Tuple["DataEntryLike", Union["DataEntryLike", "SubDictLike"]],
+        ]
+    ],
     FieldLike,
 ]
 
+Data = Union[
+    DataEntry,
+    Tuple[DataEntry, ...],
+]
+
+DataLike = Union[
+    DataEntryLike,
+    Tuple["DataEntryLike", ...],
+]
+
 StandaloneData = Union[
     Data,
     "np.ndarray[tuple[int], np.dtype[np.int64 | np.int32]]",

{foamlib-0.9.4 → foamlib-0.9.5}/tests/test_files/test_dumps.py

@@ -125,3 +125,7 @@ def test_serialize_file() -> None:
         )
         == b"FoamFile {format binary;} 3(\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00)"
     )
+    assert (
+        FoamFile.dumps({"#include": "$FOAM_CASE/simControls"}, ensure_header=False)
+        == b"\n#include $FOAM_CASE/simControls\n"
+    )

{foamlib-0.9.4 → foamlib-0.9.5}/tests/test_files/test_parsing/test_loads.py

@@ -71,3 +71,6 @@ def test_loads() -> None:
     assert FoamFile.loads("a {b c; d e;}") == {"a": {"b": "c", "d": "e"}}
     assert FoamFile.loads("(a b; c d;)") == [("a", "b"), ("c", "d")]
     assert FoamFile.loads("keyword;") == {"keyword": ""}
+    assert FoamFile.loads("#include $FOAM_CASE/simControls") == {
+        "#include": "$FOAM_CASE/simControls"
+    }