diff --git a/concore_cli/README.md b/concore_cli/README.md index 78f98b1..f105369 100644 --- a/concore_cli/README.md +++ b/concore_cli/README.md @@ -112,6 +112,13 @@ Shows all currently running concore processes with details: - Memory usage - Command +**Options:** +- `--json` - Print machine-readable JSON instead of the table, for scripts and CI. Output is `{"count": N, "processes": [{"pid", "name", "command", "uptime_seconds", "memory_mb"}]}`; `uptime_seconds` and `memory_mb` are `null` if they cannot be read. + +```bash +concore status --json +``` + **Example:** ```bash concore status diff --git a/concore_cli/cli.py b/concore_cli/cli.py index dc8fca3..2f11e94 100644 --- a/concore_cli/cli.py +++ b/concore_cli/cli.py @@ -1,12 +1,13 @@ import click from rich.console import Console +import json import os import sys from .commands.init import init_project, init_project_interactive, run_wizard from .commands.build import build_workflow from .commands.validate import validate_workflow -from .commands.status import show_status +from .commands.status import show_status, status_data from .commands.stop import stop_all from .commands.inspect import inspect_workflow from .commands.watch import watch_study @@ -143,10 +144,14 @@ def inspect(workflow_file, source, output_json): @cli.command() -def status(): +@click.option("--json", "output_json", is_flag=True, help="Output in JSON format") +def status(output_json): """Show running concore processes""" try: - show_status(console) + if output_json: + click.echo(json.dumps(status_data(), indent=2)) + else: + show_status(console) except Exception as e: console.print(f"[red]Error:[/red] {str(e)}") sys.exit(1) diff --git a/concore_cli/commands/status.py b/concore_cli/commands/status.py index 94c8bc0..83ad646 100644 --- a/concore_cli/commands/status.py +++ b/concore_cli/commands/status.py @@ -7,65 +7,87 @@ from concore_cli.commands._process_match import is_concore_process -def show_status(console): - console.print("[cyan]Scanning for concore processes...[/cyan]\n") - - concore_processes = [] +def _scan_processes(): + """Return the running concore processes as plain data (raw numbers).""" + processes = [] + current_pid = os.getpid() + + for proc in psutil.process_iter( + ["pid", "name", "cmdline", "create_time", "memory_info", "cpu_percent"] + ): + try: + cmdline = proc.info.get("cmdline") or [] + + if proc.info["pid"] == current_pid: + continue - try: - current_pid = os.getpid() + cmdline_str = " ".join(cmdline) if cmdline else "" - for proc in psutil.process_iter( - ["pid", "name", "cmdline", "create_time", "memory_info", "cpu_percent"] - ): try: - cmdline = proc.info.get("cmdline") or [] - - if proc.info["pid"] == current_pid: - continue + cwd = proc.cwd() + except (psutil.NoSuchProcess, psutil.AccessDenied, OSError): + cwd = None - cmdline_str = " ".join(cmdline) if cmdline else "" + if is_concore_process(cmdline, cwd): + try: + create_time = datetime.fromtimestamp(proc.info["create_time"]) + uptime_seconds = int((datetime.now() - create_time).total_seconds()) + except (OSError, OverflowError, ValueError): + # Failed to calculate uptime + uptime_seconds = None try: - cwd = proc.cwd() - except (psutil.NoSuchProcess, psutil.AccessDenied, OSError): - cwd = None - - if is_concore_process(cmdline, cwd): - try: - create_time = datetime.fromtimestamp(proc.info["create_time"]) - uptime = datetime.now() - create_time - hours, remainder = divmod(int(uptime.total_seconds()), 3600) - minutes, seconds = divmod(remainder, 60) - uptime_str = f"{hours}h {minutes}m {seconds}s" - except (OSError, OverflowError, ValueError): - # Failed to calculate uptime - uptime_str = "unknown" - - try: - mem_mb = proc.info["memory_info"].rss / 1024 / 1024 - mem_str = f"{mem_mb:.1f} MB" - except (psutil.NoSuchProcess, psutil.AccessDenied, AttributeError): - # Failed to get memory info - mem_str = "unknown" - - command = ( - " ".join(cmdline[:3]) if len(cmdline) >= 3 else cmdline_str[:50] - ) - - concore_processes.append( - { - "pid": proc.info["pid"], - "name": proc.info.get("name", "unknown"), - "command": command, - "uptime": uptime_str, - "memory": mem_str, - } - ) - except (psutil.NoSuchProcess, psutil.AccessDenied): - # Process may have exited or be inaccessible; safe to ignore - continue + memory_mb = proc.info["memory_info"].rss / 1024 / 1024 + except (psutil.NoSuchProcess, psutil.AccessDenied, AttributeError): + # Failed to get memory info + memory_mb = None + + command = ( + " ".join(cmdline[:3]) if len(cmdline) >= 3 else cmdline_str[:50] + ) + + processes.append( + { + "pid": proc.info["pid"], + "name": proc.info.get("name", "unknown"), + "command": command, + "uptime_seconds": uptime_seconds, + "memory_mb": memory_mb, + } + ) + except (psutil.NoSuchProcess, psutil.AccessDenied): + # Process may have exited or be inaccessible; safe to ignore + continue + + return processes + +def _format_uptime(seconds): + if seconds is None: + return "unknown" + hours, remainder = divmod(seconds, 3600) + minutes, secs = divmod(remainder, 60) + return f"{hours}h {minutes}m {secs}s" + + +def _format_memory(memory_mb): + return "unknown" if memory_mb is None else f"{memory_mb:.1f} MB" + + +def status_data(): + """Machine-readable status: {"count": N, "processes": [...]}.""" + processes = _scan_processes() + for proc in processes: + if proc["memory_mb"] is not None: + proc["memory_mb"] = round(proc["memory_mb"], 1) + return {"count": len(processes), "processes": processes} + + +def show_status(console): + console.print("[cyan]Scanning for concore processes...[/cyan]\n") + + try: + concore_processes = _scan_processes() except Exception as e: console.print(f"[red]Error scanning processes:[/red] {str(e)}") return @@ -92,8 +114,8 @@ def show_status(console): table.add_row( str(proc["pid"]), proc["name"], - proc["uptime"], - proc["memory"], + _format_uptime(proc["uptime_seconds"]), + _format_memory(proc["memory_mb"]), proc["command"], ) diff --git a/tests/test_status_json.py b/tests/test_status_json.py new file mode 100644 index 0000000..6b04d29 --- /dev/null +++ b/tests/test_status_json.py @@ -0,0 +1,56 @@ +import json +import subprocess +import sys + +import pytest +from click.testing import CliRunner + +from concore_cli.cli import cli +from concore_cli.commands.status import _format_memory, _format_uptime + + +@pytest.fixture +def fake_node(tmp_path): + """A process whose working directory looks like a generated concore node.""" + (tmp_path / "concore.iport").write_text("{}\n") + (tmp_path / "concore.py").write_text("\n") + proc = subprocess.Popen( + [sys.executable, "-c", "import time; time.sleep(60)"], cwd=tmp_path + ) + yield proc + proc.kill() + proc.wait() + + +def test_status_json_is_pure_json_with_consistent_count(): + result = CliRunner().invoke(cli, ["status", "--json"]) + assert result.exit_code == 0, result.output + data = json.loads(result.output) + assert data["count"] == len(data["processes"]) + assert "Scanning" not in result.output + + +def test_status_json_reports_a_running_node(fake_node): + result = CliRunner().invoke(cli, ["status", "--json"]) + assert result.exit_code == 0, result.output + data = json.loads(result.output) + entry = next(p for p in data["processes"] if p["pid"] == fake_node.pid) + assert set(entry) == {"pid", "name", "command", "uptime_seconds", "memory_mb"} + assert isinstance(entry["uptime_seconds"], int) and entry["uptime_seconds"] >= 0 + assert isinstance(entry["memory_mb"], float) and entry["memory_mb"] > 0 + assert "time.sleep" in entry["command"] + + +def test_status_text_output_still_works(fake_node): + result = CliRunner().invoke(cli, ["status"]) + assert result.exit_code == 0, result.output + assert "Scanning for concore processes" in result.output + assert "Use 'concore stop' to terminate all processes" in result.output + + +def test_text_formatting_helpers(): + assert _format_uptime(3725) == "1h 2m 5s" + assert _format_uptime(0) == "0h 0m 0s" + assert _format_uptime(None) == "unknown" + assert _format_memory(12.34) == "12.3 MB" + assert _format_memory(None) == "unknown"