falyx 0.1.55__py3-none-any.whl → 0.1.57__py3-none-any.whl

falyx/action/select_file_action.py

@@ -11,7 +11,6 @@ from typing import Any
 import toml
 import yaml
 from prompt_toolkit import PromptSession
-from rich.console import Console
 from rich.tree import Tree
 
 from falyx.action.action_types import FileType
@@ -51,7 +50,6 @@ class SelectFileAction(BaseAction):
         style (str): Style for the selection options.
         suffix_filter (str | None): Restrict to certain file types.
         return_type (FileType): What to return (path, content, parsed).
-        console (Console | None): Console instance for output.
         prompt_session (PromptSession | None): Prompt session for user input.
     """
 
@@ -69,7 +67,6 @@ class SelectFileAction(BaseAction):
         number_selections: int | str = 1,
         separator: str = ",",
         allow_duplicates: bool = False,
-        console: Console | None = None,
         prompt_session: PromptSession | None = None,
     ):
         super().__init__(name)
@@ -82,10 +79,6 @@ class SelectFileAction(BaseAction):
         self.number_selections = number_selections
         self.separator = separator
         self.allow_duplicates = allow_duplicates
-        if isinstance(console, Console):
-            self.console = console
-        elif console:
-            raise ValueError("`console` must be an instance of `rich.console.Console`")
         self.prompt_session = prompt_session or PromptSession()
         self.return_type = self._coerce_return_type(return_type)
 
@@ -165,6 +158,11 @@ class SelectFileAction(BaseAction):
         try:
             await self.hooks.trigger(HookType.BEFORE, context)
 
+            if not self.directory.exists():
+                raise FileNotFoundError(f"Directory {self.directory} does not exist.")
+            elif not self.directory.is_dir():
+                raise NotADirectoryError(f"{self.directory} is not a directory.")
+
             files = [
                 file
                 for file in self.directory.iterdir()
@@ -190,7 +188,6 @@ class SelectFileAction(BaseAction):
             keys = await prompt_for_selection(
                 (options | cancel_option).keys(),
                 table,
-                console=self.console,
                 prompt_session=self.prompt_session,
                 prompt_message=self.prompt_message,
                 number_selections=self.number_selections,

falyx/action/selection_action.py

@@ -3,7 +3,6 @@
 from typing import Any
 
 from prompt_toolkit import PromptSession
-from rich.console import Console
 from rich.tree import Tree
 
 from falyx.action.action_types import SelectionReturnType
@@ -54,7 +53,6 @@ class SelectionAction(BaseAction):
         inject_last_result: bool = False,
         inject_into: str = "last_result",
         return_type: SelectionReturnType | str = "value",
-        console: Console | None = None,
         prompt_session: PromptSession | None = None,
         never_prompt: bool = False,
         show_table: bool = True,
@@ -70,10 +68,6 @@ class SelectionAction(BaseAction):
         self.return_type: SelectionReturnType = self._coerce_return_type(return_type)
         self.title = title
         self.columns = columns
-        if isinstance(console, Console):
-            self.console = console
-        elif console:
-            raise ValueError("`console` must be an instance of `rich.console.Console`")
         self.prompt_session = prompt_session or PromptSession()
         self.default_selection = default_selection
         self.number_selections = number_selections
@@ -262,7 +256,6 @@ class SelectionAction(BaseAction):
                         len(self.selections),
                         table,
                         default_selection=effective_default,
-                        console=self.console,
                         prompt_session=self.prompt_session,
                         prompt_message=self.prompt_message,
                         show_table=self.show_table,
@@ -306,7 +299,6 @@ class SelectionAction(BaseAction):
                         (self.selections | cancel_option).keys(),
                         table,
                         default_selection=effective_default,
-                        console=self.console,
                         prompt_session=self.prompt_session,
                         prompt_message=self.prompt_message,
                         show_table=self.show_table,

falyx/action/user_input_action.py

@@ -2,7 +2,6 @@
 """user_input_action.py"""
 from prompt_toolkit import PromptSession
 from prompt_toolkit.validation import Validator
-from rich.console import Console
 from rich.tree import Tree
 
 from falyx.action.base_action import BaseAction
@@ -20,7 +19,6 @@ class UserInputAction(BaseAction):
         name (str): Action name.
         prompt_text (str): Prompt text (can include '{last_result}' for interpolation).
         validator (Validator, optional): Prompt Toolkit validator.
-        console (Console, optional): Rich console for rendering.
         prompt_session (PromptSession, optional): Reusable prompt session.
         inject_last_result (bool): Whether to inject last_result into prompt.
         inject_into (str): Key to use for injection (default: 'last_result').
@@ -33,7 +31,6 @@ class UserInputAction(BaseAction):
         prompt_text: str = "Input > ",
         default_text: str = "",
         validator: Validator | None = None,
-        console: Console | None = None,
         prompt_session: PromptSession | None = None,
         inject_last_result: bool = False,
     ):
@@ -43,10 +40,6 @@ class UserInputAction(BaseAction):
         )
         self.prompt_text = prompt_text
         self.validator = validator
-        if isinstance(console, Console):
-            self.console = console
-        elif console:
-            raise ValueError("`console` must be an instance of `rich.console.Console`")
         self.prompt_session = prompt_session or PromptSession()
         self.default_text = default_text
 

falyx/bottom_bar.py

@@ -5,8 +5,8 @@ from typing import Any, Callable
 
 from prompt_toolkit.formatted_text import HTML, merge_formatted_text
 from prompt_toolkit.key_binding import KeyBindings
-from rich.console import Console
 
+from falyx.console import console
 from falyx.options_manager import OptionsManager
 from falyx.themes import OneColors
 from falyx.utils import CaseInsensitiveDict, chunks
@@ -30,7 +30,7 @@ class BottomBar:
         key_validator: Callable[[str], bool] | None = None,
     ) -> None:
         self.columns = columns
-        self.console = Console(color_system="truecolor")
+        self.console: Console = console
         self._named_items: dict[str, Callable[[], HTML]] = {}
         self._value_getters: dict[str, Callable[[], Any]] = CaseInsensitiveDict()
         self.toggle_keys: list[str] = []

falyx/command.py

@@ -23,11 +23,11 @@ from typing import Any, Awaitable, Callable
 
 from prompt_toolkit.formatted_text import FormattedText
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, field_validator
-from rich.console import Console
 from rich.tree import Tree
 
 from falyx.action.action import Action
 from falyx.action.base_action import BaseAction
+from falyx.console import console
 from falyx.context import ExecutionContext
 from falyx.debug import register_debug_hooks
 from falyx.execution_registry import ExecutionRegistry as er
@@ -44,8 +44,6 @@ from falyx.signals import CancelSignal
 from falyx.themes import OneColors
 from falyx.utils import ensure_async
 
-console = Console(color_system="truecolor")
-
 
 class Command(BaseModel):
     """
@@ -91,6 +89,12 @@ class Command(BaseModel):
         logging_hooks (bool): Whether to attach logging hooks automatically.
         options_manager (OptionsManager): Manages global command-line options.
         arg_parser (CommandArgumentParser): Parses command arguments.
+        arguments (list[dict[str, Any]]): Argument definitions for the command.
+        argument_config (Callable[[CommandArgumentParser], None] | None): Function to configure arguments
+            for the command parser.
+        arg_metadata (dict[str, str | dict[str, Any]]): Metadata for arguments,
+            such as help text or choices.
+        simple_help_signature (bool): Whether to use a simplified help signature.
         custom_parser (ArgParserProtocol | None): Custom argument parser.
         custom_help (Callable[[], str | None] | None): Custom help message generator.
         auto_args (bool): Automatically infer arguments from the action.
@@ -227,7 +231,7 @@ class Command(BaseModel):
         if self.logging_hooks and isinstance(self.action, BaseAction):
             register_debug_hooks(self.action.hooks)
 
-        if self.arg_parser is None:
+        if self.arg_parser is None and not self.custom_parser:
             self.arg_parser = CommandArgumentParser(
                 command_key=self.key,
                 command_description=self.description,

falyx/completer.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import shlex
+from typing import TYPE_CHECKING, Iterable
+
+from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.document import Document
+
+if TYPE_CHECKING:
+    from falyx import Falyx
+
+
+class FalyxCompleter(Completer):
+    """Completer for Falyx commands."""
+
+    def __init__(self, falyx: "Falyx"):
+        self.falyx = falyx
+
+    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
+
+    def _suggest_commands(self, prefix: str) -> Iterable[Completion]:
+        prefix = prefix.upper()
+        keys = [self.falyx.exit_command.key]
+        keys.extend(self.falyx.exit_command.aliases)
+        if self.falyx.history_command:
+            keys.append(self.falyx.history_command.key)
+            keys.extend(self.falyx.history_command.aliases)
+        if self.falyx.help_command:
+            keys.append(self.falyx.help_command.key)
+            keys.extend(self.falyx.help_command.aliases)
+        for cmd in self.falyx.commands.values():
+            keys.append(cmd.key)
+            keys.extend(cmd.aliases)
+        for key in keys:
+            if key.upper().startswith(prefix):
+                yield Completion(key, start_position=-len(prefix))

falyx/config.py

@@ -11,18 +11,16 @@ from typing import Any, Callable
 import toml
 import yaml
 from pydantic import BaseModel, Field, field_validator, model_validator
-from rich.console import Console
 
 from falyx.action.action import Action
 from falyx.action.base_action import BaseAction
 from falyx.command import Command
+from falyx.console import console
 from falyx.falyx import Falyx
 from falyx.logger import logger
 from falyx.retry import RetryPolicy
 from falyx.themes import OneColors
 
-console = Console(color_system="truecolor")
-
 
 def wrap_if_needed(obj: Any, name=None) -> BaseAction | Command:
     if isinstance(obj, (BaseAction, Command)):

falyx/console.py

@@ -0,0 +1,5 @@
+from rich.console import Console
+
+from falyx.themes import get_nord_theme
+
+console = Console(color_system="truecolor", theme=get_nord_theme())

falyx/context.py

@@ -24,6 +24,8 @@ from typing import Any
 from pydantic import BaseModel, ConfigDict, Field
 from rich.console import Console
 
+from falyx.console import console
+
 
 class ExecutionContext(BaseModel):
     """
@@ -83,7 +85,7 @@ class ExecutionContext(BaseModel):
     index: int | None = None
 
     extra: dict[str, Any] = Field(default_factory=dict)
-    console: Console = Field(default_factory=lambda: Console(color_system="truecolor"))
+    console: Console = console
 
     shared_context: SharedContext | None = None
 

falyx/execution_registry.py

@@ -36,6 +36,7 @@ from rich import box
 from rich.console import Console
 from rich.table import Table
 
+from falyx.console import console
 from falyx.context import ExecutionContext
 from falyx.logger import logger
 from falyx.themes import OneColors

falyx/falyx.py

@@ -32,7 +32,6 @@ from functools import cached_property
 from typing import Any, Callable
 
 from prompt_toolkit import PromptSession
-from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.formatted_text import AnyFormattedText
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.patch_stdout import patch_stdout
@@ -46,6 +45,8 @@ from falyx.action.action import Action
 from falyx.action.base_action import BaseAction
 from falyx.bottom_bar import BottomBar
 from falyx.command import Command
+from falyx.completer import FalyxCompleter
+from falyx.console import console
 from falyx.context import ExecutionContext
 from falyx.debug import log_after, log_before, log_error, log_success
 from falyx.exceptions import (
@@ -63,7 +64,7 @@ from falyx.parser import CommandArgumentParser, FalyxParsers, get_arg_parsers
 from falyx.protocols import ArgParserProtocol
 from falyx.retry import RetryPolicy
 from falyx.signals import BackSignal, CancelSignal, HelpSignal, QuitSignal
-from falyx.themes import OneColors, get_nord_theme
+from falyx.themes import OneColors
 from falyx.utils import CaseInsensitiveDict, _noop, chunks
 from falyx.version import __version__
 
@@ -201,7 +202,7 @@ class Falyx:
         self.help_command: Command | None = (
             self._get_help_command() if include_help_command else None
         )
-        self.console: Console = Console(color_system="truecolor", theme=get_nord_theme())
+        self.console: Console = console
         self.welcome_message: str | Markdown | dict[str, Any] = welcome_message
         self.exit_message: str | Markdown | dict[str, Any] = exit_message
         self.hooks: HookManager = HookManager()
@@ -413,20 +414,9 @@ class Falyx:
             arg_parser=parser,
         )
 
-    def _get_completer(self) -> WordCompleter:
+    def _get_completer(self) -> FalyxCompleter:
         """Completer to provide auto-completion for the menu commands."""
-        keys = [self.exit_command.key]
-        keys.extend(self.exit_command.aliases)
-        if self.history_command:
-            keys.append(self.history_command.key)
-            keys.extend(self.history_command.aliases)
-        if self.help_command:
-            keys.append(self.help_command.key)
-            keys.extend(self.help_command.aliases)
-        for cmd in self.commands.values():
-            keys.append(cmd.key)
-            keys.extend(cmd.aliases)
-        return WordCompleter(keys, ignore_case=True)
+        return FalyxCompleter(self)
 
     def _get_validator_error_message(self) -> str:
         """Validator to check if the input is a valid command or toggle key."""
@@ -524,6 +514,8 @@ class Falyx:
                 bottom_toolbar=self._get_bottom_bar_render(),
                 key_bindings=self.key_bindings,
                 validate_while_typing=True,
+                interrupt_exception=QuitSignal,
+                eof_exception=QuitSignal,
             )
         return self._prompt_session
 

falyx/falyx_completer.py

@@ -1,53 +1,128 @@
-import shlex
-from typing import Iterable
-
+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):
-    def __init__(self, falyx: "Falyx") -> None:
+    """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, complete_event) -> Iterable[Completion]:
-        text = document.text_before_cursor.strip()
-        if not text:
-            yield from self._complete_command("")
-            return
-
+    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  # unmatched quotes or syntax error
+            return
 
-        if not tokens:
-            yield from self._complete_command("")
+        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_token = tokens[0]
-        command_key = command_token.lstrip("?").upper()
-        command = self.falyx._name_map.get(command_key)
+        command = self._match_command(tokens[0])
+        if not command:
+            return
 
-        if command is None:
-            yield from self._complete_command(command_token)
+        if command.arg_parser is None:
             return
 
-        used_flags = set(tokens[1:])  # simplistic
-        parser: CommandArgumentParser = command.arg_parser or CommandArgumentParser()
-        for arg in parser._keyword_list:
-            for flag in arg.flags:
-                if flag not in used_flags:
-                    yield Completion(flag, start_position=0)
+        self._set_used_args(tokens, command)
+
+        next_arg = self._next_expected_argument(tokens, command.arg_parser)
 
-        for dest, arg in parser._positional.items():
-            if dest not in used_flags:
-                yield Completion(arg.dest, start_position=0)
+        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 _complete_command(self, prefix: str) -> Iterable[Completion]:
+    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 not in seen and key.upper().startswith(prefix.upper()):
+                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})"
+            )

falyx/init.py

@@ -2,7 +2,7 @@
 """init.py"""
 from pathlib import Path
 
-from rich.console import Console
+from falyx.console import console
 
 TEMPLATE_TASKS = """\
 # This file is used by falyx.yaml to define CLI actions.
@@ -98,8 +98,6 @@ commands:
     aliases: [clean, cleanup]
 """
 
-console = Console(color_system="truecolor")
-
 
 def init_project(name: str) -> None:
     target = Path(name).resolve()

falyx/parser/argument.py

@@ -24,6 +24,7 @@ class Argument:
     nargs: int | str | None = None  # int, '?', '*', '+', None
     positional: bool = False  # True if no leading - or -- in flags
     resolver: BaseAction | None = None  # Action object for the argument
+    lazy_resolver: bool = False  # True if resolver should be called lazily
 
     def get_positional_text(self) -> str:
         """Get the positional text for the argument."""