runops 2.0.0__tar.gz → 2.1.0__tar.gz

{runops-2.0.0 → runops-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: runops
-Version: 2.0.0
+Version: 2.1.0
 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
@@ -60,8 +60,10 @@ mkdir lunar-sheath && cd lunar-sheath
 runo init
 ```
 
-できた directory で Codex か Claude Code を起動して、調べたいことを話しかけてください。
-使う simulator や計算機の設定も、エージェントに伝えれば `runops.toml` に書き込みます。
+`runo init` は計算機の種類と使う simulator を尋ねます。計算機はホスト名から推定するので、
+京大スパコンのログインノードなら Enter で進めます。できた directory で Codex か Claude Code を
+起動して、調べたいことを話しかけてください。設定を後から変えたいときも、エージェントに伝えれば
+`runops.toml` を書き換えます。
 
 ## 頼めること
 

{runops-2.0.0 → runops-2.1.0}/README.md

@@ -29,8 +29,10 @@ mkdir lunar-sheath && cd lunar-sheath
 runo init
 ```
 
-できた directory で Codex か Claude Code を起動して、調べたいことを話しかけてください。
-使う simulator や計算機の設定も、エージェントに伝えれば `runops.toml` に書き込みます。
+`runo init` は計算機の種類と使う simulator を尋ねます。計算機はホスト名から推定するので、
+京大スパコンのログインノードなら Enter で進めます。できた directory で Codex か Claude Code を
+起動して、調べたいことを話しかけてください。設定を後から変えたいときも、エージェントに伝えれば
+`runops.toml` を書き換えます。
 
 ## 頼めること
 

{runops-2.0.0 → runops-2.1.0}/SPEC.md

@@ -169,7 +169,7 @@ schema = 2
 name = "lunar-sheath"
 
 [site]
-name = "camphor"
+name = "kudpc"
 resource_style = "rsc"            # "standard" | "rsc"
 modules = ["intel/2023.2", "intelmpi/2023.2"]
 stdout = "stdout.%J.log"
@@ -459,7 +459,7 @@ created ──submit──▶ submitted ──(slurm)──▶ running ──▶
 
 | command | 効果 |
 |---|---|
-| `runo init [SIM...] [--site NAME] [-y]` | `runops.toml`、`cases/`、`runs/`、`LOG.md`、`AGENTS.md`、`.venv` を作る。SIM ごとに adapter package を `.venv` に install し、skill を展開する（§8） |
+| `runo init [SIM...] [--site kudpc\|standard] [--no-install] [-y]` | `runops.toml`、`cases/`、`runs/`、`LOG.md`、`AGENTS.md`、`.venv` を作る。SIM ごとに adapter package を `.venv` に install し、skill を展開する（§8）。端末から引数なしで実行すると site と simulator を尋ねる。`--site` が無ければ host 名から推定する（KUDPC のログインノードなら `kudpc`） |
 | `runo doctor [--json]` | `runops.toml` の妥当性、adapter の import 可否、executable の存在、`sbatch` の有無、skill の鮮度を検査 |
 | `runo update [--skills-only] [-y]` | adapter package を upgrade し、skill を再展開する |
 | `runo build SIM [--force]` | `local_source` simulator を `.runops/build/` に build する（§4.1） |
@@ -911,3 +911,4 @@ v2 の `docs/` は次の 3 ファイルだけにする。
 | submit 時の executable hash | attempt ごとに `exe_hash` を記録し、作成時と違えば warning | `runo update` 後の retry が作成時の hash のまま別 binary で走っていた |
 | 同一入力の warning | `input_hash`（と `exe_hash`）が一致する既存 run を作成時に知らせる | §1.3 で観察した variation の重複を、ゲート無しで抑える |
 | 整理と命名のしきい値 | `[defaults]` に `tidy_failed_days`、`tidy_archive_days`、`label_max_length` を追加。completed の目安は「`--older-than` の 3 倍」をやめて独立の値に | project ごとに計算期間や命名が違い、エージェントに毎回 option を渡させると揃わない |
+| `runo init` の対話と site の推定 | 端末から引数なしで実行したときだけ site と simulator を尋ねる。site の既定はホスト名（`camphor*`、`laurel*`、`cinnamon*`、`gardenia*` なら `kudpc`）。プリセット名は `kudpc` とし、`camphor` も同じ意味で受け付ける | 人が打つのは `runo init` だけなので、ここで KUDPC 向けの設定を取り違えないようにする。エージェントや CI からの実行（端末でない、`-y`、引数あり）は従来どおり尋ねない |

{runops-2.0.0 → runops-2.1.0}/docs/reference.md

@@ -14,7 +14,7 @@ schema = 2
 name = "lunar-sheath"
 
 [site]
-name = "camphor"
+name = "kudpc"
 resource_style = "rsc"            # "standard" | "rsc"
 modules = ["intel/2023.2", "intelmpi/2023.2"]
 stdout = "stdout.%J.log"          # 省略時は work/%j.out
@@ -132,7 +132,7 @@ runops だけが書きます。手で編集しないでください。主な fie
 
 | command | 動作 |
 |---|---|
-| `runo init [SIM...] [--site camphor] [--no-install] [-y]` | project を作る。`SIM` は `emses` や `name=package-spec` |
+| `runo init [SIM...] [--site kudpc\|standard] [--no-install] [-y]` | project を作る。`SIM` は `emses` や `name=package-spec`。端末から引数なしで実行すると site と simulator を尋ねる。`--site` の既定はホスト名から推定（KUDPC のログインノードなら `kudpc`、`camphor` も同義） |
 | `runo doctor [--json]` | 設定、adapter の解決経路、executable、sbatch、skill の鮮度を点検 |
 | `runo update [--skills-only] [-y]` | simulator package を更新し skill と AGENTS.md の管理 block を再生成 |
 | `runo build SIM [--force]` | `local_source` の simulator を build |

{runops-2.0.0 → runops-2.1.0}/pyproject.toml

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

{runops-2.0.0 → runops-2.1.0}/src/runops/__init__.py

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

{runops-2.0.0 → runops-2.1.0}/src/runops/cli.py

@@ -107,21 +107,44 @@ def init(
     sims: Optional[list[str]] = typer.Argument(
         None, help="Simulators: NAME or NAME=package-spec (e.g. emses, beach, generic)."
     ),
-    site: str = typer.Option("", "--site", help="Site preset: camphor | standard."),
+    site: str = typer.Option(
+        "", "--site", help="Site preset: kudpc | standard (default: guessed from the host name)."
+    ),
     name: str = typer.Option("", "--name", help="Project name (default: directory name)."),
     no_install: bool = typer.Option(
         False, "--no-install", help="Do not create .venv or install packages."
     ),
     yes: bool = typer.Option(False, "-y", "--yes"),
 ) -> None:
-    """Create a runops project in the current directory."""
-    from runops.ops.setup import init_project
+    """Create a runops project in the current directory.
+
+    Run from a terminal without arguments, it asks for the site preset and the
+    simulators; the site default is guessed from the host name.
+    """
+    from runops.ops.setup import SITE_PRESETS, detect_site, hostname, init_project
 
     sims = sims or []
     root = Path.cwd()
+    if not sims and not site and not yes and sys.stdin.isatty():
+        import click
+
+        guessed = detect_site()
+        site = typer.prompt(
+            f"Site preset (guessed from host {hostname()})",
+            default=guessed,
+            type=click.Choice(list(SITE_PRESETS)),
+        )
+        answer = typer.prompt(
+            "Simulators, comma-separated (emses, beach, generic; empty for none)",
+            default="",
+            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)
+    if report.site_detected:
+        out.print(f"site: {report.site} (guessed from host {hostname()}; use --site to change)")
     for item in report.created:
         out.print(f"created {item}")
     for spec in report.installed:

{runops-2.0.0 → runops-2.1.0}/src/runops/ops/setup.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import shutil
+import socket
 import subprocess
 import sys
 from dataclasses import dataclass, field
@@ -34,9 +35,9 @@ KNOWN_PACKAGES = {
 KNOWN_EXECUTABLES = {"emses": "mpiemses3D", "beach": "beach"}
 
 SITE_PRESETS: dict[str, dict[str, Any]] = {
-    "camphor": {
+    "kudpc": {
         "site": {
-            "name": "camphor",
+            "name": "kudpc",
             "resource_style": "rsc",
             "modules": ["intel/2023.2", "intelmpi/2023.2"],
             "stdout": "stdout.%J.log",
@@ -52,6 +53,31 @@ SITE_PRESETS: dict[str, dict[str, Any]] = {
         "launcher": {"kind": "srun", "use_slurm_ntasks": True},
     },
 }
+SITE_ALIASES = {"camphor": "kudpc"}
+# Login nodes of Kyoto University's supercomputer systems (A, B, C, G).
+KUDPC_HOST_PREFIXES = ("camphor", "laurel", "cinnamon", "gardenia")
+
+
+def hostname() -> str:
+    return socket.gethostname()
+
+
+def detect_site(host: str | None = None) -> str:
+    """Site preset suggested by the host name (``kudpc`` or ``standard``)."""
+    name = (hostname() if host is None else host).lower()
+    return "kudpc" if name.startswith(KUDPC_HOST_PREFIXES) else "standard"
+
+
+def resolve_site(site: str) -> tuple[str, bool]:
+    """Return (preset, detected) for a ``--site`` value; empty means detect."""
+    if not site:
+        return detect_site(), True
+    preset = SITE_ALIASES.get(site, site)
+    if preset not in SITE_PRESETS:
+        known = ", ".join([*SITE_PRESETS, *SITE_ALIASES])
+        raise UsageError(f"unknown site preset {site!r}; known: {known}")
+    return preset, False
+
 
 GITIGNORE = """\
 .venv/
@@ -81,6 +107,8 @@ Extend an existing file instead of creating a similar one.
 @dataclass
 class InitReport:
     root: Path
+    site: str = ""
+    site_detected: bool = False
     created: list[str] = field(default_factory=list)
     installed: list[str] = field(default_factory=list)
     warnings: list[str] = field(default_factory=list)
@@ -108,10 +136,9 @@ def init_project(
         raise UsageError(f"{root / CONFIG_FILE} already exists")
     if (root / "simulators.toml").exists():
         raise UsageError(f"{root} is a runops v1 project; use `runo migrate-v1`")
-    preset = SITE_PRESETS.get(site or "standard")
-    if preset is None:
-        raise UsageError(f"unknown site preset {site!r}; known: {', '.join(SITE_PRESETS)}")
-    report = InitReport(root)
+    site_key, detected = resolve_site(site)
+    preset = SITE_PRESETS[site_key]
+    report = InitReport(root, site=site_key, site_detected=detected)
     simulators: dict[str, Any] = {}
     for arg in sims:
         sim_name, spec = parse_sim_arg(arg)

{runops-2.0.0 → runops-2.1.0}/src/runops/skills/runops-reference/SKILL.md

@@ -7,7 +7,7 @@ description: Full runops (runo) command reference, project layout and manifest f
 
 | command | effect |
 |---|---|
-| `runo init [SIM...] [--site NAME] [-y]` | create runops.toml, cases/, runs/, LOG.md, notes/, AGENTS.md, skills; install simulator packages |
+| `runo init [SIM...] [--site kudpc\|standard] [--no-install] [-y]` | create runops.toml, cases/, runs/, LOG.md, notes/, AGENTS.md, skills; install simulator packages. Site defaults to a guess from the host name; asks interactively only in a terminal without arguments |
 | `runo doctor [--json]` | check config, adapters, executables, sbatch, skill freshness |
 | `runo update [--skills-only] [-y]` | upgrade simulator packages and redeploy skills / AGENTS.md block |
 | `runo build SIM [--force]` | build a local_source simulator into .runops/build/<sim>-<commit> |

{runops-2.0.0 → runops-2.1.0}/tests/conftest.py

@@ -77,6 +77,12 @@ class FakeSlurm:
         return str(self.next_id)
 
 
+@pytest.fixture(autouse=True)
+def fixed_hostname(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Site detection must not depend on the machine running the tests."""
+    monkeypatch.setattr("runops.ops.setup.hostname", lambda: "testhost")
+
+
 @pytest.fixture
 def fake_slurm(monkeypatch: pytest.MonkeyPatch) -> FakeSlurm:
     fake = FakeSlurm()

{runops-2.0.0 → runops-2.1.0}/tests/test_setup_misc.py

@@ -2,9 +2,12 @@
 
 from __future__ import annotations
 
+import io
 import json
 from pathlib import Path
 
+import pytest
+
 from runops.ops.setup import init_project
 from runops.project import Project
 from runops.util import load_toml
@@ -81,3 +84,62 @@ def test_dest_must_stay_in_runs(project_dir: Path, cli) -> None:  # type: ignore
 def test_version(cli) -> None:  # type: ignore[no-untyped-def]
     res = cli("--version")
     assert res.code == 0 and res.out.strip().startswith("2.")
+
+
+def test_detect_site() -> None:
+    from runops.ops.setup import detect_site
+
+    for host in ("camphor31", "laurel32", "cinnamon1", "gardenia13", "Laurel5.kudpc.kyoto-u.ac.jp"):
+        assert detect_site(host) == "kudpc", host
+    for host in ("xb0092", "mylaptop", "login1"):
+        assert detect_site(host) == "standard", host
+
+
+def test_init_guesses_site_from_hostname(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.setattr("runops.ops.setup.hostname", lambda: "laurel32")
+    monkeypatch.chdir(tmp_path)
+    res = cli("init", "--no-install")
+    assert res.code == 0, res.err
+    assert "site: kudpc (guessed from host laurel32" in res.out
+    config = load_toml(tmp_path / "runops.toml")
+    assert config["site"]["resource_style"] == "rsc"
+    assert config["site"]["name"] == "kudpc"
+
+
+def test_init_explicit_site_wins(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.setattr("runops.ops.setup.hostname", lambda: "laurel32")
+    monkeypatch.chdir(tmp_path)
+    res = cli("init", "--site", "standard", "--no-install")
+    assert "guessed" not in res.out
+    assert load_toml(tmp_path / "runops.toml")["site"]["resource_style"] == "standard"
+    assert cli("init", "--site", "nowhere", "--no-install").code == 2
+
+
+class _Tty(io.StringIO):
+    def isatty(self) -> bool:
+        return True
+
+
+def test_init_interactive(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.setattr("runops.ops.setup.hostname", lambda: "camphor31")
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", _Tty("\nemses, generic\n"))  # Enter keeps the guess
+    res = cli("init", "--no-install")
+    assert res.code == 0, res.err
+    assert "guessed from host camphor31" in res.out
+    config = load_toml(tmp_path / "runops.toml")
+    assert config["site"]["resource_style"] == "rsc"
+    assert sorted(config["simulators"]) == ["emses", "generic"]
+    assert config["simulators"]["emses"]["modules"][0].startswith("hdf5/")
+
+
+def test_init_not_interactive_with_yes(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, cli
+) -> None:  # type: ignore[no-untyped-def]
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", _Tty(""))
+    res = cli("init", "-y", "--no-install")
+    assert res.code == 0, res.err
+    assert load_toml(tmp_path / "runops.toml")["simulators"] == {}

{runops-2.0.0 → runops-2.1.0}/uv.lock

@@ -537,7 +537,7 @@ wheels = [
 
 [[package]]
 name = "runops"
-version = "2.0.0"
+version = "2.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },