diff --git a/pyproject.toml b/pyproject.toml index 5ae42f382..44b6d8674 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,7 +73,7 @@ all = [ "dask[dataframe]", "duckdb <1.4.0", # https://github.com/bluesky/tiled/issues/1144 "entrypoints", - "fastapi >=0.115.8", + "fastapi >=0.115.8,<0.122", "h5netcdf", "h5py", "hdf5plugin", @@ -245,7 +245,7 @@ server = [ "jinja2", "jmespath", "lz4", - "minio", + "minio != 7.2.19", "ndindex", "numba >=0.59.0", # indirect, pinned to assist uv solve "numcodecs", diff --git a/tiled/queries.py b/tiled/queries.py index ee005dcea..17e23d8fd 100644 --- a/tiled/queries.py +++ b/tiled/queries.py @@ -632,7 +632,3 @@ def __ge__(self, value): # Note: __contains__ cannot be supported because the language coerces # the result of __contains__ to be a literal boolean. We are not # allowed to return a custom type. - - -class QueryValueError(ValueError): - pass diff --git a/tiled/server/core.py b/tiled/server/core.py index dd699e2e9..f7a4e653a 100644 --- a/tiled/server/core.py +++ b/tiled/server/core.py @@ -24,7 +24,7 @@ from .. import queries from ..adapters.mapping import MapAdapter from ..links import links_for_node -from ..queries import KeyLookup, QueryValueError +from ..queries import KeyLookup from ..serialization import register_builtin_serializers from ..structures.core import Spec, StructureFamily from ..utils import ( @@ -184,7 +184,7 @@ async def apply_search(tree, filters, query_registry): key_lookups.append(query.key) continue tree = tree.search(query) - except QueryValueError as err: + except TypeError as err: raise HTTPException( status_code=HTTP_400_BAD_REQUEST, detail=err.args[0] )