Merge pull request #273 from lsst/tickets/DM-34340

DM-34340: Adapt to daf_butler API changes.
lsst · Nov 22, 2023 · 9aa77c5 · 9aa77c5
2 parents b3351f9 + 0db872b
commit 9aa77c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/python/lsst/ctrl/mpexec/dotTools.py b/python/lsst/ctrl/mpexec/dotTools.py
@@ -262,8 +262,8 @@ def expand_dimensions(connection: connectionTypes.BaseConnection) -> list[str]:
         if "skypix" in dimension_set:
             dimension_set.remove("skypix")
             skypix_dim = ["skypix"]
-        dimension_graph = universe.extract(dimension_set)
-        return list(dimension_graph.names) + skypix_dim
+        dimensions = universe.conform(dimension_set)
+        return list(dimensions.names) + skypix_dim
 
     # open a file if needed
     close = False

diff --git a/python/lsst/ctrl/mpexec/reports.py b/python/lsst/ctrl/mpexec/reports.py
@@ -41,7 +41,7 @@
 
 def _serializeDataId(dataId: DataId) -> dict[str, DataIdValue]:
     if isinstance(dataId, DataCoordinate):
-        return dataId.byName()
+        return dict(dataId.required)
     else:
         return dataId  # type: ignore
 

diff --git a/python/lsst/ctrl/mpexec/singleQuantumExecutor.py b/python/lsst/ctrl/mpexec/singleQuantumExecutor.py
@@ -36,7 +36,7 @@
 from collections import defaultdict
 from collections.abc import Callable
 from itertools import chain
-from typing import Any
+from typing import Any, cast
 
 from lsst.daf.butler import (
     Butler,
@@ -519,7 +519,7 @@ def initGlobals(self, quantum: Quantum) -> None:
         for datasetRefs in chain(quantum.inputs.values(), quantum.outputs.values()):
             for datasetRef in datasetRefs:
                 dataId = datasetRef.dataId
-                instrument = dataId.get("instrument")
+                instrument = cast(str, dataId.get("instrument"))
                 if instrument is not None:
                     if oneInstrument is not None:
                         assert (  # type: ignore