feat(wizard): add Channel Common, API Server menus and field constraint validation
- Add [H] Channel Common menu to configure send_progress, send_tool_hints, send_max_retries, and transcription_provider - Add [I] API Server menu to configure host, port, timeout - Add real-time Pydantic field constraint validation (ge/gt/le/lt/min_length/max_length) with constraint hints shown in field display (e.g. "Send Max Retries (0-10)") - Add _pause() to View Configuration Summary to prevent immediate screen clear - Fix _format_value dict branch to handle BaseModel instances without crashing
This commit is contained in:
chengyongru
Xubin Ren
+101
-9
@@ -264,7 +264,12 @@ def _format_value(value: Any, rich: bool = True, field_name: str = "") -> str:
|
||||
if isinstance(value, list):
|
||||
return ", ".join(str(v) for v in value)
|
||||
if isinstance(value, dict):
|
||||
return json.dumps(value)
|
||||
# Handle dicts containing BaseModel instances
|
||||
parts = []
|
||||
for k, v in value.items():
|
||||
formatted = _format_value(v, rich=False, field_name=str(k))
|
||||
parts.append(f"{k}: {formatted}")
|
||||
return ", ".join(parts) if parts else ("[dim]not set[/dim]" if rich else "[not set]")
|
||||
return str(value)
|
||||
|
||||
|
||||
@@ -279,6 +284,63 @@ def _format_value_for_input(value: Any, field_type: str) -> str:
|
||||
return str(value)
|
||||
|
||||
|
||||
def _validate_field_constraint(value: Any, field_info) -> str | None:
|
||||
"""Validate a value against Pydantic Field constraints.
|
||||
|
||||
Returns an error message string if validation fails, None if valid.
|
||||
Uses attribute-based detection to handle Pydantic v2 internal types.
|
||||
"""
|
||||
if field_info is None or not hasattr(field_info, "metadata"):
|
||||
return None
|
||||
|
||||
for m in field_info.metadata:
|
||||
if hasattr(m, "ge") and isinstance(value, (int, float)):
|
||||
if value < m.ge:
|
||||
return f"Value must be >= {m.ge}"
|
||||
if hasattr(m, "gt") and isinstance(value, (int, float)):
|
||||
if value <= m.gt:
|
||||
return f"Value must be > {m.gt}"
|
||||
if hasattr(m, "le") and isinstance(value, (int, float)):
|
||||
if value > m.le:
|
||||
return f"Value must be <= {m.le}"
|
||||
if hasattr(m, "lt") and isinstance(value, (int, float)):
|
||||
if value >= m.lt:
|
||||
return f"Value must be < {m.lt}"
|
||||
if hasattr(m, "min_length") and hasattr(value, "__len__"):
|
||||
if len(value) < m.min_length:
|
||||
return f"Length must be >= {m.min_length}"
|
||||
if hasattr(m, "max_length") and hasattr(value, "__len__"):
|
||||
if len(value) > m.max_length:
|
||||
return f"Length must be <= {m.max_length}"
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def _get_constraint_hint(field_info) -> str:
|
||||
"""Derive a human-readable constraint hint from field metadata.
|
||||
|
||||
Returns a string like "(0-10)" or "(>= 0)" to append to field display names.
|
||||
"""
|
||||
if field_info is None or not hasattr(field_info, "metadata"):
|
||||
return ""
|
||||
|
||||
ge_val = None
|
||||
le_val = None
|
||||
for m in field_info.metadata:
|
||||
if hasattr(m, "ge"):
|
||||
ge_val = m.ge
|
||||
if hasattr(m, "le"):
|
||||
le_val = m.le
|
||||
|
||||
if ge_val is not None and le_val is not None:
|
||||
return f" ({ge_val}-{le_val})"
|
||||
if ge_val is not None:
|
||||
return f" (>= {ge_val})"
|
||||
if le_val is not None:
|
||||
return f" (<= {le_val})"
|
||||
return ""
|
||||
|
||||
|
||||
# --- Rich UI Components ---
|
||||
|
||||
|
||||
@@ -333,7 +395,7 @@ def _input_bool(display_name: str, current: bool | None) -> bool | None:
|
||||
).ask()
|
||||
|
||||
|
||||
def _input_text(display_name: str, current: Any, field_type: str) -> Any:
|
||||
def _input_text(display_name: str, current: Any, field_type: str, field_info=None) -> Any:
|
||||
"""Get text input and parse based on field type."""
|
||||
default = _format_value_for_input(current, field_type)
|
||||
|
||||
@@ -344,16 +406,28 @@ def _input_text(display_name: str, current: Any, field_type: str) -> Any:
|
||||
|
||||
if field_type == "int":
|
||||
try:
|
||||
return int(value)
|
||||
parsed = int(value)
|
||||
except ValueError:
|
||||
console.print("[yellow]! Invalid number format, value not saved[/yellow]")
|
||||
return None
|
||||
if field_info:
|
||||
error = _validate_field_constraint(parsed, field_info)
|
||||
if error:
|
||||
console.print(f"[yellow]! {error}, value not saved[/yellow]")
|
||||
return None
|
||||
return parsed
|
||||
elif field_type == "float":
|
||||
try:
|
||||
return float(value)
|
||||
parsed = float(value)
|
||||
except ValueError:
|
||||
console.print("[yellow]! Invalid number format, value not saved[/yellow]")
|
||||
return None
|
||||
if field_info:
|
||||
error = _validate_field_constraint(parsed, field_info)
|
||||
if error:
|
||||
console.print(f"[yellow]! {error}, value not saved[/yellow]")
|
||||
return None
|
||||
return parsed
|
||||
elif field_type == "list":
|
||||
return [v.strip() for v in value.split(",") if v.strip()]
|
||||
elif field_type == "dict":
|
||||
@@ -367,7 +441,7 @@ def _input_text(display_name: str, current: Any, field_type: str) -> Any:
|
||||
|
||||
|
||||
def _input_with_existing(
|
||||
display_name: str, current: Any, field_type: str
|
||||
display_name: str, current: Any, field_type: str, field_info=None
|
||||
) -> Any:
|
||||
"""Handle input with 'keep existing' option for non-empty values."""
|
||||
has_existing = current is not None and current != "" and current != {} and current != []
|
||||
@@ -381,7 +455,7 @@ def _input_with_existing(
|
||||
if choice == "Keep existing value" or choice is None:
|
||||
return None
|
||||
|
||||
return _input_text(display_name, current, field_type)
|
||||
return _input_text(display_name, current, field_type, field_info=field_info)
|
||||
|
||||
|
||||
# --- Pydantic Model Configuration ---
|
||||
@@ -568,7 +642,7 @@ def _configure_pydantic_model(
|
||||
field_name, field_info = fields[field_idx]
|
||||
current_value = getattr(working_model, field_name, None)
|
||||
ftype = _get_field_type_info(field_info)
|
||||
field_display = _get_field_display_name(field_name, field_info)
|
||||
field_display = _get_field_display_name(field_name, field_info) + _get_constraint_hint(field_info)
|
||||
|
||||
# Nested Pydantic model - recurse
|
||||
if ftype.type_name == "model":
|
||||
@@ -610,7 +684,7 @@ def _configure_pydantic_model(
|
||||
if ftype.type_name == "bool":
|
||||
new_value = _input_bool(field_display, current_value)
|
||||
else:
|
||||
new_value = _input_with_existing(field_display, current_value, ftype.type_name)
|
||||
new_value = _input_with_existing(field_display, current_value, ftype.type_name, field_info=field_info)
|
||||
if new_value is not None:
|
||||
setattr(working_model, field_name, new_value)
|
||||
|
||||
@@ -821,18 +895,24 @@ def _configure_channels(config: Config) -> None:
|
||||
|
||||
_SETTINGS_SECTIONS: dict[str, tuple[str, str, set[str] | None]] = {
|
||||
"Agent Settings": ("Agent Defaults", "Configure default model, temperature, and behavior", None),
|
||||
"Channel Common": ("Channel Common", "Configure cross-channel behavior: progress, tool hints, retries", None),
|
||||
"API Server": ("API Server", "Configure OpenAI-compatible API endpoint", None),
|
||||
"Gateway": ("Gateway Settings", "Configure server host, port, and heartbeat", None),
|
||||
"Tools": ("Tools Settings", "Configure web search, shell exec, and other tools", {"mcp_servers"}),
|
||||
}
|
||||
|
||||
_SETTINGS_GETTER = {
|
||||
"Agent Settings": lambda c: c.agents.defaults,
|
||||
"Channel Common": lambda c: c.channels,
|
||||
"API Server": lambda c: c.api,
|
||||
"Gateway": lambda c: c.gateway,
|
||||
"Tools": lambda c: c.tools,
|
||||
}
|
||||
|
||||
_SETTINGS_SETTER = {
|
||||
"Agent Settings": lambda c, v: setattr(c.agents, "defaults", v),
|
||||
"Channel Common": lambda c, v: setattr(c, "channels", v),
|
||||
"API Server": lambda c, v: setattr(c, "api", v),
|
||||
"Gateway": lambda c, v: setattr(c, "gateway", v),
|
||||
"Tools": lambda c, v: setattr(c, "tools", v),
|
||||
}
|
||||
@@ -915,12 +995,20 @@ def _show_summary(config: Config) -> None:
|
||||
# Settings sections
|
||||
for title, model in [
|
||||
("Agent Settings", config.agents.defaults),
|
||||
("Channel Common", config.channels),
|
||||
("API Server", config.api),
|
||||
("Gateway", config.gateway),
|
||||
("Tools", config.tools),
|
||||
("Channel Common", config.channels),
|
||||
]:
|
||||
_print_summary_panel(_summarize_model(model), title)
|
||||
|
||||
_pause()
|
||||
|
||||
|
||||
def _pause() -> None:
|
||||
"""Pause for user acknowledgement before clearing the screen."""
|
||||
_get_questionary().text("Press Enter to continue...", default="").ask()
|
||||
|
||||
|
||||
# --- Main Entry Point ---
|
||||
|
||||
@@ -984,7 +1072,9 @@ def run_onboard(initial_config: Config | None = None) -> OnboardResult:
|
||||
choices=[
|
||||
"[P] LLM Provider",
|
||||
"[C] Chat Channel",
|
||||
"[H] Channel Common",
|
||||
"[A] Agent Settings",
|
||||
"[I] API Server",
|
||||
"[G] Gateway",
|
||||
"[T] Tools",
|
||||
"[V] View Configuration Summary",
|
||||
@@ -1007,7 +1097,9 @@ def run_onboard(initial_config: Config | None = None) -> OnboardResult:
|
||||
_MENU_DISPATCH = {
|
||||
"[P] LLM Provider": lambda: _configure_providers(config),
|
||||
"[C] Chat Channel": lambda: _configure_channels(config),
|
||||
"[H] Channel Common": lambda: _configure_general_settings(config, "Channel Common"),
|
||||
"[A] Agent Settings": lambda: _configure_general_settings(config, "Agent Settings"),
|
||||
"[I] API Server": lambda: _configure_general_settings(config, "API Server"),
|
||||
"[G] Gateway": lambda: _configure_general_settings(config, "Gateway"),
|
||||
"[T] Tools": lambda: _configure_general_settings(config, "Tools"),
|
||||
"[V] View Configuration Summary": lambda: _show_summary(config),
|
||||
|
||||
Reference in New Issue
Block a user