diff --git a/python/lsst/daf/butler/remote_butler/_remote_butler.py b/python/lsst/daf/butler/remote_butler/_remote_butler.py index 1930461ec0..f08a64486d 100644 --- 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 index 93c9018bc4..d63badaf11 100644 --- 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 index 9f70564b4d..7b36133008 100644 --- 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/python/lsst/daf/butler/remote_butler/server/_server_models.py b/python/lsst/daf/butler/remote_butler/server_models.py similarity index 95% rename from python/lsst/daf/butler/remote_butler/server/_server_models.py rename to python/lsst/daf/butler/remote_butler/server_models.py index 627d09abb3..1b4d59b5c1 100644 --- a/python/lsst/daf/butler/remote_butler/server/_server_models.py +++ b/python/lsst/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