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

falyx/action/action_types.py

@@ -52,3 +52,31 @@ 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"
+    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
+
+    @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/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
 
@@ -165,11 +146,9 @@ 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.",
@@ -209,7 +188,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:[/] {'Yes' if self.confirm else 'No'}")
+        tree.add(f"[bold]Prompt Required:[/] {'No' if self.never_prompt else 'Yes'}")
         if self.confirm_type == ConfirmType.TYPE_WORD:
             tree.add(f"[bold]Confirmation Word:[/] {self.word}")
         if parent is None:

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/version.py

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

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

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

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

@@ -7,10 +7,10 @@ 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_mixins.py,sha256=oUrjbweCeateshg3tqtbQiGuV8u4GvlioIZCUr9D1m4,1244
-falyx/action/action_types.py,sha256=TfzZ8y560h9RWu8Sh1HAbQVRlSAWJZcTdBMbQ-STbQY,1467
+falyx/action/action_types.py,sha256=TjUdwbnWVNzp5B5pFjgwRdA-P-MiY4bwe1dRSz-Ur3s,2318
 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=oXPnZswkQFJ-F-s73vddpF-BRg1wJeVnHjR4K2yN7ow,9085
+falyx/action/confirm_action.py,sha256=rBtkaMuMYJEXcLu5VeWA0YPO6Yvj0gJBiGDAfoAkCEI,8601
 falyx/action/fallback_action.py,sha256=3FGWfoR1MIgY0ZkDNOpKu8p3JqPWzh5ON3943mfgDGs,1708
 falyx/action/http_action.py,sha256=DNeSBWh58UTFGlfFyTk2GnhS54hpLAJLC0QNbq2cYic,5799
 falyx/action/io_action.py,sha256=V888tQgAynqsVvkhICnEeE4wRs2vvdTcdlEpDSEbHqo,6128
@@ -47,7 +47,7 @@ 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_action.py,sha256=Lcpb9siYr_q2T8qU-jXVtqFb11bFPPKEGH3gurJv2NM,757
-falyx/parser/command_argument_parser.py,sha256=lWPeoYj0NUMbBsXrf-Z3KUo4osYrRERoXA_Uu3HmF9w,41264
+falyx/parser/command_argument_parser.py,sha256=W6vfj5acUx9wiA5TDjDO3CYlzsgGHrMM86-Gs19q-Eo,41482
 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
@@ -63,9 +63,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=SH6dBtwKkjChke7DXHi0Y5HbtzV16-5wAfhv91d_D0A,23
-falyx-0.1.60.dist-info/LICENSE,sha256=B0yqgaHuSdhN7T3OBmgQSiDTy8HqT5Oe_dLypRe4Ra4,1073
-falyx-0.1.60.dist-info/METADATA,sha256=8GLh3rrDHvaz6XtiNJCau_CDE9iJGeHVYnlrDlFMXc4,5561
-falyx-0.1.60.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-falyx-0.1.60.dist-info/entry_points.txt,sha256=j8owOSl2j1Ss8DtGMnKfgehKaolqnIPhVFHaUBLUnMs,45
-falyx-0.1.60.dist-info/RECORD,,
+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,,