hydraflow 0.2.14__py3-none-any.whl → 0.2.16__py3-none-any.whl

hydraflow/asyncio.py

@@ -42,7 +42,10 @@ async def execute_command(
     """
     try:
         process = await asyncio.create_subprocess_exec(
-            program, *args, stdout=PIPE, stderr=PIPE
+            program,
+            *args,
+            stdout=PIPE,
+            stderr=PIPE,
         )
         await asyncio.gather(
             process_stream(process.stdout, stdout),
@@ -51,7 +54,8 @@ async def execute_command(
         returncode = await process.wait()
 
     except Exception as e:
-        logger.error(f"Error running command: {e}")
+        msg = f"Error running command: {e}"
+        logger.exception(msg)
         returncode = 1
 
     finally:
@@ -103,11 +107,15 @@ async def monitor_file_changes(
     str_paths = [str(path) for path in paths]
     try:
         async for changes in watchfiles.awatch(
-            *str_paths, stop_event=stop_event, **awatch_kwargs
+            *str_paths,
+            stop_event=stop_event,
+            **awatch_kwargs,
         ):
             callback(changes)
     except Exception as e:
-        logger.error(f"Error watching files: {e}")
+        msg = f"Error watching files: {e}"
+        logger.exception(msg)
+        raise
 
 
 async def run_and_monitor(
@@ -134,13 +142,16 @@ async def run_and_monitor(
     stop_event = asyncio.Event()
     run_task = asyncio.create_task(
         execute_command(
-            program, *args, stop_event=stop_event, stdout=stdout, stderr=stderr
-        )
+            program,
+            *args,
+            stop_event=stop_event,
+            stdout=stdout,
+            stderr=stderr,
+        ),
     )
     if watch and paths:
-        monitor_task = asyncio.create_task(
-            monitor_file_changes(paths, watch, stop_event, **awatch_kwargs)
-        )
+        coro = monitor_file_changes(paths, watch, stop_event, **awatch_kwargs)
+        monitor_task = asyncio.create_task(coro)
     else:
         monitor_task = None
 
@@ -151,7 +162,10 @@ async def run_and_monitor(
             await run_task
 
     except Exception as e:
-        logger.error(f"Error in run_and_monitor: {e}")
+        msg = f"Error in run_and_monitor: {e}"
+        logger.exception(msg)
+        raise
+
     finally:
         stop_event.set()
         await run_task
@@ -173,18 +187,24 @@ def run(
     """
     Run a command synchronously and optionally watch for file changes.
 
-    This function is a synchronous wrapper around the asynchronous `run_and_monitor` function.
-    It runs a specified command and optionally monitors specified paths for file changes,
-    invoking the provided callbacks for standard output, standard error, and file changes.
+    This function is a synchronous wrapper around the asynchronous
+    `run_and_monitor` function. It runs a specified command and optionally
+    monitors specified paths for file changes, invoking the provided callbacks for
+    standard output, standard error, and file changes.
 
     Args:
         program (str): The program to run.
         *args (str): Arguments for the program.
-        stdout (Callable[[str], None] | None): Callback for handling standard output lines.
-        stderr (Callable[[str], None] | None): Callback for handling standard error lines.
-        watch (Callable[[set[tuple[Change, str]]], None] | None): Callback for handling file changes.
-        paths (list[str | Path] | None): List of paths to monitor for file changes.
-        **awatch_kwargs: Additional keyword arguments to pass to `watchfiles.awatch`.
+        stdout (Callable[[str], None] | None): Callback for handling standard
+            output lines.
+        stderr (Callable[[str], None] | None): Callback for handling standard
+            error lines.
+        watch (Callable[[set[tuple[Change, str]]], None] | None): Callback for
+            handling file changes.
+        paths (list[str | Path] | None): List of paths to monitor for file
+            changes.
+        **awatch_kwargs: Additional keyword arguments to pass to
+            `watchfiles.awatch`.
 
     Returns:
         int: The return code of the process.
@@ -201,5 +221,5 @@ def run(
             watch=watch,
             paths=paths,
             **awatch_kwargs,
-        )
+        ),
     )

hydraflow/config.py

@@ -33,7 +33,7 @@ def iter_params(config: object, prefix: str = "") -> Iterator[tuple[str, Any]]:
     if config is None:
         return
 
-    if not isinstance(config, (DictConfig, ListConfig)):
+    if not isinstance(config, DictConfig | ListConfig):
         config = OmegaConf.create(config)  # type: ignore
 
     yield from _iter_params(config, prefix)
@@ -62,8 +62,8 @@ def _is_param(value: object) -> bool:
     if isinstance(value, DictConfig):
         return False
 
-    if isinstance(value, ListConfig):
-        if any(isinstance(v, (DictConfig, ListConfig)) for v in value):
+    if isinstance(value, ListConfig):  # noqa: SIM102
+        if any(isinstance(v, DictConfig | ListConfig) for v in value):
             return False
 
     return True

hydraflow/context.py

@@ -75,7 +75,8 @@ def log_run(
             yield
 
     except Exception as e:
-        log.error(f"Error during log_run: {e}")
+        msg = f"Error during log_run: {e}"
+        log.exception(msg)
         raise
 
     finally:
@@ -84,7 +85,7 @@ def log_run(
 
 
 @contextmanager
-def start_run(
+def start_run(  # noqa: PLR0913
     config: object,
     *,
     run_id: str | None = None,
@@ -112,8 +113,10 @@ def start_run(
         parent_run_id (str | None): The parent run ID. Defaults to None.
         tags (dict[str, str] | None): Tags to associate with the run. Defaults to None.
         description (str | None): A description of the run. Defaults to None.
-        log_system_metrics (bool | None): Whether to log system metrics. Defaults to None.
-        synchronous (bool | None): Whether to log parameters synchronously. Defaults to None.
+        log_system_metrics (bool | None): Whether to log system metrics.
+            Defaults to None.
+        synchronous (bool | None): Whether to log parameters synchronously.
+            Defaults to None.
 
     Yields:
         Run: An MLflow Run object representing the started run.
@@ -128,24 +131,27 @@ def start_run(
         - `log_run`: A context manager to log parameters and manage the MLflow
            run context.
     """
-    with mlflow.start_run(
-        run_id=run_id,
-        experiment_id=experiment_id,
-        run_name=run_name,
-        nested=nested,
-        parent_run_id=parent_run_id,
-        tags=tags,
-        description=description,
-        log_system_metrics=log_system_metrics,
-    ) as run:
-        with log_run(config, synchronous=synchronous):
-            yield run
+    with (
+        mlflow.start_run(
+            run_id=run_id,
+            experiment_id=experiment_id,
+            run_name=run_name,
+            nested=nested,
+            parent_run_id=parent_run_id,
+            tags=tags,
+            description=description,
+            log_system_metrics=log_system_metrics,
+        ) as run,
+        log_run(config, synchronous=synchronous),
+    ):
+        yield run
 
 
 @contextmanager
 def watch(
     callback: Callable[[Path], None],
-    dir: Path | str = "",
+    dir: Path | str = "",  # noqa: A002
+    *,
     timeout: int = 60,
     ignore_patterns: list[str] | None = None,
     ignore_log: bool = True,
@@ -178,9 +184,9 @@ def watch(
             pass
         ```
     """
-    dir = dir or get_artifact_dir()
+    dir = dir or get_artifact_dir()  # noqa: A001
     if isinstance(dir, Path):
-        dir = dir.as_posix()
+        dir = dir.as_posix()  # noqa: A001
 
     handler = Handler(callback, ignore_patterns=ignore_patterns, ignore_log=ignore_log)
     observer = Observer()
@@ -191,7 +197,8 @@ def watch(
         yield
 
     except Exception as e:
-        log.error(f"Error during watch: {e}")
+        msg = f"Error during watch: {e}"
+        log.exception(msg)
         raise
 
     finally:
@@ -210,6 +217,7 @@ class Handler(PatternMatchingEventHandler):
     def __init__(
         self,
         func: Callable[[Path], None],
+        *,
         ignore_patterns: list[str] | None = None,
         ignore_log: bool = True,
     ) -> None:

hydraflow/info.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
 
 class RunCollectionInfo:
-    def __init__(self, runs: RunCollection):
+    def __init__(self, runs: RunCollection) -> None:
         self._runs = runs
 
     @property

hydraflow/mlflow.py

@@ -81,7 +81,8 @@ def log_params(config: object, *, synchronous: bool | None = None) -> None:
         mlflow.log_param(key, value, synchronous=synchronous)
 
 
-def search_runs(
+def search_runs(  # noqa: PLR0913
+    *,
     experiment_ids: list[str] | None = None,
     filter_string: str = "",
     run_view_type: int = ViewType.ACTIVE_ONLY,
@@ -148,7 +149,8 @@ def search_runs(
 
 
 def list_runs(
-    experiment_names: str | list[str] | None = None, n_jobs: int = 0
+    experiment_names: str | list[str] | None = None,
+    n_jobs: int = 0,
 ) -> RunCollection:
     """
     List all runs for the specified experiments.

hydraflow/progress.py

@@ -31,7 +31,7 @@ if TYPE_CHECKING:
 
 # https://github.com/jonghwanhyeon/joblib-progress/blob/main/joblib_progress/__init__.py
 @contextmanager
-def JoblibProgress(
+def JoblibProgress(  # noqa: N802
     *columns: ProgressColumn | str,
     description: str | None = None,
     total: int | None = None,
@@ -68,7 +68,7 @@ def JoblibProgress(
     task_id = progress.add_task(description, total=total)
     print_progress = joblib.parallel.Parallel.print_progress
 
-    def update_progress(self: joblib.parallel.Parallel):
+    def update_progress(self: joblib.parallel.Parallel) -> None:
         progress.update(task_id, completed=self.n_completed_tasks, refresh=True)
         return print_progress(self)
 

hydraflow/run_collection.py

@@ -23,8 +23,6 @@ from dataclasses import dataclass, field
 from itertools import chain
 from typing import TYPE_CHECKING, Any, Concatenate, ParamSpec, TypeVar, overload
 
-from mlflow.entities.run import Run
-
 from hydraflow.config import iter_params
 from hydraflow.info import RunCollectionInfo
 
@@ -33,6 +31,7 @@ if TYPE_CHECKING:
     from pathlib import Path
     from typing import Any
 
+    from mlflow.entities.run import Run
     from omegaconf import DictConfig
 
 
@@ -60,7 +59,7 @@ class RunCollection:
     _info: RunCollectionInfo = field(init=False)
     """An instance of `RunCollectionInfo`."""
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         self._info = RunCollectionInfo(self)
 
     def __repr__(self) -> str:
@@ -89,7 +88,7 @@ class RunCollection:
 
     @classmethod
     def from_list(cls, runs: list[Run]) -> RunCollection:
-        """Create a new `RunCollection` instance from a list of MLflow `Run` instances."""
+        """Create a `RunCollection` instance from a list of MLflow `Run` instances."""
 
         return cls(runs)
 
@@ -120,6 +119,7 @@ class RunCollection:
     def sort(
         self,
         key: Callable[[Run], Any] | None = None,
+        *,
         reverse: bool = False,
     ) -> None:
         self._runs.sort(key=key or (lambda x: x.info.start_time), reverse=reverse)
@@ -393,7 +393,7 @@ class RunCollection:
         param_names = set()
 
         for run in self:
-            for param in run.data.params.keys():
+            for param in run.data.params:
                 param_names.add(param)
 
         return list(param_names)
@@ -537,10 +537,11 @@ class RunCollection:
             Results obtained by applying the function to each artifact directory
             in the collection.
         """
-        return (func(dir, *args, **kwargs) for dir in self.info.artifact_dir)
+        return (func(dir, *args, **kwargs) for dir in self.info.artifact_dir)  # noqa: A001
 
     def group_by(
-        self, *names: str | list[str]
+        self,
+        *names: str | list[str],
     ) -> dict[tuple[str | None, ...], RunCollection]:
         """
         Group runs by specified parameter names.
@@ -595,13 +596,19 @@ def _param_matches(run: Run, key: str, value: Any) -> bool:
     if isinstance(value, list) and value:
         return type(value[0])(param) in value
 
-    if isinstance(value, tuple) and len(value) == 2:
+    if isinstance(value, tuple) and len(value) == 2:  # noqa: PLR2004
         return value[0] <= type(value[0])(param) < value[1]
 
     return type(value)(param) == value
 
 
-def filter_runs(runs: list[Run], config: object | None = None, **kwargs) -> list[Run]:
+def filter_runs(
+    runs: list[Run],
+    config: object | None = None,
+    *,
+    status: str | list[str] | None = None,
+    **kwargs,
+) -> list[Run]:
     """
     Filter the runs based on the provided configuration.
 
@@ -623,6 +630,7 @@ def filter_runs(runs: list[Run], config: object | None = None, **kwargs) -> list
         config (object | None): The configuration object to filter the runs.
             This can be any object that provides key-value pairs through the
             `iter_params` function.
+        status (str | list[str] | None): The status of the runs to filter.
         **kwargs: Additional key-value pairs to filter the runs.
 
     Returns:
@@ -634,6 +642,15 @@ def filter_runs(runs: list[Run], config: object | None = None, **kwargs) -> list
         if len(runs) == 0:
             return []
 
+    if isinstance(status, str) and status.startswith("!"):
+        status = status[1:].lower()
+        return [run for run in runs if run.info.status.lower() != status]
+
+    if status:
+        status = [status] if isinstance(status, str) else status
+        status = [s.lower() for s in status]
+        return [run for run in runs if run.info.status.lower() in status]
+
     return runs
 
 

{hydraflow-0.2.14.dist-info → hydraflow-0.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hydraflow
-Version: 0.2.14
+Version: 0.2.16
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://github.com/daizutabi/hydraflow
 Project-URL: Source, https://github.com/daizutabi/hydraflow
@@ -14,19 +14,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: hydra-core>1.3
+Requires-Dist: hydra-core>=1.3
 Requires-Dist: joblib
-Requires-Dist: mlflow>2.15
+Requires-Dist: mlflow>=2.15
 Requires-Dist: rich
-Requires-Dist: setuptools
 Requires-Dist: watchdog
 Requires-Dist: watchfiles
-Provides-Extra: dev
-Requires-Dist: pytest-asyncio; extra == 'dev'
-Requires-Dist: pytest-clarity; extra == 'dev'
-Requires-Dist: pytest-cov; extra == 'dev'
-Requires-Dist: pytest-randomly; extra == 'dev'
-Requires-Dist: pytest-xdist; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # Hydraflow

hydraflow-0.2.16.dist-info/RECORD

@@ -0,0 +1,13 @@
+hydraflow/__init__.py,sha256=B7rWSiGP5WwWjijcb41Bv9uuo5MQ6gbBbVWGAWYtK-k,598
+hydraflow/asyncio.py,sha256=eFnDbNOQ5Hmjdforr8rTW6i_rr-zFIVY3xSQQ45gMPA,6511
+hydraflow/config.py,sha256=YU6xYLinxq-Iqw1R3Zy7s3_u8nfpvnvXlGIkPXJTNLc,2116
+hydraflow/context.py,sha256=4UDaWGoVmeF36UqsKoh6dd_cS_YVRfz80gFr28ouNlo,8040
+hydraflow/info.py,sha256=7EsCMEH6LJZB3FZiQ3IpPFTD3Meaz7G3M-HvDQeo1rw,3466
+hydraflow/mlflow.py,sha256=irD1INrVaI_1RIzUCjI36voBqgZszZ4dkSLo4aT1_FM,8271
+hydraflow/progress.py,sha256=b5LvLm3d0eW3WsaidZAZotJNTTN3OwSY3XwxXXsJV9A,6561
+hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hydraflow/run_collection.py,sha256=tiNKy_mUmE-9moLs7enfLQyiwTUvL5eCKnD1acKeUFw,23854
+hydraflow-0.2.16.dist-info/METADATA,sha256=PUsFQ8YLW_L-rVzzx1OzQX6imjdQglhIAgJCSV9qEaM,3819
+hydraflow-0.2.16.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+hydraflow-0.2.16.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.2.16.dist-info/RECORD,,

hydraflow-0.2.14.dist-info/RECORD

@@ -1,12 +0,0 @@
-hydraflow/__init__.py,sha256=B7rWSiGP5WwWjijcb41Bv9uuo5MQ6gbBbVWGAWYtK-k,598
-hydraflow/asyncio.py,sha256=jdXuEFC6f7L_Dq6beASFZPQSvCnGimVxU-PRFsNc5U0,6241
-hydraflow/config.py,sha256=6TCKNQZ3sSrIEvl245T2udwFuknejyN1dMcIVmOHdrQ,2102
-hydraflow/context.py,sha256=kNJgnDFd_dFoHMMdGPYLbdtvu0p1BgVhA7jQ7bc0m8s,7851
-hydraflow/info.py,sha256=Vj2sT66Ric63mmaq7Yu8nDFhsGQYO3MCHrxFpapDufc,3458
-hydraflow/mlflow.py,sha256=8NJPjWbpedjJ9ylaS4a_NZJ2psmsSlYjv69i6Zth1yM,8242
-hydraflow/progress.py,sha256=_9hrCv2mQFNs3dnsbhBsxrXnzpBdtA2TmfFBVNNLqV4,6539
-hydraflow/run_collection.py,sha256=V6522xC9QvNI5Cwy6dAD5Y7qKhfI6kxByc4vHITuQUs,23293
-hydraflow-0.2.14.dist-info/METADATA,sha256=HnTBaONNqaET5b9m6n1GHt4avPQqaTemcuDXGuldZE4,4088
-hydraflow-0.2.14.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-hydraflow-0.2.14.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.2.14.dist-info/RECORD,,