Skip to content
Merged
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
5 changes: 3 additions & 2 deletions pyrit/cli/_cli_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import inspect
import json
import logging
import shlex
from pathlib import Path
from typing import TYPE_CHECKING, Any, Optional

Expand Down Expand Up @@ -533,7 +534,7 @@ def parse_run_arguments(*, args_string: str) -> dict[str, Any]:
Raises:
ValueError: If parsing or validation fails.
"""
parts = args_string.split()
parts = shlex.split(args_string)

if not parts:
raise ValueError("No scenario name provided")
Expand All @@ -558,7 +559,7 @@ def parse_list_targets_arguments(*, args_string: str) -> dict[str, Any]:
Raises:
ValueError: If parsing or validation fails.
"""
parts = args_string.split()
parts = shlex.split(args_string)
return _parse_shell_arguments(parts=parts, arg_specs=_LIST_TARGETS_ARG_SPECS)


Expand Down
33 changes: 31 additions & 2 deletions tests/unit/cli/test_frontend_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,8 @@ def test_parse_run_arguments_with_max_retries(self):
assert result["max_retries"] == 3

def test_parse_run_arguments_with_memory_labels(self):
"""Test parsing with memory-labels."""
result = frontend_core.parse_run_arguments(args_string='test_scenario --memory-labels {"key":"value"}')
"""Test parsing with memory-labels (JSON must be quoted in shell mode)."""
result = frontend_core.parse_run_arguments(args_string="""test_scenario --memory-labels '{"key":"value"}'""")

assert result["memory_labels"] == {"key": "value"}

Expand All @@ -729,6 +729,35 @@ def test_parse_run_arguments_with_initialization_scripts(self):

assert result["initialization_scripts"] == ["script1.py", "script2.py"]

def test_parse_run_arguments_with_quoted_paths(self):
"""Test parsing quoted paths with spaces for shell mode."""
result = frontend_core.parse_run_arguments(
args_string='test_scenario --initialization-scripts "/tmp/my script.py" --strategies s1'
)

assert result["initialization_scripts"] == ["/tmp/my script.py"]
assert result["scenario_strategies"] == ["s1"]

def test_parse_run_arguments_with_quoted_memory_labels(self):
"""Test parsing quoted JSON for memory-labels in shell mode."""
result = frontend_core.parse_run_arguments(
args_string="""test_scenario --memory-labels '{"experiment": "test 1"}'"""
)

assert result["memory_labels"] == {"experiment": "test 1"}

def test_parse_run_arguments_with_short_strategies_after_initializers(self):
"""Test that -s is treated as a flag after multi-value initializers."""
result = frontend_core.parse_run_arguments(args_string="test_scenario --initializers init1 -s s1 s2")

assert result["initializers"] == ["init1"]
assert result["scenario_strategies"] == ["s1", "s2"]

def test_parse_run_arguments_unterminated_quote_raises(self):
"""Test that unterminated quotes raise ValueError."""
with pytest.raises(ValueError):
frontend_core.parse_run_arguments(args_string='test_scenario --initialization-scripts "/tmp/my script.py')

def test_parse_run_arguments_complex(self):
"""Test parsing complex argument combination."""
args = "test_scenario --initializers init1 --strategies s1 s2 --max-concurrency 10"
Expand Down
Loading