ms-components 0.5.0__tar.gz → 0.5.2__tar.gz

{ms_components-0.5.0 → ms_components-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ms_components
-Version: 0.5.0
+Version: 0.5.2
 Summary: PySide6 UI components for MolSuite: smart table, project browser, job monitor, PyMOL dock, steppers.
 Author: Mario S. Valdés-Tresanco, Mario E. Valdés-Tresanco
 License-Expression: MIT

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components/ms_executors.py

@@ -165,9 +165,11 @@ def describe_host(address: str, env: str = "", packages=(), tools=None) -> str:
     tools = tools or {}
     python = f"{env.rstrip('/')}/bin/python" if env else ("" if address else sys.executable)
     script = "; ".join([
-        "export LC_ALL=C", "uname -srm", '(. /etc/os-release 2>/dev/null && echo "$PRETTY_NAME")',
+        "export LC_ALL=C", "uname -srm",
+        '(. /etc/os-release 2>/dev/null && echo "$PRETTY_NAME") || (v=$(sw_vers -productVersion 2>/dev/null) && echo "macOS $v")',
         'echo "CPUs: $(nproc 2>/dev/null || sysctl -n hw.ncpu)"',
-        "awk '/MemTotal/ {printf \"Memory: %.1f GB\\n\", $2/1048576}' /proc/meminfo 2>/dev/null",
+        "awk '/MemTotal/ {printf \"Memory: %.1f GB\\n\", $2/1048576}' /proc/meminfo 2>/dev/null"
+        " || sysctl -n hw.memsize | awk '{printf \"Memory: %.1f GB\\n\", $1/1073741824}'",  # macOS: no /proc
         "(nvidia-smi -L 2>/dev/null || echo 'GPUs: none seen by nvidia-smi')",
         "echo",
         *([f"if [ -x {shlex.quote(python)} ]; then {shlex.quote(python)} -c {shlex.quote(_VERSIONS)} "

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components/ms_monitor/detail.py

@@ -628,7 +628,7 @@ class JobDetail(QWidget):
         self._traceback.setPlainText("" if item is None else str(item.data(Qt.UserRole) or ""))
 
     _FACTS = ("key", "status", "executor", "started", "finished", "elapsed", "chunks", "retried", "throughput",
-              "peak memory", "in flight", "errors")
+              "peak memory", "CPU", "GPU", "in flight", "errors")
 
     def _build_summary(self) -> None:
         self._fact: dict[str, QLabel] = {}
@@ -661,6 +661,7 @@ class JobDetail(QWidget):
             f"{job.chunks_retried:,}",
             format_speed(job.throughput_eps) + ("" if job.is_terminal else " · last 5 min"),
             f"{job.peak_mem_mb:,} MB" if job.peak_mem_mb else "—",
+            *_used(job, (end - job.started_at).total_seconds() if job.started_at else 0.0),
             f"{job.tasks_running:,} tasks · {job.cpu_used:,} CPUs" if not job.is_terminal else "—",
             f"{self._error_types:,} types" if self._error_types else "none",
         )
@@ -668,4 +669,21 @@ class JobDetail(QWidget):
             self._fact[key].setText(value)
 
 
+def _used(job: JobMonitorState, seconds: float) -> tuple[str, str]:
+    """The CPU and GPU lines of a job's summary: what it kept busy, of what it held."""
+    usage = job.usage
+    if not usage or seconds <= 0:
+        return "—", "—"
+    cpu = gpu = "—"
+    if usage.get("peak_cpu"):
+        held = f"{usage['cpu_s'] / seconds:,.1f} held on average · {usage['peak_cpu']:g} at most"
+        busy = usage.get("busy_s")  # on this machine only: what it read while the job ran
+        cpu = held if busy is None else f"{busy / 3600:,.2f} CPU·h · {busy / seconds:,.1f} busy of " + held
+    if usage.get("peak_gpu"):
+        gpu = f"{usage['gpu_s'] / 3600:,.2f} GPU·h · {usage['peak_gpu']:g} at most"
+        if usage.get("vram_mb") is not None:
+            gpu += f" · {usage['vram_mb']:,} MB VRAM at most · {usage['gpu_util']:.0f} % busy on average"
+    return cpu, gpu
+
+
 __all__ = ["ChunkGrid", "GRID_MAX", "GRID_STEP", "JobDetail", "counts", "grid_window", "layout_cells", "reason"]

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components/ms_monitor/models.py

@@ -50,6 +50,7 @@ class JobMonitorState:
     cpu_used: int = 0  # the CPU tokens those tasks hold
     chunks_retried: int = 0
     peak_mem_mb: int = 0
+    usage: dict = field(default_factory=dict)  # what it used, kept once it ended: see ms_flow's JobSnapshot.usage
     throughput_eps: float = 0.0  # chunks settled per second over the last minutes; since it began once it ended
     throughput_history: list[float] = field(default_factory=list)  # the same, one value per few seconds
     started_at: datetime | None = None

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components/ms_monitor/polling.py

@@ -33,6 +33,7 @@ def job_state(job, now: float) -> JobMonitorState:
         cpu_used=getattr(job, "cpu_used", 0),
         chunks_retried=job.chunks_retried,
         peak_mem_mb=job.peak_mem_mb,
+        usage=getattr(job, "usage", None) or {},  # ms_flow < 0.8 does not keep it
         throughput_eps=settled / elapsed if elapsed > 0 else 0.0,  # the mean; `_Speeds` gives the recent one
         started_at=datetime.fromtimestamp(job.started_at),
         finished_at=datetime.fromtimestamp(job.finished_at) if job.finished_at else None,

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components/ms_monitor/resources.py

@@ -4,7 +4,7 @@ A host is read where it is: this machine with `psutil` (or `/proc`); a node of a
 from the metrics Ray's agent exports there (`Workspace.node_metrics`), so with no ssh; another one
 through `ms_env.Host` (the system's `ssh`), with one command that prints `/proc/stat`,
 `/proc/meminfo` and `nvidia-smi`. The CPU in use is the change of `/proc/stat` between two reads, so the first
-read of a host shows none. Each host is read in its own thread, only while the strip is shown,
+read of a host shows none; a Mac, with no `/proc`, says it from `ps`, `sysctl` and `vm_stat`. Each host is read in its own thread, only while the strip is shown,
 every `interval` seconds: a few for this machine, more for one over the network. The login node
 of a queue is not read: what it uses says nothing of the nodes its jobs got.
 """
@@ -30,7 +30,14 @@ INTERVALS = {"local": 5, "ray": 15}
 _HISTORY = 120  # reads kept per host: 10 min of this machine, 30 of one over the network
 
 _GPU_QUERY = "nvidia-smi --query-gpu=utilization.gpu,memory.used,memory.total --format=csv,noheader,nounits"
-_SCRIPT = f"head -1 /proc/stat; grep -E '^(MemTotal|MemAvailable):' /proc/meminfo; {_GPU_QUERY} 2>/dev/null || true"
+# macOS has no /proc: the CPU its processes use now (`ps`, 100 = one core), and memory from
+# `sysctl` and `vm_stat` (free + inactive + speculative pages), said the way Linux says it.
+_MAC = ("n=$(sysctl -n hw.ncpu); ps -A -o %cpu= | awk -v n=$n '{s += $1} END {printf \"cpunow %.1f\\n\", s / n}'; "
+        "echo \"MemTotal: $(($(sysctl -n hw.memsize) / 1024)) kB\"; "
+        "vm_stat | awk '/page size of/ {p = $8} /^Pages (free|inactive|speculative):/ {a += $NF} "
+        "END {printf \"MemAvailable: %d kB\\n\", a * p / 1024}'")
+_SCRIPT = (f"if [ -r /proc/stat ]; then head -1 /proc/stat; grep -E '^(MemTotal|MemAvailable):' /proc/meminfo; "
+           f"else {_MAC}; fi; {_GPU_QUERY} 2>/dev/null || true")
 
 
 @dataclass(slots=True)
@@ -72,7 +79,9 @@ def parse(text: str, previous: tuple[int, int] | None) -> tuple[Sample, tuple[in
     """What `_SCRIPT` printed, and the CPU counters it read (busy, total) for the next read."""
     sample, ticks, mem = Sample(), None, {}
     for line in text.splitlines():
-        if line.startswith("cpu "):
+        if line.startswith("cpunow "):  # a Mac says its share now, no counters
+            sample.cpu = min(100.0, float(line.split()[1]))
+        elif line.startswith("cpu "):
             values = [int(v) for v in line.split()[1:]]
             idle = values[3] + (values[4] if len(values) > 4 else 0)  # idle + iowait
             ticks = (sum(values) - idle, sum(values))

{ms_components-0.5.0 → ms_components-0.5.2}/src/ms_components.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ms_components
-Version: 0.5.0
+Version: 0.5.2
 Summary: PySide6 UI components for MolSuite: smart table, project browser, job monitor, PyMOL dock, steppers.
 Author: Mario S. Valdés-Tresanco, Mario E. Valdés-Tresanco
 License-Expression: MIT

ms_components-0.5.2/src/ms_components.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.5.2",
+  "distance": 0,
+  "node": "g4dde9fadd27ceb43fa1bae25b27e897ed34c7f5c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-30"
+}

{ms_components-0.5.0 → ms_components-0.5.2}/tests/test_molsuite_monitor_widgets.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import subprocess
 from datetime import datetime
 from types import SimpleNamespace
 
@@ -75,6 +76,14 @@ def test_the_detail_shows_the_numbers_the_tasks_and_the_failures_grouped():
     detail.set_job(_job(status="completed", engine_id=None))  # of another session: no grid, a note
     assert not detail._grid.isVisibleTo(detail) and "not run by this session" in detail._meta.text()
     assert detail._fact["status"].text() == "completed"
+    assert detail._fact["CPU"].text() == detail._fact["GPU"].text() == "—"  # recorded without its usage
+
+    used = {"cpu_s": 7200.0, "peak_cpu": 4, "busy_s": 5400.0, "gpu_s": 1800.0, "peak_gpu": 1, "vram_mb": 1200,
+            "gpu_util": 61.4}
+    detail.set_job(_job(status="completed", engine_id=None, started_at=datetime(2026, 1, 1, 10),
+                        finished_at=datetime(2026, 1, 1, 11), usage=used))
+    assert detail._fact["CPU"].text() == "1.50 CPU·h · 1.5 busy of 2.0 held on average · 4 at most"
+    assert detail._fact["GPU"].text() == "0.50 GPU·h · 1 at most · 1,200 MB VRAM at most · 61 % busy on average"
 
 
 def test_monitor_widget_lists_filters_and_selects_the_jobs_and_empties_without_a_project():
@@ -110,6 +119,23 @@ def test_monitor_widget_lists_filters_and_selects_the_jobs_and_empties_without_a
     assert widget._detail._name.text() == "Select a job"
 
 
+def test_a_mac_is_read_without_proc(tmp_path):
+    """Run the Mac half of the script with stand-ins for its `sysctl`, `ps` and `vm_stat`."""
+    from ms_components.ms_monitor.resources import _MAC, parse
+
+    fakes = {
+        "sysctl": 'case "$2" in hw.ncpu) echo 8 ;; hw.memsize) echo 17179869184 ;; esac',
+        "ps": "printf ' 100.0\\n 50.0\\n 10.0\\n'",  # 160 % of one core = 20 % of eight
+        "vm_stat": "printf 'Mach Virtual Memory Statistics: (page size of 16384 bytes)\\nPages free:  65536.\\n"
+                   "Pages active:  9999.\\nPages inactive:  131072.\\nPages speculative:  65536.\\n'",  # 4 GB free
+    }
+    for name, body in fakes.items():
+        (tmp_path / name).write_text(f"#!/bin/sh\n{body}\n")
+        (tmp_path / name).chmod(0o755)
+    text = subprocess.check_output(["sh", "-c", _MAC], text=True, env={"PATH": f"{tmp_path}:/usr/bin:/bin"})
+    sample, _ = parse(text, None)
+    assert (sample.cpu, round(sample.mem), round(sample.mem_total_gb)) == (20.0, 75, 16), text
+
 def test_the_hosts_are_listed_once_with_their_executors_and_a_queue_is_not_read():
     from ms_components.ms_monitor.resources import parse, workspace_hosts
 

ms_components-0.5.0/src/ms_components.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.5.0",
-  "distance": 0,
-  "node": "gd3f2c27fd4e495b9c2d2fb03ebb83b8a2baa0d26",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-29"
-}