rio-tiler 8.0.5__py3-none-any.whl → 9.0.0a1__py3-none-any.whl

rio_tiler/io/rasterio.py

@@ -169,7 +169,7 @@ class Reader(BaseReader):
 
         def _get_descr(ix):
             """Return band description."""
-            return self.dataset.descriptions[ix - 1] or ""
+            return self.dataset.descriptions[ix - 1] or f"b{ix}"
 
         if self.options.get("nodata", self.dataset.nodata) is not None:
             nodata_type = "Nodata"
@@ -254,7 +254,7 @@ class Reader(BaseReader):
         tile_x: int,
         tile_y: int,
         tile_z: int,
-        tilesize: int = 256,
+        tilesize: int | None = None,
         indexes: Indexes | None = None,
         expression: str | None = None,
         buffer: float | None = None,
@@ -266,7 +266,7 @@ class Reader(BaseReader):
             tile_x (int): Tile's horizontal index.
             tile_y (int): Tile's vertical index.
             tile_z (int): Tile's zoom level index.
-            tilesize (int, optional): Output image size. Defaults to `256`.
+            tilesize (int, optional): Output image size.
             indexes (int or sequence of int, optional): Band indexes.
             expression (str, optional): rio-tiler expression (e.g. b1/b2+b3).
             buffer (float, optional): Buffer on each side of the given tile. It must be a multiple of `0.5`. Output **tilesize** will be expanded to `tilesize + 2 * tile_buffer` (e.g 0.5 = 257x257, 1.0 = 258x258).
@@ -281,12 +281,18 @@ class Reader(BaseReader):
                 f"Tile(x={tile_x}, y={tile_y}, z={tile_z}) is outside bounds"
             )
 
+        matrix = self.tms.matrix(tile_z)
+        bbox = cast(
+            BBox,
+            self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z)),
+        )
+
         return self.part(
-            cast(BBox, self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z))),
+            bbox,
             dst_crs=self.tms.rasterio_crs,
             bounds_crs=self.tms.rasterio_crs,
-            height=tilesize,
-            width=tilesize,
+            height=tilesize or matrix.tileHeight,
+            width=tilesize or matrix.tileWidth,
             max_size=None,
             indexes=indexes,
             expression=expression,
@@ -593,7 +599,7 @@ class LocalTileMatrixSet:
 class ImageReader(Reader):
     """Non Geo Image Reader"""
 
-    tms: TileMatrixSet = attr.ib(init=False)
+    tms: LocalTileMatrixSet = attr.ib(init=False)  # type: ignore[assignment]
 
     crs: CRS | None = attr.ib(init=False, default=None)
     transform: Affine = attr.ib(init=False)
@@ -635,7 +641,7 @@ class ImageReader(Reader):
         tile_x: int,
         tile_y: int,
         tile_z: int,
-        tilesize: int = 256,
+        tilesize: int | None = None,
         indexes: Indexes | None = None,
         expression: str | None = None,
         out_dtype: str | numpy.dtype | None = None,
@@ -666,10 +672,15 @@ class ImageReader(Reader):
                 f"Tile {tile_z}/{tile_x}/{tile_y} is outside {self.input} bounds"
             )
 
+        bbox = cast(
+            BBox,
+            self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z)),
+        )
+
         return self.part(
-            cast(BBox, self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z))),
-            height=tilesize,
-            width=tilesize,
+            bbox,
+            height=tilesize or self.tms.tile_size,
+            width=tilesize or self.tms.tile_size,
             max_size=None,
             indexes=indexes,
             expression=expression,

rio_tiler/io/stac.py

@@ -323,33 +323,52 @@ class STACReader(MultiBaseReader):
 
         """
         asset, vrt_options = self._parse_vrt_asset(asset)
+
+        method_options: dict[str, Any] = {}
+
+        # NOTE: asset can be in form of
+        # "{asset_name}|some_option=some_value&another_option=another_value"
+        if "|" in asset:
+            asset, params = asset.split("|", 1)
+            # NOTE: Construct method options from params
+            if params:
+                for param in params.split("&"):
+                    key, value = param.split("=", 1)
+                    if key == "indexes":
+                        method_options["indexes"] = list(map(int, value.split(",")))
+                    elif key == "expression":
+                        method_options["expression"] = value
+
         if asset not in self.assets:
             raise InvalidAssetName(
                 f"'{asset}' is not valid, should be one of {self.assets}"
             )
 
+        asset_modified = "expression" in method_options or vrt_options
+
         asset_info = self.item.assets[asset]
         extras = asset_info.extra_fields
 
         info = AssetInfo(
             url=asset_info.get_absolute_href() or asset_info.href,
-            metadata=extras if not vrt_options else None,
+            name=asset,
+            media_type=asset_info.media_type,
+            method_options=method_options,
         )
 
+        if not asset_modified:
+            info["metadata"] = extras
+
         if STAC_ALTERNATE_KEY and extras.get("alternate"):
             if alternate := extras["alternate"].get(STAC_ALTERNATE_KEY):
                 info["url"] = alternate["href"]
 
-        if asset_info.media_type:
-            info["media_type"] = asset_info.media_type
-
         # https://github.com/stac-extensions/file
         if head := extras.get("file:header_size"):
             info["env"] = {"GDAL_INGESTED_BYTES_AT_OPEN": head}
 
         # https://github.com/stac-extensions/raster
-        if extras.get("raster:bands") and not vrt_options:
-            bands = extras.get("raster:bands")
+        if (bands := extras.get("raster:bands", [])) and not asset_modified:
             stats = [
                 (b["statistics"]["minimum"], b["statistics"]["maximum"])
                 for b in bands

rio_tiler/io/xarray.py

@@ -160,7 +160,7 @@ class XarrayReader(BaseReader):
             if coords_name:
                 return [str(self.input.coords[coords_name[0]].data)]
 
-            return [self.input.name or ""]  # type: ignore
+            return [self.input.name or "b1"]  # type: ignore
 
         return [str(band) for d in self._dims for band in self.input[d].values]
 
@@ -173,7 +173,8 @@ class XarrayReader(BaseReader):
             "crs": CRS_to_uri(self.crs) or self.crs.to_wkt(),
             "band_metadata": [(f"b{ix}", v) for ix, v in enumerate(metadata, 1)],
             "band_descriptions": [
-                (f"b{ix}", v) for ix, v in enumerate(self.band_descriptions, 1)
+                (f"b{ix}", v or f"b{ix}")
+                for ix, v in enumerate(self.band_descriptions, 1)
             ],
             "dtype": str(self.input.dtype),
             "nodata_type": "Nodata" if self.input.rio.nodata is not None else "None",
@@ -193,11 +194,10 @@ class XarrayReader(BaseReader):
     def _sel_indexes(
         self,
         indexes: Indexes | None = None,
-    ) -> tuple[xarray.DataArray, list[str], list[str]]:
+    ) -> tuple[xarray.DataArray, list[str]]:
         """Select `band` indexes in DataArray."""
         da = self.input
         band_descriptions = self.band_descriptions
-        band_names = [f"b{ix + 1}" for ix in range(self.input.rio.count)]
 
         if indexes := cast_to_sequence(indexes):
             assert all(v > 0 for v in indexes), "Indexes value must be >= 1"
@@ -207,15 +207,14 @@ class XarrayReader(BaseReader):
                         f"Invalid indexes {indexes} for array of shape {da.shape}"
                     )
 
-                return da, band_names, band_descriptions
+                return da, band_descriptions
 
             indexes = [idx - 1 for idx in indexes]
 
             da = da[indexes]
             band_descriptions = [band_descriptions[idx] for idx in indexes]
-            band_names = [band_names[idx] for idx in indexes]
 
-        return da, band_names, band_descriptions
+        return da, band_descriptions
 
     def statistics(
         self,
@@ -230,7 +229,7 @@ class XarrayReader(BaseReader):
         """Return statistics from a dataset."""
         hist_options = hist_options or {}
 
-        da, band_names, _ = self._sel_indexes(indexes)
+        da, band_descriptions = self._sel_indexes(indexes)
 
         if nodata is not None:
             da = da.rio.write_nodata(nodata)
@@ -246,14 +245,20 @@ class XarrayReader(BaseReader):
             **hist_options,
         )
 
-        return {band_names[ix]: BandStatistics(**val) for ix, val in enumerate(stats)}
+        return {
+            f"b{ix +1}": BandStatistics(
+                **val,
+                description=band_descriptions[ix],
+            )
+            for ix, val in enumerate(stats)
+        }
 
     def tile(
         self,
         tile_x: int,
         tile_y: int,
         tile_z: int,
-        tilesize: int = 256,
+        tilesize: int | None = None,
         reproject_method: WarpResampling = "nearest",
         auto_expand: bool = True,
         nodata: NoData | None = None,
@@ -281,16 +286,22 @@ class XarrayReader(BaseReader):
                 f"Tile(x={tile_x}, y={tile_y}, z={tile_z}) is outside bounds"
             )
 
+        matrix = self.tms.matrix(tile_z)
+        bbox = cast(
+            BBox,
+            self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z)),
+        )
+
         return self.part(
-            cast(BBox, self.tms.xy_bounds(Tile(x=tile_x, y=tile_y, z=tile_z))),
+            bbox,
             dst_crs=self.tms.rasterio_crs,
             bounds_crs=self.tms.rasterio_crs,
             reproject_method=reproject_method,
             auto_expand=auto_expand,
             nodata=nodata,
             indexes=indexes,
-            height=tilesize,
-            width=tilesize,
+            height=tilesize or matrix.tileHeight,
+            width=tilesize or matrix.tileWidth,
             out_dtype=out_dtype,
             **kwargs,
         )
@@ -338,7 +349,7 @@ class XarrayReader(BaseReader):
 
         dst_crs = dst_crs or bounds_crs
 
-        da, band_names, band_descriptions = self._sel_indexes(indexes)
+        da, band_descriptions = self._sel_indexes(indexes)
 
         if nodata is not None:
             da = da.rio.write_nodata(nodata)
@@ -448,7 +459,6 @@ class XarrayReader(BaseReader):
             bounds=bbox,
             crs=da.rio.crs,
             dataset_statistics=stats,
-            band_names=band_names,
             band_descriptions=band_descriptions,
             nodata=da.rio.nodata,
         )
@@ -488,7 +498,7 @@ class XarrayReader(BaseReader):
             )
             max_size = None
 
-        da, band_names, band_descriptions = self._sel_indexes(indexes)
+        da, band_descriptions = self._sel_indexes(indexes)
 
         if da.nbytes > MAX_ARRAY_SIZE:
             raise MaxArraySizeError(
@@ -578,7 +588,6 @@ class XarrayReader(BaseReader):
             bounds=da.rio.bounds(),
             crs=da.rio.crs,
             dataset_statistics=stats,
-            band_names=band_names,
             band_descriptions=band_descriptions,
             nodata=da.rio.nodata,
         )
@@ -628,7 +637,7 @@ class XarrayReader(BaseReader):
         ):
             raise PointOutsideBounds("Point is outside dataset bounds")
 
-        da, band_names, band_descriptions = self._sel_indexes(indexes)
+        da, band_descriptions = self._sel_indexes(indexes)
 
         if nodata is not None:
             da = da.rio.write_nodata(nodata)
@@ -648,7 +657,6 @@ class XarrayReader(BaseReader):
             arr,
             coordinates=(lon, lat),
             crs=coord_crs,
-            band_names=band_names,
             band_descriptions=band_descriptions,
             pixel_location=(x, y),
             nodata=da.rio.nodata,

rio_tiler/models.py

@@ -1,6 +1,7 @@
 """rio-tiler models."""
 
 import itertools
+import re
 import warnings
 from collections.abc import Sequence
 from typing import Any, Literal, cast
@@ -87,6 +88,7 @@ class BandStatistics(BaseModel):
     valid_percent: float
     masked_pixels: float
     valid_pixels: float
+    description: str
 
     model_config = {"extra": "allow"}
 
@@ -187,7 +189,7 @@ class PointData:
 
     @band_descriptions.default
     def _default_band_descriptions(self):
-        return ["" for ix in range(self.count)]
+        return ["" or f"b{ix + 1}" for ix in range(self.count)]
 
     @scales.default
     def _default_scales(self):
@@ -290,14 +292,20 @@ class PointData:
         # Using numexpr do not preserve mask info
         data.mask = False
 
-        # TODO: Update band descriptions
+        mapexpr = {
+            self.band_names[idx]: desc for idx, desc in enumerate(self.band_descriptions)
+        }
+        _re = re.compile(r"\bb[0-9A-Z]+\b")
+        band_descriptions = [
+            _re.sub(lambda x: mapexpr[x.group()], block) for block in blocks
+        ]
 
         return PointData(
             data,
             assets=self.assets,
             crs=self.crs,
             coordinates=self.coordinates,
-            band_names=blocks,
+            band_descriptions=band_descriptions,
             metadata=self.metadata,
             pixel_location=self.pixel_location,
         )
@@ -363,7 +371,7 @@ class ImageData:
 
     @band_descriptions.default
     def _default_band_descriptions(self):
-        return ["" for ix in range(self.count)]
+        return ["" or f"b{ix + 1}" for ix in range(self.count)]
 
     @scales.default
     def _default_scales(self):
@@ -691,14 +699,20 @@ class ImageData:
         # NOTE: We use dataset mask when mixing bands
         data.mask = numpy.logical_or.reduce(self.array.mask)
 
-        # TODO: update band descriptions
+        mapexpr = {
+            self.band_names[idx]: desc for idx, desc in enumerate(self.band_descriptions)
+        }
+        _re = re.compile(r"\bb[0-9A-Z]+\b")
+        band_descriptions = [
+            _re.sub(lambda x: mapexpr[x.group()], block) for block in blocks
+        ]
 
         return ImageData(
             data,
             assets=self.assets,
             crs=self.crs,
             bounds=self.bounds,
-            band_names=blocks,
+            band_descriptions=band_descriptions,
             metadata=self.metadata,
             dataset_statistics=stats,
             alpha_mask=self.alpha_mask,
@@ -917,7 +931,10 @@ class ImageData:
         )
 
         return {
-            f"{self.band_names[ix]}": BandStatistics(**stats[ix])
+            f"{self.band_names[ix]}": BandStatistics(
+                **stats[ix],
+                description=self.band_descriptions[ix],
+            )
             for ix in range(len(stats))
         }
 

rio_tiler/reader.py

@@ -298,8 +298,9 @@ def read(
             data,
             bounds=out_bounds,
             crs=dataset.crs,
-            band_names=[f"b{idx}" for idx in indexes],
-            band_descriptions=[dataset.descriptions[ix - 1] or "" for idx in indexes],
+            band_descriptions=[
+                dataset.descriptions[ix - 1] or f"b{idx}" for idx in indexes
+            ],
             dataset_statistics=dataset_statistics,
             metadata=dataset.tags(),
             nodata=nodata,
@@ -509,7 +510,6 @@ def part(
             img.array[:, padding:-padding, padding:-padding],
             bounds=bounds,
             crs=img.crs,
-            band_names=img.band_names,
             band_descriptions=img.band_descriptions,
             nodata=img.nodata,
             scales=img.scales,
@@ -649,7 +649,6 @@ def point(
 
         return PointData(
             img.array[:, 0, 0],
-            band_names=img.band_names,
             band_descriptions=img.band_descriptions,
             coordinates=coordinates,
             crs=coord_crs,

rio_tiler/types.py

@@ -1,7 +1,7 @@
 """rio-tiler types."""
 
 from collections.abc import Sequence
-from typing import Any, Literal, TypedDict
+from typing import Any, Literal, NotRequired, TypedDict
 
 import numpy
 
@@ -61,11 +61,13 @@ WarpResampling = Literal[
 ]
 
 
-class AssetInfo(TypedDict, total=False):
+class AssetInfo(TypedDict):
     """Asset Reader Options."""
 
     url: Any
-    media_type: str
-    env: dict | None
-    metadata: dict | None
-    dataset_statistics: Sequence[tuple[float, float]] | None
+    name: str
+    media_type: str | None
+    method_options: dict
+    env: NotRequired[dict]
+    metadata: NotRequired[dict]
+    dataset_statistics: NotRequired[Sequence[tuple[float, float]]]

{rio_tiler-8.0.5.dist-info → rio_tiler-9.0.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rio-tiler
-Version: 8.0.5
+Version: 9.0.0a1
 Summary: User friendly Rasterio plugin to read raster datasets.
 Project-URL: Homepage, https://cogeotiff.github.io/rio-tiler/
 Project-URL: Documentation, https://cogeotiff.github.io/rio-tiler/

{rio_tiler-8.0.5.dist-info → rio_tiler-9.0.0a1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-rio_tiler/__init__.py,sha256=9I_AbcN_Q5q0cgOm8MkNY6J1X4ZALl8YEgSq2es0oac,192
+rio_tiler/__init__.py,sha256=ZuJ_EqBA2SkpM04p6fYKEq_v001Mr1KtKfeqX4ze270,194
 rio_tiler/colormap.py,sha256=ttimH_pdXaPwCEtP20YAIPbk0t-FeglZaB2KEplOJjs,11308
 rio_tiler/constants.py,sha256=55i-7JZDupTXZdLgxL03KsgM4lAzuGuIVP1zZKktzp0,426
 rio_tiler/errors.py,sha256=GFAuE1AaSvx6dd0z5um9n3y1wVzUyQ5S8qY7_tXdrR8,2178
-rio_tiler/expression.py,sha256=kZhxXVL7j7c-9fMi8XeLlIzaYXNY2PhKg892jNeLEpk,2301
+rio_tiler/expression.py,sha256=sVEdEP83c8TCMkcKDCg-3aTTfQiNmJ5stFBMvtjc0fU,2309
 rio_tiler/logger.py,sha256=RR8lnW3uVXkFkPa3nNJS_tTndmdiNNDVXpCDGDxGf0A,81
-rio_tiler/models.py,sha256=5ZSUWP-z5LP14X7vVaoOBFdJLsmAEBHTCW8N5J97dYs,35046
+rio_tiler/models.py,sha256=B8krrhPAfaL9tofKEax_855pcWXueNhbaJT32Nvt_aw,35712
 rio_tiler/profiles.py,sha256=EAx2JdcaOcMw5PZjxbCqQBXXWMac9mjtpHoVFPJEDNQ,1562
 rio_tiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rio_tiler/reader.py,sha256=GTz_f3m3LH-UTn7dh6Jy1U_18R66X0QnmnFcWs4PhLM,24991
+rio_tiler/reader.py,sha256=_Jd4JP4xDFMZWcL3eOv2Lgo_r-SwvbnjWcpOlaLK2dw,24895
 rio_tiler/tasks.py,sha256=rU4rpYFuTvPnWi8dp-lq0EBTOpQvQ-Gmo2eu0GcDKpE,3589
-rio_tiler/types.py,sha256=pFw_rjzAfoebIS3-sxWWZa1LHIIUen4F0NnPmiqRfvA,1635
+rio_tiler/types.py,sha256=KPSKIOToEnAqtX04v7LoTJj9yCYocthMKUQAfv3AqcI,1699
 rio_tiler/utils.py,sha256=AeWxiOW07cn_bIWxXBp2PWsc11X0DtI1UFp2sdWFQto,32248
 rio_tiler/cmap_data/__init__.py,sha256=8FtVmfpTjXlvhxQ5QesN0UC1m_B3MuF3LbGbhMC5Rw4,1039
 rio_tiler/cmap_data/accent.npy,sha256=Qde1ldOoXghe4L05v1QbVvnMA1ldwNjKWPf5xCBbmI4,1152
@@ -227,18 +227,18 @@ rio_tiler/experimental/__init__.py,sha256=dgW817h5U9OQt4V68L912g3DivPfhoWKvS-mI8
 rio_tiler/experimental/vsifile.py,sha256=O_HeGz-eMM2voQ2lSREEUeHRb6fzvDj6jl_fhkspkII,937
 rio_tiler/experimental/zarr.py,sha256=Lkz5WCNz6nRJTdvSKLCaSVaW2esSJDxyIsKr0pB6ppA,11753
 rio_tiler/io/__init__.py,sha256=_L4iILm6vSiJ14GEDDOvkuUHRtbWC9oqx6Bu8PxHhvA,270
-rio_tiler/io/base.py,sha256=qXaIybaTLRZjFvgLFX9XOEozrP-oGc8CTICFunvB0BE,53044
-rio_tiler/io/rasterio.py,sha256=xwA-EM8FUfpWIW7X4-R-UExOayUzQ1PoCeRZGi2TRNs,28952
-rio_tiler/io/stac.py,sha256=zMBmqMTakCX1fdjqlCO5KtoPaOsJUeL2AmUvWpoqlQc,12761
-rio_tiler/io/xarray.py,sha256=QjVlTnwmVMmoaFCuxuHRYEXx5Zb1dK3ScJD4HTa0WU8,26968
+rio_tiler/io/base.py,sha256=XBzXGnshY7wcipNKuh_Y9hpQR685eLQJpFaVOMUSJOA,50078
+rio_tiler/io/rasterio.py,sha256=YAp35j385LSvFdiDdSPDineLhIslbQ6sJIv44bTG1-I,29226
+rio_tiler/io/stac.py,sha256=LPXOFn9CmqdHlaHzLvk7_c9JDSPXiR_ZsVMVWbwWIcI,13490
+rio_tiler/io/xarray.py,sha256=_f9DqFMXMMUwLvf_hA7_uU3S8N7FswzBC0H3j5VJej0,26949
 rio_tiler/mosaic/__init__.py,sha256=Yj6CKpnFl8PJhLSp-a55wo33hKZ8-6OOBJtWA1HZVy8,118
 rio_tiler/mosaic/backend.py,sha256=IkkYgcoSsWuvyaFMd-ViQufDeMl-kZlNobbHYA6A21s,8450
 rio_tiler/mosaic/reader.py,sha256=FzSSMijL8KyKAw0JZ7u7dxzid_UKAVHmNKXwX4NVH44,10990
 rio_tiler/mosaic/methods/__init__.py,sha256=tgkXM9skaTLXIm5QFoheOEznQXM97KGflcAWHfkrt1g,612
 rio_tiler/mosaic/methods/base.py,sha256=E9QrriktsY1ACNXg1HEjQgZpEZZ7_oADYcDKRMWeNdk,1387
 rio_tiler/mosaic/methods/defaults.py,sha256=L2pPOpQpH3yQT6AYXMSWoCev_swOi9Xc9jzBaXXs7_w,7566
-rio_tiler-8.0.5.dist-info/METADATA,sha256=b7yu0aD1WmaaVza7whszSuRqZ8Sh54sDEFvwLox9WXY,11210
-rio_tiler-8.0.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rio_tiler-8.0.5.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
-rio_tiler-8.0.5.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
-rio_tiler-8.0.5.dist-info/RECORD,,
+rio_tiler-9.0.0a1.dist-info/METADATA,sha256=CAKjSdzv2PK4-ueqsv3oiSkBWIvTCmUcqRWwj_n_Sy8,11212
+rio_tiler-9.0.0a1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rio_tiler-9.0.0a1.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
+rio_tiler-9.0.0a1.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
+rio_tiler-9.0.0a1.dist-info/RECORD,,