foamlib 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

foamlib/_files/_parsing.py

@@ -54,11 +54,10 @@ def _list_of(entry: ParserElement) -> ParserElement:
     )
 
 
-def _dictionary_of(
+def _keyword_entry_of(
     keyword: ParserElement,
     data_entries: ParserElement,
     *,
-    len: Union[int, EllipsisType] = ...,
     located: bool = False,
 ) -> ParserElement:
     subdict = Forward()
@@ -73,7 +72,7 @@ def _dictionary_of(
 
     subdict <<= Dict(Group(keyword_entry)[...], asdict=not located)
 
-    return Dict(Group(keyword_entry)[len], asdict=not located)
+    return keyword_entry
 
 
 _binary_contents = Forward()
@@ -146,7 +145,7 @@ _FIELD = (
 )
 _TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
 _DATA = Forward()
-_KEYWORD_ENTRY = _dictionary_of(_TOKEN, _DATA, len=1)
+_KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(_TOKEN, _DATA)), asdict=True)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
@@ -159,7 +158,19 @@ _DATA <<= _DATA_ENTRY[1, ...].set_parse_action(
 )
 
 _FILE = (
-    _dictionary_of(_TOKEN, Opt(_DATA, default=""), located=True)
+    Dict(
+        Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+        + Opt(
+            Group(
+                Located(
+                    _DATA_ENTRY[1, ...].set_parse_action(
+                        lambda tks: ["", tuple(tks) if len(tks) > 1 else tks[0]]
+                    )
+                )
+            )
+        )
+        + Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+    )
     .ignore(c_style_comment)
     .ignore(cpp_style_comment)
     .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
@@ -203,8 +214,11 @@ class Parsed(Mapping[Tuple[str, ...], Union[FoamDict.Data, EllipsisType]]):
         return ret
 
     def __getitem__(
-        self, keywords: Tuple[str, ...]
+        self, keywords: Union[str, Tuple[str, ...]]
     ) -> Union[FoamDict.Data, EllipsisType]:
+        if isinstance(keywords, str):
+            keywords = (keywords,)
+
         _, data, _ = self._parsed[keywords]
         return data
 

foamlib/_files/_serialization.py

@@ -39,12 +39,14 @@ def dumpb(
         entries = []
         for k, v in data.items():
             b = dumpb(v, kind=kind)
-            if isinstance(v, Mapping):
+            if not k:
+                entries.append(b)
+            elif isinstance(v, Mapping):
                 entries.append(dumpb(k) + b"\n" + b"{\n" + b + b"\n}")
-            elif b:
-                entries.append(dumpb(k) + b" " + b + b";")
-            else:
+            elif not b:
                 entries.append(dumpb(k) + b";")
+            else:
+                entries.append(dumpb(k) + b" " + b + b";")
 
         return b"\n".join(entries)
 

{foamlib-0.3.10.dist-info → foamlib-0.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.3.10
+Version: 0.3.12
 Summary: A Python interface for interacting with OpenFOAM
 Author-email: "Gabriel S. Gerlero" <ggerlero@cimec.unl.edu.ar>
 Project-URL: Homepage, https://github.com/gerlero/foamlib
@@ -36,12 +36,12 @@ Requires-Dist: foamlib[typing] ; extra == 'dev'
 Requires-Dist: foamlib[docs] ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: foamlib[numpy] ; extra == 'docs'
-Requires-Dist: sphinx <8,>=7 ; extra == 'docs'
+Requires-Dist: sphinx <9,>=7 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
 Provides-Extra: lint
 Requires-Dist: ruff ; extra == 'lint'
 Provides-Extra: numpy
-Requires-Dist: numpy <2,>=1 ; extra == 'numpy'
+Requires-Dist: numpy <3,>=1 ; extra == 'numpy'
 Provides-Extra: test
 Requires-Dist: foamlib[numpy] ; extra == 'test'
 Requires-Dist: pytest <9,>=7 ; extra == 'test'

foamlib-0.3.12.dist-info/RECORD

@@ -0,0 +1,18 @@
+foamlib/__init__.py,sha256=vhhhADNxwAVfkJ0_bm28V9p2b-Mo5Mgua44ZIo2hl88,432
+foamlib/_util.py,sha256=vL03aAzpWdZyYIhe2WTxHiz9b4lnttVnRuzqUmZvXXk,3047
+foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+foamlib/_cases/__init__.py,sha256=4bHQRLtYh0IBOuuCSwUbipZEPqIF0sypU2xtoc6YW3c,166
+foamlib/_cases/_async.py,sha256=Rfbq3rerYZdt4lX7YxnStj4LSqwH2j0rAmbPkSDHhP0,4995
+foamlib/_cases/_base.py,sha256=jHgZAR1z7pZHPC0XTDTNXVfTJ8BKFv_ESYwUz2NPzWw,11416
+foamlib/_cases/_sync.py,sha256=irMprDmcvjvdIj82griGhXvDU_L9UnyAbyJjS74Z3ug,3961
+foamlib/_files/__init__.py,sha256=vDkPj8u8bX_I_m2YfeKvXBgwg8D1ufyFCfHGHKN3JPQ,140
+foamlib/_files/_base.py,sha256=YA5a-i5HZuA3JslCD6r-DwZzpSA8r42dqSXef286Ako,2050
+foamlib/_files/_files.py,sha256=4rZb3HMJADmJBGmRpChiujJNX1UIxhgHI5YPEmEOWvE,10784
+foamlib/_files/_io.py,sha256=pGYMoLI5Dz2Y90EB1CtklZiffpDTGuQbbbkyqRe0JAo,2115
+foamlib/_files/_parsing.py,sha256=SW1c1adDTg3e65hhZv5ZFDX8j654E88FDn13zl8gJ8c,7694
+foamlib/_files/_serialization.py,sha256=LCeaLWtNvkcs0dfowL7nViiByxw7U_fvgueVjFliipU,3462
+foamlib-0.3.12.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.3.12.dist-info/METADATA,sha256=5DDxoDLrNBs1fXupfQCTxSzb6Z1a3w34IvImEgiSrRc,5458
+foamlib-0.3.12.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+foamlib-0.3.12.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.3.12.dist-info/RECORD,,

{foamlib-0.3.10.dist-info → foamlib-0.3.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any