Merge pull request #1030 from lsst/tickets/DM-44931

DM-44931: Define the dataset type override method for chained datastore
lsst · Jul 1, 2024 · ada4740 · ada4740
2 parents fc5ae51 + 0ef6d1f
commit ada4740
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/python/lsst/daf/butler/datastores/chainedDatastore.py b/python/lsst/daf/butler/datastores/chainedDatastore.py
@@ -35,7 +35,7 @@
 import logging
 import time
 import warnings
-from collections.abc import Collection, Iterable, Mapping, Sequence
+from collections.abc import Callable, Collection, Iterable, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
 from lsst.daf.butler import DatasetRef, DatasetTypeNotSupportedError, FileDataset
@@ -1229,3 +1229,8 @@ def get_opaque_table_definitions(self) -> Mapping[str, DatastoreOpaqueTable]:
         for datastore in self.datastores:
             tables.update(datastore.get_opaque_table_definitions())
         return tables
+
+    def set_retrieve_dataset_type_method(self, method: Callable[[str], DatasetType | None] | None) -> None:
+        # Docstring inherited from the base class.
+        for datastore in self.datastores:
+            datastore.set_retrieve_dataset_type_method(method)
diff --git a/python/lsst/daf/butler/remote_butler/_query_driver.py b/python/lsst/daf/butler/remote_butler/_query_driver.py
@@ -78,7 +78,7 @@
     QueryInputs,
 )
 
-_QueryResultTypeAdapter = TypeAdapter(QueryExecuteResultData)
+_QueryResultTypeAdapter = TypeAdapter[QueryExecuteResultData](QueryExecuteResultData)
 
 
 class RemoteQueryDriver(QueryDriver):