Merge pull request #905 from lsst/tickets/DM-41705

DM-41705: Fix RemoteButler import
lsst · Nov 15, 2023 · e63b081 · e63b081
2 parents c817402 + 8bcb19c
commit e63b081
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/python/lsst/daf/butler/remote_butler/_remote_butler.py b/python/lsst/daf/butler/remote_butler/_remote_butler.py
@@ -55,7 +55,7 @@
 from ..transfers import RepoExportContext
 from ._authentication import get_authentication_headers, get_authentication_token_from_environment
 from ._config import RemoteButlerConfigModel
-from .server import FindDatasetModel
+from .server_models import FindDatasetModel
 
 
 class RemoteButler(Butler):

diff --git a/python/lsst/daf/butler/remote_butler/server/__init__.py b/python/lsst/daf/butler/remote_butler/server/__init__.py
@@ -27,4 +27,3 @@
 
 from ._factory import *
 from ._server import *
-from ._server_models import *
diff --git a/python/lsst/daf/butler/remote_butler/server/handlers/_external.py b/python/lsst/daf/butler/remote_butler/server/handlers/_external.py
@@ -32,10 +32,10 @@
 
 from fastapi import APIRouter, Depends
 from lsst.daf.butler import SerializedDatasetRef, SerializedDatasetType
+from lsst.daf.butler.remote_butler.server_models import FindDatasetModel
 
 from .._dependencies import factory_dependency
 from .._factory import Factory
-from .._server_models import FindDatasetModel
 
 external_router = APIRouter()
 

diff --git a/...er/remote_butler/server/_server_models.py → ...daf/butler/remote_butler/server_models.py b/...er/remote_butler/server/_server_models.py → ...daf/butler/remote_butler/server_models.py
@@ -31,10 +31,12 @@
 
 from lsst.daf.butler import SerializedDataCoordinate
 
-from ..._compat import _BaseModelCompat
+from .._compat import _BaseModelCompat
 
 
 class FindDatasetModel(_BaseModelCompat):
+    """Request model for find_dataset"""
+
     data_id: SerializedDataCoordinate
     collections: list[str]
     storage_class: str | None