- Refactored `Command.help_signature` to return `(usage, description, tags)` instead of a Rich `Padding`/`Panel`. - Replaced `show_help()` with `render_help()` in `Command` and `Falyx`. - Updated Falyx help rendering to use Rich `Panel`/`Padding` consistently for cleaner UI. - Swapped `print()` calls for `console.print()` for styled output. - Added hooks to `ProcessAction` to announce analysis start/finish. - Added spinners to test and deploy steps; simplified retry setup. - Converted `remove()` to `async def remove()` for consistency. - Added async lock to prevent concurrent Live loop start/stop races. - Added debug logging when starting/stopping the Live loop. - Updated `spinner_teardown_hook` to `await sm.remove(...)` to align with async `remove()`. - Removed `rich.panel`/`rich.padding` from `Command` since panels are now built in `Falyx` help rendering. - Bumped `rich` dependency to `^14.0`. - Bumped version to 0.1.78. This commit polishes help display, demo UX, and spinner lifecycle safety—making spinners thread/async safe and help output more structured and readable.
160 lines
5.9 KiB
Python
160 lines
5.9 KiB
Python
# Falyx CLI Framework — (c) 2025 rtj.dev LLC — MIT Licensed
|
|
"""
|
|
Defines `MenuOption` and `MenuOptionMap`, core components used to construct
|
|
interactive menus within Falyx Actions such as `MenuAction` and `PromptMenuAction`.
|
|
|
|
Each `MenuOption` represents a single actionable choice with a description,
|
|
styling, and a bound `BaseAction`. `MenuOptionMap` manages collections of these
|
|
options, including support for reserved keys like `B` (Back) and `X` (Exit), which
|
|
can trigger navigation signals when selected.
|
|
|
|
These constructs enable declarative and reusable menu definitions in both code and config.
|
|
|
|
Key Components:
|
|
- MenuOption: A user-facing label and action binding
|
|
- MenuOptionMap: A key-aware container for menu options, with reserved entry support
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
|
|
from prompt_toolkit.formatted_text import FormattedText
|
|
|
|
from falyx.action.base_action import BaseAction
|
|
from falyx.signals import BackSignal, QuitSignal
|
|
from falyx.themes import OneColors
|
|
from falyx.utils import CaseInsensitiveDict
|
|
|
|
|
|
@dataclass
|
|
class MenuOption:
|
|
"""
|
|
Represents a single menu entry, including its label and associated action.
|
|
|
|
Used in conjunction with `MenuOptionMap` to define interactive command menus.
|
|
Each `MenuOption` contains a description (shown to the user), a `BaseAction`
|
|
to execute when selected, and an optional Rich-compatible style.
|
|
|
|
Attributes:
|
|
description (str): The label shown next to the menu key.
|
|
action (BaseAction): The action to invoke when selected.
|
|
style (str): A Rich-compatible color/style string for UI display.
|
|
|
|
Methods:
|
|
render(key): Returns a Rich-formatted string for menu display.
|
|
render_prompt(key): Returns a `FormattedText` object for use in prompt placeholders.
|
|
|
|
Raises:
|
|
TypeError: If `description` is not a string or `action` is not a `BaseAction`.
|
|
"""
|
|
|
|
description: str
|
|
action: BaseAction
|
|
style: str = OneColors.WHITE
|
|
|
|
def __post_init__(self):
|
|
if not isinstance(self.description, str):
|
|
raise TypeError("MenuOption description must be a string.")
|
|
if not isinstance(self.action, BaseAction):
|
|
raise TypeError("MenuOption action must be a BaseAction instance.")
|
|
|
|
def render(self, key: str) -> str:
|
|
"""Render the menu option for display."""
|
|
return f"[{OneColors.WHITE}][{key}][/] [{self.style}]{self.description}[/]"
|
|
|
|
def render_prompt(self, key: str) -> FormattedText:
|
|
"""Render the menu option for prompt display."""
|
|
return FormattedText(
|
|
[(OneColors.WHITE, f"[{key}] "), (self.style, self.description)]
|
|
)
|
|
|
|
|
|
class MenuOptionMap(CaseInsensitiveDict):
|
|
"""
|
|
A container for storing and managing `MenuOption` objects by key.
|
|
|
|
`MenuOptionMap` is used to define the set of available choices in a
|
|
Falyx menu. Keys are case-insensitive and mapped to `MenuOption` instances.
|
|
The map supports special reserved keys—`B` for Back and `X` for Exit—unless
|
|
explicitly disabled via `allow_reserved=False`.
|
|
|
|
This class enforces strict typing of menu options and prevents accidental
|
|
overwrites of reserved keys.
|
|
|
|
Args:
|
|
options (dict[str, MenuOption] | None): Initial options to populate the menu.
|
|
allow_reserved (bool): If True, allows overriding reserved keys.
|
|
|
|
Methods:
|
|
items(include_reserved): Returns an iterable of menu options,
|
|
optionally filtering out reserved keys.
|
|
|
|
Raises:
|
|
TypeError: If non-`MenuOption` values are assigned.
|
|
ValueError: If attempting to use or delete a reserved key without permission.
|
|
"""
|
|
|
|
RESERVED_KEYS = {"B", "X"}
|
|
|
|
def __init__(
|
|
self,
|
|
options: dict[str, MenuOption] | None = None,
|
|
allow_reserved: bool = False,
|
|
):
|
|
super().__init__()
|
|
self.allow_reserved = allow_reserved
|
|
if options:
|
|
self.update(options)
|
|
self._inject_reserved_defaults()
|
|
|
|
def _inject_reserved_defaults(self):
|
|
from falyx.action import SignalAction
|
|
|
|
self._add_reserved(
|
|
"B",
|
|
MenuOption("Back", SignalAction("Back", BackSignal()), OneColors.DARK_YELLOW),
|
|
)
|
|
self._add_reserved(
|
|
"X",
|
|
MenuOption("Exit", SignalAction("Quit", QuitSignal()), OneColors.DARK_RED),
|
|
)
|
|
|
|
def _add_reserved(self, key: str, option: MenuOption) -> None:
|
|
"""Add a reserved key, bypassing validation."""
|
|
norm_key = key.upper()
|
|
super().__setitem__(norm_key, option)
|
|
|
|
def __setitem__(self, key: str, option: MenuOption) -> None:
|
|
if not isinstance(option, MenuOption):
|
|
raise TypeError(f"Value for key '{key}' must be a MenuOption.")
|
|
norm_key = key.upper()
|
|
if norm_key in self.RESERVED_KEYS and not self.allow_reserved:
|
|
raise ValueError(
|
|
f"Key '{key}' is reserved and cannot be used in MenuOptionMap."
|
|
)
|
|
super().__setitem__(norm_key, option)
|
|
|
|
def __delitem__(self, key: str) -> None:
|
|
if key.upper() in self.RESERVED_KEYS and not self.allow_reserved:
|
|
raise ValueError(f"Cannot delete reserved option '{key}'.")
|
|
super().__delitem__(key)
|
|
|
|
def update(self, other=None, **kwargs):
|
|
"""Update the selection options with another dictionary."""
|
|
if other:
|
|
for key, option in other.items():
|
|
if not isinstance(option, MenuOption):
|
|
raise TypeError(f"Value for key '{key}' must be a SelectionOption.")
|
|
self[key] = option
|
|
for key, option in kwargs.items():
|
|
if not isinstance(option, MenuOption):
|
|
raise TypeError(f"Value for key '{key}' must be a SelectionOption.")
|
|
self[key] = option
|
|
|
|
def items(self, include_reserved: bool = True):
|
|
for key, option in super().items():
|
|
if not include_reserved and key in self.RESERVED_KEYS:
|
|
continue
|
|
yield key, option
|