Skip to content

fix: CLI interactive mode respects --name arg; correct compose images #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanTheRobothead merged 1 commit into from
Apr 28, 2026
Merged

fix: CLI interactive mode respects --name arg; correct compose images #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 72 additions & 11 deletions src/madsci_client/madsci/client/cli/commands/new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,82 +30,118 @@ def get_console(ctx: click.Context) -> Console:
return _get_console(ctx)


def collect_parameters_interactive( # noqa: C901
engine: TemplateEngine, console: Console
def collect_parameters_interactive( # noqa: C901, PLR0912, PLR0915
engine: TemplateEngine,
console: Console,
overrides: Optional[dict[str, object]] = None,
) -> dict[str, object]:
"""Collect parameter values interactively.

Args:
engine: Template engine with manifest.
console: Rich console for output.
overrides: Optional dict of parameter values to use as defaults,
overriding the template's built-in defaults. Useful for passing
CLI-provided values (e.g., ``-n``) into interactive mode.

Returns:
Dictionary of parameter names to values.
"""
from madsci.common.types.template_types import ParameterType
from rich.prompt import Confirm, Prompt

overrides = overrides or {}
params: dict[str, object] = {}

for param in engine.manifest.parameters:
if param.type == ParameterType.STRING:
default_str = str(param.default) if param.default else ""
override = overrides.get(param.name)
default_str = (
str(override)
if override
else (str(param.default) if param.default else "")
)
value = Prompt.ask(
f" {param.description}",
default=default_str or None,
)
params[param.name] = value

elif param.type == ParameterType.INTEGER:
default_str = str(param.default) if param.default is not None else ""
override = overrides.get(param.name)
default_val = override if override is not None else param.default
default_str = str(default_val) if default_val is not None else ""
value_str = Prompt.ask(
f" {param.description}",
default=default_str or None,
)
params[param.name] = int(value_str) if value_str else 0

elif param.type == ParameterType.FLOAT:
default_str = str(param.default) if param.default is not None else ""
override = overrides.get(param.name)
default_val = override if override is not None else param.default
default_str = str(default_val) if default_val is not None else ""
value_str = Prompt.ask(
f" {param.description}",
default=default_str or None,
)
params[param.name] = float(value_str) if value_str else 0.0

elif param.type == ParameterType.BOOLEAN:
default_val = param.default if param.default is not None else False
override = overrides.get(param.name)
default_val = (
override
if override is not None
else (param.default if param.default is not None else False)
)
value = Confirm.ask(
f" {param.description}",
default=default_val,
)
params[param.name] = value

elif param.type == ParameterType.CHOICE:
override = overrides.get(param.name)
effective_default = override if override is not None else param.default
console.print(f"\n {param.description}:")
choices = param.choices or []
for i, choice in enumerate(choices, 1):
marker = "●" if choice.value == param.default else "○"
marker = "●" if choice.value == effective_default else "○"
console.print(f" {marker} {i}. {choice.label}")
if choice.description:
console.print(f" {choice.description}", style="dim")

default_idx = next(
(i for i, c in enumerate(choices, 1) if c.value == param.default),
(i for i, c in enumerate(choices, 1) if c.value == effective_default),
1,
)
idx = Prompt.ask(" Select", default=str(default_idx))
params[param.name] = choices[int(idx) - 1].value

elif param.type == ParameterType.MULTI_CHOICE:
override = overrides.get(param.name)
override_list = list(override) if override is not None else None
console.print(f"\n {param.description}:")
selected = []
for choice in param.choices or []:
if Confirm.ask(f" Include {choice.label}?", default=choice.default):
# Use override list to determine default if provided
if override_list is not None:
default_selected = choice.value in override_list
else:
default_selected = choice.default
if Confirm.ask(
f" Include {choice.label}?", default=default_selected
):
selected.append(choice.value)
params[param.name] = selected

elif param.type == ParameterType.PATH:
default_str = str(param.default) if param.default else ""
override = overrides.get(param.name)
default_str = (
str(override)
if override
else (str(param.default) if param.default else "")
)
value = Prompt.ask(
f" {param.description}",
default=default_str or None,
Expand Down Expand Up @@ -208,7 +244,32 @@ def generate_from_template( # noqa: C901, PLR0912, PLR0915
)
)
console.print()
params = collect_parameters_interactive(engine, console)

# Build overrides from CLI-provided --name so interactive prompts
# use it as the default instead of the template default.
overrides: dict[str, object] = {}
if name:
category = (
engine.manifest.category.value if engine.manifest.category else ""
)
category_name_key = f"{category}_name" if category else ""

if category_name_key and any(
p.name == category_name_key for p in engine.manifest.parameters
):
overrides[category_name_key] = name
else:
first_param = (
engine.manifest.parameters[0]
if engine.manifest.parameters
else None
)
if first_param and (
first_param.name.endswith("_name") or first_param.name == "name"
):
overrides[first_param.name] = name

params = collect_parameters_interactive(engine, console, overrides=overrides)

# Add extra params
if extra_params:
Expand Down
Loading
Loading