update for rio-tiler 9.0.0b1 (#1328)

Author: vincentsarago

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.2
+    rev: v1.19.0
     hooks:
       - id: mypy
         language_version: python

CHANGES.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 2.0.0b1 (2026-02-22)\
+
+### titiler.core
+
+* change: rio-tiler requirement to `>=9.0.0b1,<10.0`
+* add: asset's options parsing in `AssetsParams` dependency
 
 ## 2.0.0a2 (2026-02-13)
 

docs/src/migrations/v2_migration.md

@@ -173,10 +173,10 @@ GET /stac/tiles/WebMercatorQuad/10/512/384.png?url=...&assets=B02&assets=B03&bid
 
 **After (2.0):**
 
-Use new `asset` notation: `assets={AssetName}|indexes=1,2,3`
+Use new `asset` notation: `assets={AssetName}|bidx=1,2,3`
 
 ```
-GET /stac/tiles/WebMercatorQuad/10/512/384.png?url=...&assets=B02|indexes=1&assets=B03|indexes=1
+GET /stac/tiles/WebMercatorQuad/10/512/384.png?url=...&assets=B02|bidx=1&assets=B03|bidx=1
 ```
 
 ### 7. Removed: `asset_indexes` and `asset_expression` Options
@@ -191,10 +191,10 @@ GET /stac/preview.png?url=...&asset_expression=data|b1*b2
 
 **After (2.0):**
 
-Use new `asset` notation: `assets={AssetName}|indexes=1,2,3` or `assets={AssetName}|expression=b1*2`
+Use new `asset` notation: `assets={AssetName}|bidx=1,2,3` or `assets={AssetName}|expression=b1*2`
 
 ```
-GET /stac/preview.png?url=...&assets=B01|indexes=1,2,3
+GET /stac/preview.png?url=...&assets=B01|bidx=1,2,3
 GET /stac/preview.png?url=...&assets=B01|expression=b1*2
 ```
 

src/titiler/core/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "numpy",
     "pydantic~=2.0",
     "rasterio",
-    "rio-tiler>=9.0.0a4,<10.0",
+    "rio-tiler>=9.0.0b1,<10.0",
     "morecantile",
     "simplejson",
 ]

src/titiler/core/tests/test_dependencies.py

@@ -223,13 +223,23 @@ def _assets_expr(params=Depends(dependencies.AssetsExprParams)):
     response = client.get("/first?assets=data&assets=image")
     assert response.json() == ["data", "image"]
 
+    response = client.get("/first?assets=data|bidx=1,2|expression=b1*b2")
+    assert response.json()[0]["name"] == "data"
+    assert response.json()[0]["indexes"] == [1, 2]
+    assert response.json()[0]["expression"] == "b1*b2"
+
     response = client.get("/second?assets=data&assets=image")
     assert response.json()["assets"] == ["data", "image"]
     assert not response.json()["expression"]
 
     response = client.get("/second?assets=data&assets=image&expression=b1*b2")
     assert response.json()["expression"] == "b1*b2"
-    assert response.json()["assets"]
+    assert response.json()["assets"] == ["data", "image"]
+
+    response = client.get("/second?assets=data|bidx=1,2|expression=b1*b2")
+    assert response.json()["assets"][0]["name"] == "data"
+    assert response.json()["assets"][0]["indexes"] == [1, 2]
+    assert response.json()["assets"][0]["expression"] == "b1*b2"
 
     response = client.get("/second")
     assert response.status_code == 422

src/titiler/core/tests/test_factories.py

@@ -728,7 +728,7 @@ def test_MultiBaseTilerFactory(rio):
         "/preview.tif",
         params={
             "url": f"{DATA_DIR}/item.json",
-            "assets": "B01|indexes=1,1,1",
+            "assets": "B01|bidx=1,1,1",
             "return_mask": False,
         },
     )
@@ -817,16 +817,16 @@ def test_MultiBaseTilerFactory(rio):
     assert resp["B09"]["b1"]["description"] == "b1"
 
     response = client.get(
-        f"/asset_statistics?url={DATA_DIR}/item.json&assets=B09|indexes=1,1"
+        f"/asset_statistics?url={DATA_DIR}/item.json&assets=B09|bidx=1,1"
     )
     assert response.status_code == 200
     assert response.headers["content-type"] == "application/json"
     resp = response.json()
     assert len(resp) == 1
-    assert resp["B09|indexes=1,1"]["b1"]
-    assert resp["B09|indexes=1,1"]["b2"]
-    assert resp["B09|indexes=1,1"]["b1"]["description"] == "b1"
-    assert resp["B09|indexes=1,1"]["b2"]["description"] == "b1"
+    assert resp["B09|indexes=[1,1]"]["b1"]
+    assert resp["B09|indexes=[1,1]"]["b2"]
+    assert resp["B09|indexes=[1,1]"]["b1"]["description"] == "b1"
+    assert resp["B09|indexes=[1,1]"]["b2"]["description"] == "b1"
 
     # missing assets
     response = client.get(f"/statistics?url={DATA_DIR}/item.json")

src/titiler/core/titiler/core/dependencies.py

@@ -3,16 +3,16 @@
 import json
 from collections.abc import Callable, Sequence
 from dataclasses import dataclass, field
-from typing import Annotated, Literal
+from typing import Annotated, Any, Literal, cast
 
 import numpy
 from fastapi import HTTPException, Query
-from pydantic import BeforeValidator, Field
+from pydantic import AfterValidator, BeforeValidator, Field
 from rasterio.crs import CRS
 from rio_tiler.colormap import ColorMaps
 from rio_tiler.colormap import cmap as default_cmap
 from rio_tiler.colormap import parse_color
-from rio_tiler.types import RIOResampling, WarpResampling
+from rio_tiler.types import AssetType, AssetWithOptions, RIOResampling, WarpResampling
 from starlette.requests import Request
 
 from titiler.core.resources.enums import ImageType, MediaType
@@ -134,12 +134,37 @@ class BidxExprParams(ExpressionParams, BidxParams):
 
 
 # Dependencies for  MultiBaseReader (e.g STACReader)
+def _parse_asset(values: list[str]) -> list[AssetType]:
+    """Parse assets with optional parameter."""
+    assets: list[AssetType] = []
+    for v in values:
+        if "|" in v:
+            asset_name, params = v.split("|", 1)
+            opts: dict[str, Any] = {"name": asset_name}
+            for option in params.split("|"):
+                key, value = option.split("=", 1)
+                if key == "bidx":
+                    opts["indexes"] = list(map(int, value.split(",")))
+                elif key == "expression":
+                    opts["expression"] = value
+                elif key == "bands":
+                    opts["bands"] = value.split(",")
+
+            asset = cast(AssetWithOptions, opts)
+            assets.append(asset)
+        else:
+            assets.append(v)
+
+    return assets
+
+
 @dataclass
 class AssetsParams(DefaultDependency):
     """Assets parameters."""
 
     assets: Annotated[
         list[str],
+        AfterValidator(_parse_asset),
         Query(
             title="Asset names",
             description="Asset's names.",
@@ -153,6 +178,10 @@ class AssetsParams(DefaultDependency):
                     "description": "Return results for assets `data` and `cog`.",
                     "value": ["data", "cog"],
                 },
+                "multi-assets-with-options": {
+                    "description": "Return results for assets `data` and `cog`.",
+                    "value": ["data|bidx=1", "cog|bidx=1,2"],
+                },
             },
         ),
     ]

src/titiler/xarray/titiler/xarray/io.py

@@ -17,7 +17,7 @@
 import zarr
 from morecantile import TileMatrixSet
 from rio_tiler.constants import WEB_MERCATOR_TMS
-from rio_tiler.io.xarray import XarrayReader
+from rio_tiler.io.xarray import Options, XarrayReader
 from zarr.storage import ObjectStore
 
 X_DIM_NAMES = ["lon", "longitude", "LON", "LONGITUDE", "Lon", "Longitude"]
@@ -271,11 +271,17 @@ class Reader(XarrayReader):
 
     tms: TileMatrixSet = attr.ib(default=WEB_MERCATOR_TMS)
 
+    options: Options = attr.ib()
+
     ds: xarray.Dataset = attr.ib(init=False)
     input: xarray.DataArray = attr.ib(init=False)
 
     _dims: list = attr.ib(init=False, factory=list)
 
+    @options.default
+    def _options_default(self):
+        return {}
+
     def __attrs_post_init__(self):
         """Set bounds and CRS."""
         opener_options = {