foamlib 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

foamlib/__init__.py

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

foamlib/_files/_base.py

@@ -51,6 +51,7 @@ class FoamFileBase:
     """
 
     _Dict = Dict[str, Union["Data", "_Dict"]]
+    _File = Dict[Optional[str], Union["Data", "_Dict"]]
 
     _SetData = Union[
         str,

foamlib/_files/_files.py

@@ -97,9 +97,9 @@ class FoamFile(
                 assert isinstance(ret, dict)
                 v = ret[k]
                 assert isinstance(v, dict)
-                ret = v
+                ret = cast(FoamFileBase._File, v)
 
-            return ret
+            return cast(FoamFileBase._Dict, ret)
 
     def create(self, *, exist_ok: bool = False, parents: bool = False) -> Self:
         """
@@ -356,7 +356,7 @@ class FoamFile(
     def __fspath__(self) -> str:
         return str(self.path)
 
-    def as_dict(self) -> FoamFileBase._Dict:
+    def as_dict(self) -> FoamFileBase._File:
         """Return a nested dict representation of the file."""
         _, parsed = self._read()
         d = parsed.as_dict()

foamlib/_files/_parsing.py

@@ -1,6 +1,6 @@
 import array
 import sys
-from typing import Tuple, Union
+from typing import Tuple, Union, cast
 
 if sys.version_info >= (3, 9):
     from collections.abc import Iterator, Mapping, MutableMapping, Sequence
@@ -149,7 +149,8 @@ _FIELD = (
 )
 _TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
 _DATA = Forward()
-_KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(_TOKEN, _DATA)), asdict=True)
+_KEYWORD = Combine(Literal("(") + Word(identchars + " ") + Literal(")")) | _TOKEN
+_KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(_KEYWORD, _DATA)), asdict=True)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
@@ -163,7 +164,7 @@ _DATA <<= _DATA_ENTRY[1, ...].set_parse_action(
 
 _FILE = (
     Dict(
-        Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+        Group(_keyword_entry_of(_KEYWORD, Opt(_DATA, default=""), located=True))[...]
         + Opt(
             Group(
                 Located(
@@ -173,7 +174,7 @@ _FILE = (
                 )
             )
         )
-        + Group(_keyword_entry_of(_TOKEN, Opt(_DATA, default=""), located=True))[...]
+        + Group(_keyword_entry_of(_KEYWORD, Opt(_DATA, default=""), located=True))[...]
     )
     .ignore(c_style_comment)
     .ignore(cpp_style_comment)
@@ -266,17 +267,20 @@ class Parsed(Mapping[Tuple[str, ...], Union[FoamFileBase.Data, EllipsisType]]):
 
         return start, end
 
-    def as_dict(self) -> FoamFileBase._Dict:
-        ret: FoamFileBase._Dict = {}
+    def as_dict(self) -> FoamFileBase._File:
+        ret: FoamFileBase._File = {}
         for keywords, (_, data, _) in self._parsed.items():
             r = ret
             for k in keywords[:-1]:
-                assert isinstance(r, dict)
                 v = r[k]
                 assert isinstance(v, dict)
-                r = v
+                r = cast(FoamFileBase._File, v)
 
             assert isinstance(r, dict)
-            r[keywords[-1]] = {} if data is ... else data
+            if keywords:
+                r[keywords[-1]] = {} if data is ... else data
+            else:
+                assert data is not ...
+                r[None] = data
 
         return ret

{foamlib-0.4.1.dist-info → foamlib-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.4.1
+Version: 0.4.3
 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

{foamlib-0.4.1.dist-info → foamlib-0.4.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foamlib/__init__.py,sha256=Lm0oAsj1KsJFBiIAaNSSE231t6g92HybfoXNwBoFUBQ,446
+foamlib/__init__.py,sha256=EfoThBRk5flPnxHT6JVA0jF01z42YT0I3RxCZR3fPp8,446
 foamlib/_util.py,sha256=UMzXmTFgvbp46w6k3oEZJoYC98pFgEK6LN5uLOwrlCg,397
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=xnQpR64EvFtCh07qnSz7kjQ1IhJXjRDwaZWwQGZhGv4,280
@@ -7,13 +7,13 @@ foamlib/_cases/_base.py,sha256=JrYJplmXV84qwgerdVSCHz2rCI-KWB4IvTBPMkYpecw,12657
 foamlib/_cases/_sync.py,sha256=CloQgd-93jxfSXIt7J5NxcAu3N_iF3eXMKO-NfNOgi4,4522
 foamlib/_cases/_util.py,sha256=v6sHxHCEgagsVuup0S1xJW-x9py5xj3bUye8PiFfb3o,925
 foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
-foamlib/_files/_base.py,sha256=sy1RP08pdv079KD_UBy7xUYEnXyNK35AiKVcCalYmPU,1873
-foamlib/_files/_files.py,sha256=2bvl2YZ0bqHpbQV35vzYO7wWNOo_2WDF9LbyLagIvBE,16193
+foamlib/_files/_base.py,sha256=zaFDjLE6jB7WtGWk8hfKusjLtlGu6CZV16AHJpRUibs,1929
+foamlib/_files/_files.py,sha256=-3mDRIsaQaxHF74q0Zfzlrhfieb7w_EPOFScSx8wRPE,16245
 foamlib/_files/_io.py,sha256=f_tYI7AqaFsQ8mtK__fEoIUqpYb3YmrI8X5D8updmNM,2084
-foamlib/_files/_parsing.py,sha256=eqY3grOnBdeXQLmM418VFKtCrpSd7FnLXuQ8h4mzD2M,8189
+foamlib/_files/_parsing.py,sha256=ZDEnMdLfTCn82I5E-IOv-PxGv4w7N2Nvtc4NX7-m0MA,8383
 foamlib/_files/_serialization.py,sha256=3yb9fgjCpDoRfZoLsbZaIFrkZ3vGBzleFRw6IbaZuuY,3408
-foamlib-0.4.1.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.4.1.dist-info/METADATA,sha256=u17GpI0WPbXEBVwUo0lJI6J8sApdaTYzwX_DGbPr0rw,5457
-foamlib-0.4.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-foamlib-0.4.1.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.4.1.dist-info/RECORD,,
+foamlib-0.4.3.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.4.3.dist-info/METADATA,sha256=M-Cy5LK8xxGL-jEtA7jZ0p5y_7iZ-Co6yTePRg1czb0,5457
+foamlib-0.4.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+foamlib-0.4.3.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.4.3.dist-info/RECORD,,