falyx 0.1.61__py3-none-any.whl → 0.1.63__py3-none-any.whl

falyx/action/action_factory.py

@@ -112,7 +112,16 @@ class ActionFactory(BaseAction):
         tree = parent.add(label) if parent else Tree(label)
 
         try:
-            generated = await self.factory(*self.preview_args, **self.preview_kwargs)
+            generated = None
+            if self.args or self.kwargs:
+                try:
+                    generated = await self.factory(*self.args, **self.kwargs)
+                except TypeError:
+                    ...
+
+            if not generated:
+                generated = await self.factory(*self.preview_args, **self.preview_kwargs)
+
             if isinstance(generated, BaseAction):
                 await generated.preview(parent=tree)
             else:

falyx/action/action_group.py

@@ -60,6 +60,8 @@ class ActionGroup(BaseAction, ActionListMixin):
             Sequence[BaseAction | Callable[..., Any] | Callable[..., Awaitable]] | None
         ) = None,
         *,
+        args: tuple[Any, ...] = (),
+        kwargs: dict[str, Any] | None = None,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
         inject_into: str = "last_result",
@@ -71,6 +73,8 @@ class ActionGroup(BaseAction, ActionListMixin):
             inject_into=inject_into,
         )
         ActionListMixin.__init__(self)
+        self.args = args
+        self.kwargs = kwargs or {}
         if actions:
             self.set_actions(actions)
 
@@ -115,13 +119,17 @@ class ActionGroup(BaseAction, ActionListMixin):
     async def _run(self, *args, **kwargs) -> list[tuple[str, Any]]:
         if not self.actions:
             raise EmptyGroupError(f"[{self.name}] No actions to execute.")
+
+        combined_args = args + self.args
+        combined_kwargs = {**self.kwargs, **kwargs}
+
         shared_context = SharedContext(name=self.name, action=self, is_parallel=True)
         if self.shared_context:
             shared_context.set_shared_result(self.shared_context.last_result())
-        updated_kwargs = self._maybe_inject_last_result(kwargs)
+        updated_kwargs = self._maybe_inject_last_result(combined_kwargs)
         context = ExecutionContext(
             name=self.name,
-            args=args,
+            args=combined_args,
             kwargs=updated_kwargs,
             action=self,
             extra={"results": [], "errors": []},
@@ -131,7 +139,7 @@ class ActionGroup(BaseAction, ActionListMixin):
         async def run_one(action: BaseAction):
             try:
                 prepared = action.prepare(shared_context, self.options_manager)
-                result = await prepared(*args, **updated_kwargs)
+                result = await prepared(*combined_args, **updated_kwargs)
                 shared_context.add_result((action.name, result))
                 context.extra["results"].append((action.name, result))
             except Exception as error:

falyx/action/action_types.py

@@ -61,7 +61,9 @@ class ConfirmType(Enum):
     YES_CANCEL = "yes_cancel"
     YES_NO_CANCEL = "yes_no_cancel"
     TYPE_WORD = "type_word"
+    TYPE_WORD_CANCEL = "type_word_cancel"
     OK_CANCEL = "ok_cancel"
+    ACKNOWLEDGE = "acknowledge"
 
     @classmethod
     def choices(cls) -> list[ConfirmType]:

falyx/action/chained_action.py

@@ -54,6 +54,8 @@ class ChainedAction(BaseAction, ActionListMixin):
             | None
         ) = None,
         *,
+        args: tuple[Any, ...] = (),
+        kwargs: dict[str, Any] | None = None,
         hooks: HookManager | None = None,
         inject_last_result: bool = False,
         inject_into: str = "last_result",
@@ -67,6 +69,8 @@ class ChainedAction(BaseAction, ActionListMixin):
             inject_into=inject_into,
         )
         ActionListMixin.__init__(self)
+        self.args = args
+        self.kwargs = kwargs or {}
         self.auto_inject = auto_inject
         self.return_list = return_list
         if actions:
@@ -111,13 +115,16 @@ class ChainedAction(BaseAction, ActionListMixin):
         if not self.actions:
             raise EmptyChainError(f"[{self.name}] No actions to execute.")
 
+        combined_args = args + self.args
+        combined_kwargs = {**self.kwargs, **kwargs}
+
         shared_context = SharedContext(name=self.name, action=self)
         if self.shared_context:
             shared_context.add_result(self.shared_context.last_result())
-        updated_kwargs = self._maybe_inject_last_result(kwargs)
+        updated_kwargs = self._maybe_inject_last_result(combined_kwargs)
         context = ExecutionContext(
             name=self.name,
-            args=args,
+            args=combined_args,
             kwargs=updated_kwargs,
             action=self,
             extra={"results": [], "rollback_stack": []},
@@ -136,7 +143,7 @@ class ChainedAction(BaseAction, ActionListMixin):
                 shared_context.current_index = index
                 prepared = action.prepare(shared_context, self.options_manager)
                 try:
-                    result = await prepared(*args, **updated_kwargs)
+                    result = await prepared(*combined_args, **updated_kwargs)
                 except Exception as error:
                     if index + 1 < len(self.actions) and isinstance(
                         self.actions[index + 1], FallbackAction
@@ -155,10 +162,12 @@ class ChainedAction(BaseAction, ActionListMixin):
                         fallback._skip_in_chain = True
                     else:
                         raise
-                args, updated_kwargs = self._clear_args()
                 shared_context.add_result(result)
                 context.extra["results"].append(result)
-                context.extra["rollback_stack"].append(prepared)
+                context.extra["rollback_stack"].append(
+                    (prepared, combined_args, updated_kwargs)
+                )
+                combined_args, updated_kwargs = self._clear_args()
 
             all_results = context.extra["results"]
             assert (
@@ -171,11 +180,11 @@ class ChainedAction(BaseAction, ActionListMixin):
             logger.info("[%s] Chain broken: %s", self.name, error)
             context.exception = error
             shared_context.add_error(shared_context.current_index, error)
-            await self._rollback(context.extra["rollback_stack"], *args, **kwargs)
+            await self._rollback(context.extra["rollback_stack"])
         except Exception as error:
             context.exception = error
             shared_context.add_error(shared_context.current_index, error)
-            await self._rollback(context.extra["rollback_stack"], *args, **kwargs)
+            await self._rollback(context.extra["rollback_stack"])
             await self.hooks.trigger(HookType.ON_ERROR, context)
             raise
         finally:
@@ -184,7 +193,9 @@ class ChainedAction(BaseAction, ActionListMixin):
             await self.hooks.trigger(HookType.ON_TEARDOWN, context)
             er.record(context)
 
-    async def _rollback(self, rollback_stack, *args, **kwargs):
+    async def _rollback(
+        self, rollback_stack: list[tuple[Action, tuple[Any, ...], dict[str, Any]]]
+    ):
         """
         Roll back all executed actions in reverse order.
 
@@ -197,12 +208,12 @@ class ChainedAction(BaseAction, ActionListMixin):
             rollback_stack (list): Actions to roll back.
             *args, **kwargs: Passed to rollback handlers.
         """
-        for action in reversed(rollback_stack):
+        for action, args, kwargs in reversed(rollback_stack):
             rollback = getattr(action, "rollback", None)
             if rollback:
                 try:
                     logger.warning("[%s] Rolling back...", action.name)
-                    await action.rollback(*args, **kwargs)
+                    await rollback(*args, **kwargs)
                 except Exception as error:
                     logger.error("[%s] Rollback failed: %s", action.name, error)
 

falyx/action/confirm_action.py

@@ -112,6 +112,14 @@ class ConfirmAction(BaseAction):
                     validator=word_validator(self.word),
                 )
                 return answer.upper().strip() != "N"
+            case ConfirmType.TYPE_WORD_CANCEL:
+                answer = await self.prompt_session.prompt_async(
+                    f"❓ {self.message} [{self.word}] to confirm or [N/n] > ",
+                    validator=word_validator(self.word),
+                )
+                if answer.upper().strip() == "N":
+                    raise CancelSignal(f"Action '{self.name}' was cancelled by the user.")
+                return answer.upper().strip() == self.word.upper().strip()
             case ConfirmType.YES_CANCEL:
                 answer = await confirm_async(
                     self.message,
@@ -131,6 +139,12 @@ class ConfirmAction(BaseAction):
                 if answer.upper() == "C":
                     raise CancelSignal(f"Action '{self.name}' was cancelled by the user.")
                 return answer.upper() == "O"
+            case ConfirmType.ACKNOWLEDGE:
+                answer = await self.prompt_session.prompt_async(
+                    f"❓ {self.message} [A]cknowledge > ",
+                    validator=word_validator("A"),
+                )
+                return answer.upper().strip() == "A"
             case _:
                 raise ValueError(f"Unknown confirm_type: {self.confirm_type}")
 
@@ -151,7 +165,7 @@ class ConfirmAction(BaseAction):
                 and not should_prompt_user(confirm=True, options=self.options_manager)
             ):
                 logger.debug(
-                    "Skipping confirmation for action '%s' as 'confirm' is False or options manager indicates no prompt.",
+                    "Skipping confirmation for '%s' due to never_prompt or options_manager settings.",
                     self.name,
                 )
                 if self.return_last_result:
@@ -189,7 +203,7 @@ class ConfirmAction(BaseAction):
         tree.add(f"[bold]Message:[/] {self.message}")
         tree.add(f"[bold]Type:[/] {self.confirm_type.value}")
         tree.add(f"[bold]Prompt Required:[/] {'No' if self.never_prompt else 'Yes'}")
-        if self.confirm_type == ConfirmType.TYPE_WORD:
+        if self.confirm_type in (ConfirmType.TYPE_WORD, ConfirmType.TYPE_WORD_CANCEL):
             tree.add(f"[bold]Confirmation Word:[/] {self.word}")
         if parent is None:
             self.console.print(tree)

falyx/action/process_pool_action.py

@@ -91,9 +91,7 @@ class ProcessPoolAction(BaseAction):
                     f"Cannot inject last result into {self.name}: "
                     f"last result is not pickleable."
                 )
-        print(kwargs)
         updated_kwargs = self._maybe_inject_last_result(kwargs)
-        print(updated_kwargs)
         context = ExecutionContext(
             name=self.name,
             args=args,

falyx/completer.py

@@ -29,6 +29,26 @@ class FalyxCompleter(Completer):
             yield from self._suggest_commands(tokens[0] if tokens else "")
             return
 
+        # Identify command
+        command_key = tokens[0].upper()
+        command = self.falyx._name_map.get(command_key)
+        if not command or not command.arg_parser:
+            return
+
+        # If at end of token, e.g., "--t" vs "--tag ", add a stub so suggest_next sees it
+        parsed_args = tokens[1:] if cursor_at_end_of_token else tokens[1:-1]
+        stub = "" if cursor_at_end_of_token else tokens[-1]
+
+        try:
+            suggestions = command.arg_parser.suggest_next(
+                parsed_args + ([stub] if stub else [])
+            )
+            for suggestion in suggestions:
+                if suggestion.startswith(stub):
+                    yield Completion(suggestion, start_position=-len(stub))
+        except Exception:
+            return
+
     def _suggest_commands(self, prefix: str) -> Iterable[Completion]:
         prefix = prefix.upper()
         keys = [self.falyx.exit_command.key]

falyx/falyx.py

@@ -507,7 +507,6 @@ class Falyx:
                 message=self.prompt,
                 multiline=False,
                 completer=self._get_completer(),
-                reserve_space_for_menu=1,
                 validator=CommandValidator(self, self._get_validator_error_message()),
                 bottom_toolbar=self._get_bottom_bar_render(),
                 key_bindings=self.key_bindings,

falyx/parser/argument.py

@@ -26,6 +26,7 @@ class Argument:
         resolver (BaseAction | None):
             An action object that resolves the argument, if applicable.
         lazy_resolver (bool): True if the resolver should be called lazily, False otherwise
+        suggestions (list[str] | None): A list of suggestions for the argument.
     """
 
     flags: tuple[str, ...]
@@ -40,6 +41,7 @@ class Argument:
     positional: bool = False
     resolver: BaseAction | None = None
     lazy_resolver: bool = False
+    suggestions: list[str] | None = None
 
     def get_positional_text(self) -> str:
         """Get the positional text for the argument."""

falyx/parser/command_argument_parser.py

@@ -4,7 +4,8 @@ from __future__ import annotations
 
 from collections import defaultdict
 from copy import deepcopy
-from typing import Any, Iterable
+from dataclasses import dataclass
+from typing import Any, Iterable, Sequence
 
 from rich.console import Console
 from rich.markup import escape
@@ -19,6 +20,12 @@ from falyx.parser.utils import coerce_value
 from falyx.signals import HelpSignal
 
 
+@dataclass
+class ArgumentState:
+    arg: Argument
+    consumed: bool = False
+
+
 class CommandArgumentParser:
     """
     Custom argument parser for Falyx Commands.
@@ -64,6 +71,8 @@ class CommandArgumentParser:
         self._flag_map: dict[str, Argument] = {}
         self._dest_set: set[str] = set()
         self._add_help()
+        self._last_positional_states: dict[str, ArgumentState] = {}
+        self._last_keyword_states: dict[str, ArgumentState] = {}
 
     def _add_help(self):
         """Add help argument to the parser."""
@@ -359,19 +368,19 @@ class CommandArgumentParser:
         )
 
         self._register_argument(argument)
-        self._register_argument(negated_argument)
+        self._register_argument(negated_argument, bypass_validation=True)
 
-    def _register_argument(self, argument: Argument):
+    def _register_argument(
+        self, argument: Argument, bypass_validation: bool = False
+    ) -> None:
 
         for flag in argument.flags:
-            if (
-                flag in self._flag_map
-                and not argument.action == ArgumentAction.STORE_BOOL_OPTIONAL
-            ):
+            if flag in self._flag_map and not bypass_validation:
                 existing = self._flag_map[flag]
                 raise CommandArgumentError(
                     f"Flag '{flag}' is already used by argument '{existing.dest}'"
                 )
+
         for flag in argument.flags:
             self._flag_map[flag] = argument
             if not argument.positional:
@@ -396,6 +405,7 @@ class CommandArgumentParser:
         dest: str | None = None,
         resolver: BaseAction | None = None,
         lazy_resolver: bool = True,
+        suggestions: list[str] | None = None,
     ) -> None:
         """Add an argument to the parser.
         For `ArgumentAction.ACTION`, `nargs` and `type` determine how many and what kind
@@ -415,6 +425,8 @@ class CommandArgumentParser:
             help: A brief description of the argument.
             dest: The name of the attribute to be added to the object returned by parse_args().
             resolver: A BaseAction called with optional nargs specified parsed arguments.
+            lazy_resolver: If True, the resolver is called lazily when the argument is accessed.
+            suggestions: A list of suggestions for the argument.
         """
         expected_type = type
         self._validate_flags(flags)
@@ -445,6 +457,10 @@ class CommandArgumentParser:
                 f"Default value '{default}' not in allowed choices: {choices}"
             )
         required = self._determine_required(required, positional, nargs, action)
+        if not isinstance(suggestions, Sequence) and suggestions is not None:
+            raise CommandArgumentError(
+                f"suggestions must be a list or None, got {type(suggestions)}"
+            )
         if not isinstance(lazy_resolver, bool):
             raise CommandArgumentError(
                 f"lazy_resolver must be a boolean, got {type(lazy_resolver)}"
@@ -465,6 +481,7 @@ class CommandArgumentParser:
                 positional=positional,
                 resolver=resolver,
                 lazy_resolver=lazy_resolver,
+                suggestions=suggestions,
             )
             self._register_argument(argument)
 
@@ -490,6 +507,27 @@ class CommandArgumentParser:
             )
         return defs
 
+    def raise_remaining_args_error(
+        self, token: str, arg_states: dict[str, ArgumentState]
+    ) -> None:
+        consumed_dests = [
+            state.arg.dest for state in arg_states.values() if state.consumed
+        ]
+        remaining_flags = [
+            flag
+            for flag, arg in self._keyword.items()
+            if arg.dest not in consumed_dests and flag.startswith(token)
+        ]
+
+        if remaining_flags:
+            raise CommandArgumentError(
+                f"Unrecognized option '{token}'. Did you mean one of: {', '.join(remaining_flags)}?"
+            )
+        else:
+            raise CommandArgumentError(
+                f"Unrecognized option '{token}'. Use --help to see available options."
+            )
+
     def _consume_nargs(
         self, args: list[str], start: int, spec: Argument
     ) -> tuple[list[str], int]:
@@ -535,6 +573,7 @@ class CommandArgumentParser:
         result: dict[str, Any],
         positional_args: list[Argument],
         consumed_positional_indicies: set[int],
+        arg_states: dict[str, ArgumentState],
         from_validate: bool = False,
     ) -> int:
         remaining_positional_args = [
@@ -580,17 +619,7 @@ class CommandArgumentParser:
             except Exception as error:
                 if len(args[i - new_i :]) == 1 and args[i - new_i].startswith("-"):
                     token = args[i - new_i]
-                    valid_flags = [
-                        flag for flag in self._flag_map if flag.startswith(token)
-                    ]
-                    if valid_flags:
-                        raise CommandArgumentError(
-                            f"Unrecognized option '{token}'. Did you mean one of: {', '.join(valid_flags)}?"
-                        ) from error
-                    else:
-                        raise CommandArgumentError(
-                            f"Unrecognized option '{token}'. Use --help to see available options."
-                        ) from error
+                    self.raise_remaining_args_error(token, arg_states)
                 else:
                     raise CommandArgumentError(
                         f"Invalid value for '{spec.dest}': {error}"
@@ -606,6 +635,7 @@ class CommandArgumentParser:
                         raise CommandArgumentError(
                             f"[{spec.dest}] Action failed: {error}"
                         ) from error
+                arg_states[spec.dest].consumed = True
             elif not typed and spec.default:
                 result[spec.dest] = spec.default
             elif spec.action == ArgumentAction.APPEND:
@@ -618,8 +648,10 @@ class CommandArgumentParser:
                 assert result.get(spec.dest) is not None, "dest should not be None"
                 result[spec.dest].extend(typed)
             elif spec.nargs in (None, 1, "?"):
+                arg_states[spec.dest].consumed = True
                 result[spec.dest] = typed[0] if len(typed) == 1 else typed
             else:
+                arg_states[spec.dest].consumed = True
                 result[spec.dest] = typed
 
             if spec.nargs not in ("*", "+"):
@@ -628,15 +660,7 @@ class CommandArgumentParser:
         if i < len(args):
             if len(args[i:]) == 1 and args[i].startswith("-"):
                 token = args[i]
-                valid_flags = [flag for flag in self._flag_map if flag.startswith(token)]
-                if valid_flags:
-                    raise CommandArgumentError(
-                        f"Unrecognized option '{token}'. Did you mean one of: {', '.join(valid_flags)}?"
-                    )
-                else:
-                    raise CommandArgumentError(
-                        f"Unrecognized option '{token}'. Use --help to see available options."
-                    )
+                self.raise_remaining_args_error(token, arg_states)
             else:
                 plural = "s" if len(args[i:]) > 1 else ""
                 raise CommandArgumentError(
@@ -670,6 +694,7 @@ class CommandArgumentParser:
         positional_args: list[Argument],
         consumed_positional_indices: set[int],
         consumed_indices: set[int],
+        arg_states: dict[str, ArgumentState],
         from_validate: bool = False,
     ) -> int:
         if token in self._keyword:
@@ -679,6 +704,7 @@ class CommandArgumentParser:
             if action == ArgumentAction.HELP:
                 if not from_validate:
                     self.render_help()
+                arg_states[spec.dest].consumed = True
                 raise HelpSignal()
             elif action == ArgumentAction.ACTION:
                 assert isinstance(
@@ -691,24 +717,29 @@ class CommandArgumentParser:
                     raise CommandArgumentError(
                         f"Invalid value for '{spec.dest}': {error}"
                     ) from error
-                try:
-                    result[spec.dest] = await spec.resolver(*typed_values)
-                except Exception as error:
-                    raise CommandArgumentError(
-                        f"[{spec.dest}] Action failed: {error}"
-                    ) from error
+                if not spec.lazy_resolver or not from_validate:
+                    try:
+                        result[spec.dest] = await spec.resolver(*typed_values)
+                    except Exception as error:
+                        raise CommandArgumentError(
+                            f"[{spec.dest}] Action failed: {error}"
+                        ) from error
+                arg_states[spec.dest].consumed = True
                 consumed_indices.update(range(i, new_i))
                 i = new_i
             elif action == ArgumentAction.STORE_TRUE:
                 result[spec.dest] = True
+                arg_states[spec.dest].consumed = True
                 consumed_indices.add(i)
                 i += 1
             elif action == ArgumentAction.STORE_FALSE:
                 result[spec.dest] = False
+                arg_states[spec.dest].consumed = True
                 consumed_indices.add(i)
                 i += 1
             elif action == ArgumentAction.STORE_BOOL_OPTIONAL:
                 result[spec.dest] = spec.type(True)
+                arg_states[spec.dest].consumed = True
                 consumed_indices.add(i)
                 i += 1
             elif action == ArgumentAction.COUNT:
@@ -778,19 +809,11 @@ class CommandArgumentParser:
                     )
                 else:
                     result[spec.dest] = typed_values
+                arg_states[spec.dest].consumed = True
                 consumed_indices.update(range(i, new_i))
                 i = new_i
         elif token.startswith("-"):
-            # Handle unrecognized option
-            valid_flags = [flag for flag in self._flag_map if flag.startswith(token)]
-            if valid_flags:
-                raise CommandArgumentError(
-                    f"Unrecognized option '{token}'. Did you mean one of: {', '.join(valid_flags)}?"
-                )
-            else:
-                raise CommandArgumentError(
-                    f"Unrecognized option '{token}'. Use --help to see available options."
-                )
+            self.raise_remaining_args_error(token, arg_states)
         else:
             # Get the next flagged argument index if it exists
             next_flagged_index = -1
@@ -805,6 +828,7 @@ class CommandArgumentParser:
                 result,
                 positional_args,
                 consumed_positional_indices,
+                arg_states=arg_states,
                 from_validate=from_validate,
             )
             i += args_consumed
@@ -817,6 +841,14 @@ class CommandArgumentParser:
         if args is None:
             args = []
 
+        arg_states = {arg.dest: ArgumentState(arg) for arg in self._arguments}
+        self._last_positional_states = {
+            arg.dest: arg_states[arg.dest] for arg in self._positional.values()
+        }
+        self._last_keyword_states = {
+            arg.dest: arg_states[arg.dest] for arg in self._keyword_list
+        }
+
         result = {arg.dest: deepcopy(arg.default) for arg in self._arguments}
         positional_args: list[Argument] = [
             arg for arg in self._arguments if arg.positional
@@ -838,6 +870,7 @@ class CommandArgumentParser:
                 positional_args,
                 consumed_positional_indices,
                 consumed_indices,
+                arg_states=arg_states,
                 from_validate=from_validate,
             )
 
@@ -862,6 +895,7 @@ class CommandArgumentParser:
                 )
 
             if spec.choices and result.get(spec.dest) not in spec.choices:
+                arg_states[spec.dest].consumed = False
                 raise CommandArgumentError(
                     f"Invalid value for '{spec.dest}': must be one of {{{', '.join(spec.choices)}}}"
                 )
@@ -914,6 +948,91 @@ class CommandArgumentParser:
                 kwargs_dict[arg.dest] = parsed[arg.dest]
         return tuple(args_list), kwargs_dict
 
+    def suggest_next(self, args: list[str]) -> list[str]:
+        """
+        Suggest the next possible flags or values given partially typed arguments.
+
+        This does NOT raise errors. It is intended for completions, not validation.
+
+        Returns:
+            A list of possible completions based on the current input.
+        """
+
+        # Case 1: Next positional argument
+        next_non_consumed_positional: Argument | None = None
+        for state in self._last_positional_states.values():
+            if not state.consumed:
+                next_non_consumed_positional = state.arg
+                break
+        if next_non_consumed_positional:
+            if next_non_consumed_positional.choices:
+                return sorted(
+                    (str(choice) for choice in next_non_consumed_positional.choices)
+                )
+            if next_non_consumed_positional.suggestions:
+                return sorted(next_non_consumed_positional.suggestions)
+
+        consumed_dests = [
+            state.arg.dest
+            for state in self._last_keyword_states.values()
+            if state.consumed
+        ]
+
+        remaining_flags = [
+            flag for flag, arg in self._keyword.items() if arg.dest not in consumed_dests
+        ]
+
+        last = args[-1]
+        next_to_last = args[-2] if len(args) > 1 else ""
+        suggestions: list[str] = []
+
+        # Case 2: Mid-flag (e.g., "--ver")
+        if last.startswith("-") and last not in self._keyword:
+            if (
+                len(args) > 1
+                and next_to_last in self._keyword
+                and next_to_last in remaining_flags
+            ):
+                # If the last token is a mid-flag, suggest based on the previous flag
+                arg = self._keyword[next_to_last]
+                if arg.choices:
+                    suggestions.extend(arg.choices)
+                elif arg.suggestions:
+                    suggestions.extend(arg.suggestions)
+            else:
+                possible_flags = [
+                    flag
+                    for flag, arg in self._keyword.items()
+                    if flag.startswith(last) and arg.dest not in consumed_dests
+                ]
+                suggestions.extend(possible_flags)
+        # Case 3: Flag that expects a value (e.g., ["--tag"])
+        elif last in self._keyword:
+            arg = self._keyword[last]
+            if arg.choices:
+                suggestions.extend(arg.choices)
+            elif arg.suggestions:
+                suggestions.extend(arg.suggestions)
+        # Case 4: Last flag with choices mid-choice (e.g., ["--tag", "v"])
+        elif next_to_last in self._keyword:
+            arg = self._keyword[next_to_last]
+            if arg.choices and last not in arg.choices:
+                suggestions.extend(arg.choices)
+            elif (
+                arg.suggestions
+                and last not in arg.suggestions
+                and not any(last.startswith(suggestion) for suggestion in arg.suggestions)
+                and any(suggestion.startswith(last) for suggestion in arg.suggestions)
+            ):
+                suggestions.extend(arg.suggestions)
+            else:
+                suggestions.extend(remaining_flags)
+        # Case 5: Suggest all remaining flags
+        else:
+            suggestions.extend(remaining_flags)
+
+        return sorted(set(suggestions))
+
     def get_options_text(self, plain_text=False) -> str:
         # Options
         # Add all keyword arguments to the options list

falyx/parser/signature.py

@@ -54,8 +54,10 @@ def infer_args_from_func(
         if arg_type is bool:
             if param.default is False:
                 action = "store_true"
-            else:
+                default = None
+            elif param.default is True:
                 action = "store_false"
+                default = None
 
         if arg_type is list:
             action = "append"
@@ -75,6 +77,7 @@ def infer_args_from_func(
                 "action": action,
                 "help": metadata.get("help", ""),
                 "choices": metadata.get("choices"),
+                "suggestions": metadata.get("suggestions"),
             }
         )
 

falyx/version.py

@@ -1 +1 @@
-__version__ = "0.1.61"
+__version__ = "0.1.63"

{falyx-0.1.61.dist-info → falyx-0.1.63.dist-info}/METADATA

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

{falyx-0.1.61.dist-info → falyx-0.1.63.dist-info}/RECORD

@@ -4,13 +4,13 @@ falyx/__main__.py,sha256=xHO4pB45rccixo-ougF84QJeB36ef8mEZXWVK_CJL9M,3420
 falyx/action/.pytyped,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 falyx/action/__init__.py,sha256=_DfOQkNOCTmtC8DmS4rD4h5Vv9tmf0dab6VVyvvdQWU,1464
 falyx/action/action.py,sha256=Pm9lnxKhJoI1vs-fadAJrXkcDGYcBCMwvQ81HHxd0HA,5879
-falyx/action/action_factory.py,sha256=WosLeaYf79e83XHAAkxKi62zi8jJEiVlzvgOC84Z7t0,4840
-falyx/action/action_group.py,sha256=RQdHOWCa8XRUme3S5YGJTICLozIApAlIpRUgEeFaiyw,7728
+falyx/action/action_factory.py,sha256=hxSN1PVVnsZ7mYhO0CqbFjcNBPkPRCHZ9JZ0vvwly38,5103
+falyx/action/action_group.py,sha256=TBovifJ-HIBTBt_uBcoGXmj3MYpG8NdH37bIB5Q0e6Y,7992
 falyx/action/action_mixins.py,sha256=oUrjbweCeateshg3tqtbQiGuV8u4GvlioIZCUr9D1m4,1244
-falyx/action/action_types.py,sha256=TjUdwbnWVNzp5B5pFjgwRdA-P-MiY4bwe1dRSz-Ur3s,2318
+falyx/action/action_types.py,sha256=3dT3k4c4aYcuuqcxPXPYO-YLuOqwNTApRAS9alnljoA,2392
 falyx/action/base_action.py,sha256=o9Nml70-SEVTXnu9J0-VYnO-t5wZZM0o59lYDth24Po,5829
-falyx/action/chained_action.py,sha256=TNJz25jnzQQAIwXM6uaK8mzhq4bgRks5n7IZ2nDQM6Q,9614
-falyx/action/confirm_action.py,sha256=rBtkaMuMYJEXcLu5VeWA0YPO6Yvj0gJBiGDAfoAkCEI,8601
+falyx/action/chained_action.py,sha256=hAFjdUUXhPBIR8AEPV4G3tJq_tjZPrxc6Xk8we2KZNw,9981
+falyx/action/confirm_action.py,sha256=deyqeO_dYLdumkQD1Io2BajtZ9LkM6MLqTB_9UlEP-o,9385
 falyx/action/fallback_action.py,sha256=3FGWfoR1MIgY0ZkDNOpKu8p3JqPWzh5ON3943mfgDGs,1708
 falyx/action/http_action.py,sha256=DNeSBWh58UTFGlfFyTk2GnhS54hpLAJLC0QNbq2cYic,5799
 falyx/action/io_action.py,sha256=V888tQgAynqsVvkhICnEeE4wRs2vvdTcdlEpDSEbHqo,6128
@@ -18,7 +18,7 @@ falyx/action/literal_input_action.py,sha256=ShXXiUYKg01BMZRChlxEWlNcaLXV1B1LW-w5
 falyx/action/load_file_action.py,sha256=HcwSVWI8-4_dp3VC4iHR3ARaTpY0Y1rChMqpyqQjIGg,8091
 falyx/action/menu_action.py,sha256=UwMF3Y3v8AWXGCkVpzj_k3pCge5BlJvKhqGYXh_dNCc,5775
 falyx/action/process_action.py,sha256=nUNcJD6Ms34vmj8njWzv1R1P9xJTyJmelnyJksHcp7M,4666
-falyx/action/process_pool_action.py,sha256=XeL6e7vsy4OkOWGQHD0ET14CzuyJ0TL-c1W5VIgdCP8,6204
+falyx/action/process_pool_action.py,sha256=bBemgzB_shJfPytjbn1n6g9ScrpqrxMCujZU-I-UFf0,6152
 falyx/action/prompt_menu_action.py,sha256=PTn6US8ql5SU7ilEMVCeoGqKTc31be3AbdCfcrZ6ujU,5034
 falyx/action/save_file_action.py,sha256=Pe_j0hZjDNsO14bykzVYM0gkWB3zmpB1cExSN01IQOI,9899
 falyx/action/select_file_action.py,sha256=PcV22_wiPeDoJLIhHRiEUmW8N3pYeqQZMVTscQKXuas,9867
@@ -28,15 +28,14 @@ falyx/action/signal_action.py,sha256=GxV-0zqYqODOQUa3-tvFTZ2AS1W1QpW6ExonxmWNWbs
 falyx/action/user_input_action.py,sha256=Up47lumscxnhORMvaft0X-NWpxTXc2GmMZMua__pGhA,3524
 falyx/bottom_bar.py,sha256=B62N3YCQF_h2Rw_hpc2_FUuLNARI-XIGbQkg-1XvaYE,7405
 falyx/command.py,sha256=QdcwLEFIaq3a4Lfot4cV3zHbVJNQxwSpShprBgLBkh8,16891
-falyx/completer.py,sha256=EODbakx5PFAwjNcfuUZPFuSx2Q9MXBlWRZJ2LejF6DI,1686
+falyx/completer.py,sha256=tCePNM6NoVmgbDobE6HSrR34KiJ9N5GwXYL2lcdqCfk,2461
 falyx/config.py,sha256=OFEq9pFhV39o6_D7dP_QUDjqEusSQNpgomRsh5AAZYY,9621
 falyx/console.py,sha256=WIZ004R9x6DJp2g3onBQ4DOJ7iDeTOr8HqJCwRt30Rc,143
 falyx/context.py,sha256=M7iWEKto_NwI3GM-VCDPwXT0dBpFPf1Y_RvHQKodZgI,10804
 falyx/debug.py,sha256=pguI0XQcZ-7jte5YUPexAufa1oxxalYO1JgmO6GU3rI,1557
 falyx/exceptions.py,sha256=58D4BYkyJ7PlpZoNk37GsUsFThm_gIlb2Ex2XXhLklI,1099
 falyx/execution_registry.py,sha256=RLRMOEmfDElFy4tuC8L9tRyNToX7GJ4GoEBh2Iri8zo,7662
-falyx/falyx.py,sha256=6hKcD1RC-jTPA0WiF9JJ31QkacNJAJwqoqO1zhegwoM,49332
-falyx/falyx_completer.py,sha256=MsfuZXpfGwbsGG-4Zp-j-vNsNnaote-UAJkJh0s2NZI,5236
+falyx/falyx.py,sha256=WajWR9MZwZAno4gnXQR-RCIS4hEqiY25Egrfu6Wz2ls,49290
 falyx/hook_manager.py,sha256=TFuHQnAncS_rk6vuw-VSx8bnAppLuHfrZCrzLwqcO9o,2979
 falyx/hooks.py,sha256=xMfQROib0BNsaQF4AXJpmCiGePoE1f1xpcdibgnVZWM,2913
 falyx/init.py,sha256=fZ8cvJ9rTGOhvAiAUmA7aPw9FsOUIuobTPW3sz47My8,3287
@@ -45,12 +44,12 @@ falyx/menu.py,sha256=9kvLZhkC8PoSQvv1NZQsPIFSDy11dXfFgqVAuDmtfsM,3752
 falyx/options_manager.py,sha256=dFAnQw543tQ6Xupvh1PwBrhiSWlSACHw8K-sHP_lUh4,2842
 falyx/parser/.pytyped,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 falyx/parser/__init__.py,sha256=NbxAovKIY-duFTs6DAsdM_OzL7s3VIu19KMOmltX9ts,512
-falyx/parser/argument.py,sha256=MIKUj-hrdLDUK8xuW84_l9ms_t5CoNFpVDmxMZIbW-I,4105
+falyx/parser/argument.py,sha256=pX1qTAtsqw2qBlu8dKRdIfViNC3Pg3QZtdUb7ZTT5oc,4226
 falyx/parser/argument_action.py,sha256=Lcpb9siYr_q2T8qU-jXVtqFb11bFPPKEGH3gurJv2NM,757
-falyx/parser/command_argument_parser.py,sha256=W6vfj5acUx9wiA5TDjDO3CYlzsgGHrMM86-Gs19q-Eo,41482
+falyx/parser/command_argument_parser.py,sha256=n6yTIGuwproH0RC2ZJ1T4RNpr97OVs4kt8GxVB2pbcw,46092
 falyx/parser/parser_types.py,sha256=DLLuIXE8cAVLS41trfsNy-XJmtqSa1HfnJVAYIIc42w,315
 falyx/parser/parsers.py,sha256=vb-l_NNh5O9L98Lcafhz91flRLxC1BnW6U8JdeabRCw,14118
-falyx/parser/signature.py,sha256=fSltLEr8ctj1qpbU-OvTMnREjlb8OTG5t-guJFR7j4E,2529
+falyx/parser/signature.py,sha256=yGcd_Clcoz1YmbCgmP61MR2aNU5H6X_PhdW1fW6pvKs,2673
 falyx/parser/utils.py,sha256=GlxB1WORwoJ5XUtmmAVBUPaDV2nF9Hio7TbvNJvd8oY,3006
 falyx/prompt_utils.py,sha256=qgk0bXs7mwzflqzWyFhEOTpKQ_ZtMIqGhKeg-ocwNnE,1542
 falyx/protocols.py,sha256=vd9JL-TXdLEiAQXLw2UKLd3MUMivoG7iMLo08ZggwYQ,539
@@ -63,9 +62,9 @@ falyx/themes/__init__.py,sha256=1CZhEUCin9cUk8IGYBUFkVvdHRNNJBEFXccHwpUKZCA,284
 falyx/themes/colors.py,sha256=4aaeAHJetmeNInI0Zytg4E3YqKfPFelpf04vtjSvsS8,19776
 falyx/utils.py,sha256=U45xnZFUdoFC4xiji_9S1jHS5V7MvxSDtufP8EgB0SM,6732
 falyx/validators.py,sha256=AXpMGnk1_7J7MAbbol6pkMAiSIdNHoF5pwtA2-xS6H8,6029
-falyx/version.py,sha256=CjOPJsj7rCFM2zpom_253GmmHGb2RQ8NuZwsEg0ZmF0,23
-falyx-0.1.61.dist-info/LICENSE,sha256=B0yqgaHuSdhN7T3OBmgQSiDTy8HqT5Oe_dLypRe4Ra4,1073
-falyx-0.1.61.dist-info/METADATA,sha256=JdPjGhW2VQKmq-EPF5IfR5m7lRVx8Xlq6Yb4hb11WR4,5561
-falyx-0.1.61.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-falyx-0.1.61.dist-info/entry_points.txt,sha256=j8owOSl2j1Ss8DtGMnKfgehKaolqnIPhVFHaUBLUnMs,45
-falyx-0.1.61.dist-info/RECORD,,
+falyx/version.py,sha256=cTmhGBJnpgNHayq6sOIrPTQIgyT8ZhqsvcCSuLORZYQ,23
+falyx-0.1.63.dist-info/LICENSE,sha256=B0yqgaHuSdhN7T3OBmgQSiDTy8HqT5Oe_dLypRe4Ra4,1073
+falyx-0.1.63.dist-info/METADATA,sha256=-gRHGPkv51x3udjxmGyVcavpHi1SlOSZj_EyIUvM40s,5561
+falyx-0.1.63.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+falyx-0.1.63.dist-info/entry_points.txt,sha256=j8owOSl2j1Ss8DtGMnKfgehKaolqnIPhVFHaUBLUnMs,45
+falyx-0.1.63.dist-info/RECORD,,

falyx/falyx_completer.py

@@ -1,128 +0,0 @@
-from collections import Counter
-from prompt_toolkit.completion import Completer, Completion
-from prompt_toolkit.document import Document
-from typing import Iterable, Set, Optional
-import shlex
-
-from falyx.command import Command
-from falyx.parser.command_argument_parser import CommandArgumentParser
-from falyx.parser.argument import Argument
-from falyx.parser.argument_action import ArgumentAction
-
-class FalyxCompleter(Completer):
-    """Completer for Falyx commands and their arguments."""
-    def __init__(self, falyx: "Falyx"):
-        self.falyx = falyx
-        self._used_args: Set[str] = set()
-        self._used_args_counter: Counter = Counter()
-
-    def get_completions(self, document: Document, complete_event) -> Iterable[Completion]:
-        text = document.text_before_cursor
-        try:
-            tokens = shlex.split(text)
-            cursor_at_end_of_token = document.text_before_cursor.endswith((' ', '\t'))
-        except ValueError:
-            return
-
-        if not tokens or (len(tokens) == 1 and not cursor_at_end_of_token):
-            # Suggest command keys and aliases
-            yield from self._suggest_commands(tokens[0] if tokens else "")
-            return
-
-        command = self._match_command(tokens[0])
-        if not command:
-            return
-
-        if command.arg_parser is None:
-            return
-
-        self._set_used_args(tokens, command)
-
-        next_arg = self._next_expected_argument(tokens, command.arg_parser)
-
-        if next_arg:
-            # Positional arguments or required flagged arguments
-            yield from self._suggest_argument(next_arg, document)
-        else:
-            # Optional arguments
-            for arg in command.arg_parser._keyword.values():
-                if not self._arg_already_used(arg.dest):
-                    yield from self._suggest_argument(arg, document)
-
-    def _set_used_args(self, tokens: list[str], command: Command) -> None:
-        """Extracts used argument flags from the provided tokens."""
-        if not command.arg_parser:
-            return
-        self._used_args.clear()
-        self._used_args_counter.clear()
-        for token in tokens[1:]:
-            if token.startswith('-'):
-                if keyword_argument := command.arg_parser._keyword.get(token):
-                    self._used_args_counter[keyword_argument.dest] += 1
-                    if isinstance(keyword_argument.nargs, int) and self._used_args_counter[keyword_argument.dest] > keyword_argument.nargs:
-                        continue
-                    elif isinstance(keyword_argument.nargs, str) and keyword_argument.nargs in ("?"):
-                        self._used_args.add(keyword_argument.dest)
-                    else:
-                        self._used_args.add(keyword_argument.dest)
-            else:
-                # Handle positional arguments
-                if command.arg_parser._positional:
-                    for arg in command.arg_parser._positional.values():
-                        if arg.dest not in self._used_args:
-                            self._used_args.add(arg.dest)
-                            break
-        print(f"Used args: {self._used_args}, Counter: {self._used_args_counter}")
-
-    def _suggest_commands(self, prefix: str) -> Iterable[Completion]:
-        prefix = prefix.upper()
-        seen = set()
-        for cmd in self.falyx.commands.values():
-            for key in [cmd.key] + cmd.aliases:
-                if key.upper().startswith(prefix) and key not in seen:
-                    yield Completion(key, start_position=-len(prefix))
-                    seen.add(key)
-
-    def _match_command(self, token: str) -> Optional[Command]:
-        token = token.lstrip("?").upper()
-        return self.falyx._name_map.get(token)
-
-    def _next_expected_argument(
-        self, tokens: list[str], parser: CommandArgumentParser
-    ) -> Optional[Argument]:
-        """Determine the next expected argument based on the current tokens."""
-        # Positional arguments first
-        for arg in parser._positional.values():
-            if arg.dest not in self._used_args:
-                return arg
-
-        # Then required keyword arguments
-        for arg in parser._keyword_list:
-            if arg.required and not self._arg_already_used(arg.dest):
-                return arg
-
-        return None
-
-    def _arg_already_used(self, dest: str) -> bool:
-        print(f"Checking if argument '{dest}' is already used: {dest in self._used_args} - Used args: {self._used_args}")
-        return dest in self._used_args
-
-    def _suggest_argument(self, arg: Argument, document: Document) -> Iterable[Completion]:
-        if not arg.positional:
-            for flag in arg.flags:
-                yield Completion(flag, start_position=0)
-
-        if arg.choices:
-            for choice in arg.choices:
-                yield Completion(
-                    choice,
-                    start_position=0,
-                    display=f"{arg.dest}={choice}"
-                )
-
-        if arg.default is not None and arg.action == ArgumentAction.STORE:
-            yield Completion(
-                str(arg.default),
-                start_position=0,
-                display=f"{arg.dest} (default: {arg.default})"
-            )