Merge pull request #96 from lsst/tickets/DM-27519

DM-27519: Improve printing of config history
lsst · Nov 15, 2020 · f820c27 · f820c27
2 parents cf8cecc + 537b115
commit f820c27
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/python/lsst/ctrl/mpexec/cli/opt/options.py b/python/lsst/ctrl/mpexec/cli/opt/options.py
@@ -185,7 +185,7 @@
                                             `config=[Task::]<PATTERN>:NOIGNORECASE` to dump configuration
                                             fields possibly matching given pattern and/or task label;
                                             `history=<FIELD>` to dump configuration history for a field, field
-                                            name is specified as [Task::][SubTask.]Field; `dump-config`,
+                                            name is specified as [Task::]<PATTERN>; `dump-config`,
                                             `dump-config=Task` to dump complete configuration for a task given
                                             its label or all tasks; `pipeline` to show pipeline composition;
                                             `graph` to show information about quanta; `workflow` to show

diff --git a/python/lsst/ctrl/mpexec/cmdLineFwk.py b/python/lsst/ctrl/mpexec/cmdLineFwk.py
@@ -765,30 +765,27 @@ def _showConfigHistory(self, pipeline, showArgs):
                 if nmatch > 0:
                     print("")
 
-                partitioned = thisName.split(".")
-                cpath, cname = partitioned[:-1], partitioned[-1]
-
-                hconfig = config  # the config that we're interested in
-
-                for i, cpt in enumerate(cpath):
-                    # We know this should be available because we checked
-                    # all the names above but we still might be caught out
-                    try:
-                        hconfig = getattr(hconfig, cpt)
-                    except AttributeError:
-                        config_path = ".".join(["config"] + cpath[:i])
-                        print(f"Error: Unable to extract {cname} from {config_path} "
-                              f"from task {taskDef.label}", file=sys.stderr)
-                        hconfig = None
+                cpath, _, cname = thisName.rpartition(".")
+                try:
+                    if not cpath:
+                        # looking for top-level field
+                        hconfig = taskDef.config
+                    else:
+                        hconfig = eval("config." + cpath, {}, {"config": config})
+                except AttributeError:
+                    print(f"Error: Unable to extract attribute {cpath} from task {taskDef.label}",
+                          file=sys.stderr)
+                    hconfig = None
 
                 # Sometimes we end up with a non-Config so skip those
-                if isinstance(hconfig, pexConfig.Config) and hasattr(hconfig, cname):
+                if isinstance(hconfig, (pexConfig.Config, pexConfig.ConfigurableInstance)) and \
+                        hasattr(hconfig, cname):
                     print(f"### Configuration field for task `{taskDef.label}'")
                     print(pexConfig.history.format(hconfig, cname))
                     found = True
 
         if not found:
-            print(f"None of the tasks has field named {pattern}", file=sys.stderr)
+            print(f"None of the tasks has field matching {pattern}", file=sys.stderr)
             sys.exit(1)
 
     def _showTaskHierarchy(self, pipeline):