Skip to content
Merged
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
64 changes: 64 additions & 0 deletions apps/agentstack-cli/src/agentstack_cli/commands/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@
TextField,
TextFieldValue,
)
from agentstack_sdk.a2a.extensions.ui.settings import (
AgentRunSettings,
CheckboxGroupField,
CheckboxGroupFieldValue,
SettingsExtensionSpec,
SettingsFieldValue,
SettingsRender,
)
from agentstack_sdk.a2a.extensions.ui.settings import (
CheckboxFieldValue as SettingsCheckboxFieldValue,
)
from agentstack_sdk.a2a.extensions.ui.settings import SingleSelectField as SettingsSingleSelectField
from agentstack_sdk.a2a.extensions.ui.settings import (
SingleSelectFieldValue as SettingsSingleSelectFieldValue,
)
from agentstack_sdk.platform import BuildState, File, ModelProvider, Provider, UserFeedback
from agentstack_sdk.platform.context import Context, ContextPermissions, ContextToken, Permissions
from agentstack_sdk.platform.model_provider import ModelCapability
Expand Down Expand Up @@ -446,11 +461,43 @@ async def _ask_form_questions(form_render: FormRender) -> FormResponse:
return FormResponse(values=form_values)


async def _ask_settings_questions(settings_render: SettingsRender) -> AgentRunSettings:
"""Ask user to configure settings using inquirer."""
settings_values: dict[str, SettingsFieldValue] = {}

console.print("[bold]Agent Settings[/bold]\n")

for field in settings_render.fields:
if isinstance(field, CheckboxGroupField):
checkbox_values: dict[str, SettingsCheckboxFieldValue] = {}
for checkbox in field.fields:
answer = await inquirer.confirm( # pyright: ignore[reportPrivateImportUsage]
message=checkbox.label + ":",
default=checkbox.default_value,
).execute_async()
checkbox_values[checkbox.id] = SettingsCheckboxFieldValue(value=answer)
settings_values[field.id] = CheckboxGroupFieldValue(values=checkbox_values)
elif isinstance(field, SettingsSingleSelectField):
choices = [Choice(value=opt.value, name=opt.label) for opt in field.options]
answer = await inquirer.fuzzy( # pyright: ignore[reportPrivateImportUsage]
message=field.label + ":",
choices=choices,
default=field.default_value,
).execute_async()
settings_values[field.id] = SettingsSingleSelectFieldValue(value=answer)
else:
raise ValueError(f"Unsupported settings field type: {type(field).__name__}")

console.print()
return AgentRunSettings(values=settings_values)


async def _run_agent(
client: Client,
input: str | DataPart | FormResponse,
agent_card: AgentCard,
context_token: ContextToken,
settings: AgentRunSettings | None = None,
dump_files_path: Path | None = None,
handle_input: Callable[[], str] | None = None,
task_id: str | None = None,
Expand Down Expand Up @@ -523,6 +570,7 @@ async def _run_agent(
if platform_extension_spec
else {}
)
| ({SettingsExtensionSpec.URI: settings.model_dump(mode="json")} if settings else {})
)

msg = Message(
Expand Down Expand Up @@ -939,6 +987,15 @@ async def run_agent(
splash_screen = Group(Markdown(f"# {agent.name} \n{agent.description}"), NewLine())
handle_input = _create_input_handler([], splash_screen=splash_screen)

settings_render = next(
(
SettingsRender.model_validate(ext.params)
for ext in agent.capabilities.extensions or ()
if ext.uri == SettingsExtensionSpec.URI and ext.params
),
None,
)

if not input:
if interaction_mode not in {InteractionMode.MULTI_TURN, InteractionMode.SINGLE_TURN}:
err_console.error(
Expand All @@ -959,6 +1016,7 @@ async def run_agent(

if interaction_mode == InteractionMode.MULTI_TURN:
console.print(f"{user_greeting}\n")
settings_input = await _ask_settings_questions(settings_render) if settings_render else None
turn_input = await _ask_form_questions(initial_form_render) if initial_form_render else handle_input()
async with a2a_client(provider.agent_card, context_token=context_token) as client:
while True:
Expand All @@ -968,6 +1026,7 @@ async def run_agent(
input=turn_input,
agent_card=agent,
context_token=context_token,
settings=settings_input,
dump_files_path=dump_files,
handle_input=handle_input,
)
Expand All @@ -976,24 +1035,29 @@ async def run_agent(
elif interaction_mode == InteractionMode.SINGLE_TURN:
user_greeting = ui_annotations.get("user_greeting", None) or "Enter your instructions."
console.print(f"{user_greeting}\n")
settings_input = await _ask_settings_questions(settings_render) if settings_render else None
console.print()
async with a2a_client(provider.agent_card, context_token=context_token) as client:
await _run_agent(
client,
input=await _ask_form_questions(initial_form_render) if initial_form_render else handle_input(),
agent_card=agent,
context_token=context_token,
settings=settings_input,
dump_files_path=dump_files,
handle_input=handle_input,
)

else:
settings_input = await _ask_settings_questions(settings_render) if settings_render else None

async with a2a_client(provider.agent_card, context_token=context_token) as client:
await _run_agent(
client,
input,
agent_card=agent,
context_token=context_token,
settings=settings_input,
dump_files_path=dump_files,
handle_input=handle_input,
)
Expand Down