foamlib 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

foamlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.6"
+__version__ = "0.1.8"
 
 from ._cases import FoamCase, AsyncFoamCase, FoamTimeDirectory, FoamCaseBase
 from ._dictionaries import (

foamlib/_cases.py

@@ -14,7 +14,6 @@ from typing import (
     Sequence,
     AsyncGenerator,
     Callable,
-    Mapping,
     Iterator,
     overload,
 )

foamlib/_dictionaries.py

@@ -23,6 +23,7 @@ except ModuleNotFoundError:
 else:
     numpy = True
 
+from pyparsing import Group, Keyword, Opt, ZeroOrMore, Literal, Forward, common
 
 FoamDimensionSet = namedtuple(
     "FoamDimensionSet",
@@ -63,108 +64,46 @@ FoamValue = Union[
 A value that can be stored in an OpenFOAM dictionary.
 """
 
+_YES = Keyword("yes").set_parse_action(lambda s, loc, tks: True)
+_NO = Keyword("no").set_parse_action(lambda s, loc, tks: False)
+_VALUE = Forward()
+_LIST = Opt(
+    Literal("List") + Literal("<") + common.identifier + Literal(">")
+).suppress() + (
+    (
+        Opt(common.integer).suppress()
+        + Literal("(").suppress()
+        + Group(ZeroOrMore(_VALUE))
+        + Literal(")").suppress()
+    )
+    | (
+        common.integer + Literal("{").suppress() + _VALUE + Literal("}").suppress()
+    ).set_parse_action(lambda s, loc, tks: [tks[1]] * tks[0])
+)
+_FIELD = (Keyword("uniform").suppress() + _VALUE) | (
+    Keyword("nonuniform").suppress() + _LIST
+)
+_DIMENSIONS = (
+    Literal("[").suppress() + common.number * 7 + Literal("]").suppress()
+).set_parse_action(lambda s, loc, tks: FoamDimensionSet(*tks))
+_DIMENSIONED = (common.identifier + _DIMENSIONS + _VALUE).set_parse_action(
+    lambda s, loc, tks: FoamDimensioned(tks[0], tks[1], tks[2].as_list())
+)
 
-def _parse_bool(value: str) -> bool:
-    if value == "yes":
-        return True
-    elif value == "no":
-        return False
-    else:
-        raise ValueError(f"Cannot parse '{value}' as a boolean")
-
-
-def _parse_number(value: str) -> Union[int, float]:
-    with suppress(ValueError):
-        return int(value)
-    with suppress(ValueError):
-        return float(value)
-    raise ValueError(f"Cannot parse '{value}' as a number")
-
-
-def _parse_sequence(value: str) -> Sequence[FoamValue]:
-    start = value.find("(")
-    if start != -1:
-        assert value.endswith(")")
-        seq = []
-        nested = 0
-        start += 1
-        for i, c in enumerate(value[start:], start=start):
-            if c == "(":
-                nested += 1
-            elif c == ")":
-                nested -= 1
-            if c.isspace() and not nested:
-                v = value[start:i].strip()
-                if v:
-                    seq.append(_parse(v))
-                start = i + 1
-
-        v = value[start:-1].strip()
-        if v:
-            seq.append(_parse(v))
-
-        return seq
-
-    else:
-        raise ValueError(f"Cannot parse '{value}' as a sequence")
-
-
-def _parse_field(value: str) -> FoamValue:
-    if value.startswith("uniform "):
-        value = value[len("uniform ") :]
-        return _parse(value)
-    elif value.startswith("nonuniform "):
-        value = value[len("nonuniform ") :]
-        return _parse_sequence(value)
-    else:
-        raise ValueError(f"Cannot parse '{value}' as a field")
-
-
-def _parse_dimensions(value: str) -> FoamDimensionSet:
-    if value.startswith("["):
-        assert value.endswith("]")
-        return FoamDimensionSet(*(_parse_number(v) for v in value[1:-1].split()))
-    else:
-        raise ValueError(f"Cannot parse '{value}' as a dimension set")
-
-
-def _parse_dimensioned(value: str) -> FoamDimensioned:
-    start = value.find("[", 1)
-    if start != -1:
-        name = value[:start].strip()
-        end = value.find("]", start)
-        if end != -1:
-            dimensions = _parse_dimensions(value[start : end + 1])
-            value = value[end + 1 :].strip()
-            return FoamDimensioned(
-                name,
-                dimensions,
-                cast(Union[int, float, Sequence[Union[int, float]]], _parse(value)),
-            )
-
-    raise ValueError(f"Cannot parse '{value}' as a dimensioned value")
+_VALUE << (
+    _FIELD
+    | _LIST
+    | _DIMENSIONED
+    | _DIMENSIONS
+    | common.number
+    | _YES
+    | _NO
+    | common.identifier
+)
 
 
 def _parse(value: str) -> FoamValue:
-    with suppress(ValueError):
-        return _parse_bool(value)
-
-    with suppress(ValueError):
-        return _parse_field(value)
-
-    with suppress(ValueError):
-        return _parse_number(value)
-
-    with suppress(ValueError):
-        return _parse_dimensions(value)
-
-    with suppress(ValueError):
-        return _parse_dimensioned(value)
-
-    with suppress(ValueError):
-        return _parse_sequence(value)
-
-    return value
+    return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
 
 
 def _serialize_bool(value: Any) -> str:
@@ -176,24 +115,26 @@ def _serialize_bool(value: Any) -> str:
         raise TypeError(f"Not a bool: {type(value)}")
 
 
-def _serialize_sequence(sequence: Any) -> str:
-    if (
-        isinstance(sequence, Sequence)
-        and not isinstance(sequence, str)
+def _is_sequence(value: Any) -> bool:
+    return (
+        isinstance(value, Sequence)
+        and not isinstance(value, str)
         or numpy
-        and isinstance(sequence, np.ndarray)
-    ):
-        return f"({' '.join(_serialize(v) for v in sequence)})"
+        and isinstance(value, np.ndarray)
+    )
+
+
+def _serialize_list(value: Any) -> str:
+    if _is_sequence(value):
+        return f"({' '.join(_serialize(v) for v in value)})"
     else:
-        raise TypeError(f"Not a valid sequence: {type(sequence)}")
+        raise TypeError(f"Not a valid sequence: {type(value)}")
 
 
 def _serialize_field(value: Any) -> str:
-    if isinstance(value, (int, float)):
-        return f"uniform {value}"
-    else:
+    if _is_sequence(value):
         try:
-            s = _serialize_sequence(value)
+            s = _serialize_list(value)
         except TypeError:
             raise TypeError(f"Not a valid field: {type(value)}") from None
         else:
@@ -213,15 +154,12 @@ def _serialize_field(value: Any) -> str:
                         f"Unsupported sequence length for field: {len(value[0])}"
                     )
                 return f"nonuniform List<{kind}> {len(value)}{s}"
+    else:
+        return f"uniform {value}"
 
 
 def _serialize_dimensions(value: Any) -> str:
-    if (
-        isinstance(value, Sequence)
-        and not isinstance(value, str)
-        or numpy
-        and isinstance(value, np.ndarray)
-    ) and len(value) == 7:
+    if _is_sequence(value) and len(value) == 7:
         return f"[{' '.join(str(v) for v in value)}]"
     else:
         raise TypeError(f"Not a valid dimension set: {type(value)}")
@@ -249,7 +187,7 @@ def _serialize(
         return _serialize_dimensioned(value)
 
     with suppress(TypeError):
-        return _serialize_sequence(value)
+        return _serialize_list(value)
 
     with suppress(TypeError):
         return _serialize_bool(value)

{foamlib-0.1.6.dist-info → foamlib-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.1.6
+Version: 0.1.8
 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
@@ -26,6 +26,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aioshutil <2,>=1
+Requires-Dist: pyparsing <4,>=3
 Provides-Extra: docs
 Requires-Dist: sphinx <8,>=7 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
@@ -36,6 +37,8 @@ Requires-Dist: pytest <9,>=7 ; extra == 'lint'
 Requires-Dist: pytest-asyncio <0.24,>=0.21 ; extra == 'lint'
 Requires-Dist: numpy <2,>=1 ; extra == 'lint'
 Requires-Dist: black ; extra == 'lint'
+Requires-Dist: flake8 ; extra == 'lint'
+Requires-Dist: Flake8-pyproject ; extra == 'lint'
 Provides-Extra: test
 Requires-Dist: pytest <9,>=7 ; extra == 'test'
 Requires-Dist: pytest-asyncio <0.24,>=0.21 ; extra == 'test'

foamlib-0.1.8.dist-info/RECORD

@@ -0,0 +1,10 @@
+foamlib/__init__.py,sha256=Lq8PsAvbE-bdL4D_1TWlLVltS9_14AhRrY0xq_u-bZE,550
+foamlib/_cases.py,sha256=Q5c8vPzKT5coOy4q_H6s5gHgEArhLHByh6GSvDVCRdY,20683
+foamlib/_dictionaries.py,sha256=71E0IMfU4sxjxsHJ7-_kUyuZX6olU31OLKxFhoEvC0s,12903
+foamlib/_subprocesses.py,sha256=5vqdQvpN_2v4GgDqxi-s88NGhZ6doFxkh0XY89ZWuHA,1926
+foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+foamlib-0.1.8.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.1.8.dist-info/METADATA,sha256=lTbuF5eCAj3Nce2vHZGBS6xoQPzorYG_GMp5iogXo_A,4526
+foamlib-0.1.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foamlib-0.1.8.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.1.8.dist-info/RECORD,,

foamlib-0.1.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-foamlib/__init__.py,sha256=JgLq3i2DqpIp1R2I1z_aWDmUTDHhwXvWFCuPsQ5ZBqo,550
-foamlib/_cases.py,sha256=NhtIOPumR_iWR9tL8K7WO2UVjB14WIacnaxnoa4EjYY,20696
-foamlib/_dictionaries.py,sha256=ZjNDEe-ls8pSxqvV6qtO0XRBBTfkj-8U6igNHbtXvqs,14523
-foamlib/_subprocesses.py,sha256=5vqdQvpN_2v4GgDqxi-s88NGhZ6doFxkh0XY89ZWuHA,1926
-foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foamlib-0.1.6.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.1.6.dist-info/METADATA,sha256=3Bkce079R0PXo5Leq9G9ZyuncUrOXTJXww73RtDP2wQ,4404
-foamlib-0.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foamlib-0.1.6.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.1.6.dist-info/RECORD,,