Default CollectionInfo.parents to None

lsst · Aug 16, 2024 · 32d0753 · 32d0753
1 parent 1c58667
commit 32d0753
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/python/lsst/daf/butler/_butler_collections.py b/python/lsst/daf/butler/_butler_collections.py
@@ -49,8 +49,11 @@ class CollectionInfo(BaseModel):
     """Documentation string associated with this collection."""
     children: tuple[str, ...] = tuple()
     """Children of this collection (only if CHAINED)."""
-    parents: frozenset[str] = frozenset()
-    """Any parents of this collection."""
+    parents: frozenset[str] | None = None
+    """Any parents of this collection.
+
+    `None` if the parents were not requested.
+    """
 
     def __lt__(self, other: Any) -> bool:
         """Compare objects by collection name."""

diff --git a/python/lsst/daf/butler/direct_butler/_direct_butler_collections.py b/python/lsst/daf/butler/direct_butler/_direct_butler_collections.py
@@ -125,7 +125,7 @@ def get_info(self, name: str, include_parents: bool = False) -> CollectionInfo:
         if record.type == CollectionType.CHAINED:
             assert isinstance(record, ChainedCollectionRecord)
             children = tuple(record.children)
-        parents: set[str] = set()
+        parents: set[str] | None = None
         if include_parents:
             parents = self._registry.getCollectionParentChains(name)
         return CollectionInfo(name=name, type=record.type, doc=doc, parents=parents, children=children)

diff --git a/python/lsst/daf/butler/remote_butler/_remote_butler_collections.py b/python/lsst/daf/butler/remote_butler/_remote_butler_collections.py
@@ -97,8 +97,7 @@ def get_info(self, name: str, include_parents: bool = False) -> CollectionInfo:
         info = self._registry._get_collection_info(name, include_doc=True, include_parents=include_parents)
         doc = info.doc or ""
         children = info.children or ()
-        parents = info.parents or set()
-        return CollectionInfo(name=name, type=info.type, doc=doc, parents=parents, children=children)
+        return CollectionInfo(name=name, type=info.type, doc=doc, parents=info.parents, children=children)
 
     def register(self, name: str, type: CollectionType = CollectionType.RUN, doc: str | None = None) -> bool:
         raise NotImplementedError("Not yet available.")

diff --git a/python/lsst/daf/butler/script/queryCollections.py b/python/lsst/daf/butler/script/queryCollections.py
@@ -148,6 +148,7 @@ def _getTree(
     def addCollection(info: CollectionInfo, level: int = 0) -> None:
         table.add_row(("  " * level + info.name, info.type.name))
         if inverse:
+            assert info.parents is not None  # For mypy.
             for pname in sorted(info.parents):
                 pinfo = butler.collections.get_info(pname, include_parents=inverse)
                 addCollection(pinfo, level + 1)

diff --git a/python/lsst/daf/butler/script/removeRuns.py b/python/lsst/daf/butler/script/removeRuns.py
@@ -97,7 +97,7 @@ def _getCollectionInfo(
     runs = []
     datasets: dict[str, int] = defaultdict(int)
     for collection_info in collections:
-        assert collection_info.type == CollectionType.RUN
+        assert collection_info.type == CollectionType.RUN and collection_info.parents is not None
         runs.append(RemoveRun(collection_info.name, list(collection_info.parents)))
         with butler._query() as query:
             for dt in dataset_types: