From 61c8c5b665ecda776f8f0b734b82dcc6a8b4a3ee Mon Sep 17 00:00:00 2001
From: Brent Yi <yibrenth@gmail.com>
Date: Mon, 3 Oct 2022 10:09:40 -0700
Subject: [PATCH] Bump dcargs, omit subcommand prefixes (#625)

---
 nerfstudio/data/datamanagers.py | 24 +++++++++++++-----------
 pyproject.toml                  |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/nerfstudio/data/datamanagers.py b/nerfstudio/data/datamanagers.py
index 02578a79d..6c8dfaf23 100644
--- a/nerfstudio/data/datamanagers.py
+++ b/nerfstudio/data/datamanagers.py
@@ -50,17 +50,19 @@ from nerfstudio.engine.callbacks import TrainingCallback, TrainingCallbackAttrib
 from nerfstudio.model_components.ray_generators import RayGenerator
 from nerfstudio.utils.misc import IterableWrapper
 
-AnnotatedDataParserUnion = dcargs.extras.subcommand_type_from_defaults(
-    {
-        "nerfstudio-data": NerfstudioDataParserConfig(),
-        "blender-data": BlenderDataParserConfig(),
-        "friends-data": FriendsDataParserConfig(),
-        "mipnerf-360-data": MipNerf360DataParserConfig(),
-        "instant-ngp-data": InstantNGPDataParserConfig(),
-        "record3d-data": Record3DDataParserConfig(),
-    },
-    prefix_names=False,
-)
+AnnotatedDataParserUnion = dcargs.conf.OmitSubcommandPrefixes[  # Omit prefixes of flags in subcommands.
+    dcargs.extras.subcommand_type_from_defaults(
+        {
+            "nerfstudio-data": NerfstudioDataParserConfig(),
+            "blender-data": BlenderDataParserConfig(),
+            "friends-data": FriendsDataParserConfig(),
+            "mipnerf-360-data": MipNerf360DataParserConfig(),
+            "instant-ngp-data": InstantNGPDataParserConfig(),
+            "record3d-data": Record3DDataParserConfig(),
+        },
+        prefix_names=False,  # Omit prefixes in subcommands themselves.
+    )
+]
 """Union over possible dataparser types, annotated with metadata for dcargs. This is the
 same as the vanilla union, but results in shorter subcommand names."""
 
diff --git a/pyproject.toml b/pyproject.toml
index 7b3201da7..6ef497c47 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
     "aiortc==1.3.2",
     "appdirs>=1.4",
     "av==9.2.0",
-    "dcargs>=0.3.14",
+    "dcargs>=0.3.17",
     "gdown==4.5.1",
     "ninja==1.10.2.3",
     "functorch==0.2.1",