foamlib 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

foamlib/__init__.py

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

foamlib/_files/_files.py

@@ -308,15 +308,15 @@ class FoamFile(
                     self[(*keywords, k)] = v
 
             elif keywords:
+                val = dumps(data, kind=kind)
                 parsed.put(
                     keywords,
                     normalize(data, kind=kind),
                     before
                     + indentation
                     + dumps(keywords[-1])
-                    + b" "
-                    + dumps(data, kind=kind)
-                    + b";"
+                    + ((b" " + val) if val else b"")
+                    + (b";" if not keywords[-1].startswith("#") else b"")
                     + after,
                 )
 

foamlib/_files/_parsing.py

@@ -89,7 +89,7 @@ def _parse_ascii_field(
         s = re.sub(ignore.re, " ", s)
     s = s.replace("(", " ").replace(")", " ")
 
-    return np.fromstring(s, sep=" ").reshape(-1, *tensor_kind.shape)
+    return np.fromstring(s, sep=" ").reshape(-1, *tensor_kind.shape)  # type: ignore [return-value]
 
 
 def _unpack_binary_field(
@@ -99,7 +99,7 @@ def _unpack_binary_field(
     assert float_size in (4, 8)
 
     dtype = np.float32 if float_size == 4 else float
-    return np.frombuffer(b, dtype=dtype).reshape(-1, *tensor_kind.shape)
+    return np.frombuffer(b, dtype=dtype).reshape(-1, *tensor_kind.shape)  # type: ignore [return-value]
 
 
 def _tensor_list(
@@ -153,12 +153,19 @@ def _tensor_list(
 
 
 def _dict_of(
-    keyword: ParserElement, data: ParserElement, *, located: bool = False
+    keyword: ParserElement,
+    data: ParserElement,
+    *,
+    directive: ParserElement | None = None,
+    located: bool = False,
 ) -> ParserElement:
     dict_ = Forward()
 
     keyword_entry = keyword + (dict_ | (data + Literal(";").suppress()))
 
+    if directive is not None:
+        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+
     if located:
         keyword_entry = Located(keyword_entry)
 
@@ -175,12 +182,17 @@ def _keyword_entry_of(
     keyword: ParserElement,
     data: ParserElement,
     *,
+    directive: ParserElement | None = None,
     located: bool = False,
 ) -> ParserElement:
     keyword_entry = keyword + (
-        _dict_of(keyword, data, located=located) | (data + Literal(";").suppress())
+        _dict_of(keyword, data, directive=directive, located=located)
+        | (data + Literal(";").suppress())
     )
 
+    if directive is not None:
+        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+
     if located:
         keyword_entry = Located(keyword_entry)
     else:
@@ -223,9 +235,10 @@ _TENSOR = (
     | _tensor(TensorKind.SYMM_TENSOR)
     | _tensor(TensorKind.TENSOR)
 )
-_IDENTIFIER = Combine(
+_IDENTIFIER = Forward()
+_IDENTIFIER <<= Combine(
     Word(_IDENTCHARS, _IDENTBODYCHARS, exclude_chars="()")
-    + Opt(Literal("(") + Word(_IDENTBODYCHARS, exclude_chars="()") + Literal(")"))
+    + Opt(Literal("(") + _IDENTIFIER + Literal(")"))
 )
 _DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: Dimensioned(*reversed(tks.as_list()))
@@ -239,7 +252,8 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
         | _tensor_list(TensorKind.TENSOR, ignore=_COMMENT)
     )
 )
-_TOKEN = dbl_quoted_string | _IDENTIFIER
+_DIRECTIVE = Word("#", _IDENTBODYCHARS)
+_TOKEN = dbl_quoted_string | _IDENTIFIER | _DIRECTIVE
 _DATA = Forward()
 _KEYWORD_ENTRY = _keyword_entry_of(_TOKEN | _list_of(_IDENTIFIER), _DATA)
 _DICT = _dict_of(_TOKEN, _DATA)
@@ -258,18 +272,21 @@ _DATA <<= (
 
 
 def parse_data(s: str) -> Data:
+    if not s.strip():
+        return ""
     return cast(Data, _DATA.parse_string(s, parse_all=True)[0])
 
 
 _LOCATED_DICTIONARY = Group(
-    _keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True)
+    _keyword_entry_of(
+        _TOKEN, Opt(_DATA, default=""), directive=_DIRECTIVE, located=True
+    )
 )[...]
 _LOCATED_DATA = Group(Located(_DATA.copy().add_parse_action(lambda tks: ["", tks[0]])))
 
 _FILE = (
     Dict(_LOCATED_DICTIONARY + Opt(_LOCATED_DATA) + _LOCATED_DICTIONARY)
     .ignore(_COMMENT)
-    .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
     .parse_with_tabs()
 )
 

foamlib/_files/_serialization.py

@@ -50,7 +50,7 @@ def normalize(data: Entry, *, kind: Kind = Kind.DEFAULT) -> Entry:
                     arr = arr.astype(float)
 
                 if arr.ndim == 1 or (arr.ndim == 2 and arr.shape[1] in (3, 6, 9)):
-                    return arr
+                    return arr  # type: ignore [return-value]
 
             return data
 
@@ -111,7 +111,10 @@ def dumps(
 
     if isinstance(data, tuple) and kind == Kind.SINGLE_ENTRY and len(data) == 2:
         k, v = data
-        ret = dumps(k) + b" " + dumps(v)
+        ret = dumps(k)
+        val = dumps(v)
+        if val:
+            ret += b" " + val
         if not isinstance(v, Mapping):
             ret += b";"
         return ret

foamlib/_files/_types.py

@@ -79,7 +79,7 @@ class Dimensioned:
 
     def __post_init__(self) -> None:
         if is_sequence(self.value):
-            self.value = np.asarray(self.value, dtype=float)
+            self.value = np.asarray(self.value, dtype=float)  # type: ignore [assignment]
         else:
             assert isinstance(self.value, (int, float, np.ndarray))
             self.value = float(self.value)

{foamlib-0.8.2.dist-info → foamlib-0.8.4.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: foamlib
-Version: 0.8.2
+Version: 0.8.4
 Summary: A Python interface for interacting with OpenFOAM
 Project-URL: Homepage, https://github.com/gerlero/foamlib
 Project-URL: Repository, https://github.com/gerlero/foamlib
 Project-URL: Documentation, https://foamlib.readthedocs.io
 Author-email: "Gabriel S. Gerlero" <ggerlero@cimec.unl.edu.ar>
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
@@ -31,7 +32,7 @@ Requires-Dist: pyparsing<4,>=3.1.2
 Requires-Dist: typing-extensions<5,>=4; python_version < '3.11'
 Provides-Extra: dev
 Requires-Dist: mypy<2,>=1; extra == 'dev'
-Requires-Dist: pytest-asyncio<0.25,>=0.21; extra == 'dev'
+Requires-Dist: pytest-asyncio<0.26,>=0.21; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
 Requires-Dist: pytest<9,>=7; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
@@ -43,12 +44,12 @@ Requires-Dist: sphinx<9,>=5; extra == 'docs'
 Provides-Extra: lint
 Requires-Dist: ruff; extra == 'lint'
 Provides-Extra: test
-Requires-Dist: pytest-asyncio<0.25,>=0.21; extra == 'test'
+Requires-Dist: pytest-asyncio<0.26,>=0.21; extra == 'test'
 Requires-Dist: pytest-cov; extra == 'test'
 Requires-Dist: pytest<9,>=7; extra == 'test'
 Provides-Extra: typing
 Requires-Dist: mypy<2,>=1; extra == 'typing'
-Requires-Dist: pytest-asyncio<0.25,>=0.21; extra == 'typing'
+Requires-Dist: pytest-asyncio<0.26,>=0.21; extra == 'typing'
 Requires-Dist: pytest-cov; extra == 'typing'
 Requires-Dist: pytest<9,>=7; extra == 'typing'
 Description-Content-Type: text/markdown

{foamlib-0.8.2.dist-info → foamlib-0.8.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foamlib/__init__.py,sha256=QpOhIHnI_P5oekqBFi8WZFxeYVsyODiHJFcRGvDoB8c,452
+foamlib/__init__.py,sha256=xYSLuRubvL_srTiNR5-bYmOHuvUEv_y3cMIOAXMcCt8,452
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=_A1TTHuQfS9FH2_33lSEyLtOJZGFHZBco1tWJCVOHks,358
 foamlib/_cases/_async.py,sha256=onECxRLQCF7Kd-GeuLqH_Xv3gbMMhKOSbFaUG5Ttgmk,7822
@@ -9,12 +9,12 @@ foamlib/_cases/_subprocess.py,sha256=6BlBRxknj2-BFcGkx7oVcuL63_utSaY1Axmsc1qV9j8
 foamlib/_cases/_sync.py,sha256=2BJXB7Nzldb4OgPukqupgYqdceUGkI2mYhhtGPWEBrc,5901
 foamlib/_cases/_util.py,sha256=tK4SM5WT3eEgGsFLnidIySbom1qowBAua9z13gipKJk,1518
 foamlib/_files/__init__.py,sha256=q1vkjXnjnSZvo45jPAICpWeF2LZv5V6xfzAR6S8fS5A,96
-foamlib/_files/_files.py,sha256=5sxtHQuN25w1gszZBpSMOaF--KOJy2HLmM6CScLof9s,15331
+foamlib/_files/_files.py,sha256=V740S36NVunULv8pnyEsJ7lIWbSjk_-LwbP7BBqFsO0,15404
 foamlib/_files/_io.py,sha256=BGbbm6HKxL2ka0YMCmHqZQZ1R4PPQlkvWWb4FHMAS8k,2217
-foamlib/_files/_parsing.py,sha256=Cwc_5Z34UAz5hkB-Sb2hQ6bemoPRuXgmtcAybtOSic8,12997
-foamlib/_files/_serialization.py,sha256=SeSR7vMaii5GQ4OXJv8yFPecqOk_mGxAyPJRtjum30Q,5145
-foamlib/_files/_types.py,sha256=ouP2VQtQr2M-GJCojm954Cb8CdzyfypDpmQlZQWsmw4,3379
-foamlib-0.8.2.dist-info/METADATA,sha256=jyVgylX2aU7UT907iOuyxtTG94iDHCoobt-yyd2JwsE,7942
-foamlib-0.8.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-foamlib-0.8.2.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.8.2.dist-info/RECORD,,
+foamlib/_files/_parsing.py,sha256=_YCi1-ltrlQWyh5RvGDZgi47MzJ7FzFcsK6L_rAWksA,13489
+foamlib/_files/_serialization.py,sha256=PvMzNyTja6OKT_GUfExTulx9nMLBjfu0-9yThCKbvxs,5227
+foamlib/_files/_types.py,sha256=m-fFjJnS4sFSavDsijlXpAfEhnbh10RBumSHAT0GOgQ,3408
+foamlib-0.8.4.dist-info/METADATA,sha256=YsjrAXLrG3ELANlB9PRyyHiciEJAU7rL0IP4AOsMV8A,7968
+foamlib-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+foamlib-0.8.4.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.8.4.dist-info/RECORD,,

{foamlib-0.8.2.dist-info → foamlib-0.8.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any