falyx 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

falyx/falyx.py

@@ -83,8 +83,12 @@ class CommandValidator(Validator):
         self.falyx = falyx
         self.error_message = error_message
 
-    def validate(self, _) -> None:
-        pass
+    def validate(self, document) -> None:
+        if not document.text:
+            raise ValidationError(
+                message=self.error_message,
+                cursor_position=len(document.text),
+            )
 
     async def validate_async(self, document) -> None:
         text = document.text
@@ -742,12 +746,10 @@ class Falyx:
         """
         table = Table(title=self.title, show_header=False, box=box.SIMPLE)  # type: ignore[arg-type]
         visible_commands = [item for item in self.commands.items() if not item[1].hidden]
-        space = self.console.width // self.columns
         for chunk in chunks(visible_commands, self.columns):
             row = []
             for key, command in chunk:
-                cell = f"[{key}] [{command.style}]{command.description}"
-                row.append(f"{cell:<{space}}")
+                row.append(f"[{key}] [{command.style}]{command.description}")
             table.add_row(*row)
         bottom_row = self.get_bottom_row()
         for row in chunks(bottom_row, self.columns):
@@ -807,7 +809,7 @@ class Falyx:
                 args, kwargs = await name_map[choice].parse_args(
                     input_args, from_validate
                 )
-            except CommandArgumentError as error:
+            except (CommandArgumentError, Exception) as error:
                 if not from_validate:
                     name_map[choice].show_help()
                     self.console.print(f"[{OneColors.DARK_RED}]❌ [{choice}]: {error}")

falyx/parsers/argparse.py

@@ -292,10 +292,10 @@ class CommandArgumentParser:
             if not isinstance(choice, expected_type):
                 try:
                     coerce_value(choice, expected_type)
-                except Exception:
+                except Exception as error:
                     raise CommandArgumentError(
-                        f"Invalid choice {choice!r}: not coercible to {expected_type.__name__}"
-                    )
+                        f"Invalid choice {choice!r}: not coercible to {expected_type.__name__} error: {error}"
+                    ) from error
         return choices
 
     def _validate_default_type(
@@ -305,10 +305,10 @@ class CommandArgumentParser:
         if default is not None and not isinstance(default, expected_type):
             try:
                 coerce_value(default, expected_type)
-            except Exception:
+            except Exception as error:
                 raise CommandArgumentError(
-                    f"Default value {default!r} for '{dest}' cannot be coerced to {expected_type.__name__}"
-                )
+                    f"Default value {default!r} for '{dest}' cannot be coerced to {expected_type.__name__} error: {error}"
+                ) from error
 
     def _validate_default_list_type(
         self, default: list[Any], expected_type: type, dest: str
@@ -318,10 +318,10 @@ class CommandArgumentParser:
                 if not isinstance(item, expected_type):
                     try:
                         coerce_value(item, expected_type)
-                    except Exception:
+                    except Exception as error:
                         raise CommandArgumentError(
-                            f"Default list value {default!r} for '{dest}' cannot be coerced to {expected_type.__name__}"
-                        )
+                            f"Default list value {default!r} for '{dest}' cannot be coerced to {expected_type.__name__} error: {error}"
+                        ) from error
 
     def _validate_resolver(
         self, action: ArgumentAction, resolver: BaseAction | None
@@ -597,10 +597,10 @@ class CommandArgumentParser:
 
             try:
                 typed = [coerce_value(value, spec.type) for value in values]
-            except Exception:
+            except Exception as error:
                 raise CommandArgumentError(
-                    f"Invalid value for '{spec.dest}': expected {spec.type.__name__}"
-                )
+                    f"Invalid value for '{spec.dest}': {error}"
+                ) from error
             if spec.action == ArgumentAction.ACTION:
                 assert isinstance(
                     spec.resolver, BaseAction
@@ -684,10 +684,10 @@ class CommandArgumentParser:
                         typed_values = [
                             coerce_value(value, spec.type) for value in values
                         ]
-                    except ValueError:
+                    except ValueError as error:
                         raise CommandArgumentError(
-                            f"Invalid value for '{spec.dest}': expected {spec.type.__name__}"
-                        )
+                            f"Invalid value for '{spec.dest}': {error}"
+                        ) from error
                     try:
                         result[spec.dest] = await spec.resolver(*typed_values)
                     except Exception as error:
@@ -715,10 +715,10 @@ class CommandArgumentParser:
                         typed_values = [
                             coerce_value(value, spec.type) for value in values
                         ]
-                    except ValueError:
+                    except ValueError as error:
                         raise CommandArgumentError(
-                            f"Invalid value for '{spec.dest}': expected {spec.type.__name__}"
-                        )
+                            f"Invalid value for '{spec.dest}': {error}"
+                        ) from error
                     if spec.nargs is None:
                         result[spec.dest].append(spec.type(values[0]))
                     else:
@@ -732,10 +732,10 @@ class CommandArgumentParser:
                         typed_values = [
                             coerce_value(value, spec.type) for value in values
                         ]
-                    except ValueError:
+                    except ValueError as error:
                         raise CommandArgumentError(
-                            f"Invalid value for '{spec.dest}': expected {spec.type.__name__}"
-                        )
+                            f"Invalid value for '{spec.dest}': {error}"
+                        ) from error
                     result[spec.dest].extend(typed_values)
                     consumed_indices.update(range(i, new_i))
                     i = new_i
@@ -745,10 +745,10 @@ class CommandArgumentParser:
                         typed_values = [
                             coerce_value(value, spec.type) for value in values
                         ]
-                    except ValueError:
+                    except ValueError as error:
                         raise CommandArgumentError(
-                            f"Invalid value for '{spec.dest}': expected {spec.type.__name__}"
-                        )
+                            f"Invalid value for '{spec.dest}': {error}"
+                        ) from error
                     if not typed_values and spec.nargs not in ("*", "?"):
                         raise CommandArgumentError(
                             f"Expected at least one value for '{spec.dest}'"

falyx/parsers/signature.py

@@ -31,11 +31,16 @@ def infer_args_from_func(
         ):
             continue
 
-        arg_type = (
-            param.annotation if param.annotation is not inspect.Parameter.empty else str
-        )
-        if isinstance(arg_type, str):
-            arg_type = str
+        if metadata.get("type"):
+            arg_type = metadata["type"]
+        else:
+            arg_type = (
+                param.annotation
+                if param.annotation is not inspect.Parameter.empty
+                else str
+            )
+            if isinstance(arg_type, str):
+                arg_type = str
         default = param.default if param.default is not inspect.Parameter.empty else None
         is_required = param.default is inspect.Parameter.empty
         if is_required:

falyx/version.py

@@ -1 +1 @@
-__version__ = "0.1.46"
+__version__ = "0.1.48"

{falyx-0.1.46.dist-info → falyx-0.1.48.dist-info}/METADATA

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

{falyx-0.1.46.dist-info → falyx-0.1.48.dist-info}/RECORD

@@ -29,7 +29,7 @@ falyx/context.py,sha256=NfBpxzFzn-dYP6I3wrtGFucqm__UZo4SSBLmM8yYayE,10330
 falyx/debug.py,sha256=IRpYtdH8yeXJEsfP5rASALmBQb2U_EwrTudF2GIDdZY,1545
 falyx/exceptions.py,sha256=kK9k1v7LVNjJSwYztRa9Krhr3ZOI-6Htq2ZjlYICPKg,922
 falyx/execution_registry.py,sha256=rctsz0mrIHPToLZqylblVjDdKWdq1x_JBc8GwMP5sJ8,4710
-falyx/falyx.py,sha256=59Dqh8U7sR4MZcklmNoJJVEOGcpUULWiEcy-uGZeQ0U,48002
+falyx/falyx.py,sha256=7MeQUdvJd71tamEZoNmgkJgWmLOJaveLU5NSjPctDpk,48091
 falyx/hook_manager.py,sha256=TFuHQnAncS_rk6vuw-VSx8bnAppLuHfrZCrzLwqcO9o,2979
 falyx/hooks.py,sha256=xMfQROib0BNsaQF4AXJpmCiGePoE1f1xpcdibgnVZWM,2913
 falyx/init.py,sha256=VZ3rYMxo7g01EraYATdl_pRN4ZqrsVueo2ZFx54gojo,3326
@@ -38,9 +38,9 @@ falyx/menu.py,sha256=E580qZsx08bnWcqRVjJuD2Fy8Zh_1zIexp5f0lC7L2c,3745
 falyx/options_manager.py,sha256=dFAnQw543tQ6Xupvh1PwBrhiSWlSACHw8K-sHP_lUh4,2842
 falyx/parsers/.pytyped,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 falyx/parsers/__init__.py,sha256=ZfPmbtEUechDvgl99-lWhTXmFnXS_FMXJ_xb8KGEJLo,448
-falyx/parsers/argparse.py,sha256=lXhGvumL2XRHhJzE0anVnTy23XZLikCn7nZAkMf8ZdE,37301
+falyx/parsers/argparse.py,sha256=5fIGDLrI-Aec0pTgDDTg5crGrHjE-EPadpSJmT8H-Ac,37396
 falyx/parsers/parsers.py,sha256=MXWC8OQ3apDaeKfY0O4J8NnkxofWVOCRnKatC00lGm0,8796
-falyx/parsers/signature.py,sha256=PfDe432PYcJDhDXguNzumFqWjDLk13s6jhZF33r__AM,2326
+falyx/parsers/signature.py,sha256=cCa-yKUcbbET0Ho45oFZWWHFGCX5a_LaAOWRP7b87po,2465
 falyx/parsers/utils.py,sha256=w_UzvvP62EDKXWSf3jslEsJfd45usGyFqXKNziQhLRI,2893
 falyx/prompt_utils.py,sha256=qgk0bXs7mwzflqzWyFhEOTpKQ_ZtMIqGhKeg-ocwNnE,1542
 falyx/protocols.py,sha256=-9GbCBUzzsEgw2_KOCYqxxzWJuez0eHmwnZp_ShY0jc,493
@@ -53,9 +53,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=t5iyzVpY8tdC4rfhr4isEfWpD5gNTzjeX_Hbi_Uq6sA,1328
-falyx/version.py,sha256=X3e_85I7oZGwZD8nW9SBKEUbQU7-_3W9FXuicrfxHjc,23
-falyx-0.1.46.dist-info/LICENSE,sha256=B0yqgaHuSdhN7T3OBmgQSiDTy8HqT5Oe_dLypRe4Ra4,1073
-falyx-0.1.46.dist-info/METADATA,sha256=sKgexNI7YEsZiUNO2LTxZSmlJheEm_nj0WnVkZsZXhI,5561
-falyx-0.1.46.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-falyx-0.1.46.dist-info/entry_points.txt,sha256=j8owOSl2j1Ss8DtGMnKfgehKaolqnIPhVFHaUBLUnMs,45
-falyx-0.1.46.dist-info/RECORD,,
+falyx/version.py,sha256=HQG3McjdVzmICa25LtGfE6oXxlwg6YdEcj9EoChMH00,23
+falyx-0.1.48.dist-info/LICENSE,sha256=B0yqgaHuSdhN7T3OBmgQSiDTy8HqT5Oe_dLypRe4Ra4,1073
+falyx-0.1.48.dist-info/METADATA,sha256=t0yc7XPob84f7Rd4Nh3d0u1NhHYawf9w18jALzc1yII,5561
+falyx-0.1.48.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+falyx-0.1.48.dist-info/entry_points.txt,sha256=j8owOSl2j1Ss8DtGMnKfgehKaolqnIPhVFHaUBLUnMs,45
+falyx-0.1.48.dist-info/RECORD,,