Better handling of nested modal CLIs

scriptconfig/modal.py

@@ -53,8 +53,8 @@ class MetaModalCLI(type):
             final_subconfigs.extend(cls_subconfigs)
 
         # Helps make the class pickleable. Pretty hacky though.
-        for k in attr_subconfigs.keys():
-            namespace.pop(k)
+        # for k in attr_subconfigs.keys():
+        #     namespace.pop(k)
         namespace['__subconfigs__'] = final_subconfigs
 
         cls = super().__new__(mcls, name, bases, namespace, *args, **kwargs)
@@ -216,6 +216,8 @@ class ModalCLI(metaclass=MetaModalCLI):
         cmdinfo_list = []
         for cli_cls in self.sub_clis:
             cmdname = getattr(cli_cls, '__command__', None)
+            if cmdname is None:
+                cmdname = cli_cls.__name__
             if cmdname is None:
                 raise ValueError(ub.paragraph(
                     f'''
@@ -240,10 +242,29 @@ class ModalCLI(metaclass=MetaModalCLI):
             group = getattr(cli_cls, '__group__', DEFAULT_GROUP)
             # group = 'FOO'
 
-            if isinstance(cli_cls, ModalCLI):
+            # print(f'cli_cls={cli_cls}')
+            # print(isinstance(cli_cls, ModalCLI))
+            # print('cli_cls.__bases__ = {}'.format(ub.urepr(cli_cls.__bases__, nl=1)))
+            # print('ModalCLI = {}'.format(ub.urepr(ModalCLI, nl=1)))
+
+            if isinstance(cli_cls, ModalCLI) or issubclass(cli_cls, ModalCLI):
                 # Another modal layer
                 modal = cli_cls
+                from scriptconfig import argparse_ext
+                # FIXME: ModalCLI needs a _parserkw method.
+
+                parserkw.update(
+                    # prog=self._prog,
+                    description=self.description,
+                    # epilog=self._epilog,
+                    # formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+                    # formatter_class=argparse.RawDescriptionHelpFormatter,
+                    formatter_class=argparse_ext.RawDescriptionDefaultsHelpFormatter,
+                    # exit_on_error=False,
+                )
+                parserkw['help'] = parserkw['description'].split('\n')[0]
                 cmdinfo_list.append({
+                    'is_modal': True,
                     'cmdname': cmdname,
                     'parserkw': parserkw,
                     'main_func': cli_cls.main,
@@ -256,6 +277,7 @@ class ModalCLI(metaclass=MetaModalCLI):
                 parserkw.update(subconfig._parserkw())
                 parserkw['help'] = parserkw['description'].split('\n')[0]
                 cmdinfo_list.append({
+                    'is_modal': False,
                     'cmdname': cmdname,
                     'parserkw': parserkw,
                     'main_func': cli_cls.main,
@@ -274,7 +296,7 @@ class ModalCLI(metaclass=MetaModalCLI):
                 formatter_class=RawDescriptionDefaultsHelpFormatter,
             )
 
-        if self.version is not None:
+        if hasattr(self, 'version') and self.version is not None:
             parser.add_argument('--version', action='store_true',
                                 help='show version number and exit')
 
@@ -304,10 +326,18 @@ class ModalCLI(metaclass=MetaModalCLI):
         for cmdinfo in cmdinfo_list:
             # group = cmdinfo['group']
             # Add a new command to subparser_group
-            subparser = command_subparsers.add_parser(
-                cmdinfo['cmdname'], **cmdinfo['parserkw'])
-            subparser = cmdinfo['subconfig'].argparse(subparser)
-            subparser.set_defaults(main=cmdinfo['main_func'])
+            if cmdinfo['is_modal']:
+                modal_cls = cmdinfo['subconfig']
+                modal_inst = modal_cls()
+                modal_parser = command_subparsers.add_parser(
+                    cmdinfo['cmdname'], **cmdinfo['parserkw'])
+                modal_parser = modal_inst.argparse(parser=modal_parser)
+                modal_parser.set_defaults(main=cmdinfo['main_func'])
+            else:
+                subparser = command_subparsers.add_parser(
+                    cmdinfo['cmdname'], **cmdinfo['parserkw'])
+                subparser = cmdinfo['subconfig'].argparse(subparser)
+                subparser.set_defaults(main=cmdinfo['main_func'])
         return parser
 
     build_parser = argparse