foamlib 0.2.1__tar.gz → 0.2.2__tar.gz

{foamlib-0.2.1 → foamlib-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.2.1
+Version: 0.2.2
 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.2.1 → foamlib-0.2.2}/foamlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 from ._cases import FoamCase, AsyncFoamCase, FoamCaseBase
 from ._dictionaries import FoamFile, FoamFieldFile

{foamlib-0.2.1 → foamlib-0.2.2}/foamlib/_cases.py

@@ -64,6 +64,14 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
             except FileNotFoundError as e:
                 raise KeyError(key) from e
 
+        def __contains__(self, obj: object) -> bool:
+            if isinstance(obj, FoamFieldFile):
+                return obj.path.parent == self.path
+            elif isinstance(obj, str):
+                return (self.path / obj).is_file()
+            else:
+                return False
+
         def __iter__(self) -> Iterator[FoamFieldFile]:
             for p in self.path.iterdir():
                 if p.is_file():

{foamlib-0.2.1 → foamlib-0.2.2}/foamlib/_dictionaries.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 from dataclasses import dataclass
-from collections import namedtuple
 from contextlib import suppress
 from typing import (
     Any,
@@ -10,6 +9,7 @@ from typing import (
     Optional,
     Mapping,
     MutableMapping,
+    NamedTuple,
     cast,
 )
 
@@ -20,16 +20,15 @@ from pyparsing import (
     Keyword,
     LineEnd,
     Literal,
-    Located,
     Opt,
+    ParserElement,
     QuotedString,
     Word,
     c_style_comment,
     common,
     cpp_style_comment,
-    printables,
-    identchars,
     identbodychars,
+    printables,
 )
 
 try:
@@ -76,8 +75,7 @@ class _FoamDictionary(MutableMapping[str, Union["FoamFile.Value", "_FoamDictiona
                 ) from None
 
     def __getitem__(self, key: str) -> Union["FoamFile.Value", "_FoamDictionary"]:
-        contents = self._file.path.read_text()
-        value = _DICTIONARY.parse_string(contents, parse_all=True).as_dict()
+        value = _DICTIONARY.parse_file(self._file.path, parse_all=True).as_dict()
 
         for key in [*self._keywords, key]:
             value = value[key]
@@ -85,8 +83,7 @@ class _FoamDictionary(MutableMapping[str, Union["FoamFile.Value", "_FoamDictiona
         if isinstance(value, dict):
             return _FoamDictionary(self._file, [*self._keywords, key])
         else:
-            start, end = value
-            return _VALUE.parse_string(contents[start:end], parse_all=True).as_list()[0]
+            return value
 
     def _setitem(
         self,
@@ -101,7 +98,6 @@ class _FoamDictionary(MutableMapping[str, Union["FoamFile.Value", "_FoamDictiona
         elif isinstance(value, Mapping):
             self._cmd(["-set", "{}"], key=key)
             subdict = self[key]
-            print(subdict)
             assert isinstance(subdict, _FoamDictionary)
             for k, v in value.items():
                 subdict[k] = v
@@ -139,7 +135,7 @@ class _FoamDictionary(MutableMapping[str, Union["FoamFile.Value", "_FoamDictiona
         return len(list(iter(self)))
 
     def __repr__(self) -> str:
-        return "FoamFile.Dictionary"
+        return f"FoamFile.Dictionary({self._file}, {self._keywords})"
 
 
 class FoamFile(_FoamDictionary):
@@ -147,19 +143,17 @@ class FoamFile(_FoamDictionary):
 
     Dictionary = _FoamDictionary
 
-    DimensionSet = namedtuple(
-        "DimensionSet",
-        [
-            "mass",
-            "length",
-            "time",
-            "temperature",
-            "moles",
-            "current",
-            "luminous_intensity",
-        ],
-        defaults=(0, 0, 0, 0, 0, 0, 0),
-    )
+    class DimensionSet(NamedTuple):
+        mass: Union[int, float] = 0
+        length: Union[int, float] = 0
+        time: Union[int, float] = 0
+        temperature: Union[int, float] = 0
+        moles: Union[int, float] = 0
+        current: Union[int, float] = 0
+        luminous_intensity: Union[int, float] = 0
+
+        def __repr__(self) -> str:
+            return f"{type(self).__qualname__}({', '.join(f'{n}={v}' for n, v in zip(self._fields, self) if v != 0)})"
 
     @dataclass
     class Dimensioned:
@@ -206,7 +200,7 @@ class FoamFieldFile(FoamFile):
             return ret
 
         def __repr__(self) -> str:
-            return "FoamFieldFile.BoundariesDictionary"
+            return f"{type(self).__qualname__}({self._file}, {self._keywords})"
 
     class BoundaryDictionary(_FoamDictionary):
         """An OpenFOAM dictionary representing a boundary condition as a mutable mapping."""
@@ -265,7 +259,7 @@ class FoamFieldFile(FoamFile):
             del self["value"]
 
         def __repr__(self) -> str:
-            return "FoamFieldFile.BoundaryDictionary"
+            return f"{type(self).__qualname__}({self._file}, {self._keywords})"
 
     def __getitem__(self, key: str) -> Union[FoamFile.Value, _FoamDictionary]:
         ret = super().__getitem__(key)
@@ -343,62 +337,65 @@ _NO = Keyword("no").set_parse_action(lambda: False)
 _DIMENSIONS = (
     Literal("[").suppress() + common.number * 7 + Literal("]").suppress()
 ).set_parse_action(lambda tks: FoamFile.DimensionSet(*tks))
-_TOKEN = QuotedString('"', unquote_results=False) | Word(
-    identchars + "$", identbodychars
-)
-_ITEM = Forward()
-_LIST = Opt(
-    Literal("List") + Literal("<") + common.identifier + Literal(">")
-).suppress() + (
-    (
-        Opt(common.integer).suppress()
-        + Literal("(").suppress()
-        + Group(_ITEM[...])
-        + Literal(")").suppress()
+
+
+def _list_of(elem: ParserElement) -> ParserElement:
+    return Opt(
+        Literal("List") + Literal("<") + common.identifier + Literal(">")
+    ).suppress() + (
+        (
+            Opt(common.integer).suppress()
+            + (
+                Literal("(").suppress()
+                + Group((elem)[...]).set_parse_action(lambda tks: tks.as_list())
+                + Literal(")").suppress()
+            )
+        )
+        | (
+            common.integer + Literal("{").suppress() + elem + Literal("}").suppress()
+        ).set_parse_action(lambda tks: [[tks[1]] * tks[0]])
     )
-    | (
-        common.integer + Literal("{").suppress() + _ITEM + Literal("}").suppress()
-    ).set_parse_action(lambda tks: [tks[1]] * tks[0])
-)
-_FIELD = (Keyword("uniform").suppress() + _ITEM) | (
-    Keyword("nonuniform").suppress() + _LIST
-)
-_DIMENSIONED = (Opt(common.identifier) + _DIMENSIONS + _ITEM).set_parse_action(
+
+
+_TENSOR = _list_of(common.number) | common.number
+_IDENTIFIER = Word(identbodychars + "$", identbodychars + "({,./:^!)}")
+_DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: FoamFile.Dimensioned(*reversed(tks.as_list()))
 )
+_FIELD = (Keyword("uniform").suppress() + _TENSOR) | (
+    Keyword("nonuniform").suppress() + _list_of(_TENSOR)
+)
+_TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
+_DICTIONARY = Forward()
+_SUBDICT = Literal("{").suppress() + _DICTIONARY + Literal("}").suppress()
+_ITEM = Forward()
+_LIST = _list_of(_ITEM)
 _ITEM <<= (
-    _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _YES | _NO | _TOKEN
+    _FIELD
+    | _LIST
+    | _SUBDICT
+    | _DIMENSIONED
+    | _DIMENSIONS
+    | common.number
+    | _YES
+    | _NO
+    | _TOKEN
 )
-
 _TOKENS = (
-    QuotedString('"', unquote_results=False)
-    | Word(printables.replace(";", "").replace("{", "").replace("}", ""))
+    QuotedString('"', unquote_results=False) | Word(printables.replace(";", ""))
 )[2, ...].set_parse_action(lambda tks: " ".join(tks))
 
-_VALUE = (_ITEM ^ _TOKENS).ignore(c_style_comment).ignore(cpp_style_comment)
-
+_VALUE = _ITEM ^ _TOKENS
 
-_UNPARSED_VALUE = (
-    QuotedString('"', unquote_results=False)
-    | Word(printables.replace(";", "").replace("{", "").replace("}", ""))
-)[...]
-_KEYWORD = QuotedString('"', unquote_results=False) | Word(
-    identchars + "$(,.)", identbodychars + "$(,.)"
-)
-_DICTIONARY = Forward()
-_ENTRY = _KEYWORD + (
-    (
-        Located(_UNPARSED_VALUE).set_parse_action(lambda tks: (tks[0], tks[2]))
-        + Literal(";").suppress()
-    )
-    | (Literal("{").suppress() + _DICTIONARY + Literal("}").suppress())
+_ENTRY = _IDENTIFIER + (
+    (Opt(_VALUE, default=None) + Literal(";").suppress()) | _SUBDICT
 )
 _DICTIONARY <<= (
     Dict(Group(_ENTRY)[...])
     .set_parse_action(lambda tks: {} if not tks else tks)
     .ignore(c_style_comment)
     .ignore(cpp_style_comment)
-    .ignore(Literal("#include") + ... + LineEnd())  # type: ignore
+    .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
 )
 
 

{foamlib-0.2.1 → foamlib-0.2.2}/foamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.2.1
+Version: 0.2.2
 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.2.1 → foamlib-0.2.2}/tests/test_dictionaries.py

@@ -25,17 +25,26 @@ def test_parse_value() -> None:
     assert _VALUE.parse_string("(1.0 2.0 3.0)").as_list()[0] == [1.0, 2.0, 3.0]
     assert _VALUE.parse_string("uniform (1 2 3)").as_list()[0] == [1, 2, 3]
     assert _VALUE.parse_string("nonuniform List<scalar> 2(1 2)").as_list()[0] == [1, 2]
+    assert _VALUE.parse_string("nonuniform List<scalar> 2{1}").as_list()[0] == [1, 1]
     assert _VALUE.parse_string("3(1 2 3)").as_list()[0] == [1, 2, 3]
     assert _VALUE.parse_string("2((1 2 3) (4 5 6))").as_list()[0] == [
         [1, 2, 3],
         [4, 5, 6],
     ]
+    assert _VALUE.parse_string("2{(1 2 3)}").as_list()[0] == [
+        [1, 2, 3],
+        [1, 2, 3],
+    ]
     assert _VALUE.parse_string("nonuniform List<vector> 2((1 2 3) (4 5 6))").as_list()[
         0
     ] == [
         [1, 2, 3],
         [4, 5, 6],
     ]
+    assert _VALUE.parse_string("nonuniform List<vector> 2{(1 2 3)}").as_list()[0] == [
+        [1, 2, 3],
+        [1, 2, 3],
+    ]
     assert _VALUE.parse_string("[1 1 -2 0 0 0 0]").as_list()[
         0
     ] == FoamFile.DimensionSet(mass=1, length=1, time=-2)