runops 2.1.1__tar.gz → 2.1.3__tar.gz

{runops-2.1.1 → runops-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: runops
-Version: 2.1.1
+Version: 2.1.3
 Summary: Run ledger and Slurm job submission for HPC simulation projects
 Project-URL: Homepage, https://github.com/Nkzono99/runops
 Project-URL: Documentation, https://github.com/Nkzono99/runops/blob/main/docs/reference.md
@@ -111,7 +111,7 @@ run は ID が変わらないので、directory を移動してもエージェ
 | simulator | package | 状態 |
 |---|---|---|
 | MPIEMSES3D | `mpiemses3d-tools` ≥ 4.20 | adapter とエージェント向け skill を同梱 |
-| BEACH | `beach-bem` | 次のリリースで同梱。それまでは runops 内蔵の adapter を使用 |
+| BEACH | `beach-bem` ≥ 3.0 | adapter とエージェント向け skill を同梱 |
 | その他 | 自作の adapter、または `generic` | [adapter ガイド](https://github.com/Nkzono99/runops/blob/main/docs/adapter.md) |
 
 ---

{runops-2.1.1 → runops-2.1.3}/README.md

@@ -80,7 +80,7 @@ run は ID が変わらないので、directory を移動してもエージェ
 | simulator | package | 状態 |
 |---|---|---|
 | MPIEMSES3D | `mpiemses3d-tools` ≥ 4.20 | adapter とエージェント向け skill を同梱 |
-| BEACH | `beach-bem` | 次のリリースで同梱。それまでは runops 内蔵の adapter を使用 |
+| BEACH | `beach-bem` ≥ 3.0 | adapter とエージェント向け skill を同梱 |
 | その他 | 自作の adapter、または `generic` | [adapter ガイド](https://github.com/Nkzono99/runops/blob/main/docs/adapter.md) |
 
 ---

{runops-2.1.1 → runops-2.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "runops"
-version = "2.1.1"
+version = "2.1.3"
 description = "Run ledger and Slurm job submission for HPC simulation projects"
 readme = "README.md"
 license = "Apache-2.0"

{runops-2.1.1 → runops-2.1.3}/src/runops/__init__.py

@@ -1,3 +1,3 @@
 """runops: run ledger and Slurm job submission for HPC simulation projects."""
 
-__version__ = "2.1.1"
+__version__ = "2.1.3"

{runops-2.1.1 → runops-2.1.3}/src/runops/cli.py

@@ -91,6 +91,19 @@ def _confirm(message: str, yes: bool) -> None:
         raise typer.Exit(1)
 
 
+def _ask_install(root: Path, yes: bool) -> bool:
+    """Ask before creating .venv; default yes. Off a terminal, require -y."""
+    message = (
+        f"Create .venv in {root} and install simulator packages "
+        "(may build simulator binaries and take several minutes)?"
+    )
+    if yes:
+        return True
+    if not sys.stdin.isatty():
+        raise UsageError(f"{message} -- confirmation required; rerun with -y/--yes or --no-install")
+    return bool(typer.confirm(message, default=True))
+
+
 def _resolve(project: Project, refs: list[str]) -> list[Manifest]:
     if not refs:
         raise UsageError("give at least one RUN")
@@ -133,11 +146,19 @@ def init(
             show_default=False,
         )
         sims = [s.strip() for s in answer.split(",") if s.strip()]
-    if sims and not no_install and any(s.split("=")[0] != "generic" for s in sims):
-        _confirm(f"Create .venv in {root} and install simulator packages?", yes)
-    report = init_project(root, sims, site=site, name=name, install=not no_install)
+    install = not no_install
+    if sims and install and any(s.split("=")[0] != "generic" for s in sims):
+        install = _ask_install(root, yes)
+    report = init_project(root, sims, site=site, name=name, install=install)
     if report.site_detected:
         out.print(f"site: {report.site} (guessed from host {hostname()}; use --site to change)")
+    if report.install_failed:
+        err.print(
+            "[yellow]the project is ready, but simulator packages are not installed; "
+            "ask your agent to fix the install, or run `runo update` after fixing it[/]"
+        )
+    elif not install and not no_install:
+        out.print("packages not installed; ask your agent or run `runo update` later")
     for item in report.created:
         out.print(f"created {item}")
     for spec in report.installed:

{runops-2.1.1 → runops-2.1.3}/src/runops/ops/setup.py

@@ -30,7 +30,7 @@ from runops.runtime import package_specs, resolve_runtime
 # Package specs for simulators whose adapter lives in their own package.
 KNOWN_PACKAGES = {
     "emses": "MPIEMSES3D @ git+https://github.com/CS12-Laboratory/MPIEMSES3D.git",
-    "beach": "beach-bem",
+    "beach": "beach-bem>=3.0",  # 3.0 ships the runops adapter and skills
 }
 KNOWN_EXECUTABLES = {"emses": "mpiemses3D", "beach": "beach"}
 
@@ -109,6 +109,7 @@ class InitReport:
     root: Path
     site: str = ""
     site_detected: bool = False
+    install_failed: bool = False
     created: list[str] = field(default_factory=list)
     installed: list[str] = field(default_factory=list)
     warnings: list[str] = field(default_factory=list)
@@ -190,8 +191,14 @@ def init_project(
 
     project = Project(load_config(root))
     if install:
-        report.installed, warnings = install_packages(project, upgrade=False)
-        report.warnings += warnings
+        # A failed install must not leave a half-made project: runops.toml is
+        # already written, so finish the agent files and let `runo update` retry.
+        try:
+            report.installed, warnings = install_packages(project, upgrade=False)
+            report.warnings += warnings
+        except RunopsError as exc:
+            report.install_failed = True
+            report.warnings.append(f"package install failed: {exc}")
     report.created += add_legacy_adapters(project)
     report.warnings += refresh_agent_files(project)
     report.created += ["AGENTS.md", "CLAUDE.md", ".agents/skills/", ".claude/skills/"]

{runops-2.1.1 → runops-2.1.3}/tests/test_setup_misc.py

@@ -165,3 +165,74 @@ def test_usage_error_exit_code(cli) -> None:  # type: ignore[no-untyped-def]
 def test_cli_does_not_import_click_directly() -> None:
     source = (Path(__file__).parents[1] / "src/runops/cli.py").read_text()
     assert "import click" not in source  # newer typer vendors click
+
+
+def test_init_install_prompt_defaults_to_yes(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    calls: list[bool] = []
+
+    def fake_install(project, *, upgrade):  # type: ignore[no-untyped-def]
+        calls.append(upgrade)
+        return ["MPIEMSES3D"], []
+
+    monkeypatch.setattr("runops.ops.setup.install_packages", fake_install)
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(
+        "sys.stdin", _Tty("\nemses\n\n")
+    )  # site: Enter, sims: emses, install: Enter
+    res = cli("init")
+    assert res.code == 0, res.err
+    assert "may build simulator binaries" in res.out
+    assert "[Y/n]" in res.out
+    assert calls == [False]
+    assert "installed MPIEMSES3D" in res.out
+
+
+def test_init_install_declined_keeps_project(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.setattr(
+        "runops.ops.setup.install_packages",
+        lambda project, *, upgrade: (_ for _ in ()).throw(AssertionError("must not install")),
+    )
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", _Tty("\nemses\nn\n"))
+    res = cli("init")
+    assert res.code == 0, res.err
+    assert "runo update" in res.out
+    assert "emses" in load_toml(tmp_path / "runops.toml")["simulators"]
+
+
+def test_init_install_needs_yes_off_terminal(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.chdir(tmp_path)
+    res = cli("init", "emses")
+    assert res.code == 2 and "--yes" in res.err
+    assert not (tmp_path / "runops.toml").exists()
+
+
+def test_init_finishes_when_install_fails(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    from runops.errors import RunError
+
+    def failing_install(project, *, upgrade):  # type: ignore[no-untyped-def]
+        raise RunError("package install failed:\nerror: fpm not found")
+
+    monkeypatch.setattr("runops.ops.setup.install_packages", failing_install)
+    monkeypatch.chdir(tmp_path)
+    res = cli("init", "beach", "-y")
+    assert res.code == 0, res.err
+    assert "fpm not found" in res.err
+    assert "runo update" in res.err
+    for name in (
+        "runops.toml",
+        "AGENTS.md",
+        "CLAUDE.md",
+        ".agents/skills/runops-maintain/SKILL.md",
+    ):
+        assert (tmp_path / name).exists(), name
+    assert load_toml(tmp_path / "runops.toml")["simulators"]["beach"]["package"] == "beach-bem>=3.0"
+    assert (tmp_path / "adapters/beach.py").is_file()  # no entry point yet -> bundled port

{runops-2.1.1 → runops-2.1.3}/uv.lock

@@ -525,7 +525,7 @@ wheels = [
 
 [[package]]
 name = "runops"
-version = "2.1.1"
+version = "2.1.3"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },