foamlib 0.4.4__py3-none-any.whl → 0.5.0__py3-none-any.whl

foamlib/__init__.py

@@ -1,11 +1,10 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.4.4"
+__version__ = "0.5.0"
 
 from ._cases import (
     AsyncFoamCase,
     CalledProcessError,
-    CalledProcessWarning,
     FoamCase,
     FoamCaseBase,
 )
@@ -19,5 +18,4 @@ __all__ = [
     "FoamFieldFile",
     "FoamFileBase",
     "CalledProcessError",
-    "CalledProcessWarning",
 ]

foamlib/_cases/__init__.py

@@ -1,12 +1,11 @@
 from ._async import AsyncFoamCase
 from ._base import FoamCaseBase
+from ._subprocess import CalledProcessError
 from ._sync import FoamCase
-from ._util import CalledProcessError, CalledProcessWarning
 
 __all__ = [
     "FoamCaseBase",
     "FoamCase",
     "AsyncFoamCase",
     "CalledProcessError",
-    "CalledProcessWarning",
 ]

foamlib/_cases/_async.py

@@ -1,6 +1,8 @@
 import asyncio
 import multiprocessing
+import os
 import sys
+import tempfile
 from contextlib import asynccontextmanager
 from pathlib import Path
 from typing import (
@@ -14,14 +16,19 @@ if sys.version_info >= (3, 9):
 else:
     from typing import AsyncGenerator, Collection, Sequence
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 import aioshutil
 
-from .._util import is_sequence
-from ._base import FoamCaseBase
-from ._util import check_returncode
+from ._recipes import _FoamCaseRecipes
+from ._subprocess import run_async
+from ._util import awaitableasynccontextmanager
 
 
-class AsyncFoamCase(FoamCaseBase):
+class AsyncFoamCase(_FoamCaseRecipes):
     """
     An OpenFOAM case with asynchronous support.
 
@@ -63,17 +70,19 @@ class AsyncFoamCase(FoamCaseBase):
                     AsyncFoamCase._cpus_cond.notify(cpus)
 
     @staticmethod
-    async def _rmtree(path: Path, ignore_errors: bool = False) -> None:
+    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]
 
     @staticmethod
     async def _copytree(
-        src: Path,
-        dest: Path,
+        src: Union["os.PathLike[str]", str],
+        dest: Union["os.PathLike[str]", str],
         *,
         symlinks: bool = False,
         ignore: Optional[
-            Callable[[Union[Path, str], Collection[str]], Collection[str]]
+            Callable[[Union["os.PathLike[str]", str], Collection[str]], Collection[str]]
         ] = None,
     ) -> None:
         await aioshutil.copytree(src, dest, symlinks=symlinks, ignore=ignore)
@@ -95,60 +104,54 @@ class AsyncFoamCase(FoamCaseBase):
 
     async def _run(
         self,
-        cmd: Union[Sequence[Union[str, Path]], str, Path],
+        cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str],
         *,
         parallel: bool = False,
         cpus: int = 1,
         check: bool = True,
+        log: bool = True,
     ) -> None:
-        async with self._cpus(cpus):
-            if not is_sequence(cmd):
-                if parallel:
-                    cmd = f"mpiexec -np {cpus} {cmd} -parallel"
-
-                proc = await asyncio.create_subprocess_shell(
-                    str(cmd),
+        with self._output(cmd, log=log) as (stdout, stderr):
+            if parallel:
+                if isinstance(cmd, str):
+                    cmd = [
+                        "mpiexec",
+                        "-n",
+                        str(cpus),
+                        "/bin/sh",
+                        "-c",
+                        f"{cmd} -parallel",
+                    ]
+                else:
+                    cmd = ["mpiexec", "-n", str(cpus), *cmd, "-parallel"]
+
+            async with self._cpus(cpus):
+                await run_async(
+                    cmd,
+                    check=check,
                     cwd=self.path,
-                    env=self._env(shell=True),
-                    stdout=asyncio.subprocess.DEVNULL,
-                    stderr=asyncio.subprocess.PIPE
-                    if check
-                    else asyncio.subprocess.DEVNULL,
+                    env=self._env(shell=isinstance(cmd, str)),
+                    stdout=stdout,
+                    stderr=stderr,
                 )
 
-            else:
-                if parallel:
-                    cmd = ["mpiexec", "-np", str(cpus), *cmd, "-parallel"]
-
-                if sys.version_info < (3, 8):
-                    cmd = (str(arg) for arg in cmd)
-                proc = await asyncio.create_subprocess_exec(
-                    *cmd,
-                    cwd=self.path,
-                    env=self._env(shell=False),
-                    stdout=asyncio.subprocess.DEVNULL,
-                    stderr=asyncio.subprocess.PIPE
-                    if check
-                    else asyncio.subprocess.DEVNULL,
-                )
-
-            stdout, stderr = await proc.communicate()
-
-            assert stdout is None
-            assert proc.returncode is not None
-
-            if check:
-                check_returncode(proc.returncode, cmd, stderr.decode())
-
     async def run(
         self,
-        cmd: Optional[Union[Sequence[Union[str, Path]], str, Path]] = None,
+        cmd: Optional[Union[Sequence[Union[str, "os.PathLike[str]"]], str]] = None,
         *,
         script: bool = True,
         parallel: Optional[bool] = None,
         cpus: Optional[int] = None,
         check: bool = True,
     ) -> None:
+        """
+        Run this case, or a specified command in the context of this case.
+
+        :param cmd: The command to run. If None, run the case. If a sequence, the first element is the command and the rest are arguments. If a string, `cmd` is executed in a shell.
+        :param script: If True and `cmd` is None, use an (All)run(-parallel) script if it exists for running the case. If False or no run script is found, autodetermine the command(s) needed to run the case.
+        :param parallel: If True, run in parallel using MPI. If None, autodetect whether to run in parallel.
+        :param check: If True, raise a CalledProcessError if any command returns a non-zero exit code.
+        """
         for name, args, kwargs in self._run_cmds(
             cmd=cmd, script=script, parallel=parallel, cpus=cpus, check=check
         ):
@@ -171,24 +174,60 @@ class AsyncFoamCase(FoamCaseBase):
         for name, args, kwargs in self._restore_0_dir_cmds():
             await getattr(self, name)(*args, **kwargs)
 
-    async def copy(self, dest: Union[Path, str]) -> "AsyncFoamCase":
+    @awaitableasynccontextmanager
+    @asynccontextmanager
+    async def copy(
+        self, dst: Optional[Union["os.PathLike[str]", str]] = None
+    ) -> "AsyncGenerator[Self]":
         """
         Make a copy of this case.
 
-        :param dest: The destination path.
+        Use as an async context manager to automatically delete the copy when done.
+
+        :param dst: The destination path. If None, copy to a temporary directory.
         """
-        for name, args, kwargs in self._copy_cmds(dest):
+        if dst is None:
+            dst = Path(tempfile.mkdtemp(), self.name)
+            tmp = True
+        else:
+            tmp = False
+
+        for name, args, kwargs in self._copy_cmds(dst):
             await getattr(self, name)(*args, **kwargs)
 
-        return AsyncFoamCase(dest)
+        yield type(self)(dst)
 
-    async def clone(self, dest: Union[Path, str]) -> "AsyncFoamCase":
+        if tmp:
+            assert isinstance(dst, Path)
+            await self._rmtree(dst.parent)
+        else:
+            await self._rmtree(dst)
+
+    @awaitableasynccontextmanager
+    @asynccontextmanager
+    async def clone(
+        self, dst: Optional[Union["os.PathLike[str]", str]] = None
+    ) -> "AsyncGenerator[Self]":
         """
         Clone this case (make a clean copy).
 
-        :param dest: The destination path.
+        Use as an async context manager to automatically delete the clone when done.
+
+        :param dst: The destination path. If None, clone to a temporary directory.
         """
-        for name, args, kwargs in self._clone_cmds(dest):
+        if dst is None:
+            dst = Path(tempfile.mkdtemp(), self.name)
+            tmp = True
+        else:
+            tmp = False
+
+        for name, args, kwargs in self._clone_cmds(dst):
             await getattr(self, name)(*args, **kwargs)
 
-        return AsyncFoamCase(dest)
+        yield type(self)(dst)
+
+        if tmp:
+            assert isinstance(dst, Path)
+            await self._rmtree(dst.parent)
+        else:
+            await self._rmtree(dst)

foamlib/_cases/_base.py

@@ -3,40 +3,29 @@ import shutil
 import sys
 from pathlib import Path
 from typing import (
-    Any,
     Optional,
-    Tuple,
     Union,
     overload,
 )
 
 if sys.version_info >= (3, 9):
     from collections.abc import (
-        Callable,
-        Collection,
-        Generator,
         Iterator,
-        Mapping,
         Sequence,
         Set,
     )
 else:
     from typing import AbstractSet as Set
     from typing import (
-        Callable,
-        Collection,
-        Generator,
         Iterator,
-        Mapping,
         Sequence,
     )
 
-
 from .._files import FoamFieldFile, FoamFile
 
 
 class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
-    def __init__(self, path: Union[Path, str, "FoamCaseBase"] = Path()):
+    def __init__(self, path: Union["os.PathLike[str]", str] = Path()):
         self.path = Path(path).absolute()
 
     class TimeDirectory(Set[FoamFieldFile]):
@@ -48,7 +37,7 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
         :param path: The path to the time directory.
         """
 
-        def __init__(self, path: Union[Path, str]):
+        def __init__(self, path: Union["os.PathLike[str]", str]):
             self.path = Path(path).absolute()
 
         @property
@@ -141,254 +130,15 @@ class FoamCaseBase(Sequence["FoamCaseBase.TimeDirectory"]):
     def __len__(self) -> int:
         return len(self._times)
 
-    def _clean_paths(self) -> Set[Path]:
-        has_decompose_par_dict = (self.path / "system" / "decomposeParDict").is_file()
-        has_block_mesh_dict = (self.path / "system" / "blockMeshDict").is_file()
-
-        paths = set()
-
-        for p in self.path.iterdir():
-            if p.is_dir():
-                try:
-                    t = float(p.name)
-                except ValueError:
-                    pass
-                else:
-                    if t != 0:
-                        paths.add(p)
-
-                if has_decompose_par_dict and p.name.startswith("processor"):
-                    paths.add(p)
-
-        if (self.path / "0.orig").is_dir() and (self.path / "0").is_dir():
-            paths.add(self.path / "0")
-
-        if has_block_mesh_dict and (self.path / "constant" / "polyMesh").exists():
-            paths.add(self.path / "constant" / "polyMesh")
-
-        if self._run_script() is not None:
-            paths.update(self.path.glob("log.*"))
-
-        return paths
-
     def __delitem__(self, key: Union[int, float, str]) -> None:
         shutil.rmtree(self[key].path)
 
-    def _clone_ignore(
-        self,
-    ) -> Callable[[Union[Path, str], Collection[str]], Collection[str]]:
-        clean_paths = self._clean_paths()
-
-        def ignore(path: Union[Path, str], names: Collection[str]) -> Collection[str]:
-            paths = {Path(path) / name for name in names}
-            return {p.name for p in paths.intersection(clean_paths)}
-
-        return ignore
-
-    def _clean_script(self) -> Optional[Path]:
-        """Return the path to the (All)clean script, or None if no clean script is found."""
-        clean = self.path / "clean"
-        all_clean = self.path / "Allclean"
-
-        if clean.is_file():
-            script = clean
-        elif all_clean.is_file():
-            script = all_clean
-        else:
-            return None
-
-        if sys.argv and Path(sys.argv[0]).absolute() == script.absolute():
-            return None
-
-        return script if Path(sys.argv[0]).absolute() != script.absolute() else None
-
-    def _run_script(self, *, parallel: Optional[bool] = None) -> Optional[Path]:
-        """Return the path to the (All)run script, or None if no run script is found."""
-        run = self.path / "run"
-        run_parallel = self.path / "run-parallel"
-        all_run = self.path / "Allrun"
-        all_run_parallel = self.path / "Allrun-parallel"
-
-        if run.is_file() or all_run.is_file():
-            if run_parallel.is_file() or all_run_parallel.is_file():
-                if parallel:
-                    script = (
-                        run_parallel if run_parallel.is_file() else all_run_parallel
-                    )
-                elif parallel is False:
-                    script = run if run.is_file() else all_run
-                else:
-                    raise ValueError(
-                        "Both (All)run and (All)run-parallel scripts are present. Please specify parallel argument."
-                    )
-            else:
-                script = run if run.is_file() else all_run
-        elif parallel is not False and (
-            run_parallel.is_file() or all_run_parallel.is_file()
-        ):
-            script = run_parallel if run_parallel.is_file() else all_run_parallel
-        else:
-            return None
-
-        if sys.argv and Path(sys.argv[0]).absolute() == script.absolute():
-            return None
-
-        return script
-
-    def _env(self, *, shell: bool) -> Optional[Mapping[str, str]]:
-        sip_workaround = os.environ.get(
-            "FOAM_LD_LIBRARY_PATH", ""
-        ) and not os.environ.get("DYLD_LIBRARY_PATH", "")
-
-        if not shell or sip_workaround:
-            env = os.environ.copy()
-
-            if not shell:
-                env["PWD"] = str(self.path)
-
-            if sip_workaround:
-                env["DYLD_LIBRARY_PATH"] = env["FOAM_LD_LIBRARY_PATH"]
-
-            return env
-        else:
-            return None
-
-    def _copy_cmds(
-        self, dest: Union[Path, str]
-    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
-        yield (
-            "_copytree",
-            (
-                self.path,
-                dest,
-            ),
-            {"symlinks": True},
-        )
-
-    def _clean_cmds(
-        self, *, script: bool = True, check: bool = False
-    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
-        script_path = self._clean_script() if script else None
-
-        if script_path is not None:
-            yield ("_run", ([script_path],), {"cpus": 0, "check": check})
-        else:
-            for p in self._clean_paths():
-                if p.is_dir():
-                    yield ("_rmtree", (p,), {})
-                else:
-                    p.unlink()
-
-    def _clone_cmds(
-        self, dest: Union[Path, str]
-    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
-        if self._clean_script() is not None:
-            yield ("copy", (dest,), {})
-            yield ("clean", (), {})
-        else:
-            yield (
-                "_copytree",
-                (
-                    self.path,
-                    dest,
-                ),
-                {"symlinks": True, "ignore": self._clone_ignore()},
-            )
-
-    def _restore_0_dir_cmds(
-        self,
-    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
-        yield ("_rmtree", (self.path / "0",), {"ignore_errors": True})
-        yield (
-            "_copytree",
-            (
-                self.path / "0.orig",
-                self.path / "0",
-            ),
-            {"symlinks": True},
-        )
-
-    def _run_cmds(
-        self,
-        cmd: Optional[Union[Sequence[Union[str, Path]], str, Path]] = None,
-        *,
-        script: bool = True,
-        parallel: Optional[bool] = None,
-        cpus: Optional[int] = None,
-        check: bool = True,
-    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
-        if cmd is not None:
-            if parallel:
-                if cpus is None:
-                    cpus = max(self._nprocessors, 1)
-            else:
-                parallel = False
-                if cpus is None:
-                    cpus = 1
-
-            yield ("_run", (cmd,), {"parallel": parallel, "cpus": cpus, "check": check})
-
-        else:
-            script_path = self._run_script(parallel=parallel) if script else None
-
-            if script_path is not None:
-                if parallel or parallel is None:
-                    if cpus is None:
-                        if self._nprocessors > 0:
-                            cpus = self._nprocessors
-                        elif (self.path / "system" / "decomposeParDict").is_file():
-                            cpus = self._nsubdomains
-                        else:
-                            cpus = 1
-                else:
-                    if cpus is None:
-                        cpus = 1
-
-                yield (
-                    "_run",
-                    ([script_path],),
-                    {"parallel": False, "cpus": cpus, "check": check},
-                )
-
-            else:
-                if not self and (self.path / "0.orig").is_dir():
-                    yield ("restore_0_dir", (), {})
-
-                if (self.path / "system" / "blockMeshDict").is_file():
-                    yield ("block_mesh", (), {"check": check})
-
-                if parallel is None:
-                    parallel = (
-                        (cpus is not None and cpus > 1)
-                        or self._nprocessors > 0
-                        or (self.path / "system" / "decomposeParDict").is_file()
-                    )
-
-                if parallel:
-                    if (
-                        self._nprocessors == 0
-                        and (self.path / "system" / "decomposeParDict").is_file()
-                    ):
-                        yield ("decompose_par", (), {"check": check})
-
-                    if cpus is None:
-                        cpus = max(self._nprocessors, 1)
-                else:
-                    if cpus is None:
-                        cpus = 1
-
-                yield (
-                    "_run",
-                    ([self.application],),
-                    {"parallel": parallel, "cpus": cpus, "check": check},
-                )
-
     @property
     def name(self) -> str:
         """The name of the case."""
         return self.path.name
 
-    def file(self, path: Union[Path, str]) -> FoamFile:
+    def file(self, path: Union["os.PathLike[str]", str]) -> FoamFile:
         """Return a FoamFile object for the given path in the case."""
         return FoamFile(self.path / path)
 

foamlib/_cases/_recipes.py

@@ -0,0 +1,299 @@
+import os
+import shlex
+import shutil
+import sys
+from contextlib import contextmanager
+from pathlib import Path
+from typing import (
+    IO,
+    Any,
+    Optional,
+    Tuple,
+    Union,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import (
+        Callable,
+        Collection,
+        Generator,
+        Mapping,
+        Sequence,
+        Set,
+    )
+else:
+    from typing import AbstractSet as Set
+    from typing import (
+        Callable,
+        Collection,
+        Generator,
+        Mapping,
+        Sequence,
+    )
+
+from ._base import FoamCaseBase
+from ._subprocess import DEVNULL, STDOUT
+
+
+class _FoamCaseRecipes(FoamCaseBase):
+    def _clean_paths(self) -> Set[Path]:
+        has_decompose_par_dict = (self.path / "system" / "decomposeParDict").is_file()
+        has_block_mesh_dict = (self.path / "system" / "blockMeshDict").is_file()
+
+        paths = set()
+
+        for p in self.path.iterdir():
+            if p.is_dir():
+                try:
+                    t = float(p.name)
+                except ValueError:
+                    pass
+                else:
+                    if t != 0:
+                        paths.add(p)
+
+                if has_decompose_par_dict and p.name.startswith("processor"):
+                    paths.add(p)
+
+        if (self.path / "0.orig").is_dir() and (self.path / "0").is_dir():
+            paths.add(self.path / "0")
+
+        if has_block_mesh_dict and (self.path / "constant" / "polyMesh").exists():
+            paths.add(self.path / "constant" / "polyMesh")
+
+        if self._run_script() is not None:
+            paths.update(self.path.glob("log.*"))
+
+        return paths
+
+    def __delitem__(self, key: Union[int, float, str]) -> None:
+        shutil.rmtree(self[key].path)
+
+    def _clone_ignore(
+        self,
+    ) -> Callable[[Union["os.PathLike[str]", str], Collection[str]], Collection[str]]:
+        clean_paths = self._clean_paths()
+
+        def ignore(
+            path: Union["os.PathLike[str]", str], names: Collection[str]
+        ) -> Collection[str]:
+            paths = {Path(path) / name for name in names}
+            return {p.name for p in paths.intersection(clean_paths)}
+
+        return ignore
+
+    def _clean_script(self) -> Optional[Path]:
+        """Return the path to the (All)clean script, or None if no clean script is found."""
+        clean = self.path / "clean"
+        all_clean = self.path / "Allclean"
+
+        if clean.is_file():
+            script = clean
+        elif all_clean.is_file():
+            script = all_clean
+        else:
+            return None
+
+        if sys.argv and Path(sys.argv[0]).absolute() == script.absolute():
+            return None
+
+        return script if Path(sys.argv[0]).absolute() != script.absolute() else None
+
+    def _run_script(self, *, parallel: Optional[bool] = None) -> Optional[Path]:
+        """Return the path to the (All)run script, or None if no run script is found."""
+        run = self.path / "run"
+        run_parallel = self.path / "run-parallel"
+        all_run = self.path / "Allrun"
+        all_run_parallel = self.path / "Allrun-parallel"
+
+        if run.is_file() or all_run.is_file():
+            if run_parallel.is_file() or all_run_parallel.is_file():
+                if parallel:
+                    script = (
+                        run_parallel if run_parallel.is_file() else all_run_parallel
+                    )
+                elif parallel is False:
+                    script = run if run.is_file() else all_run
+                else:
+                    raise ValueError(
+                        "Both (All)run and (All)run-parallel scripts are present. Please specify parallel argument."
+                    )
+            else:
+                script = run if run.is_file() else all_run
+        elif parallel is not False and (
+            run_parallel.is_file() or all_run_parallel.is_file()
+        ):
+            script = run_parallel if run_parallel.is_file() else all_run_parallel
+        else:
+            return None
+
+        if sys.argv and Path(sys.argv[0]).absolute() == script.absolute():
+            return None
+
+        return script
+
+    def _env(self, *, shell: bool) -> Optional[Mapping[str, str]]:
+        sip_workaround = os.environ.get(
+            "FOAM_LD_LIBRARY_PATH", ""
+        ) and not os.environ.get("DYLD_LIBRARY_PATH", "")
+
+        if not shell or sip_workaround:
+            env = os.environ.copy()
+
+            if not shell:
+                env["PWD"] = str(self.path)
+
+            if sip_workaround:
+                env["DYLD_LIBRARY_PATH"] = env["FOAM_LD_LIBRARY_PATH"]
+
+            return env
+        else:
+            return None
+
+    @contextmanager
+    def _output(
+        self, cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str], *, log: bool
+    ) -> Generator[Tuple[Union[int, IO[bytes]], Union[int, IO[bytes]]], None, None]:
+        if log:
+            if isinstance(cmd, str):
+                name = shlex.split(cmd)[0]
+            else:
+                if isinstance(cmd[0], os.PathLike):
+                    name = Path(cmd[0]).name
+                else:
+                    name = cmd[0]
+
+            with (self.path / f"log.{name}").open("ab") as stdout:
+                yield stdout, STDOUT
+        else:
+            yield DEVNULL, DEVNULL
+
+    def _copy_cmds(
+        self, dest: Union["os.PathLike[str]", str]
+    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
+        yield (
+            "_copytree",
+            (
+                self.path,
+                dest,
+            ),
+            {"symlinks": True},
+        )
+
+    def _clean_cmds(
+        self, *, script: bool = True, check: bool = False
+    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
+        script_path = self._clean_script() if script else None
+
+        if script_path is not None:
+            yield ("_run", ([script_path],), {"cpus": 0, "check": check, "log": False})
+        else:
+            for p in self._clean_paths():
+                if p.is_dir():
+                    yield ("_rmtree", (p,), {})
+                else:
+                    p.unlink()
+
+    def _clone_cmds(
+        self, dest: Union["os.PathLike[str]", str]
+    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
+        if self._clean_script() is not None:
+            yield ("copy", (dest,), {})
+            yield ("clean", (), {})
+        else:
+            yield (
+                "_copytree",
+                (
+                    self.path,
+                    dest,
+                ),
+                {"symlinks": True, "ignore": self._clone_ignore()},
+            )
+
+    def _restore_0_dir_cmds(
+        self,
+    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
+        yield ("_rmtree", (self.path / "0",), {"ignore_errors": True})
+        yield (
+            "_copytree",
+            (
+                self.path / "0.orig",
+                self.path / "0",
+            ),
+            {"symlinks": True},
+        )
+
+    def _run_cmds(
+        self,
+        cmd: Optional[Union[Sequence[Union[str, "os.PathLike[str]"]], str]] = None,
+        *,
+        script: bool = True,
+        parallel: Optional[bool] = None,
+        cpus: Optional[int] = None,
+        check: bool = True,
+    ) -> Generator[Tuple[str, Sequence[Any], Mapping[str, Any]], None, None]:
+        if cmd is not None:
+            if parallel:
+                if cpus is None:
+                    cpus = max(self._nprocessors, 1)
+            else:
+                parallel = False
+                if cpus is None:
+                    cpus = 1
+
+            yield ("_run", (cmd,), {"parallel": parallel, "cpus": cpus, "check": check})
+
+        else:
+            script_path = self._run_script(parallel=parallel) if script else None
+
+            if script_path is not None:
+                if parallel or parallel is None:
+                    if cpus is None:
+                        if self._nprocessors > 0:
+                            cpus = self._nprocessors
+                        elif (self.path / "system" / "decomposeParDict").is_file():
+                            cpus = self._nsubdomains
+                        else:
+                            cpus = 1
+                else:
+                    if cpus is None:
+                        cpus = 1
+
+                yield (
+                    "_run",
+                    ([script_path],),
+                    {"parallel": False, "cpus": cpus, "check": check},
+                )
+
+            else:
+                if not self and (self.path / "0.orig").is_dir():
+                    yield ("restore_0_dir", (), {})
+
+                if (self.path / "system" / "blockMeshDict").is_file():
+                    yield ("block_mesh", (), {"check": check})
+
+                if parallel is None:
+                    parallel = (
+                        (cpus is not None and cpus > 1)
+                        or self._nprocessors > 0
+                        or (self.path / "system" / "decomposeParDict").is_file()
+                    )
+
+                if parallel:
+                    if (
+                        self._nprocessors == 0
+                        and (self.path / "system" / "decomposeParDict").is_file()
+                    ):
+                        yield ("decompose_par", (), {"check": check})
+
+                    if cpus is None:
+                        cpus = max(self._nprocessors, 1)
+                else:
+                    if cpus is None:
+                        cpus = 1
+
+                yield (
+                    "_run",
+                    ([self.application],),
+                    {"parallel": parallel, "cpus": cpus, "check": check},
+                )

foamlib/_cases/_subprocess.py

@@ -0,0 +1,86 @@
+import asyncio
+import os
+import subprocess
+import sys
+from typing import IO, Optional, Union
+
+if sys.version_info >= (3, 9):
+    from collections.abc import Mapping, Sequence
+else:
+    from typing import Mapping, Sequence
+
+CalledProcessError = subprocess.CalledProcessError
+CompletedProcess = subprocess.CompletedProcess
+
+DEVNULL = subprocess.DEVNULL
+PIPE = subprocess.PIPE
+STDOUT = subprocess.STDOUT
+
+
+def run_sync(
+    cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str],
+    *,
+    check: bool = True,
+    cwd: Optional["os.PathLike[str]"] = None,
+    env: Optional[Mapping[str, str]] = None,
+    stdout: Optional[Union[int, IO[bytes]]] = None,
+    stderr: Optional[Union[int, IO[bytes]]] = None,
+) -> "CompletedProcess[bytes]":
+    if not isinstance(cmd, str) and sys.version_info < (3, 8):
+        cmd = [str(arg) for arg in cmd]
+
+    return subprocess.run(
+        cmd,
+        cwd=cwd,
+        env=env,
+        stdout=stdout,
+        stderr=stderr,
+        shell=isinstance(cmd, str),
+        check=check,
+    )
+
+
+async def run_async(
+    cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str],
+    *,
+    check: bool = True,
+    cwd: Optional["os.PathLike[str]"] = None,
+    env: Optional[Mapping[str, str]] = None,
+    stdout: Optional[Union[int, IO[bytes]]] = None,
+    stderr: Optional[Union[int, IO[bytes]]] = None,
+) -> "CompletedProcess[bytes]":
+    if isinstance(cmd, str):
+        proc = await asyncio.create_subprocess_shell(
+            cmd,
+            cwd=cwd,
+            env=env,
+            stdout=stdout,
+            stderr=stderr,
+        )
+
+    else:
+        if sys.version_info < (3, 8):
+            cmd = [str(arg) for arg in cmd]
+        proc = await asyncio.create_subprocess_exec(
+            *cmd,
+            cwd=cwd,
+            env=env,
+            stdout=stdout,
+            stderr=stderr,
+        )
+
+    output, error = await proc.communicate()
+
+    assert proc.returncode is not None
+
+    if check and proc.returncode != 0:
+        raise CalledProcessError(
+            returncode=proc.returncode,
+            cmd=cmd,
+            output=output,
+            stderr=error,
+        )
+
+    return CompletedProcess(
+        cmd, returncode=proc.returncode, stdout=output, stderr=error
+    )

foamlib/_cases/_sync.py

@@ -1,10 +1,13 @@
+import os
 import shutil
-import subprocess
 import sys
+import tempfile
 from pathlib import Path
+from types import TracebackType
 from typing import (
     Callable,
     Optional,
+    Type,
     Union,
 )
 
@@ -13,12 +16,16 @@ if sys.version_info >= (3, 9):
 else:
     from typing import Collection, Sequence
 
-from .._util import is_sequence
-from ._base import FoamCaseBase
-from ._util import check_returncode
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
+from ._recipes import _FoamCaseRecipes
+from ._subprocess import run_sync
 
 
-class FoamCase(FoamCaseBase):
+class FoamCase(_FoamCaseRecipes):
     """
     An OpenFOAM case.
 
@@ -30,21 +37,34 @@ class FoamCase(FoamCaseBase):
     """
 
     @staticmethod
-    def _rmtree(path: Path, *, ignore_errors: bool = False) -> None:
+    def _rmtree(
+        path: Union["os.PathLike[str]", str], *, ignore_errors: bool = False
+    ) -> None:
         shutil.rmtree(path, ignore_errors=ignore_errors)
 
     @staticmethod
     def _copytree(
-        src: Path,
-        dest: Path,
+        src: Union["os.PathLike[str]", str],
+        dest: Union["os.PathLike[str]", str],
         *,
         symlinks: bool = False,
         ignore: Optional[
-            Callable[[Union[Path, str], Collection[str]], Collection[str]]
+            Callable[[Union["os.PathLike[str]", str], Collection[str]], Collection[str]]
         ] = None,
     ) -> None:
         shutil.copytree(src, dest, symlinks=symlinks, ignore=ignore)
 
+    def __enter__(self) -> "FoamCase":
+        return self
+
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> None:
+        self._rmtree(self.path)
+
     def clean(
         self,
         *,
@@ -62,43 +82,39 @@ class FoamCase(FoamCaseBase):
 
     def _run(
         self,
-        cmd: Union[Sequence[Union[str, Path]], str, Path],
+        cmd: Union[Sequence[Union[str, "os.PathLike[str]"]], str],
         *,
         parallel: bool = False,
         cpus: int = 1,
         check: bool = True,
+        log: bool = True,
     ) -> None:
-        shell = not is_sequence(cmd)
-
-        if parallel:
-            if shell:
-                cmd = f"mpiexec -np {cpus} {cmd} -parallel"
-            else:
-                assert is_sequence(cmd)
-                cmd = ["mpiexec", "-np", str(cpus), *cmd, "-parallel"]
-
-        if sys.version_info < (3, 8):
-            if shell:
-                cmd = str(cmd)
-            else:
-                cmd = (str(arg) for arg in cmd)
-
-        proc = subprocess.run(
-            cmd,
-            cwd=self.path,
-            env=self._env(shell=shell),
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.PIPE if check else subprocess.DEVNULL,
-            text=True,
-            shell=shell,
-        )
-
-        if check:
-            check_returncode(proc.returncode, cmd, proc.stderr)
+        with self._output(cmd, log=log) as (stdout, stderr):
+            if parallel:
+                if isinstance(cmd, str):
+                    cmd = [
+                        "mpiexec",
+                        "-n",
+                        str(cpus),
+                        "/bin/sh",
+                        "-c",
+                        f"{cmd} -parallel",
+                    ]
+                else:
+                    cmd = ["mpiexec", "-n", str(cpus), *cmd, "-parallel"]
+
+            run_sync(
+                cmd,
+                check=check,
+                cwd=self.path,
+                env=self._env(shell=isinstance(cmd, str)),
+                stdout=stdout,
+                stderr=stderr,
+            )
 
     def run(
         self,
-        cmd: Optional[Union[Sequence[Union[str, Path]], str, Path]] = None,
+        cmd: Optional[Union[Sequence[Union[str, "os.PathLike[str]"]], str]] = None,
         *,
         script: bool = True,
         parallel: Optional[bool] = None,
@@ -134,24 +150,34 @@ class FoamCase(FoamCaseBase):
         for name, args, kwargs in self._restore_0_dir_cmds():
             getattr(self, name)(*args, **kwargs)
 
-    def copy(self, dest: Union[Path, str]) -> "FoamCase":
+    def copy(self, dst: Optional[Union["os.PathLike[str]", str]] = None) -> "Self":
         """
         Make a copy of this case.
 
-        :param dest: The destination path.
+        Use as a context manager to automatically delete the copy when done.
+
+        :param dst: The destination path. If None, copy to a temporary directory.
         """
-        for name, args, kwargs in self._copy_cmds(dest):
+        if dst is None:
+            dst = Path(tempfile.mkdtemp(), self.name)
+
+        for name, args, kwargs in self._copy_cmds(dst):
             getattr(self, name)(*args, **kwargs)
 
-        return FoamCase(dest)
+        return type(self)(dst)
 
-    def clone(self, dest: Union[Path, str]) -> "FoamCase":
+    def clone(self, dst: Optional[Union["os.PathLike[str]", str]] = None) -> "Self":
         """
         Clone this case (make a clean copy).
 
-        :param dest: The destination path.
+        Use as a context manager to automatically delete the clone when done.
+
+        :param dst: The destination path. If None, clone to a temporary directory.
         """
-        for name, args, kwargs in self._clone_cmds(dest):
+        if dst is None:
+            dst = Path(tempfile.mkdtemp(), self.name)
+
+        for name, args, kwargs in self._clone_cmds(dst):
             getattr(self, name)(*args, **kwargs)
 
-        return FoamCase(dest)
+        return type(self)(dst)

foamlib/_cases/_util.py

@@ -1,35 +1,27 @@
-import subprocess
-import sys
-from pathlib import Path
-from typing import Optional, Union
-from warnings import warn
+from types import TracebackType
+from typing import Any, AsyncContextManager, Callable, Optional, Type
 
-if sys.version_info >= (3, 9):
-    from collections.abc import Sequence
-else:
-    from typing import Sequence
 
+class _AwaitableAsyncContextManager:
+    def __init__(self, cm: "AsyncContextManager[Any]"):
+        self._cm = cm
 
-class CalledProcessError(subprocess.CalledProcessError):
-    """Exception raised when a process fails and `check=True`."""
+    def __await__(self) -> Any:
+        return self._cm.__aenter__().__await__()
 
-    def __str__(self) -> str:
-        msg = super().__str__()
-        if self.stderr:
-            msg += f"\n{self.stderr}"
-        return msg
+    async def __aenter__(self) -> Any:
+        return await self._cm.__aenter__()
 
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> Any:
+        return await self._cm.__aexit__(exc_type, exc_val, exc_tb)
 
-class CalledProcessWarning(Warning):
-    """Warning raised when a process prints to stderr and `check=True`."""
 
-
-def check_returncode(
-    retcode: int,
-    cmd: Union[Sequence[Union[str, Path]], str, Path],
-    stderr: Optional[str],
-) -> None:
-    if retcode != 0:
-        raise CalledProcessError(retcode, cmd, None, stderr)
-    elif stderr:
-        warn(f"Command {cmd} printed to stderr.\n{stderr}", CalledProcessWarning)
+def awaitableasynccontextmanager(
+    cm: Callable[..., "AsyncContextManager[Any]"],
+) -> Callable[..., _AwaitableAsyncContextManager]:
+    return lambda *args, **kwargs: _AwaitableAsyncContextManager(cm(*args, **kwargs))

foamlib/_files/_files.py

@@ -16,10 +16,10 @@ if sys.version_info >= (3, 11):
 else:
     from typing_extensions import Self
 
-from .._util import is_sequence
 from ._base import FoamFileBase
 from ._io import _FoamFileIO
 from ._serialization import Kind, dumpb
+from ._util import is_sequence
 
 try:
     import numpy as np
@@ -105,13 +105,9 @@ class FoamFile(
         """
         Create the file.
 
-        Parameters
-        ----------
-        exist_ok : bool, optional
-            If False (the default), raise a FileExistsError if the file already exists.
-            If True, do nothing if the file already exists.
-        parents : bool, optional
-            If True, also create parent directories as needed.
+        :param exist_ok: If False, raise a FileExistsError if the file already exists.
+
+        :param parents: If True, also create parent directories as needed.
         """
         if self.path.exists():
             if not exist_ok:

foamlib/_files/_serialization.py

@@ -8,8 +8,8 @@ if sys.version_info >= (3, 9):
 else:
     from typing import Mapping
 
-from .._util import is_sequence
 from ._base import FoamFileBase
+from ._util import is_sequence
 
 try:
     import numpy as np

{foamlib-0.4.4.dist-info → foamlib-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.4.4
+Version: 0.5.0
 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
@@ -19,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
@@ -123,6 +124,14 @@ my_pitz.clean()
 my_pitz.control_dict["writeInterval"] = 10
 ```
 
+### Make multiple file reads and writes in a single go
+
+```python
+with my_pitz.fv_schemes as f:
+    f["gradSchemes"]["default"] = f["divSchemes"]["default"]
+    f["snGradSchemes"]["default"] = "uncorrected"
+```
+
 ### Run a case asynchronously
 
 ```python

foamlib-0.5.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+foamlib/__init__.py,sha256=VR4c4hlAQ8I180EqNsDls6vyYKbnOScayXFOr2fKAEk,392
+foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+foamlib/_cases/__init__.py,sha256=C0mpRu7c-X-4uVMKmVrZhwIyhBNyvUoCv0o-BQ72RC0,236
+foamlib/_cases/_async.py,sha256=QVZaYJCOaUgt0_xI_cYsZAJcdfpdZoYnh5dojTjMX08,7816
+foamlib/_cases/_base.py,sha256=1CUkkK4afBxDgP79dmho97WJdj-GLgYhnrCSf_52Eao,6604
+foamlib/_cases/_recipes.py,sha256=UTFnVuTvEf-9wn-Fr30a9wOOmyOxvWeDhbqBhdtbhzA,9692
+foamlib/_cases/_subprocess.py,sha256=CfUy_LrqLnMLR9FHINqInCd3soN6eYvonwZ30epiLu8,2234
+foamlib/_cases/_sync.py,sha256=JQAkKXwgdhR_drGy7gadun1XPGjNddKR7Y07HK-TpoA,5964
+foamlib/_cases/_util.py,sha256=4jlv8pe2Ro1-ZtpY5DtR2B1Vpbj84SlqH_HzwGYPoH4,861
+foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
+foamlib/_files/_base.py,sha256=zaFDjLE6jB7WtGWk8hfKusjLtlGu6CZV16AHJpRUibs,1929
+foamlib/_files/_files.py,sha256=6Fdrc0lksFK99i1a6wEsBi-BtYgSQnUc5s10h2LQ9ew,16091
+foamlib/_files/_io.py,sha256=f_tYI7AqaFsQ8mtK__fEoIUqpYb3YmrI8X5D8updmNM,2084
+foamlib/_files/_parsing.py,sha256=8V2CKZ45mKE3f9fP8lAfexIdhPGrq7elIZkpBkkGB6Q,8773
+foamlib/_files/_serialization.py,sha256=pb8_cIVgRhGS_ZV2p3x8p5_lK1SS6xzQHscAYYuOgFY,3407
+foamlib/_files/_util.py,sha256=UMzXmTFgvbp46w6k3oEZJoYC98pFgEK6LN5uLOwrlCg,397
+foamlib-0.5.0.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.5.0.dist-info/METADATA,sha256=pecBt-ku69uh-HjSN02M40tCqhT22L-sZ9Fcf6AezwM,5759
+foamlib-0.5.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+foamlib-0.5.0.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.5.0.dist-info/RECORD,,

foamlib-0.4.4.dist-info/RECORD

@@ -1,19 +0,0 @@
-foamlib/__init__.py,sha256=r8VZ1cNvef7NfWWxf7GzPuveJO3LrXVwrF5pwgok-eg,446
-foamlib/_util.py,sha256=UMzXmTFgvbp46w6k3oEZJoYC98pFgEK6LN5uLOwrlCg,397
-foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foamlib/_cases/__init__.py,sha256=xnQpR64EvFtCh07qnSz7kjQ1IhJXjRDwaZWwQGZhGv4,280
-foamlib/_cases/_async.py,sha256=WgEunau8GvkI-k4amS98Uxz8O0fZBxLWqzUY3uiAmQQ,6345
-foamlib/_cases/_base.py,sha256=4sndDYfXPWhkSel41e8d00xX3PX22wMrYniA_zb0luo,14958
-foamlib/_cases/_sync.py,sha256=S-9-TOK7PTC3NMKgIdvKWTn4fS34FPccedvm-lpjpH8,5037
-foamlib/_cases/_util.py,sha256=v6sHxHCEgagsVuup0S1xJW-x9py5xj3bUye8PiFfb3o,925
-foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
-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=8V2CKZ45mKE3f9fP8lAfexIdhPGrq7elIZkpBkkGB6Q,8773
-foamlib/_files/_serialization.py,sha256=3yb9fgjCpDoRfZoLsbZaIFrkZ3vGBzleFRw6IbaZuuY,3408
-foamlib-0.4.4.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.4.4.dist-info/METADATA,sha256=i9qq7ZU7oFhmn1BO0rz-53wueFfOvEziP4am3x3qBA4,5496
-foamlib-0.4.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-foamlib-0.4.4.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.4.4.dist-info/RECORD,,