foamlib 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

foamlib/__init__.py

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

foamlib/_cases/_async.py

@@ -101,7 +101,7 @@ class AsyncFoamCase(FoamCaseRunBase):
     async def _rmtree(
         path: Union["os.PathLike[str]", str], ignore_errors: bool = False
     ) -> None:
-        await aioshutil.rmtree(path, ignore_errors=ignore_errors)  # type: ignore [call-arg]
+        await aioshutil.rmtree(path, ignore_errors=ignore_errors)
 
     @staticmethod
     async def _copytree(
@@ -188,7 +188,7 @@ class AsyncFoamCase(FoamCaseRunBase):
     @asynccontextmanager
     async def copy(
         self, dst: Optional[Union["os.PathLike[str]", str]] = None
-    ) -> "AsyncGenerator[Self]":
+    ) -> AsyncGenerator[Self, None]:
         """
         Make a copy of this case.
 
@@ -209,7 +209,7 @@ class AsyncFoamCase(FoamCaseRunBase):
     @asynccontextmanager
     async def clone(
         self, dst: Optional[Union["os.PathLike[str]", str]] = None
-    ) -> "AsyncGenerator[Self]":
+    ) -> AsyncGenerator[Self, None]:
         """
         Clone this case (make a clean copy).
 

foamlib/_cases/_subprocess.py

@@ -2,6 +2,7 @@ import asyncio
 import os
 import subprocess
 import sys
+from io import BytesIO
 from typing import IO, Optional, Union
 
 if sys.version_info >= (3, 9):
@@ -48,22 +49,26 @@ def run_sync(
         shell=isinstance(cmd, str),
     )
 
-    error = b""
-
     if stderr == STDOUT:
         stderr = stdout
     if stderr not in (PIPE, DEVNULL):
+        stderr_copy = BytesIO()
+
         assert not isinstance(stderr, int)
         if stderr is None:
             stderr = sys.stderr.buffer
 
         assert proc.stderr is not None
         for line in proc.stderr:
-            error += line
             stderr.write(line)
+            stderr_copy.write(line)
+
+        output, _ = proc.communicate()
+        assert not _
+        error = stderr_copy.getvalue()
+    else:
+        output, error = proc.communicate()
 
-    output, _ = proc.communicate()
-    assert not _
     assert proc.returncode is not None
 
     if check and proc.returncode != 0:
@@ -108,22 +113,26 @@ async def run_async(
             stderr=PIPE,
         )
 
-    error = b""
-
     if stderr == STDOUT:
         stderr = stdout
     if stderr not in (PIPE, DEVNULL):
+        stderr_copy = BytesIO()
+
         assert not isinstance(stderr, int)
         if stderr is None:
             stderr = sys.stderr.buffer
 
         assert proc.stderr is not None
         async for line in proc.stderr:
-            error += line
             stderr.write(line)
+            stderr_copy.write(line)
+
+        output, _ = await proc.communicate()
+        assert not _
+        error = stderr_copy.getvalue()
+    else:
+        output, error = await proc.communicate()
 
-    output, _ = await proc.communicate()
-    assert not _
     assert proc.returncode is not None
 
     if check and proc.returncode != 0:

foamlib/_cases/_sync.py

@@ -1,7 +1,6 @@
 import os
 import shutil
 import sys
-from pathlib import Path
 from types import TracebackType
 from typing import Any, Callable, Optional, Type, Union, overload
 
@@ -49,9 +48,6 @@ class FoamCase(FoamCaseRunBase):
 
             return calls.value
 
-    def __init__(self, path: Union["os.PathLike[str]", str] = Path()):
-        super().__init__(path)
-
     @staticmethod
     def _run(
         cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str],

foamlib/_files/_files.py

@@ -86,7 +86,7 @@ class FoamFile(
 
         def as_dict(self) -> FoamFileBase._Dict:
             """Return a nested dict representation of the dictionary."""
-            ret = self._file.as_dict()
+            ret = self._file.as_dict(include_header=True)
 
             for k in self._keywords:
                 assert isinstance(ret, dict)
@@ -294,15 +294,10 @@ class FoamFile(
 
     def _iter(self, keywords: Tuple[str, ...] = ()) -> Iterator[Optional[str]]:
         _, parsed = self._read()
-
-        yield from (
-            k[-1] if k else None
-            for k in parsed
-            if k != ("FoamFile",) and k[:-1] == keywords
-        )
+        yield from (k[-1] if k else None for k in parsed if k[:-1] == keywords)
 
     def __iter__(self) -> Iterator[Optional[str]]:
-        return self._iter()
+        yield from (k for k in self._iter() if k != "FoamFile")
 
     def __contains__(self, keywords: object) -> bool:
         if not keywords:
@@ -328,11 +323,16 @@ class FoamFile(
     def __fspath__(self) -> str:
         return str(self.path)
 
-    def as_dict(self) -> FoamFileBase._File:
-        """Return a nested dict representation of the file."""
+    def as_dict(self, *, include_header: bool = False) -> FoamFileBase._File:
+        """
+        Return a nested dict representation of the file.
+
+        :param include_header: Whether to include the "FoamFile" header in the output.
+        """
         _, parsed = self._read()
         d = parsed.as_dict()
-        del d["FoamFile"]
+        if not include_header:
+            d.pop("FoamFile", None)
         return d
 
 

foamlib/_files/_parsing.py

@@ -95,18 +95,35 @@ def _unpack_binary_field(
     return [all]
 
 
+_IDENTCHARS = identchars + "$"
+_IDENTBODYCHARS = (
+    printables.replace(";", "")
+    .replace("{", "")
+    .replace("}", "")
+    .replace("[", "")
+    .replace("]", "")
+)
+
 _SWITCH = (
-    Keyword("yes") | Keyword("true") | Keyword("on") | Keyword("y") | Keyword("t")
+    Keyword("yes", _IDENTBODYCHARS)
+    | Keyword("true", _IDENTBODYCHARS)
+    | Keyword("on", _IDENTBODYCHARS)
+    | Keyword("y", _IDENTBODYCHARS)
+    | Keyword("t", _IDENTBODYCHARS)
 ).set_parse_action(lambda: True) | (
-    Keyword("no") | Keyword("false") | Keyword("off") | Keyword("n") | Keyword("f")
+    Keyword("no", _IDENTBODYCHARS)
+    | Keyword("false", _IDENTBODYCHARS)
+    | Keyword("off", _IDENTBODYCHARS)
+    | Keyword("n", _IDENTBODYCHARS)
+    | Keyword("f", _IDENTBODYCHARS)
 ).set_parse_action(lambda: False)
 _DIMENSIONS = (
     Literal("[").suppress() + common.number[0, 7] + Literal("]").suppress()
 ).set_parse_action(lambda tks: FoamFileBase.DimensionSet(*tks))
 _TENSOR = _list_of(common.number) | common.number
 _IDENTIFIER = Combine(
-    Word(identchars + "$", printables, exclude_chars="[{(;)}]")
-    + Opt(Literal("(") + Word(printables, exclude_chars="[{(;)}]") + Literal(")"))
+    Word(_IDENTCHARS, _IDENTBODYCHARS, exclude_chars="()")
+    + Opt(Literal("(") + Word(_IDENTBODYCHARS, exclude_chars="()") + Literal(")"))
 )
 _DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: FoamFileBase.Dimensioned(*reversed(tks.as_list()))

{foamlib-0.6.5.dist-info → foamlib-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.6.5
+Version: 0.6.7
 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
@@ -37,12 +37,13 @@ Requires-Dist: foamlib[typing] ; extra == 'dev'
 Requires-Dist: foamlib[docs] ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: foamlib[numpy] ; extra == 'docs'
-Requires-Dist: sphinx <9,>=7 ; extra == 'docs'
+Requires-Dist: sphinx <9,>=5 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
 Provides-Extra: lint
 Requires-Dist: ruff ; extra == 'lint'
 Provides-Extra: numpy
 Requires-Dist: numpy <3,>=1 ; extra == 'numpy'
+Requires-Dist: numpy <3,>=1.25.0 ; (python_version >= "3.10") and extra == 'numpy'
 Provides-Extra: test
 Requires-Dist: foamlib[numpy] ; extra == 'test'
 Requires-Dist: pytest <9,>=7 ; extra == 'test'
@@ -59,7 +60,9 @@ Requires-Dist: mypy <2,>=1 ; extra == 'typing'
 [![Codecov](https://codecov.io/gh/gerlero/foamlib/branch/main/graph/badge.svg)](https://codecov.io/gh/gerlero/foamlib)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 [![PyPI](https://img.shields.io/pypi/v/foamlib)](https://pypi.org/project/foamlib/)
+[![Conda Version](https://img.shields.io/conda/vn/conda-forge/foamlib)](https://anaconda.org/conda-forge/foamlib)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/foamlib)](https://pypi.org/project/foamlib/)
 ![OpenFOAM](https://img.shields.io/badge/openfoam-.com%20|%20.org-informational)
 [![Docker image](https://img.shields.io/badge/docker%20image-microfluidica%2Ffoamlib-0085a0)](https://hub.docker.com/r/microfluidica/foamlib/)
@@ -68,19 +71,26 @@ Requires-Dist: mypy <2,>=1 ; extra == 'typing'
 
 It offers the following classes:
 
-* [`FoamFile`](https://foamlib.readthedocs.io/en/stable/files.html#foamlib.FoamFile) (and [`FoamFieldFile`](https://foamlib.readthedocs.io/en/stable/files.html#foamlib.FoamFieldFile)): read-write access to OpenFOAM configuration and field files as if they were Python `dict`s, using `foamlib`'s own parser. Supports both ASCII and binary field formats.
+* [`FoamFile`](https://foamlib.readthedocs.io/en/stable/files.html#foamlib.FoamFile) (and [`FoamFieldFile`](https://foamlib.readthedocs.io/en/stable/files.html#foamlib.FoamFieldFile)): read-write access to OpenFOAM configuration and field files as if they were Python `dict`s, using `foamlib`'s own parser. Supports ASCII and binary field formats (with or without compression).
 * [`FoamCase`](https://foamlib.readthedocs.io/en/stable/cases.html#foamlib.FoamCase): a class for configuring, running, and accessing the results of OpenFOAM cases.
 * [`AsyncFoamCase`](https://foamlib.readthedocs.io/en/stable/cases.html#foamlib.AsyncFoamCase): variant of `FoamCase` with asynchronous methods for running multiple cases at once.
+* [`AsyncSlurmFoamCase`](https://foamlib.readthedocs.io/en/stable/cases.html#foamlib.AsyncSlurmFoamCase): subclass of `AsyncFoamCase` used for running cases on a Slurm cluster.
 
 ## Get started
 
 ### Install
 
-Install with [pip](https://pypi.org/project/pip/):
+* With [pip](https://pypi.org/project/pip/):
 
-```bash
-pip install foamlib
-```
+    ```bash
+    pip install foamlib
+    ```
+
+* With [conda](https://docs.conda.io/en/latest/):
+
+    ```bash
+    conda install -c conda-forge foamlib
+    ```
 
 ### Clone a case
 
@@ -164,6 +174,7 @@ from foamlib import AsyncFoamCase
 from scipy.optimize import differential_evolution
 
 base = AsyncFoamCase(Path(os.environ["FOAM_TUTORIALS"]) / "incompressible/simpleFoam/pitzDaily")
+# Replace with `AsyncSlurmFoamCase` if on a cluster and you want cases to be run as Slurm jobs
 
 async def cost(x):
     async with base.clone() as clone:

{foamlib-0.6.5.dist-info → foamlib-0.6.7.dist-info}/RECORD

@@ -1,22 +1,22 @@
-foamlib/__init__.py,sha256=rB9ilpTj2t4pK8NuAdlVahgfFWtBlWld8s2r_oRsW5s,486
+foamlib/__init__.py,sha256=iaj4sni5OiXEQQ21hCOeo3akWqysdXWCuJSu-uQwRIY,486
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=wTUHcUgU1CBgpu0cUMtksQ5VKG6B8CFu9xc3dWwsQuo,358
-foamlib/_cases/_async.py,sha256=PYODgIkRLHArMf3wtf34jMx7gBGi-K6hoLEhjYK9bOw,7753
+foamlib/_cases/_async.py,sha256=rkJkOvOPQBcIrIyj2Q98HFh0eZ5QHzClSqEt-wcyS0M,7734
 foamlib/_cases/_base.py,sha256=4VWsu22VockyKgU_5tnSMeNrAkMgBKwZo2KGkV65rRQ,6739
 foamlib/_cases/_run.py,sha256=SjA-Qux5NhnhcLz7qiph2DcGYpElAAl_PlTGk6kGeuU,13972
 foamlib/_cases/_slurm.py,sha256=rhGSFJ-3g72TnAYlhECGfs7P7IkeaHL3ysjXfXLdCCc,2308
-foamlib/_cases/_subprocess.py,sha256=GTmHWy1LRD9ujpXJfSTXU2bf87GncpIA0VOR1rQW2fg,3633
-foamlib/_cases/_sync.py,sha256=L1Em9_32zd01RnMvksZ1GU-4okxhcwZgpLQf1c15uAs,6038
+foamlib/_cases/_subprocess.py,sha256=Z6GHZ44fIQcOiDO-c7Oqp8pqE8NG7WFP9Mdbf_6WtIU,3916
+foamlib/_cases/_sync.py,sha256=5lVMGuesCC--1GX8CL82bXg2o0K7OsZoff2zSOEs5d0,5910
 foamlib/_cases/_util.py,sha256=GNndpqw3Jg_S-Hxzl5vwRgD0czcTNb9NYHMhcfBoMBg,1493
 foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
 foamlib/_files/_base.py,sha256=zaFDjLE6jB7WtGWk8hfKusjLtlGu6CZV16AHJpRUibs,1929
-foamlib/_files/_files.py,sha256=1jV52dZqr-g6P0X0lA80OQcr2yMt4O-mAgERcaU4440,15583
+foamlib/_files/_files.py,sha256=nQXQ-NbRDy0GETYi4e9RHsnbvLxxjSTnXVpRbTV8iXY,15748
 foamlib/_files/_io.py,sha256=T8vTEmJDidL03qeX1PUJFND-_vaF0AuC_0lE_zxLz7Q,2447
-foamlib/_files/_parsing.py,sha256=DzgJ53QnohRQyLXn2zOs52RIQ7bJ_fS_S2Z7rmRyVK4,9023
+foamlib/_files/_parsing.py,sha256=SvPAbNb_xJwOBRGii4oLOUvhj9OdJ8auMIzdx77AYwI,9394
 foamlib/_files/_serialization.py,sha256=pb8_cIVgRhGS_ZV2p3x8p5_lK1SS6xzQHscAYYuOgFY,3407
 foamlib/_files/_util.py,sha256=UMzXmTFgvbp46w6k3oEZJoYC98pFgEK6LN5uLOwrlCg,397
-foamlib-0.6.5.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.6.5.dist-info/METADATA,sha256=xgpPiDbPfFBJjg09mDarYez95jP5RSw0uGCt9AS9kxk,6569
-foamlib-0.6.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-foamlib-0.6.5.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.6.5.dist-info/RECORD,,
+foamlib-0.6.7.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.6.7.dist-info/METADATA,sha256=ZgNLLtXhkCRJtcrycPWZfCxoEd3CU_HDv1--_4C7p-o,7333
+foamlib-0.6.7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+foamlib-0.6.7.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.6.7.dist-info/RECORD,,

{foamlib-0.6.5.dist-info → foamlib-0.6.7.dist-info}/WHEEL

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