falyx 0.1.60__tar.gz → 0.1.62__tar.gz

{falyx-0.1.60 → falyx-0.1.62}/PKG-INFO

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

{falyx-0.1.60 → falyx-0.1.62}/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-0.1.60 → falyx-0.1.62}/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-0.1.60 → falyx-0.1.62}/falyx/action/action_types.py

@@ -52,3 +52,33 @@ class SelectionReturnType(Enum):
     def _missing_(cls, value: object) -> SelectionReturnType:
         valid = ", ".join(member.value for member in cls)
         raise ValueError(f"Invalid DictReturnType: '{value}'. Must be one of: {valid}")
+
+
+class ConfirmType(Enum):
+    """Enum for different confirmation types."""
+
+    YES_NO = "yes_no"
+    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]:
+        """Return a list of all hook type choices."""
+        return list(cls)
+
+    def __str__(self) -> str:
+        """Return the string representation of the confirm type."""
+        return self.value
+
+    @classmethod
+    def _missing_(cls, value: object) -> ConfirmType:
+        if isinstance(value, str):
+            for member in cls:
+                if member.value == value.lower():
+                    return member
+        valid = ", ".join(member.value for member in cls)
+        raise ValueError(f"Invalid ConfirmType: '{value}'. Must be one of: {valid}")

{falyx-0.1.60 → falyx-0.1.62}/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-0.1.60 → falyx-0.1.62}/falyx/action/confirm_action.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from enum import Enum
 from typing import Any
 
 from prompt_toolkit import PromptSession
 from rich.tree import Tree
 
+from falyx.action.action_types import ConfirmType
 from falyx.action.base_action import BaseAction
 from falyx.context import ExecutionContext
 from falyx.execution_registry import ExecutionRegistry as er
@@ -17,25 +17,6 @@ from falyx.themes import OneColors
 from falyx.validators import word_validator, words_validator
 
 
-class ConfirmType(Enum):
-    """Enum for different confirmation types."""
-
-    YES_NO = "yes_no"
-    YES_CANCEL = "yes_cancel"
-    YES_NO_CANCEL = "yes_no_cancel"
-    TYPE_WORD = "type_word"
-    OK_CANCEL = "ok_cancel"
-
-    @classmethod
-    def choices(cls) -> list[ConfirmType]:
-        """Return a list of all hook type choices."""
-        return list(cls)
-
-    def __str__(self) -> str:
-        """Return the string representation of the confirm type."""
-        return self.value
-
-
 class ConfirmAction(BaseAction):
     """
     Action to confirm an operation with the user.
@@ -66,7 +47,7 @@ class ConfirmAction(BaseAction):
         message: str = "Confirm?",
         confirm_type: ConfirmType | str = ConfirmType.YES_NO,
         prompt_session: PromptSession | None = None,
-        confirm: bool = True,
+        never_prompt: bool = False,
         word: str = "CONFIRM",
         return_last_result: bool = False,
         inject_last_result: bool = True,
@@ -88,11 +69,11 @@ class ConfirmAction(BaseAction):
             name=name,
             inject_last_result=inject_last_result,
             inject_into=inject_into,
+            never_prompt=never_prompt,
         )
         self.message = message
         self.confirm_type = self._coerce_confirm_type(confirm_type)
         self.prompt_session = prompt_session or PromptSession()
-        self.confirm = confirm
         self.word = word
         self.return_last_result = return_last_result
 
@@ -131,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,
@@ -150,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}")
 
@@ -165,14 +160,12 @@ class ConfirmAction(BaseAction):
         try:
             await self.hooks.trigger(HookType.BEFORE, context)
             if (
-                not self.confirm
+                self.never_prompt
                 or self.options_manager
-                and not should_prompt_user(
-                    confirm=self.confirm, options=self.options_manager
-                )
+                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:
@@ -209,8 +202,8 @@ 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:[/] {'Yes' if self.confirm else 'No'}")
-        if self.confirm_type == ConfirmType.TYPE_WORD:
+        tree.add(f"[bold]Prompt Required:[/] {'No' if self.never_prompt else 'Yes'}")
+        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-0.1.60 → falyx-0.1.62}/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-0.1.60 → falyx-0.1.62}/falyx/parser/command_argument_parser.py

@@ -395,7 +395,7 @@ class CommandArgumentParser:
         help: str = "",
         dest: str | None = None,
         resolver: BaseAction | None = None,
-        lazy_resolver: bool = False,
+        lazy_resolver: bool = True,
     ) -> None:
         """Add an argument to the parser.
         For `ArgumentAction.ACTION`, `nargs` and `type` determine how many and what kind
@@ -852,6 +852,10 @@ class CommandArgumentParser:
                     and spec.lazy_resolver
                     and from_validate
                 ):
+                    if not args:
+                        raise CommandArgumentError(
+                            f"Missing required argument '{spec.dest}': {spec.get_choice_text()}{help_text}"
+                        )
                     continue  # Lazy resolvers are not validated here
                 raise CommandArgumentError(
                     f"Missing required argument '{spec.dest}': {spec.get_choice_text()}{help_text}"

falyx-0.1.62/falyx/version.py

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

{falyx-0.1.60 → falyx-0.1.62}/pyproject.toml

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

falyx-0.1.60/falyx/version.py

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