Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions skydiscover/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,12 @@ def parse_args() -> argparse.Namespace:
)

parser.add_argument(
"initial_program",
nargs="?",
default=None,
help="Path to the initial program file (can be optional)",
)
parser.add_argument(
"evaluation_file",
"paths",
nargs="+",
metavar="path",
help=(
"Evaluator: path to a Python file (must define evaluate()) "
"or a benchmark directory containing Dockerfile + evaluate.sh"
"Positional paths: either '<evaluation_file>' or "
"'<initial_program> <evaluation_file>'"
),
)
parser.add_argument("--config", "-c", help="Path to configuration file (YAML)", default=None)
Expand Down Expand Up @@ -94,7 +90,18 @@ def parse_args() -> argparse.Namespace:
help="Search algorithm to use",
)

return parser.parse_args()
args = parser.parse_args()

if len(args.paths) == 1:
args.initial_program = None
args.evaluation_file = args.paths[0]
elif len(args.paths) == 2:
args.initial_program, args.evaluation_file = args.paths
else:
parser.error("Expected either '<evaluation_file>' or '<initial_program> <evaluation_file>'")

delattr(args, "paths")
return args


def main() -> int:
Expand Down Expand Up @@ -275,9 +282,9 @@ def _find_latest_checkpoint(checkpoint_dir: str) -> Optional[str]:
if not os.path.isdir(checkpoint_dir):
return None

def parse_iteration(path: str) -> Optional[int]:
def parse_iteration(name: str) -> Optional[int]:
try:
return int(path.rsplit("_", 1)[-1])
return int(name.rsplit("_", 1)[-1])
except (ValueError, IndexError):
return None

Expand Down
34 changes: 34 additions & 0 deletions tests/test_cli_positional_paths.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""Tests for CLI positional path parsing."""

import sys

import pytest

from skydiscover.cli import parse_args


def test_parse_args_single_path_uses_evaluation_file(monkeypatch):
monkeypatch.setattr(sys, "argv", ["skydiscover-run", "evaluate.py"])

args = parse_args()

assert args.initial_program is None
assert args.evaluation_file == "evaluate.py"


def test_parse_args_two_paths_use_initial_and_evaluation(monkeypatch):
monkeypatch.setattr(sys, "argv", ["skydiscover-run", "seed.py", "evaluate.py"])

args = parse_args()

assert args.initial_program == "seed.py"
assert args.evaluation_file == "evaluate.py"


def test_parse_args_rejects_more_than_two_paths(monkeypatch):
monkeypatch.setattr(sys, "argv", ["skydiscover-run", "a.py", "b.py", "c.py"])

with pytest.raises(SystemExit) as exc_info:
parse_args()

assert exc_info.value.code == 2
Loading