hydraflow 0.4.1__tar.gz → 0.4.2__tar.gz

hydraflow-0.4.2/.devcontainer/devcontainer.json

@@ -0,0 +1,18 @@
+{
+  "image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu24.04",
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/starship:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "charliermarsh.ruff",
+        "fill-labs.dependi",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "tamasfe.even-better-toml"
+      ]
+    }
+  },
+  "postCreateCommand": ".devcontainer/postCreate.sh"
+}

hydraflow-0.4.2/.devcontainer/postCreate.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo 'eval "$(starship init bash)"' >> ~/.bashrc
+echo "alias ll='ls -alF'" >> ~/.bashrc
+mkdir -p ~/.config
+cp .devcontainer/starship.toml ~/.config
+
+curl -LsSf https://astral.sh/uv/install.sh | sh
+source $HOME/.cargo/env
+echo 'eval "$(uv generate-shell-completion bash)"' >> ~/.bashrc

{hydraflow-0.4.1 → hydraflow-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hydraflow
-Version: 0.4.1
+Version: 0.4.2
 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

{hydraflow-0.4.1 → hydraflow-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.4.1"
+version = "0.4.2"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = "MIT"

{hydraflow-0.4.1 → hydraflow-0.4.2}/src/hydraflow/context.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from watchdog.events import FileModifiedEvent, PatternMatchingEventHandler
 from watchdog.observers import Observer

{hydraflow-0.4.1 → hydraflow-0.4.2}/src/hydraflow/mlflow.py

@@ -21,6 +21,7 @@ from typing import TYPE_CHECKING
 
 import joblib
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from mlflow.entities import ViewType
 from mlflow.tracking.fluent import SEARCH_MAX_RESULTS_PANDAS, _get_experiment_id

{hydraflow-0.4.1 → hydraflow-0.4.2}/src/hydraflow/param.py

@@ -30,7 +30,7 @@ def match(param: str, value: Any) -> bool:
         False otherwise.
 
     """
-    if value in [None, True, False]:
+    if any(value is x for x in [None, True, False]):
         return param == str(value)
 
     if isinstance(value, list) and (m := _match_list(param, value)) is not None:
@@ -39,12 +39,12 @@ def match(param: str, value: Any) -> bool:
     if isinstance(value, tuple) and (m := _match_tuple(param, value)) is not None:
         return m
 
+    if isinstance(value, int | float):
+        return float(param) == value
+
     if isinstance(value, str):
         return param == value
 
-    if isinstance(value, int | float):
-        return type(value)(param) == value
-
     return param == str(value)
 
 

{hydraflow-0.4.1 → hydraflow-0.4.2}/src/hydraflow/utils.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from mlflow.entities import Run
 from mlflow.tracking import artifact_utils

{hydraflow-0.4.1 → hydraflow-0.4.2}/tests/scripts/app.py

@@ -30,6 +30,16 @@ def app(cfg: MySQLConfig):
     with hydraflow.chdir_hydra_output() as path:
         Path("chdir_hydra.txt").write_text(path.as_posix())
 
+    o = hydraflow.select_overrides(cfg)
+    if "host" in o:
+        assert o["host"] == cfg.host
+
+    if "port" not in o:
+        assert cfg.port == 3306
+
+    if "values" not in o:
+        assert cfg.get("values") == [1, 2, 3]  # type: ignore
+
     hydraflow.set_experiment(prefix="_", suffix="_")
     with hydraflow.start_run(cfg) as run:
         log.info(f"START, {cfg.host}, {cfg.port} ")
@@ -52,6 +62,9 @@ def app(cfg: MySQLConfig):
 
         assert hydraflow.get_overrides() == hydraflow.load_overrides(run)
 
+        if cfg.host == "error":
+            raise Exception("error")
+
         log.info("END")
 
 

{hydraflow-0.4.1 → hydraflow-0.4.2}/tests/test_app.py

@@ -194,3 +194,22 @@ def test_sort_by(rc: RunCollection):
 
     sorted = rc.sort_by(["host", "port"], reverse=True)
     assert sorted.values(["host", "port"]) == [("y", 2), ("y", 1), ("x", 2), ("x", 1)]
+
+
+def test_log_run_error(monkeypatch, tmp_path):
+    file = Path("tests/scripts/app.py").absolute()
+    monkeypatch.chdir(tmp_path)
+
+    args = [sys.executable, file.as_posix()]
+    args += ["host=error", "hydra.job.name=error"]
+    cp = subprocess.run(args, check=False, capture_output=True)
+    assert cp.returncode == 1
+    assert b"Error during log_run: error" in cp.stdout
+
+
+def test_chdir_artifact(rc: RunCollection):
+    from hydraflow.context import chdir_artifact
+
+    with chdir_artifact(rc[0]):
+        assert Path.cwd().stem == "artifacts"
+        assert Path.cwd().parent.stem == rc[0].info.run_id

{hydraflow-0.4.1 → hydraflow-0.4.2}/tests/test_asyncio.py

@@ -164,3 +164,58 @@ def test_run(tmp_path: Path):
     assert stderr_lines == ["world"]
     assert Path(path).read_text() == "hello world"
     assert len(changes_detected) >= 2
+
+
+@pytest.mark.asyncio
+async def test_execute_command_nonexistent():
+    from hydraflow.asyncio import execute_command
+
+    stop_event = asyncio.Event()
+
+    rc = await execute_command("nonexistent_command", stop_event=stop_event)
+    assert rc == 1
+    assert stop_event.is_set()
+
+
+@pytest.mark.asyncio
+async def test_process_stream_none():
+    from hydraflow.asyncio import process_stream
+
+    assert await process_stream(None, None) is None
+
+
+@pytest.mark.asyncio
+async def test_monitor_file_changes_error():
+    from hydraflow.asyncio import monitor_file_changes
+
+    stop_event = asyncio.Event()
+
+    with pytest.raises(FileNotFoundError):
+        await monitor_file_changes(["nonexistent_path"], lambda _: None, stop_event)
+
+
+@pytest.mark.asyncio
+async def test_run_and_monitor_none():
+    from hydraflow.asyncio import run_and_monitor
+
+    assert await run_and_monitor("echo", "hello") == 0
+
+
+@pytest.mark.asyncio
+async def test_run_and_monitor_error():
+    from hydraflow.asyncio import run_and_monitor
+
+    with pytest.raises(FileNotFoundError):
+        await run_and_monitor(
+            "nonexistent_command",
+            watch=lambda _: None,
+            paths=["nonexistent_path"],
+        )
+
+
+def test_run_cwd():
+    from hydraflow.asyncio import run
+
+    return_code = run(sys.executable, "--version", watch=lambda _: None)
+
+    assert return_code == 0

{hydraflow-0.4.1 → hydraflow-0.4.2}/tests/test_param.py

@@ -49,6 +49,22 @@ def test_param(param, x, y):
     assert match(p, x)
 
 
+def test_param_float():
+    from hydraflow.param import match
+
+    assert match("1.0", 1.0)
+    assert match("1.0", 1)
+    assert match("0.0", 0)
+    assert match("0.0", 0.0)
+
+
+def test_param_bool():
+    from hydraflow.param import match
+
+    assert not match("1", True)
+    assert not match("0", False)
+
+
 def test_match_list():
     from hydraflow.param import _match_list
 

hydraflow-0.4.1/.devcontainer/devcontainer.json

@@ -1,17 +0,0 @@
-{
-  "image": "mcr.microsoft.com/vscode/devcontainers/python:3.12",
-  "features": {
-    "ghcr.io/devcontainers-contrib/features/starship:1": {},
-    "ghcr.io/va-h/devcontainers-features/uv:1": {}
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "charliermarsh.ruff",
-        "ms-python.python",
-        "ms-python.vscode-pylance"
-      ]
-    }
-  },
-  "postCreateCommand": ".devcontainer/postCreate.sh"
-}

hydraflow-0.4.1/.devcontainer/postCreate.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo 'eval "$(starship init bash)"' >> ~/.bashrc
-mkdir -p ~/.config
-cp .devcontainer/starship.toml ~/.config