Allow remote butler factory to set datastore cache status

lsst · Aug 20, 2024 · cd7a019 · cd7a019
1 parent 48d9216
commit cd7a019
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/python/lsst/daf/butler/_butler.py b/python/lsst/daf/butler/_butler.py
@@ -309,8 +309,12 @@ def from_config(
             case ButlerType.REMOTE:
                 from .remote_butler import RemoteButlerFactory
 
+                # Assume this is being created by a client who would like
+                # default caching of remote datasets.
                 factory = RemoteButlerFactory.create_factory_from_config(butler_config)
-                return factory.create_butler_with_credentials_from_environment(butler_options=options)
+                return factory.create_butler_with_credentials_from_environment(
+                    butler_options=options, use_disabled_datastore_cache=False
+                )
             case _:
                 raise TypeError(f"Unknown Butler type '{butler_type}'")
 

diff --git a/python/lsst/daf/butler/remote_butler/_factory.py b/python/lsst/daf/butler/remote_butler/_factory.py
@@ -87,7 +87,11 @@ def create_factory_for_url(server_url: str) -> RemoteButlerFactory:
         return RemoteButlerFactory(server_url)
 
     def create_butler_for_access_token(
-        self, access_token: str, *, butler_options: ButlerInstanceOptions | None = None
+        self,
+        access_token: str,
+        *,
+        butler_options: ButlerInstanceOptions | None = None,
+        use_disabled_datastore_cache: bool = True,
     ) -> RemoteButler:
         if butler_options is None:
             butler_options = ButlerInstanceOptions()
@@ -97,15 +101,21 @@ def create_butler_for_access_token(
             ),
             options=butler_options,
             cache=self._cache,
+            use_disabled_datastore_cache=use_disabled_datastore_cache,
         )
 
     def create_butler_with_credentials_from_environment(
-        self, *, butler_options: ButlerInstanceOptions | None = None
+        self,
+        *,
+        butler_options: ButlerInstanceOptions | None = None,
+        use_disabled_datastore_cache: bool = True,
     ) -> RemoteButler:
         token = get_authentication_token_from_environment(self.server_url)
         if token is None:
             raise RuntimeError(
                 "Attempting to connect to Butler server,"
                 " but no access credentials were found in the environment."
             )
-        return self.create_butler_for_access_token(token, butler_options=butler_options)
+        return self.create_butler_for_access_token(
+            token, butler_options=butler_options, use_disabled_datastore_cache=use_disabled_datastore_cache
+        )