fixes #245

Author: jph00

fastcore/script.py

@@ -27,7 +27,7 @@ def bool_arg(v):
 # Cell
 def clean_type_str(x:str):
     x = str(x)
-    x = re.sub("(class|function|__main__\.|\ at.*)", '', x)
+    x = re.sub("(enum |class|function|__main__\.|\ at.*)", '', x)
     x = re.sub("(<|>|'|\ )", '', x) # spl characters
     return x
 
@@ -38,6 +38,7 @@ def __init__(self, help=None, type=None, opt=True, action=None, nargs=None, cons
                  choices=None, required=None, default=None):
         if type==store_true:  type,action,default=None,'store_true' ,False
         if type==store_false: type,action,default=None,'store_false',True
+        if type and isinstance(type,typing.Type) and issubclass(type,enum.Enum) and not choices: choices=list(type)
         store_attr()
 
     def set_default(self, d):
@@ -52,10 +53,10 @@ def pre(self): return '--' if self.opt else ''
     def kwargs(self): return {k:v for k,v in self.__dict__.items()
                               if v is not None and k!='opt' and k[0]!='_'}
     def __repr__(self):
-        if self.help is None and self.type is None: return ""
-        if self.help is None and self.type is not None: return f"{clean_type_str(self.type)}"
-        if self.help is not None and self.type is None: return f"<{self.help}>"
-        if self.help is not None and self.type is not None: return f"{clean_type_str(self.type)} <{self.help}>"
+        if not self.help and self.type is None: return ""
+        if not self.help and self.type is not None: return f"{clean_type_str(self.type)}"
+        if self.help and self.type is None: return f"<{self.help}>"
+        if self.help and self.type is not None: return f"{clean_type_str(self.type)} <{self.help}>"
 
 # Cell
 def anno_parser(func, prog=None, from_name=False):
@@ -65,8 +66,8 @@ def anno_parser(func, prog=None, from_name=False):
         param = func.__annotations__.get(k, Param())
         param.set_default(v.default)
         p.add_argument(f"{param.pre}{k}", **param.kwargs)
-    p.add_argument(f"--pdb", help="Run in pdb debugger (default: False)", action='store_true')
-    p.add_argument(f"--xtra", help="Parse for additional args (default: '')", type=str)
+    p.add_argument(f"--pdb", help=argparse.SUPPRESS, action='store_true')
+    p.add_argument(f"--xtra", help=argparse.SUPPRESS, type=str)
     return p
 
 # Cell

nbs/08_script.ipynb

@@ -198,7 +198,7 @@
     "#export\n",
     "def clean_type_str(x:str):\n",
     "    x = str(x)\n",
-    "    x = re.sub(\"(class|function|__main__\\.|\\ at.*)\", '', x)\n",
+    "    x = re.sub(\"(enum |class|function|__main__\\.|\\ at.*)\", '', x)\n",
     "    x = re.sub(\"(<|>|'|\\ )\", '', x) # spl characters\n",
     "    return x"
    ]
@@ -231,6 +231,7 @@
     "                 choices=None, required=None, default=None):\n",
     "        if type==store_true:  type,action,default=None,'store_true' ,False\n",
     "        if type==store_false: type,action,default=None,'store_false',True\n",
+    "        if type and isinstance(type,typing.Type) and issubclass(type,enum.Enum) and not choices: choices=list(type)\n",
     "        store_attr()\n",
     "        \n",
     "    def set_default(self, d):\n",
@@ -245,10 +246,10 @@
     "    def kwargs(self): return {k:v for k,v in self.__dict__.items()\n",
     "                              if v is not None and k!='opt' and k[0]!='_'}\n",
     "    def __repr__(self):\n",
-    "        if self.help is None and self.type is None: return \"\"\n",
-    "        if self.help is None and self.type is not None: return f\"{clean_type_str(self.type)}\"\n",
-    "        if self.help is not None and self.type is None: return f\"<{self.help}>\"\n",
-    "        if self.help is not None and self.type is not None: return f\"{clean_type_str(self.type)} <{self.help}>\""
+    "        if not self.help and self.type is None: return \"\"\n",
+    "        if not self.help and self.type is not None: return f\"{clean_type_str(self.type)}\"\n",
+    "        if self.help and self.type is None: return f\"<{self.help}>\"\n",
+    "        if self.help and self.type is not None: return f\"{clean_type_str(self.type)} <{self.help}>\""
    ]
   },
   {
@@ -333,8 +334,8 @@
     "        param = func.__annotations__.get(k, Param())\n",
     "        param.set_default(v.default)\n",
     "        p.add_argument(f\"{param.pre}{k}\", **param.kwargs)\n",
-    "    p.add_argument(f\"--pdb\", help=\"Run in pdb debugger (default: False)\", action='store_true')\n",
-    "    p.add_argument(f\"--xtra\", help=\"Parse for additional args (default: '')\", type=str)\n",
+    "    p.add_argument(f\"--pdb\", help=argparse.SUPPRESS, action='store_true')\n",
+    "    p.add_argument(f\"--xtra\", help=argparse.SUPPRESS, type=str)\n",
     "    return p"
    ]
   },
@@ -354,26 +355,27 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "usage: progname [-h] [--b B] [--pdb] [--xtra XTRA] required a\n",
+      "usage: progname [-h] [--b B] [--c {aa,bb,cc}] required a\n",
       "\n",
       "my docs\n",
       "\n",
       "positional arguments:\n",
-      "  required     Required param\n",
-      "  a            param 1\n",
+      "  required        Required param\n",
+      "  a               param 1\n",
       "\n",
       "optional arguments:\n",
-      "  -h, --help   show this help message and exit\n",
-      "  --b B        param 2 (default: test)\n",
-      "  --pdb        Run in pdb debugger (default: False)\n",
-      "  --xtra XTRA  Parse for additional args (default: '')\n"
+      "  -h, --help      show this help message and exit\n",
+      "  --b B           param 2 (default: test)\n",
+      "  --c {aa,bb,cc}  param 3 (default: aa)\n"
      ]
     }
    ],
    "source": [
+    "_en = str_enum('_en', 'aa','bb','cc')\n",
     "def f(required:Param(\"Required param\", int),\n",
     "      a:Param(\"param 1\", bool_arg),\n",
-    "      b:Param(\"param 2\", str)=\"test\"):\n",
+    "      b:Param(\"param 2\", str)=\"test\",\n",
+    "      c:Param(\"param 3\", en)=_en.aa):\n",
     "    \"my docs\"\n",
     "    ...\n",
     "\n",
@@ -512,6 +514,8 @@
       "Converted 01_basics.ipynb.\n",
       "Converted 02_foundation.ipynb.\n",
       "Converted 03_xtras.ipynb.\n",
+      "Converted 03a_parallel.ipynb.\n",
+      "Converted 03b_net.ipynb.\n",
       "Converted 04_dispatch.ipynb.\n",
       "Converted 05_transform.ipynb.\n",
       "Converted 07_meta.ipynb.\n",