operx-cli 0.13.0__tar.gz → 0.13.1__tar.gz

{operx_cli-0.13.0 → operx_cli-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: operx-cli
-Version: 0.13.0
+Version: 0.13.1
 Summary: La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{operx_cli-0.13.0 → operx_cli-0.13.1}/operx_cli/__init__.py

@@ -2,4 +2,4 @@
 API (backend/users/api_allowlist.py) from a terminal, with a personal API
 token."""
 
-__version__ = "0.13.0"
+__version__ = "0.13.1"

{operx_cli-0.13.0 → operx_cli-0.13.1}/operx_cli/agent_guide.py

@@ -4,6 +4,8 @@ installed version."""
 
 from importlib.resources import files
 
+from .option_words import allowed_words
+
 ROOT_TITLE = "operx (opciones de cualquier comando)"
 
 
@@ -45,7 +47,7 @@ def _param_line(param):
         line = f"`{param.name.upper()}`"
     else:
         line = ", ".join(f"`{opt}`" for opt in param.opts)
-        choices = getattr(param.type, "choices", None)
+        choices = allowed_words(param)
         if choices:
             line = f"`{' '.join(param.opts)} [{'|'.join(str(choice) for choice in choices)}]`"
         elif not getattr(param, "is_flag", False):

operx_cli-0.13.1/operx_cli/option_words.py

@@ -0,0 +1,15 @@
+"""The words a choice option allows, whichever version of Typer is installed.
+
+Typer before 0.29 keeps an option's click type (`option.type.choices`, plain words). From 0.29 the option has no `type`:
+its `type_descriptor` holds the `choices`, as the members of the enum the option was written with. The CLI asks for the
+installed one by `typer>=0.27` only, so both shapes are read here."""
+
+
+def allowed_words(option):
+    """The words a choice option allows, as text; empty for an option that is not a choice."""
+    descriptor = getattr(option, "type_descriptor", None)
+    if descriptor is not None:
+        choices = getattr(descriptor, "choices", None)
+    else:
+        choices = getattr(getattr(option, "type", None), "choices", None)
+    return [str(getattr(choice, "value", choice)) for choice in choices or []]

{operx_cli-0.13.0 → operx_cli-0.13.1}/operx_cli/shell.py

@@ -17,6 +17,7 @@ from rich.console import Console
 from rich.text import Text
 
 from . import __version__, settings
+from .option_words import allowed_words
 from .output import print_aligned
 from .record_completion import RecordNames, completion_text
 
@@ -121,7 +122,7 @@ def suggestions(root, text, products=None):
 
     option = _option_named(node, words[-1]) if words else None
     if option is not None and not getattr(option, "is_flag", False):
-        choices = getattr(option.type, "choices", None) or []
+        choices = allowed_words(option)
         return [(choice, "") for choice in choices if choice.startswith(current)]
 
     if hasattr(node, "commands"):
@@ -156,9 +157,10 @@ def spanish_usage_error(error):
         if suggested:
             return f"No existe el comando «{typed}». ¿Quisiste decir {' o '.join(f'«{name}»' for name in suggested)}?"
         return f"No existe el comando «{typed}». Escribe ayuda para ver los comandos."
-    choices = getattr(getattr(param, "type", None), "choices", None)
+    choices = allowed_words(param) if param else []
     if choices:
-        value = re.match(r"'(.*?)' is not", message)
+        # Click says «'x' is not one of…»; Typer 0.29 puts «Value error, » before it.
+        value = re.search(r"'(.*?)' is not", message)
         shown = f"«{value.group(1)}»" if value else "Ese valor"
         return f"{shown} no sirve para {name}. Elige una de: {', '.join(choices)}."
     return f"No entendí eso ({message}). Prueba con --help."

{operx_cli-0.13.0 → operx_cli-0.13.1}/operx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: operx-cli
-Version: 0.13.0
+Version: 0.13.1
 Summary: La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{operx_cli-0.13.0 → operx_cli-0.13.1}/operx_cli.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ operx_cli/app.py
 operx_cli/browser_login.py
 operx_cli/client.py
 operx_cli/lookup.py
+operx_cli/option_words.py
 operx_cli/output.py
 operx_cli/record_completion.py
 operx_cli/self_update.py
@@ -73,6 +74,7 @@ tests/test_logout_and_routes.py
 tests/test_lookup.py
 tests/test_more_of_the_api.py
 tests/test_muestreo.py
+tests/test_option_words.py
 tests/test_ordenes.py
 tests/test_output.py
 tests/test_personas.py

{operx_cli-0.13.0 → operx_cli-0.13.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "operx-cli"
-version = "0.13.0"
+version = "0.13.1"
 description = "La línea de comandos de OperX: tu empresa desde la terminal, con tu token de API."
 readme = "README.md"
 requires-python = ">=3.10"

operx_cli-0.13.1/tests/test_option_words.py

@@ -0,0 +1,52 @@
+"""The words a choice option allows, read the same under every Typer the CLI accepts (typer>=0.27): the old click type's
+plain words, and the enum members of the descriptor that Typer 0.29 keeps instead."""
+
+import enum
+from types import SimpleNamespace
+
+import typer
+from typer.main import get_command
+
+from operx_cli.option_words import allowed_words
+
+
+class Colour(str, enum.Enum):
+    rojo = "rojo"
+    azul = "azul"
+
+
+def _options_of_a_real_command():
+    app = typer.Typer()
+
+    @app.command()
+    def pinta(colour: Colour = Colour.rojo, copies: int = 1):
+        """A command with a choice and a number."""
+
+    @app.command()
+    def otro():
+        """A second command, so the app is a group."""
+
+    return {option.name: option for option in get_command(app).commands["pinta"].params}
+
+
+def test_a_real_choice_option_lists_its_words_and_a_number_lists_none():
+    options = _options_of_a_real_command()
+
+    assert allowed_words(options["colour"]) == ["rojo", "azul"]
+    assert allowed_words(options["copies"]) == []
+
+
+def test_the_old_shape_gives_plain_words():
+    old = SimpleNamespace(type=SimpleNamespace(choices=("uno", "dos")))
+
+    assert allowed_words(old) == ["uno", "dos"]
+
+
+def test_the_new_shape_gives_the_enum_values_not_their_names():
+    new = SimpleNamespace(type_descriptor=SimpleNamespace(choices=(Colour.rojo, Colour.azul)))
+
+    assert allowed_words(new) == ["rojo", "azul"]
+
+
+def test_an_option_with_neither_shape_allows_nothing_in_particular():
+    assert allowed_words(SimpleNamespace()) == []