foamlib 0.4.1__tar.gz → 0.4.3__tar.gz

{foamlib-0.4.1 → foamlib-0.4.3}/PKG-INFO

@@ -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 → foamlib-0.4.3}/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-0.4.1 → foamlib-0.4.3}/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-0.4.1 → foamlib-0.4.3}/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-0.4.1 → foamlib-0.4.3}/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 → foamlib-0.4.3}/foamlib.egg-info/PKG-INFO

@@ -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