more

CamDavidsonPilon · CamDavidsonPilon · commit 94770ddaaa23 · 2026-06-30T14:41:42.000-04:00
diff --git a/core/pioreactor/cli/pio.py b/core/pioreactor/cli/pio.py
@@ -7,7 +7,6 @@
 import stat
 import subprocess
 import tempfile
-import time
 import typing as t
 from os import geteuid
 from pathlib import Path
@@ -202,135 +201,6 @@ def get_runtime_cache_database_paths(run_pioreactor_cache: Path) -> list[Path]:
     ]
 
 
-def format_repair_sample(paths: list[Path], limit: int = 5) -> str:
-    sample = ", ".join(str(path) for path in paths[:limit])
-    remaining_count = len(paths) - limit
-    if remaining_count > 0:
-        return f"{sample}, and {remaining_count} more"
-    return sample
-
-
-def collect_dot_pioreactor_repair_changes(dot_pioreactor_root: Path) -> dict[str, list[Path]]:
-    expected_uid, expected_gid, _expected_owner = get_expected_dot_pioreactor_uid_gid()
-    changes: dict[str, list[Path]] = {
-        "ownership": [],
-        "group_writable": [],
-        "setgid": [],
-    }
-
-    for path in [dot_pioreactor_root, *dot_pioreactor_root.rglob("*")]:
-        path_stat = path.lstat()
-        mode = path_stat.st_mode
-
-        if expected_uid is not None and expected_gid is not None:
-            if path_stat.st_uid != expected_uid or path_stat.st_gid != expected_gid:
-                changes["ownership"].append(path)
-
-        if path == dot_pioreactor_root or stat.S_ISDIR(mode) or stat.S_ISREG(mode):
-            if not mode & stat.S_IWGRP:
-                changes["group_writable"].append(path)
-
-        if stat.S_ISDIR(mode) and not mode & stat.S_ISGID:
-            changes["setgid"].append(path)
-
-    return changes
-
-
-def collect_runtime_repair_changes() -> dict[str, list[Path]]:
-    expected_uid, expected_gid, _expected_owner = get_expected_dot_pioreactor_uid_gid()
-    run_pioreactor_root = Path("/run/pioreactor")
-    run_pioreactor_exports = run_pioreactor_root / "exports"
-    run_pioreactor_cache = run_pioreactor_root / "cache"
-    runtime_cache_databases = get_runtime_cache_database_paths(run_pioreactor_cache)
-    now = time.time()
-
-    changes: dict[str, list[Path]] = {
-        "directories": [],
-        "stale_exports": [],
-        "cache_databases": [],
-        "cache_sidecars": [],
-    }
-
-    for path, expected_mode in (
-        (run_pioreactor_root, 0o2775),
-        (run_pioreactor_exports, 0o2775),
-        (run_pioreactor_cache, 0o2770),
-    ):
-        if not path.exists():
-            changes["directories"].append(path)
-            continue
-
-        path_stat = path.lstat()
-        current_mode = stat.S_IMODE(path_stat.st_mode)
-        owner_or_group_differs = (
-            expected_uid is not None
-            and expected_gid is not None
-            and (path_stat.st_uid != expected_uid or path_stat.st_gid != expected_gid)
-        )
-        if current_mode != expected_mode or owner_or_group_differs:
-            changes["directories"].append(path)
-
-    if run_pioreactor_exports.exists():
-        for path in run_pioreactor_exports.iterdir():
-            path_stat = path.lstat()
-            if not stat.S_ISREG(path_stat.st_mode):
-                continue
-
-            age_minutes = (now - path_stat.st_mtime) / 60
-            if (path.name.endswith((".tmp", ".csv")) and age_minutes > 30) or (
-                path.name.startswith("export_") and path.name.endswith(".zip") and age_minutes > 360
-            ):
-                changes["stale_exports"].append(path)
-
-    for path in runtime_cache_databases:
-        if not path.exists():
-            changes["cache_databases"].append(path)
-            continue
-
-        path_stat = path.lstat()
-        current_mode = stat.S_IMODE(path_stat.st_mode)
-        owner_or_group_differs = (
-            expected_uid is not None
-            and expected_gid is not None
-            and (path_stat.st_uid != expected_uid or path_stat.st_gid != expected_gid)
-        )
-        if current_mode != 0o660 or owner_or_group_differs:
-            changes["cache_databases"].append(path)
-
-    if run_pioreactor_cache.exists():
-        for path in run_pioreactor_cache.iterdir():
-            path_stat = path.lstat()
-            if not stat.S_ISREG(path_stat.st_mode) or not path.name.endswith(("-wal", "-shm")):
-                continue
-
-            current_mode = stat.S_IMODE(path_stat.st_mode)
-            owner_or_group_differs = (
-                expected_uid is not None
-                and expected_gid is not None
-                and (path_stat.st_uid != expected_uid or path_stat.st_gid != expected_gid)
-            )
-            if current_mode != 0o660 or owner_or_group_differs:
-                changes["cache_sidecars"].append(path)
-
-    return changes
-
-
-def echo_repair_changes(title: str, changes: dict[str, list[Path]], labels: dict[str, str]) -> None:
-    changed_anything = False
-    for key, label in labels.items():
-        paths = changes[key]
-        if not paths:
-            continue
-
-        if not changed_anything:
-            click.echo(f"{title}:")
-            changed_anything = True
-        click.echo(f"  - {label}: {len(paths)} path(s): {format_repair_sample(paths)}")
-
-    if not changed_anything:
-        click.echo(f"{title}: no changes needed.")
-
-
 def build_runtime_repair_commands(tools: dict[str, str]) -> list[list[str]]:
     run_pioreactor_root = Path("/run/pioreactor")
     run_pioreactor_exports = run_pioreactor_root / "exports"
@@ -1694,40 +1564,19 @@ def repair() -> None:
         raise click.ClickException(f"{dot_pioreactor_root} does not exist.")
 
     tools = require_repair_command_paths("sudo", "find", "chown", "chmod", "install", "touch", "systemctl")
-    dot_pioreactor_changes = collect_dot_pioreactor_repair_changes(dot_pioreactor_root)
-    runtime_changes = collect_runtime_repair_changes()
     dot_pioreactor_commands = build_dot_pioreactor_repair_commands(dot_pioreactor_root, tools)
     runtime_commands = build_runtime_repair_commands(tools)
     command_groups = [
-        dot_pioreactor_commands,
-        runtime_commands[:2],
-        runtime_commands[2:3],
-        runtime_commands[3:],
+        (dot_pioreactor_commands, f"Repaired ownership and group permissions for {dot_pioreactor_root}."),
+        (runtime_commands[:2], "Repaired runtime directories under /run/pioreactor."),
+        (runtime_commands[2:3], "Cleared stale runtime export artifacts from /run/pioreactor/exports."),
+        (runtime_commands[3:], "Repaired runtime cache files under /run/pioreactor/cache."),
     ]
 
-    for commands in command_groups:
+    for commands, message in command_groups:
         for command in commands:
             subprocess.run(command, check=True)
-
-    echo_repair_changes(
-        f"Ownership and group permissions for {dot_pioreactor_root}",
-        dot_pioreactor_changes,
-        {
-            "ownership": "fixed owner/group",
-            "group_writable": "added group-write permission",
-            "setgid": "added setgid permission",
-        },
-    )
-    echo_repair_changes(
-        "Runtime files under /run/pioreactor",
-        runtime_changes,
-        {
-            "directories": "created or repaired runtime directories",
-            "stale_exports": "removed stale export artifacts",
-            "cache_databases": "created or repaired cache databases",
-            "cache_sidecars": "repaired cache sidecar files",
-        },
-    )
+        click.echo(message)
 
     restarted_services = restart_inactive_pioreactor_web_services(tools)
     if restarted_services:
diff --git a/core/pioreactor/web/api.py b/core/pioreactor/web/api.py
@@ -4073,16 +4073,22 @@ def get_worker_model_and_metadata(pioreactor_unit: str) -> ResponseReturnValue:
         one=True,
     )
     if result is None:
-        # If the worker is not found, return an error
         return abort_with(
             404,
             "Worker not found",
             cause="Worker name not found in database.",
             remediation="Check the unit name or add the worker to the inventory.",
         )
+
+    assert isinstance(result, dict)
+    if result["model_version"] or not result["model_name"]:
+        return abort_with(
+            404,
+            f"Model not set for worker {pioreactor_unit}.",
+            cause="Model not set in database.",
+            remediation="Set the model of this worker.",
+        )
     else:
-        assert isinstance(result, dict)
-        # If the worker is found, return the model and metadata
         return attach_cache_control(
             jsonify(
                 {
diff --git a/core/pioreactor/web/utils.py b/core/pioreactor/web/utils.py
@@ -225,7 +225,7 @@ def load_background_job_descriptors(
     for file in files:
         try:
             decoded_yaml = yaml_decode(file.read_bytes(), type=structs.BackgroundJobDescriptor)
-            validate_background_job_descriptor(decoded_yaml)
+            # validate_background_job_descriptor(decoded_yaml) TODO: uncomment me for next update.sh release.
             if decoded_yaml.job_name in parsed_yaml and report_error is not None:
                 report_error(f"Descriptor {file.name} overrides job {decoded_yaml.job_name}.")
             parsed_yaml[decoded_yaml.job_name] = decoded_yaml
diff --git a/core/tests/test_cli.py b/core/tests/test_cli.py
@@ -576,23 +576,6 @@ def test_pio_repair_runs_dot_pioreactor_and_runtime_permission_commands(
 
     monkeypatch.setenv("DOT_PIOREACTOR", str(dot_pioreactor))
     monkeypatch.setattr("shutil.which", lambda name: f"/usr/bin/{name}")
-    monkeypatch.setattr(
-        "pioreactor.cli.pio.collect_dot_pioreactor_repair_changes",
-        lambda _root: {
-            "ownership": [dot_pioreactor / "config.ini"],
-            "group_writable": [dot_pioreactor, dot_pioreactor / "storage"],
-            "setgid": [dot_pioreactor / "storage"],
-        },
-    )
-    monkeypatch.setattr(
-        "pioreactor.cli.pio.collect_runtime_repair_changes",
-        lambda: {
-            "directories": [Path("/run/pioreactor/cache")],
-            "stale_exports": [Path("/run/pioreactor/exports/export_old.zip")],
-            "cache_databases": [Path("/run/pioreactor/cache/huey.db")],
-            "cache_sidecars": [Path("/run/pioreactor/cache/huey.db-wal")],
-        },
-    )
 
     class DummyResult:
         def __init__(self, returncode: int = 0) -> None:
@@ -763,20 +746,10 @@ def record_run(command: list[str], check: bool) -> DummyResult:
         "restart",
         "pioreactor_startup_run@mqtt_to_db_streaming.service",
     ]
-    assert f"Ownership and group permissions for {dot_pioreactor}:" in result.output
-    assert f"fixed owner/group: 1 path(s): {dot_pioreactor / 'config.ini'}" in result.output
-    assert (
-        f"added group-write permission: 2 path(s): {dot_pioreactor}, {dot_pioreactor / 'storage'}"
-        in result.output
-    )
-    assert f"added setgid permission: 1 path(s): {dot_pioreactor / 'storage'}" in result.output
-    assert "Runtime files under /run/pioreactor:" in result.output
-    assert "created or repaired runtime directories: 1 path(s): /run/pioreactor/cache" in result.output
-    assert (
-        "removed stale export artifacts: 1 path(s): /run/pioreactor/exports/export_old.zip" in result.output
-    )
-    assert "created or repaired cache databases: 1 path(s): /run/pioreactor/cache/huey.db" in result.output
-    assert "repaired cache sidecar files: 1 path(s): /run/pioreactor/cache/huey.db-wal" in result.output
+    assert f"Repaired ownership and group permissions for {dot_pioreactor}." in result.output
+    assert "Repaired runtime directories under /run/pioreactor." in result.output
+    assert "Cleared stale runtime export artifacts from /run/pioreactor/exports." in result.output
+    assert "Repaired runtime cache files under /run/pioreactor/cache." in result.output
     assert "Restarted inactive pioreactor-web.target services: huey.service." in result.output
     assert (
         "Restarted inactive pioreactor startup services: "
@@ -785,42 +758,6 @@ def record_run(command: list[str], check: bool) -> DummyResult:
     assert "Repair complete." in result.output
 
 
-def test_pio_repair_reports_no_changes_when_preflight_is_clean(
-    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
-) -> None:
-    dot_pioreactor = tmp_path / ".pioreactor"
-    dot_pioreactor.mkdir()
-
-    monkeypatch.setenv("DOT_PIOREACTOR", str(dot_pioreactor))
-    monkeypatch.setattr("shutil.which", lambda name: f"/usr/bin/{name}")
-    monkeypatch.setattr(
-        "pioreactor.cli.pio.collect_dot_pioreactor_repair_changes",
-        lambda _root: {"ownership": [], "group_writable": [], "setgid": []},
-    )
-    monkeypatch.setattr(
-        "pioreactor.cli.pio.collect_runtime_repair_changes",
-        lambda: {"directories": [], "stale_exports": [], "cache_databases": [], "cache_sidecars": []},
-    )
-
-    class DummyResult:
-        def __init__(self, returncode: int = 0) -> None:
-            self.returncode = returncode
-
-    def record_run(command: list[str], check: bool) -> DummyResult:
-        assert check is True or command[:3] == ["/usr/bin/systemctl", "is-active", "--quiet"]
-        return DummyResult()
-
-    monkeypatch.setattr("subprocess.run", record_run)
-    monkeypatch.setattr("pioreactor.cli.pio.whoami.am_I_leader", lambda: True)
-
-    runner = CliRunner()
-    result = runner.invoke(pio, ["repair"])
-
-    assert result.exit_code == 0
-    assert f"Ownership and group permissions for {dot_pioreactor}: no changes needed." in result.output
-    assert "Runtime files under /run/pioreactor: no changes needed." in result.output
-
-
 def test_pio_repair_does_not_check_mqtt_to_db_streaming_on_workers(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:
diff --git a/frontend/src/Inventory.jsx b/frontend/src/Inventory.jsx
diff --git a/frontend/src/__tests__/Inventory.test.jsx b/frontend/src/__tests__/Inventory.test.jsx
