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

rio_tiler/__init__.py

@@ -1,6 +1,6 @@
 """rio-tiler."""
 
-__version__ = "8.0.4"
+__version__ = "9.0.0a1"
 
 from . import (  # noqa
     colormap,

rio_tiler/colormap.py

@@ -6,9 +6,9 @@ import os
 import pathlib
 import re
 import warnings
+from collections.abc import Sequence
 from importlib.resources import as_file
 from importlib.resources import files as resources_files
-from typing import Dict, List, Sequence, Tuple, Union
 
 import attr
 import numpy
@@ -137,7 +137,7 @@ def apply_cmap(data: numpy.ndarray, colormap: ColorMapType) -> DataMaskType:
 
 
 def apply_discrete_cmap(
-    data: numpy.ndarray, colormap: Union[GDALColorMapType, DiscreteColorMapType]
+    data: numpy.ndarray, colormap: GDALColorMapType | DiscreteColorMapType
 ) -> DataMaskType:
     """Apply discrete colormap.
 
@@ -217,7 +217,7 @@ def apply_intervals_cmap(
     return data[:-1], data[-1]
 
 
-def parse_color(rgba: Union[Sequence[int], str]) -> Tuple[int, int, int, int]:
+def parse_color(rgba: Sequence[int] | str | None) -> tuple[int, int, int, int]:
     """Parse RGB/RGBA color and return valid rio-tiler compatible RGBA colormap entry.
 
     Args:
@@ -290,7 +290,7 @@ class ColorMaps:
 
     """
 
-    data: Dict[str, Union[str, pathlib.Path, ColorMapType]] = attr.ib(
+    data: dict[str, str | pathlib.Path | ColorMapType | None] = attr.ib(
         default=attr.Factory(lambda: DEFAULT_CMAPS_FILES)
     )
 
@@ -344,7 +344,7 @@ class ColorMaps:
 
         return cmap
 
-    def list(self) -> List[str]:
+    def list(self) -> list[str]:
         """List registered Colormaps.
 
         Returns
@@ -355,7 +355,7 @@ class ColorMaps:
 
     def register(
         self,
-        custom_cmap: Dict[str, Union[str, pathlib.Path, ColorMapType]],
+        custom_cmap: dict[str, str | pathlib.Path | ColorMapType | None],
         overwrite: bool = False,
     ) -> "ColorMaps":
         """Register a custom colormap.

rio_tiler/experimental/vsifile.py

@@ -1,7 +1,5 @@
 """rio_tiler.io.Reader with VSIFILE/Obstore Opener."""
 
-from typing import Union
-
 import attr
 import rasterio
 from rasterio.io import DatasetReader, DatasetWriter, MemoryFile
@@ -21,7 +19,7 @@ except ImportError:  # pragma: nocover
 class VSIReader(Reader):
     """Rasterio Reader with VSIFILE opener."""
 
-    dataset: Union[DatasetReader, DatasetWriter, MemoryFile, WarpedVRT] = attr.ib(
+    dataset: DatasetReader | DatasetWriter | MemoryFile | WarpedVRT | None = attr.ib(
         default=None, init=False
     )
 

rio_tiler/experimental/zarr.py

@@ -3,9 +3,10 @@
 from __future__ import annotations
 
 import contextlib
+from collections.abc import Callable
 from functools import cache
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Literal, Optional, Union
+from typing import Any, Literal
 from urllib.parse import urlparse
 
 import attr
@@ -88,13 +89,13 @@ class ZarrReader(BaseReader):
 
     """
 
-    input: str = attr.ib()
-    dataset: xarray.Dataset = attr.ib(default=None)
+    input: str | None = attr.ib()
+    dataset: xarray.Dataset | None = attr.ib(default=None)
 
     tms: TileMatrixSet = attr.ib(default=WEB_MERCATOR_TMS)
 
     opener: Callable[..., xarray.Dataset] = attr.ib(default=open_dataset)
-    opener_options: Dict = attr.ib(factory=dict)
+    opener_options: dict = attr.ib(factory=dict)
     _ctx_stack: contextlib.ExitStack = attr.ib(init=False, factory=contextlib.ExitStack)
 
     def __attrs_post_init__(self):
@@ -142,7 +143,7 @@ class ZarrReader(BaseReader):
         self.close()
 
     @property
-    def variables(self) -> List[str]:
+    def variables(self) -> list[str]:
         """Return dataset variable names"""
         return list(self.dataset.data_vars)  # type: ignore
 
@@ -191,16 +192,16 @@ class ZarrReader(BaseReader):
     def _get_variable(
         self,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
     ) -> xarray.DataArray:
         """Get DataArray from xarray Dataset."""
         da = self.dataset[variable]
 
         if sel:
-            _idx: Dict[str, List] = {}
+            _idx: dict[str, list] = {}
             for s in sel:
-                val: Union[str, slice]
+                val: str | slice
                 dim, val = s.split("=")
 
                 # cast string to dtype of the dimension
@@ -239,8 +240,8 @@ class ZarrReader(BaseReader):
         self,
         *,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
     ):
         """Return xarray.DataArray info."""
         with XarrayReader(
@@ -258,8 +259,8 @@ class ZarrReader(BaseReader):
         crs: CRS,
         *,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
     ) -> BBox:
         """Return Geographic Bounds for a Geographic CRS."""
         with XarrayReader(
@@ -271,8 +272,8 @@ class ZarrReader(BaseReader):
         self,
         *,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
     ) -> Info:
         """Return xarray.DataArray info."""
         with XarrayReader(
@@ -284,10 +285,10 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
-    ) -> Dict[str, BandStatistics]:
+    ) -> dict[str, BandStatistics]:
         """Return statistics from a dataset."""
         with XarrayReader(
             self._get_variable(variable, sel=sel, method=method),
@@ -298,8 +299,8 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read a Web Map tile from a dataset."""
@@ -313,8 +314,8 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read part of a dataset."""
@@ -327,8 +328,8 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Return a preview of a dataset."""
@@ -341,8 +342,8 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
     ) -> PointData:
         """Read a pixel value from a dataset."""
@@ -355,8 +356,8 @@ class ZarrReader(BaseReader):
         self,
         *args: Any,
         variable: str,
-        sel: Optional[List[str]] = None,
-        method: Optional[sel_methods] = None,
+        sel: list[str] | None = None,
+        method: sel_methods | None = None,
         **kwargs: Any,
     ) -> ImageData:
         """Read part of a dataset defined by a geojson feature."""

rio_tiler/expression.py

@@ -1,7 +1,7 @@
 """rio-tiler.expression: Parse and Apply expression."""
 
 import re
-from typing import List, Sequence, Tuple
+from collections.abc import Sequence
 
 import numexpr
 import numpy
@@ -9,7 +9,7 @@ import numpy
 from rio_tiler.errors import InvalidExpression
 
 
-def parse_expression(expression: str, cast: bool = True) -> Tuple:
+def parse_expression(expression: str, cast: bool = True) -> tuple:
     """Parse rio-tiler band math expression and extract bands.
 
     Args:
@@ -37,7 +37,7 @@ def parse_expression(expression: str, cast: bool = True) -> Tuple:
     return output_bands
 
 
-def get_expression_blocks(expression: str) -> List[str]:
+def get_expression_blocks(expression: str) -> list[str]:
     """Split expression in blocks.
 
     Args:
@@ -51,7 +51,7 @@ def get_expression_blocks(expression: str) -> List[str]:
             ['b1/b2', 'b2+b1']
 
     """
-    return [expr for expr in expression.split(";") if expr]
+    return [expr.lower() for expr in expression.split(";") if expr]
 
 
 def apply_expression(