v70 Improved help for variadic

Author: overgodofchaos

pydantic_argparse_next/parser/classes.py

@@ -323,7 +323,10 @@ def help_text(self) -> list[str]:
                         req_args += ", {" f"arg{i}, ..."
 
                     if self.variadic_max_args < float("inf"):
-                        req_args += f", arg{self.variadic_max_args}" + "}"
+                        if i == self.variadic_max_args:
+                            req_args += ", {" + f"arg{self.variadic_max_args}" + "}"
+                        else:
+                            req_args += f", arg{self.variadic_max_args}" + "}"
                     else:
                         req_args += "}"
 
@@ -350,7 +353,10 @@ def help_text(self) -> list[str]:
                         req_args += ", {" f"arg{i}, ..."
 
                     if self.variadic_max_args < float("inf"):
-                        req_args += f", arg{self.variadic_max_args}" + "}"
+                        if i == self.variadic_max_args:
+                            req_args += ", {" + f"arg{self.variadic_max_args}" + "}"
+                        else:
+                            req_args += f", arg{self.variadic_max_args}" + "}"
                     else:
                         req_args += "}"
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "pydantic-argparse-next"
-version = "1.0.6"
+version = "1.0.7"
 description = "Pydantic 2 argparse."
 readme = "README.md"
 requires-python = ">=3.11"

tests/help/test_help.py

@@ -204,11 +204,13 @@ class Test(BaseModel):
         b: tuple[str, int, float]
         c: tuple
         d: list[int] = pa.KwArg(n_args="2...6")
+        e: list[str] = pa.KwArg(n_args="2...3")
 
     output = read_output(Test, ["--help"], capsys).out
 
     assert "LIST[STR] (arg1, {arg2, ...})" in output
     assert "TUPLE (arg1 STR, arg2 INT, arg3 FLOAT)" in output
     assert "TUPLE[STR] (arg1, {arg2, ...})" in output
     assert "LIST[INT] (arg1, arg2, {arg3, ..., arg6})" in output
+    assert "LIST[STR] (arg1, arg2, {arg3})" in output