feat: using "num2words and fixing command = output

Author: clatapie

pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "importlib-metadata>=4.0",
     "pygithub>=1.59.1",
     "lxml>=4.9.3",
+    "num2words>=0.5.0",
     "numpy>=1.14.0,<1.25.0; python_version<'3.9'",
     "numpy>=1.14.0; python_version>='3.9'",
     "py-asciimath==0.3.0",
@@ -46,6 +47,7 @@ tests = [
     "click==8.1.7",
     "pygithub==2.4.0",
     "lxml==5.3.0",
+    "num2words==0.5.13",
     "numpy==2.1.2",
     "parse==1.20.2",
     "pytest==8.3.2",
@@ -60,6 +62,7 @@ doc = [
     "build>= 0.10.0",
     "flit>=3.8.0",
     "jupyter_sphinx==0.5.3",
+    "num2words==0.5.13",
     "numpy==2.1.2",
     "numpydoc==1.8.0",
     "pandas==2.2.3",

src/pyconverter/xml2py/ast_tree.py

@@ -22,6 +22,7 @@
 
 import logging
 import textwrap
+from num2words import num2words as num
 from typing import List
 import warnings
 
@@ -51,34 +52,8 @@
     '``"``': "``",
 }
 
-word_digit = [
-    "zero",
-    "one",
-    "two",
-    "three",
-    "four",
-    "five",
-    "six",
-    "seven",
-    "eight",
-    "nine",
-]
-
 superlatif = ["st", "nd", "rd", "th"]
 
-superlatif_digit = [
-    "",
-    "first",
-    "second",
-    "third",
-    "fourth",
-    "fifth",
-    "sixth",
-    "seventh",
-    "eighth",
-    "ninth",
-]
-
 
 CLEANUP = {
     ",, ": ", ",
@@ -167,9 +142,10 @@ def to_py_arg_name(name: str) -> str:
         if arg[1].isdigit():
             raise ValueError(f"The code needs to be expanded to handle numbers")
         elif arg[1:3] not in superlatif:
-            arg = f"{word_digit[int(arg[0])]}{arg[1:]}"
+            arg = f"{num(arg[0])}{arg[1:]}"
         else:
-            arg = f"{superlatif_digit[int(arg[0])]}{arg[3:]}"
+            arg = f"{num(arg[0], to="ordinal")}{arg[3:]}"
+        print(arg)
 
     if ("," in arg and "--" in arg) or arg == "–":
         return ""
@@ -2189,6 +2165,11 @@ def __init__(
         self._description = description
         self._initial_argument = initial_argument
 
+    @property
+    def py_arg_name(self) -> str:
+        """Python-compatible term."""
+        return to_py_arg_name(self._name)
+
     @property
     def is_arg_elipsis(self):
         """
@@ -2343,11 +2324,6 @@ def str_types(self, join_str: str) -> str:
         ptype_str = join_str.join([parm_type.__name__ for parm_type in self.types])
         return ptype_str
 
-    @property
-    def py_arg_name(self) -> str:
-        """Python-compatible term."""
-        return to_py_arg_name(self._name)
-
     def resized_description(
         self, description: str | None = None, max_length: int = 100, indent: str = ""
     ) -> List[str]:
@@ -2877,8 +2853,14 @@ def py_source(self, custom_functions=None, indent=""):
         """
         if custom_functions is None or self.py_name not in custom_functions.py_names:
 
-            if len(self.py_args) > 0:
-                command = 'command = f"' + self.name + ",{" + "},{".join(self.py_args) + '}"\n'
+            if len(self.arg_desc) > 0:
+                command = 'command = f"' + self.name 
+                for arg in self.arg_desc:
+                    command += ',{'
+                    command += arg.py_arg_name
+                    command += '}'
+                command += '"\n'
+                # ",{" + "},{".join(self.arg_desc.py_arg_name) + '}"\n'
             else:
                 command = 'command = f"' + self.name + '"\n'
             return_command = "return self.run(command, **kwargs)\n"