falyx 0.1.18__tar.gz → 0.1.20__tar.gz

{falyx-0.1.18 → falyx-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: falyx
-Version: 0.1.18
+Version: 0.1.20
 Summary: Reliable and introspectable async CLI action framework.
 License: MIT
 Author: Roland Thomas Jr

{falyx-0.1.18 → falyx-0.1.20}/falyx/action.py

@@ -56,7 +56,7 @@ class BaseAction(ABC):
     be run independently or as part of Falyx.
 
     inject_last_result (bool): Whether to inject the previous action's result into kwargs.
-    inject_last_result_as (str): The name of the kwarg key to inject the result as
+    inject_into (str): The name of the kwarg key to inject the result as
                                  (default: 'last_result').
     _requires_injection (bool): Whether the action requires input injection.
     """
@@ -66,7 +66,7 @@ class BaseAction(ABC):
         name: str,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         never_prompt: bool = False,
         logging_hooks: bool = False,
     ) -> None:
@@ -75,7 +75,7 @@ class BaseAction(ABC):
         self.is_retryable: bool = False
         self.shared_context: SharedContext | None = None
         self.inject_last_result: bool = inject_last_result
-        self.inject_last_result_as: str = inject_last_result_as
+        self.inject_into: str = inject_into
         self._never_prompt: bool = never_prompt
         self._requires_injection: bool = False
         self._skip_in_chain: bool = False
@@ -133,7 +133,7 @@ class BaseAction(ABC):
 
     def _maybe_inject_last_result(self, kwargs: dict[str, Any]) -> dict[str, Any]:
         if self.inject_last_result and self.shared_context:
-            key = self.inject_last_result_as
+            key = self.inject_into
             if key in kwargs:
                 logger.warning("[%s] ⚠️ Overriding '%s' with last_result", self.name, key)
             kwargs = dict(kwargs)
@@ -173,7 +173,7 @@ class Action(BaseAction):
         kwargs (dict, optional): Static keyword arguments.
         hooks (HookManager, optional): Hook manager for lifecycle events.
         inject_last_result (bool, optional): Enable last_result injection.
-        inject_last_result_as (str, optional): Name of injected key.
+        inject_into (str, optional): Name of injected key.
         retry (bool, optional): Enable retry logic.
         retry_policy (RetryPolicy, optional): Retry settings.
     """
@@ -187,11 +187,11 @@ class Action(BaseAction):
         kwargs: dict[str, Any] | None = None,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         retry: bool = False,
         retry_policy: RetryPolicy | None = None,
     ) -> None:
-        super().__init__(name, hooks, inject_last_result, inject_last_result_as)
+        super().__init__(name, hooks, inject_last_result, inject_into)
         self.action = action
         self.rollback = rollback
         self.args = args
@@ -257,7 +257,7 @@ class Action(BaseAction):
             if context.result is not None:
                 logger.info("[%s] ✅ Recovered: %s", self.name, self.name)
                 return context.result
-            raise error
+            raise
         finally:
             context.stop_timer()
             await self.hooks.trigger(HookType.AFTER, context)
@@ -267,7 +267,7 @@ class Action(BaseAction):
     async def preview(self, parent: Tree | None = None):
         label = [f"[{OneColors.GREEN_b}]⚙ Action[/] '{self.name}'"]
         if self.inject_last_result:
-            label.append(f" [dim](injects '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](injects '{self.inject_into}')[/dim]")
         if self.retry_policy.enabled:
             label.append(
                 f"\n[dim]↻ Retries:[/] {self.retry_policy.max_retries}x, "
@@ -413,7 +413,7 @@ class ChainedAction(BaseAction, ActionListMixin):
         actions (list): List of actions or literals to execute.
         hooks (HookManager, optional): Hooks for lifecycle events.
         inject_last_result (bool, optional): Whether to inject last results into kwargs by default.
-        inject_last_result_as (str, optional): Key name for injection.
+        inject_into (str, optional): Key name for injection.
         auto_inject (bool, optional): Auto-enable injection for subsequent actions.
         return_list (bool, optional): Whether to return a list of all results. False returns the last result.
     """
@@ -424,11 +424,11 @@ class ChainedAction(BaseAction, ActionListMixin):
         actions: list[BaseAction | Any] | None = None,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         auto_inject: bool = False,
         return_list: bool = False,
     ) -> None:
-        super().__init__(name, hooks, inject_last_result, inject_last_result_as)
+        super().__init__(name, hooks, inject_last_result, inject_into)
         ActionListMixin.__init__(self)
         self.auto_inject = auto_inject
         self.return_list = return_list
@@ -448,6 +448,8 @@ class ChainedAction(BaseAction, ActionListMixin):
         if self.actions and self.auto_inject and not action.inject_last_result:
             action.inject_last_result = True
         super().add_action(action)
+        if hasattr(action, "register_teardown") and callable(action.register_teardown):
+            action.register_teardown(self.hooks)
 
     async def _run(self, *args, **kwargs) -> list[Any]:
         if not self.actions:
@@ -480,9 +482,7 @@ class ChainedAction(BaseAction, ActionListMixin):
                 last_result = shared_context.last_result()
                 try:
                     if self.requires_io_injection() and last_result is not None:
-                        result = await prepared(
-                            **{prepared.inject_last_result_as: last_result}
-                        )
+                        result = await prepared(**{prepared.inject_into: last_result})
                     else:
                         result = await prepared(*args, **updated_kwargs)
                 except Exception as error:
@@ -557,7 +557,7 @@ class ChainedAction(BaseAction, ActionListMixin):
     async def preview(self, parent: Tree | None = None):
         label = [f"[{OneColors.CYAN_b}]⛓ ChainedAction[/] '{self.name}'"]
         if self.inject_last_result:
-            label.append(f" [dim](injects '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](injects '{self.inject_into}')[/dim]")
         tree = parent.add("".join(label)) if parent else Tree("".join(label))
         for action in self.actions:
             await action.preview(parent=tree)
@@ -601,7 +601,7 @@ class ActionGroup(BaseAction, ActionListMixin):
         actions (list): List of actions or literals to execute.
         hooks (HookManager, optional): Hooks for lifecycle events.
         inject_last_result (bool, optional): Whether to inject last results into kwargs by default.
-        inject_last_result_as (str, optional): Key name for injection.
+        inject_into (str, optional): Key name for injection.
     """
 
     def __init__(
@@ -610,13 +610,29 @@ class ActionGroup(BaseAction, ActionListMixin):
         actions: list[BaseAction] | None = None,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
     ):
-        super().__init__(name, hooks, inject_last_result, inject_last_result_as)
+        super().__init__(name, hooks, inject_last_result, inject_into)
         ActionListMixin.__init__(self)
         if actions:
             self.set_actions(actions)
 
+    def _wrap_if_needed(self, action: BaseAction | Any) -> BaseAction:
+        if isinstance(action, BaseAction):
+            return action
+        elif callable(action):
+            return Action(name=action.__name__, action=action)
+        else:
+            raise TypeError(
+                f"ActionGroup only accepts BaseAction or callable, got {type(action).__name__}"
+            )
+
+    def add_action(self, action: BaseAction | Any) -> None:
+        action = self._wrap_if_needed(action)
+        super().add_action(action)
+        if hasattr(action, "register_teardown") and callable(action.register_teardown):
+            action.register_teardown(self.hooks)
+
     async def _run(self, *args, **kwargs) -> list[tuple[str, Any]]:
         shared_context = SharedContext(name=self.name, is_parallel=True)
         if self.shared_context:
@@ -676,7 +692,7 @@ class ActionGroup(BaseAction, ActionListMixin):
     async def preview(self, parent: Tree | None = None):
         label = [f"[{OneColors.MAGENTA_b}]⏩ ActionGroup (parallel)[/] '{self.name}'"]
         if self.inject_last_result:
-            label.append(f" [dim](receives '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](receives '{self.inject_into}')[/dim]")
         tree = parent.add("".join(label)) if parent else Tree("".join(label))
         actions = self.actions.copy()
         random.shuffle(actions)
@@ -708,7 +724,7 @@ class ProcessAction(BaseAction):
         hooks (HookManager, optional): Hook manager for lifecycle events.
         executor (ProcessPoolExecutor, optional): Custom executor if desired.
         inject_last_result (bool, optional): Inject last result into the function.
-        inject_last_result_as (str, optional): Name of the injected key.
+        inject_into (str, optional): Name of the injected key.
     """
 
     def __init__(
@@ -720,9 +736,9 @@ class ProcessAction(BaseAction):
         hooks: HookManager | None = None,
         executor: ProcessPoolExecutor | None = None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
     ):
-        super().__init__(name, hooks, inject_last_result, inject_last_result_as)
+        super().__init__(name, hooks, inject_last_result, inject_into)
         self.func = func
         self.args = args
         self.kwargs = kwargs or {}
@@ -782,7 +798,7 @@ class ProcessAction(BaseAction):
             f"[{OneColors.DARK_YELLOW_b}]🧠 ProcessAction (new process)[/] '{self.name}'"
         ]
         if self.inject_last_result:
-            label.append(f" [dim](injects '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](injects '{self.inject_into}')[/dim]")
         if parent:
             parent.add("".join(label))
         else:

falyx-0.1.20/falyx/action_factory.py

@@ -0,0 +1,95 @@
+from typing import Any
+
+from rich.tree import Tree
+
+from falyx.action import BaseAction
+from falyx.context import ExecutionContext
+from falyx.execution_registry import ExecutionRegistry as er
+from falyx.hook_manager import HookType
+from falyx.protocols import ActionFactoryProtocol
+from falyx.themes.colors import OneColors
+
+
+class ActionFactoryAction(BaseAction):
+    """
+    Dynamically creates and runs another Action at runtime using a factory function.
+
+    This is useful for generating context-specific behavior (e.g., dynamic HTTPActions)
+    where the structure of the next action depends on runtime values.
+
+    Args:
+        name (str): Name of the action.
+        factory (Callable): A function that returns a BaseAction given args/kwargs.
+        inject_last_result (bool): Whether to inject last_result into the factory.
+        inject_into (str): The name of the kwarg to inject last_result as.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        factory: ActionFactoryProtocol,
+        *,
+        inject_last_result: bool = False,
+        inject_into: str = "last_result",
+        preview_args: tuple[Any, ...] = (),
+        preview_kwargs: dict[str, Any] = {},
+    ):
+        super().__init__(
+            name=name,
+            inject_last_result=inject_last_result,
+            inject_into=inject_into,
+        )
+        self.factory = factory
+        self.preview_args = preview_args
+        self.preview_kwargs = preview_kwargs
+
+    async def _run(self, *args, **kwargs) -> Any:
+        updated_kwargs = self._maybe_inject_last_result(kwargs)
+        context = ExecutionContext(
+            name=f"{self.name} (factory)",
+            args=args,
+            kwargs=updated_kwargs,
+            action=self,
+        )
+        context.start_timer()
+        try:
+            await self.hooks.trigger(HookType.BEFORE, context)
+            generated_action = self.factory(*args, **updated_kwargs)
+            if not isinstance(generated_action, BaseAction):
+                raise TypeError(
+                    f"[{self.name}] Factory must return a BaseAction, got {type(generated_action).__name__}"
+                )
+            if self.shared_context:
+                generated_action.set_shared_context(self.shared_context)
+            if self.options_manager:
+                generated_action.set_options_manager(self.options_manager)
+            context.result = await generated_action(*args, **kwargs)
+            await self.hooks.trigger(HookType.ON_SUCCESS, context)
+            return context.result
+        except Exception as error:
+            context.exception = error
+            await self.hooks.trigger(HookType.ON_ERROR, context)
+            raise
+        finally:
+            context.stop_timer()
+            await self.hooks.trigger(HookType.AFTER, context)
+            await self.hooks.trigger(HookType.ON_TEARDOWN, context)
+            er.record(context)
+
+    async def preview(self, parent: Tree | None = None):
+        label = f"[{OneColors.CYAN_b}]🏗️ ActionFactory[/] '{self.name}'"
+        tree = parent.add(label) if parent else Tree(label)
+
+        try:
+            generated = self.factory(*self.preview_args, **self.preview_kwargs)
+            if isinstance(generated, BaseAction):
+                await generated.preview(parent=tree)
+            else:
+                tree.add(
+                    f"[{OneColors.DARK_RED}]⚠️ Factory did not return a BaseAction[/]"
+                )
+        except Exception as error:
+            tree.add(f"[{OneColors.DARK_RED}]⚠️ Preview failed: {error}[/]")
+
+        if not parent:
+            self.console.print(tree)

{falyx-0.1.18 → falyx-0.1.20}/falyx/falyx.py

@@ -24,6 +24,7 @@ import logging
 import sys
 from argparse import Namespace
 from difflib import get_close_matches
+from enum import Enum
 from functools import cached_property
 from typing import Any, Callable
 
@@ -59,6 +60,13 @@ from falyx.utils import CaseInsensitiveDict, chunks, get_program_invocation, log
 from falyx.version import __version__
 
 
+class FalyxMode(str, Enum):
+    MENU = "menu"
+    RUN = "run"
+    PREVIEW = "preview"
+    RUN_ALL = "run-all"
+
+
 class Falyx:
     """
     Main menu controller for Falyx CLI applications.
@@ -148,7 +156,8 @@ class Falyx:
         self.render_menu: Callable[["Falyx"], None] | None = render_menu
         self.custom_table: Callable[["Falyx"], Table] | Table | None = custom_table
         self.validate_options(cli_args, options)
-        self._session: PromptSession | None = None
+        self._prompt_session: PromptSession | None = None
+        self.mode = FalyxMode.MENU
 
     def validate_options(
         self,
@@ -272,6 +281,11 @@ class Falyx:
             )
 
         self.console.print(table, justify="center")
+        if self.mode == FalyxMode.MENU:
+            self.console.print(
+                f"📦 Tip: Type '[{OneColors.LIGHT_YELLOW}]?[KEY][/]' to preview a command before running it.\n",
+                justify="center",
+            )
 
     def _get_help_command(self) -> Command:
         """Returns the help command for the menu."""
@@ -329,7 +343,8 @@ class Falyx:
         error_message = " ".join(message_lines)
 
         def validator(text):
-            return True if self.get_command(text, from_validate=True) else False
+            _, choice = self.get_command(text, from_validate=True)
+            return True if choice else False
 
         return Validator.from_callable(
             validator,
@@ -337,11 +352,11 @@ class Falyx:
             move_cursor_to_end=True,
         )
 
-    def _invalidate_session_cache(self):
-        """Forces the session to be recreated on the next access."""
-        if hasattr(self, "session"):
-            del self.session
-        self._session = None
+    def _invalidate_prompt_session_cache(self):
+        """Forces the prompt session to be recreated on the next access."""
+        if hasattr(self, "prompt_session"):
+            del self.prompt_session
+        self._prompt_session = None
 
     def add_help_command(self):
         """Adds a help command to the menu if it doesn't already exist."""
@@ -375,7 +390,7 @@ class Falyx:
             raise FalyxError(
                 "Bottom bar must be a string, callable, or BottomBar instance."
             )
-        self._invalidate_session_cache()
+        self._invalidate_prompt_session_cache()
 
     def _get_bottom_bar_render(self) -> Callable[[], Any] | str | None:
         """Returns the bottom bar for the menu."""
@@ -390,10 +405,10 @@ class Falyx:
         return None
 
     @cached_property
-    def session(self) -> PromptSession:
+    def prompt_session(self) -> PromptSession:
         """Returns the prompt session for the menu."""
-        if self._session is None:
-            self._session = PromptSession(
+        if self._prompt_session is None:
+            self._prompt_session = PromptSession(
                 message=self.prompt,
                 multiline=False,
                 completer=self._get_completer(),
@@ -402,7 +417,7 @@ class Falyx:
                 bottom_toolbar=self._get_bottom_bar_render(),
                 key_bindings=self.key_bindings,
             )
-        return self._session
+        return self._prompt_session
 
     def register_all_hooks(self, hook_type: HookType, hooks: Hook | list[Hook]) -> None:
         """Registers hooks for all commands in the menu and actions recursively."""
@@ -668,17 +683,25 @@ class Falyx:
         else:
             return self.build_default_table()
 
-    def get_command(self, choice: str, from_validate=False) -> Command | None:
+    def parse_preview_command(self, input_str: str) -> tuple[bool, str]:
+        if input_str.startswith("?"):
+            return True, input_str[1:].strip()
+        return False, input_str.strip()
+
+    def get_command(
+        self, choice: str, from_validate=False
+    ) -> tuple[bool, Command | None]:
         """Returns the selected command based on user input. Supports keys, aliases, and abbreviations."""
+        is_preview, choice = self.parse_preview_command(choice)
         choice = choice.upper()
         name_map = self._name_map
 
         if choice in name_map:
-            return name_map[choice]
+            return is_preview, name_map[choice]
 
         prefix_matches = [cmd for key, cmd in name_map.items() if key.startswith(choice)]
         if len(prefix_matches) == 1:
-            return prefix_matches[0]
+            return is_preview, prefix_matches[0]
 
         fuzzy_matches = get_close_matches(choice, list(name_map.keys()), n=3, cutoff=0.7)
         if fuzzy_matches:
@@ -694,7 +717,7 @@ class Falyx:
                 self.console.print(
                     f"[{OneColors.LIGHT_YELLOW}]⚠️ Unknown command '{choice}'[/]"
                 )
-        return None
+        return is_preview, None
 
     def _create_context(self, selected_command: Command) -> ExecutionContext:
         """Creates a context dictionary for the selected command."""
@@ -717,12 +740,17 @@ class Falyx:
 
     async def process_command(self) -> bool:
         """Processes the action of the selected command."""
-        choice = await self.session.prompt_async()
-        selected_command = self.get_command(choice)
+        choice = await self.prompt_session.prompt_async()
+        is_preview, selected_command = self.get_command(choice)
         if not selected_command:
             logger.info(f"Invalid command '{choice}'.")
             return True
 
+        if is_preview:
+            logger.info(f"Preview command '{selected_command.key}' selected.")
+            await selected_command.preview()
+            return True
+
         if selected_command.requires_input:
             program = get_program_invocation()
             self.console.print(
@@ -759,7 +787,7 @@ class Falyx:
     async def run_key(self, command_key: str, return_context: bool = False) -> Any:
         """Run a command by key without displaying the menu (non-interactive mode)."""
         self.debug_hooks()
-        selected_command = self.get_command(command_key)
+        _, selected_command = self.get_command(command_key)
         self.last_run_command = selected_command
 
         if not selected_command:
@@ -899,7 +927,8 @@ class Falyx:
             sys.exit(0)
 
         if self.cli_args.command == "preview":
-            command = self.get_command(self.cli_args.name)
+            self.mode = FalyxMode.PREVIEW
+            _, command = self.get_command(self.cli_args.name)
             if not command:
                 self.console.print(
                     f"[{OneColors.DARK_RED}]❌ Command '{self.cli_args.name}' not found.[/]"
@@ -912,7 +941,8 @@ class Falyx:
             sys.exit(0)
 
         if self.cli_args.command == "run":
-            command = self.get_command(self.cli_args.name)
+            self.mode = FalyxMode.RUN
+            _, command = self.get_command(self.cli_args.name)
             if not command:
                 self.console.print(
                     f"[{OneColors.DARK_RED}]❌ Command '{self.cli_args.name}' not found.[/]"
@@ -927,6 +957,7 @@ class Falyx:
             sys.exit(0)
 
         if self.cli_args.command == "run-all":
+            self.mode = FalyxMode.RUN_ALL
             matching = [
                 cmd
                 for cmd in self.commands.values()

{falyx-0.1.18 → falyx-0.1.20}/falyx/http_action.py

@@ -15,6 +15,7 @@ from rich.tree import Tree
 
 from falyx.action import Action
 from falyx.context import ExecutionContext, SharedContext
+from falyx.hook_manager import HookManager, HookType
 from falyx.themes.colors import OneColors
 from falyx.utils import logger
 
@@ -55,7 +56,7 @@ class HTTPAction(Action):
         data (Any, optional): Raw data or form-encoded body.
         hooks (HookManager, optional): Hook manager for lifecycle events.
         inject_last_result (bool): Enable last_result injection.
-        inject_last_result_as (str): Name of injected key.
+        inject_into (str): Name of injected key.
         retry (bool): Enable retry logic.
         retry_policy (RetryPolicy): Retry settings.
     """
@@ -73,7 +74,7 @@ class HTTPAction(Action):
         data: Any = None,
         hooks=None,
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         retry: bool = False,
         retry_policy=None,
     ):
@@ -91,13 +92,12 @@ class HTTPAction(Action):
             kwargs={},
             hooks=hooks,
             inject_last_result=inject_last_result,
-            inject_last_result_as=inject_last_result_as,
+            inject_into=inject_into,
             retry=retry,
             retry_policy=retry_policy,
         )
 
     async def _request(self, *args, **kwargs) -> dict[str, Any]:
-        # TODO: Add check for HOOK registration
         if self.shared_context:
             context: SharedContext = self.shared_context
             session = context.get("http_session")
@@ -128,6 +128,9 @@ class HTTPAction(Action):
             if not self.shared_context:
                 await session.close()
 
+    def register_teardown(self, hooks: HookManager):
+        hooks.register(HookType.ON_TEARDOWN, close_shared_http_session)
+
     async def preview(self, parent: Tree | None = None):
         label = [
             f"[{OneColors.CYAN_b}]🌐 HTTPAction[/] '{self.name}'",
@@ -135,7 +138,7 @@ class HTTPAction(Action):
             f"\n[dim]URL:[/] {self.url}",
         ]
         if self.inject_last_result:
-            label.append(f"\n[dim]Injects:[/] '{self.inject_last_result_as}'")
+            label.append(f"\n[dim]Injects:[/] '{self.inject_into}'")
         if self.retry_policy and self.retry_policy.enabled:
             label.append(
                 f"\n[dim]↻ Retries:[/] {self.retry_policy.max_retries}x, "

{falyx-0.1.18 → falyx-0.1.20}/falyx/init.py

@@ -33,8 +33,10 @@ async def cleanup():
 """
 
 GLOBAL_CONFIG = """\
-async def cleanup():
-    print("🧹 Cleaning temp files...")
+- key: C
+  description: Cleanup temp files
+  action: tasks.cleanup
+  aliases: [clean, cleanup]
 """
 
 console = Console(color_system="auto")

{falyx-0.1.18 → falyx-0.1.20}/falyx/io_action.py

@@ -83,7 +83,7 @@ class BaseIOAction(BaseAction):
         raise NotImplementedError
 
     async def _resolve_input(self, kwargs: dict[str, Any]) -> str | bytes:
-        last_result = kwargs.pop(self.inject_last_result_as, None)
+        last_result = kwargs.pop(self.inject_into, None)
 
         data = await self._read_stdin()
         if data:
@@ -168,7 +168,7 @@ class BaseIOAction(BaseAction):
     async def preview(self, parent: Tree | None = None):
         label = [f"[{OneColors.GREEN_b}]⚙ IOAction[/] '{self.name}'"]
         if self.inject_last_result:
-            label.append(f" [dim](injects '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](injects '{self.inject_into}')[/dim]")
         if parent:
             parent.add("".join(label))
         else:
@@ -243,7 +243,7 @@ class ShellAction(BaseIOAction):
     async def preview(self, parent: Tree | None = None):
         label = [f"[{OneColors.GREEN_b}]⚙ ShellAction[/] '{self.name}'"]
         if self.inject_last_result:
-            label.append(f" [dim](injects '{self.inject_last_result_as}')[/dim]")
+            label.append(f" [dim](injects '{self.inject_into}')[/dim]")
         if parent:
             parent.add("".join(label))
         else:

{falyx-0.1.18 → falyx-0.1.20}/falyx/menu_action.py

@@ -101,7 +101,7 @@ class MenuAction(BaseAction):
         prompt_message: str = "Select > ",
         default_selection: str = "",
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         console: Console | None = None,
         prompt_session: PromptSession | None = None,
         never_prompt: bool = False,
@@ -111,7 +111,7 @@ class MenuAction(BaseAction):
         super().__init__(
             name,
             inject_last_result=inject_last_result,
-            inject_last_result_as=inject_last_result_as,
+            inject_into=inject_into,
             never_prompt=never_prompt,
         )
         self.menu_options = menu_options
@@ -168,15 +168,13 @@ class MenuAction(BaseAction):
             await self.hooks.trigger(HookType.BEFORE, context)
             key = effective_default
             if not self.never_prompt:
-                console = self.console
-                session = self.prompt_session
                 table = self._build_table()
                 key = await prompt_for_selection(
                     self.menu_options.keys(),
                     table,
                     default_selection=self.default_selection,
-                    console=console,
-                    session=session,
+                    console=self.console,
+                    prompt_session=self.prompt_session,
                     prompt_message=self.prompt_message,
                     show_table=self.show_table,
                 )

{falyx-0.1.18 → falyx-0.1.20}/falyx/prompt_utils.py

@@ -9,11 +9,10 @@ def should_prompt_user(
 ):
     """Determine whether to prompt the user for confirmation based on command and global options."""
     never_prompt = options.get("never_prompt", False, namespace)
-    always_confirm = options.get("always_confirm", False, namespace)
     force_confirm = options.get("force_confirm", False, namespace)
     skip_confirm = options.get("skip_confirm", False, namespace)
 
     if never_prompt or skip_confirm:
         return False
 
-    return confirm or always_confirm or force_confirm
+    return confirm or force_confirm

falyx-0.1.20/falyx/protocols.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from typing import Any, Protocol
+
+from falyx.action import BaseAction
+
+
+class ActionFactoryProtocol(Protocol):
+    def __call__(self, *args: Any, **kwargs: Any) -> BaseAction: ...

{falyx-0.1.18 → falyx-0.1.20}/falyx/select_files_action.py

@@ -10,7 +10,7 @@ class SelectFilesAction(BaseAction):
         suffix_filter: str | None = None,
         return_path: bool = True,
         console: Console | None = None,
-        session: PromptSession | None = None,
+        prompt_session: PromptSession | None = None,
     ):
         super().__init__(name)
         self.directory = Path(directory).resolve()
@@ -20,7 +20,7 @@ class SelectFilesAction(BaseAction):
         self.style = style
         self.return_path = return_path
         self.console = console or Console()
-        self.session = session or PromptSession()
+        self.prompt_session = prompt_session or PromptSession()
 
     async def _run(self, *args, **kwargs) -> Any:
         context = ExecutionContext(name=self.name, args=args, kwargs=kwargs, action=self)
@@ -49,7 +49,7 @@ class SelectFilesAction(BaseAction):
                 options.keys(),
                 table,
                 console=self.console,
-                session=self.session,
+                prompt_session=self.prompt_session,
                 prompt_message=self.prompt_message,
             )
 

{falyx-0.1.18 → falyx-0.1.20}/falyx/selection.py

@@ -203,17 +203,17 @@ async def prompt_for_index(
     min_index: int = 0,
     default_selection: str = "",
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     show_table: bool = True,
 ):
-    session = session or PromptSession()
+    prompt_session = prompt_session or PromptSession()
     console = console or Console(color_system="auto")
 
     if show_table:
         console.print(table)
 
-    selection = await session.prompt_async(
+    selection = await prompt_session.prompt_async(
         message=prompt_message,
         validator=int_range_validator(min_index, max_index),
         default=default_selection,
@@ -226,18 +226,18 @@ async def prompt_for_selection(
     table: Table,
     default_selection: str = "",
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     show_table: bool = True,
 ) -> str:
     """Prompt the user to select a key from a set of options. Return the selected key."""
-    session = session or PromptSession()
+    prompt_session = prompt_session or PromptSession()
     console = console or Console(color_system="auto")
 
     if show_table:
         console.print(table, justify="center")
 
-    selected = await session.prompt_async(
+    selected = await prompt_session.prompt_async(
         message=prompt_message,
         validator=key_validator(keys),
         default=default_selection,
@@ -250,7 +250,7 @@ async def select_value_from_list(
     title: str,
     selections: Sequence[str],
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     default_selection: str = "",
     columns: int = 4,
@@ -283,7 +283,7 @@ async def select_value_from_list(
         caption_style,
         highlight,
     )
-    session = session or PromptSession()
+    prompt_session = prompt_session or PromptSession()
     console = console or Console(color_system="auto")
 
     selection_index = await prompt_for_index(
@@ -291,7 +291,7 @@ async def select_value_from_list(
         table,
         default_selection=default_selection,
         console=console,
-        session=session,
+        prompt_session=prompt_session,
         prompt_message=prompt_message,
     )
 
@@ -302,12 +302,12 @@ async def select_key_from_dict(
     selections: dict[str, SelectionOption],
     table: Table,
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     default_selection: str = "",
 ) -> Any:
     """Prompt for a key from a dict, returns the key."""
-    session = session or PromptSession()
+    prompt_session = prompt_session or PromptSession()
     console = console or Console(color_system="auto")
 
     console.print(table)
@@ -317,7 +317,7 @@ async def select_key_from_dict(
         table,
         default_selection=default_selection,
         console=console,
-        session=session,
+        prompt_session=prompt_session,
         prompt_message=prompt_message,
     )
 
@@ -326,12 +326,12 @@ async def select_value_from_dict(
     selections: dict[str, SelectionOption],
     table: Table,
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     default_selection: str = "",
 ) -> Any:
     """Prompt for a key from a dict, but return the value."""
-    session = session or PromptSession()
+    prompt_session = prompt_session or PromptSession()
     console = console or Console(color_system="auto")
 
     console.print(table)
@@ -341,7 +341,7 @@ async def select_value_from_dict(
         table,
         default_selection=default_selection,
         console=console,
-        session=session,
+        prompt_session=prompt_session,
         prompt_message=prompt_message,
     )
 
@@ -352,7 +352,7 @@ async def get_selection_from_dict_menu(
     title: str,
     selections: dict[str, SelectionOption],
     console: Console | None = None,
-    session: PromptSession | None = None,
+    prompt_session: PromptSession | None = None,
     prompt_message: str = "Select an option > ",
     default_selection: str = "",
 ):
@@ -366,7 +366,7 @@ async def get_selection_from_dict_menu(
         selections,
         table,
         console,
-        session,
+        prompt_session,
         prompt_message,
         default_selection,
     )

{falyx-0.1.18 → falyx-0.1.20}/falyx/selection_action.py

@@ -26,24 +26,24 @@ class SelectionAction(BaseAction):
     def __init__(
         self,
         name: str,
-        selections: list[str] | dict[str, SelectionOption],
+        selections: list[str] | set[str] | tuple[str, ...] | dict[str, SelectionOption],
         *,
         title: str = "Select an option",
         columns: int = 2,
         prompt_message: str = "Select > ",
         default_selection: str = "",
         inject_last_result: bool = False,
-        inject_last_result_as: str = "last_result",
+        inject_into: str = "last_result",
         return_key: bool = False,
         console: Console | None = None,
-        session: PromptSession | None = None,
+        prompt_session: PromptSession | None = None,
         never_prompt: bool = False,
         show_table: bool = True,
     ):
         super().__init__(
             name,
             inject_last_result=inject_last_result,
-            inject_last_result_as=inject_last_result_as,
+            inject_into=inject_into,
             never_prompt=never_prompt,
         )
         self.selections: list[str] | CaseInsensitiveDict = selections
@@ -51,7 +51,7 @@ class SelectionAction(BaseAction):
         self.title = title
         self.columns = columns
         self.console = console or Console(color_system="auto")
-        self.session = session or PromptSession()
+        self.prompt_session = prompt_session or PromptSession()
         self.default_selection = default_selection
         self.prompt_message = prompt_message
         self.show_table = show_table
@@ -61,9 +61,11 @@ class SelectionAction(BaseAction):
         return self._selections
 
     @selections.setter
-    def selections(self, value: list[str] | dict[str, SelectionOption]):
-        if isinstance(value, list):
-            self._selections: list[str] | CaseInsensitiveDict = value
+    def selections(
+        self, value: list[str] | set[str] | tuple[str, ...] | dict[str, SelectionOption]
+    ):
+        if isinstance(value, (list, tuple, set)):
+            self._selections: list[str] | CaseInsensitiveDict = list(value)
         elif isinstance(value, dict):
             cid = CaseInsensitiveDict()
             cid.update(value)
@@ -123,7 +125,7 @@ class SelectionAction(BaseAction):
                         table,
                         default_selection=effective_default,
                         console=self.console,
-                        session=self.session,
+                        prompt_session=self.prompt_session,
                         prompt_message=self.prompt_message,
                         show_table=self.show_table,
                     )
@@ -140,7 +142,7 @@ class SelectionAction(BaseAction):
                         table,
                         default_selection=effective_default,
                         console=self.console,
-                        session=self.session,
+                        prompt_session=self.prompt_session,
                         prompt_message=self.prompt_message,
                         show_table=self.show_table,
                     )

falyx-0.1.20/falyx/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.20"

{falyx-0.1.18 → falyx-0.1.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "falyx"
-version = "0.1.18"
+version = "0.1.20"
 description = "Reliable and introspectable async CLI action framework."
 authors = ["Roland Thomas Jr <roland@rtj.dev>"]
 license = "MIT"

falyx-0.1.18/falyx/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.18"