rio-tiler 8.0.4__py3-none-any.whl → 8.0.5__py3-none-any.whl

rio_tiler/mosaic/methods/base.py

@@ -2,7 +2,6 @@
 
 import abc
 from dataclasses import dataclass, field
-from typing import Optional
 
 import numpy
 
@@ -11,9 +10,9 @@ import numpy
 class MosaicMethodBase(abc.ABC):
     """Abstract base class for rio-tiler-mosaic methods objects."""
 
-    mosaic: Optional[numpy.ma.MaskedArray] = field(default=None, init=False)
+    mosaic: numpy.ma.MaskedArray | None = field(default=None, init=False)
     exit_when_filled: bool = field(default=False, init=False)
-    cutline_mask: Optional[numpy.ndarray] = field(default=None, init=False)
+    cutline_mask: numpy.ndarray | None = field(default=None, init=False)
     width: int = field(init=False)
     height: int = field(init=False)
     count: int = field(init=False)
@@ -42,7 +41,7 @@ class MosaicMethodBase(abc.ABC):
         return False
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return data."""
         return self.mosaic
 

rio_tiler/mosaic/methods/defaults.py

@@ -1,7 +1,6 @@
 """rio_tiler.mosaic.methods.defaults: default mosaic filling methods."""
 
 from dataclasses import dataclass, field
-from typing import List, Optional
 
 import numpy
 
@@ -18,7 +17,7 @@ class FirstMethod(MosaicMethodBase):
         """Mosaic Method repr."""
         return "<Mosaic: FirstMethod>"
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add data to the mosaic array."""
         if self.mosaic is None:
             self.mosaic = array
@@ -39,7 +38,7 @@ class HighestMethod(MosaicMethodBase):
         """Mosaic Method repr."""
         return "<Mosaic: HighestMethod>"
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add data to the mosaic array."""
         if self.mosaic is None:
             self.mosaic = array
@@ -63,7 +62,7 @@ class LowestMethod(MosaicMethodBase):
         """Mosaic Method repr."""
         return "<Mosaic: LowestMethod>"
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add data to the mosaic array."""
         if self.mosaic is None:
             self.mosaic = array
@@ -84,14 +83,14 @@ class MeanMethod(MosaicMethodBase):
     """Stack the arrays and return the Mean pixel value."""
 
     enforce_data_type: bool = True
-    stack: List[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
+    stack: list[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
 
     def __repr__(self):
         """Mosaic Method repr."""
         return "<Mosaic: MeanMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return Mean of the data stack."""
         if self.stack:
             array = numpy.ma.mean(numpy.ma.stack(self.stack, axis=0), axis=0)
@@ -112,14 +111,14 @@ class MedianMethod(MosaicMethodBase):
     """Stack the arrays and return the Median pixel value."""
 
     enforce_data_type: bool = True
-    stack: List[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
+    stack: list[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
 
     def __repr__(self):
         """Mosaic Method repr."""
         return "<Mosaic: MedianMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return Median of the data stack."""
         if self.stack:
             array = numpy.ma.median(numpy.ma.stack(self.stack, axis=0), axis=0)
@@ -130,7 +129,7 @@ class MedianMethod(MosaicMethodBase):
 
         return None
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add array to the stack."""
         self.stack.append(array)
 
@@ -139,21 +138,21 @@ class MedianMethod(MosaicMethodBase):
 class StdevMethod(MosaicMethodBase):
     """Stack the arrays and return the Standard Deviation value."""
 
-    stack: List[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
+    stack: list[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
 
     def __repr__(self):
         """Mosaic Method repr."""
         return "<Mosaic: StdevMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return STDDEV of the data stack."""
         if self.stack:
             return numpy.ma.std(numpy.ma.stack(self.stack, axis=0), axis=0)
 
         return None
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add array to the stack."""
         self.stack.append(array)
 
@@ -167,14 +166,14 @@ class LastBandHighMethod(MosaicMethodBase):
         return "<Mosaic: LastBandHighMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return data."""
         if self.mosaic is not None:
             return self.mosaic[:-1].copy()
 
         return None
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add data to the mosaic array."""
         if self.mosaic is None:
             self.mosaic = array
@@ -199,14 +198,14 @@ class LastBandLowMethod(MosaicMethodBase):
         return "<Mosaic: LastBandLowMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return data."""
         if self.mosaic is not None:
             return self.mosaic[:-1].copy()
 
         return None
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add data to the mosaic array."""
         if self.mosaic is None:
             self.mosaic = array
@@ -226,14 +225,14 @@ class LastBandLowMethod(MosaicMethodBase):
 class CountMethod(MosaicMethodBase):
     """Stack the arrays and return the valid pixel count."""
 
-    stack: List[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
+    stack: list[numpy.ma.MaskedArray] = field(default_factory=list, init=False)
 
     def __repr__(self):
         """Mosaic Method repr."""
         return "<Mosaic: CountMethod>"
 
     @property
-    def data(self) -> Optional[numpy.ma.MaskedArray]:
+    def data(self) -> numpy.ma.MaskedArray | None:
         """Return valid data count of the data stack."""
         if self.stack:
             data = numpy.ma.count(numpy.ma.stack(self.stack, axis=0), axis=0)
@@ -254,6 +253,6 @@ class CountMethod(MosaicMethodBase):
 
         return None
 
-    def feed(self, array: Optional[numpy.ma.MaskedArray]):
+    def feed(self, array: numpy.ma.MaskedArray | None):
         """Add array to the stack."""
         self.stack.append(array)

rio_tiler/mosaic/reader.py

@@ -1,8 +1,9 @@
 """rio_tiler.mosaic: create tile from multiple assets."""
 
 import warnings
+from collections.abc import Callable, Sequence
 from inspect import isclass
-from typing import Any, Callable, List, Optional, Sequence, Tuple, Type, Union, cast
+from typing import Any, cast
 
 import numpy
 from rasterio.crs import CRS
@@ -26,12 +27,12 @@ def mosaic_reader(  # noqa: C901
     mosaic_assets: Sequence,
     reader: Callable[..., ImageData],
     *args: Any,
-    pixel_selection: Union[Type[MosaicMethodBase], MosaicMethodBase] = FirstMethod,
-    chunk_size: Optional[int] = None,
+    pixel_selection: type[MosaicMethodBase] | MosaicMethodBase = FirstMethod,
+    chunk_size: int | None = None,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Tuple = (TileOutsideBounds,),
+    allowed_exceptions: tuple = (TileOutsideBounds,),
     **kwargs,
-) -> Tuple[ImageData, List]:
+) -> tuple[ImageData, list]:
     """Merge multiple assets.
 
     Args:
@@ -65,7 +66,7 @@ def mosaic_reader(  # noqa: C901
 
     """
     if isclass(pixel_selection):
-        pixel_selection = cast(Type[MosaicMethodBase], pixel_selection)
+        pixel_selection = cast(type[MosaicMethodBase], pixel_selection)
 
         if issubclass(pixel_selection, MosaicMethodBase):
             pixel_selection = pixel_selection()
@@ -79,10 +80,10 @@ def mosaic_reader(  # noqa: C901
     if not chunk_size:
         chunk_size = threads if threads > 1 else len(mosaic_assets)
 
-    assets_used: List = []
-    crs: Optional[CRS]
-    bounds: Optional[BBox]
-    band_names: List[str]
+    assets_used: list = []
+    crs: CRS | None
+    bounds: BBox | None
+    band_names: list[str]
 
     for chunks in _chunks(mosaic_assets, chunk_size):
         tasks = create_tasks(reader, chunks, threads, *args, **kwargs)
@@ -171,12 +172,12 @@ def mosaic_point_reader(
     mosaic_assets: Sequence,
     reader: Callable[..., PointData],
     *args: Any,
-    pixel_selection: Union[Type[MosaicMethodBase], MosaicMethodBase] = FirstMethod,
-    chunk_size: Optional[int] = None,
+    pixel_selection: type[MosaicMethodBase] | MosaicMethodBase = FirstMethod,
+    chunk_size: int | None = None,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Tuple = (PointOutsideBounds,),
+    allowed_exceptions: tuple = (PointOutsideBounds,),
     **kwargs,
-) -> Tuple[PointData, List]:
+) -> tuple[PointData, list]:
     """Merge multiple assets.
 
     Args:
@@ -202,7 +203,7 @@ def mosaic_point_reader(
 
     """
     if isclass(pixel_selection):
-        pixel_selection = cast(Type[MosaicMethodBase], pixel_selection)
+        pixel_selection = cast(type[MosaicMethodBase], pixel_selection)
 
         if issubclass(pixel_selection, MosaicMethodBase):
             pixel_selection = pixel_selection()
@@ -216,10 +217,10 @@ def mosaic_point_reader(
     if not chunk_size:
         chunk_size = threads if threads > 1 else len(mosaic_assets)
 
-    assets_used: List = []
-    crs: Optional[CRS]
-    coordinates: Optional[Tuple[float, float]]
-    band_names: List[str]
+    assets_used: list = []
+    crs: CRS | None
+    coordinates: tuple[float, float] | None
+    band_names: list[str]
 
     for chunks in _chunks(mosaic_assets, chunk_size):
         tasks = create_tasks(reader, chunks, threads, *args, **kwargs)

rio_tiler/reader.py

@@ -3,7 +3,8 @@
 import contextlib
 import math
 import warnings
-from typing import Callable, Dict, Optional, Tuple, TypedDict, Union, cast
+from collections.abc import Callable
+from typing import TypedDict, cast
 
 import numpy
 from affine import Affine
@@ -34,12 +35,12 @@ from rio_tiler.utils import (
 class Options(TypedDict, total=False):
     """Reader Options."""
 
-    nodata: Optional[NoData]
-    vrt_options: Optional[Dict]
-    resampling_method: Optional[RIOResampling]
-    reproject_method: Optional[WarpResampling]
-    unscale: Optional[bool]
-    post_process: Optional[Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]]
+    nodata: NoData | None
+    vrt_options: dict | None
+    resampling_method: RIOResampling | None
+    reproject_method: WarpResampling | None
+    unscale: bool | None
+    post_process: Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray] | None
 
 
 def _apply_buffer(
@@ -47,7 +48,7 @@ def _apply_buffer(
     bounds: BBox,
     height: int,
     width: int,
-) -> Tuple[BBox, int, int]:
+) -> tuple[BBox, int, int]:
     """Apply buffer on bounds."""
     x_res = (bounds[2] - bounds[0]) / width
     y_res = (bounds[3] - bounds[1]) / height
@@ -68,20 +69,20 @@ def _apply_buffer(
 
 
 def read(
-    src_dst: Union[DatasetReader, DatasetWriter, WarpedVRT],
-    dst_crs: Optional[CRS] = None,
-    height: Optional[int] = None,
-    width: Optional[int] = None,
-    max_size: Optional[int] = None,
-    indexes: Optional[Indexes] = None,
-    window: Optional[windows.Window] = None,
-    nodata: Optional[NoData] = None,
-    vrt_options: Optional[Dict] = None,
-    out_dtype: Optional[Union[str, numpy.dtype]] = None,
+    src_dst: DatasetReader | DatasetWriter | WarpedVRT,
+    dst_crs: CRS | None = None,
+    height: int | None = None,
+    width: int | None = None,
+    max_size: int | None = None,
+    indexes: Indexes | None = None,
+    window: windows.Window | None = None,
+    nodata: NoData | None = None,
+    vrt_options: dict | None = None,
+    out_dtype: str | numpy.dtype | None = None,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
     unscale: bool = False,
-    post_process: Optional[Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]] = None,
+    post_process: Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray] | None = None,
 ) -> ImageData:
     """Low level read function.
 
@@ -309,25 +310,25 @@ def read(
 
 # flake8: noqa: C901
 def part(
-    src_dst: Union[DatasetReader, DatasetWriter, WarpedVRT],
+    src_dst: DatasetReader | DatasetWriter | WarpedVRT,
     bounds: BBox,
-    height: Optional[int] = None,
-    width: Optional[int] = None,
-    max_size: Optional[int] = None,
-    dst_crs: Optional[CRS] = None,
-    bounds_crs: Optional[CRS] = None,
-    indexes: Optional[Indexes] = None,
-    minimum_overlap: Optional[float] = None,
-    padding: Optional[int] = None,
-    buffer: Optional[float] = None,
-    nodata: Optional[NoData] = None,
-    vrt_options: Optional[Dict] = None,
-    out_dtype: Optional[Union[str, numpy.dtype]] = None,
+    height: int | None = None,
+    width: int | None = None,
+    max_size: int | None = None,
+    dst_crs: CRS | None = None,
+    bounds_crs: CRS | None = None,
+    indexes: Indexes | None = None,
+    minimum_overlap: float | None = None,
+    padding: int | None = None,
+    buffer: float | None = None,
+    nodata: NoData | None = None,
+    vrt_options: dict | None = None,
+    out_dtype: str | numpy.dtype | None = None,
     align_bounds_with_dataset: bool = False,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
     unscale: bool = False,
-    post_process: Optional[Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]] = None,
+    post_process: Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray] | None = None,
 ) -> ImageData:
     """Read part of a dataset.
 
@@ -533,18 +534,18 @@ def part(
 
 
 def point(
-    src_dst: Union[DatasetReader, DatasetWriter, WarpedVRT],
-    coordinates: Tuple[float, float],
-    indexes: Optional[Indexes] = None,
+    src_dst: DatasetReader | DatasetWriter | WarpedVRT,
+    coordinates: tuple[float, float],
+    indexes: Indexes | None = None,
     coord_crs: CRS = WGS84_CRS,
-    nodata: Optional[NoData] = None,
-    vrt_options: Optional[Dict] = None,
-    out_dtype: Optional[Union[str, numpy.dtype]] = None,
+    nodata: NoData | None = None,
+    vrt_options: dict | None = None,
+    out_dtype: str | numpy.dtype | None = None,
     resampling_method: RIOResampling = "nearest",
     reproject_method: WarpResampling = "nearest",
     interpolate: bool = False,
     unscale: bool = False,
-    post_process: Optional[Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray]] = None,
+    post_process: Callable[[numpy.ma.MaskedArray], numpy.ma.MaskedArray] | None = None,
 ) -> PointData:
     """Read a pixel value for a point.
 

rio_tiler/tasks.py

@@ -1,19 +1,20 @@
 """rio_tiler.tasks: tools for handling rio-tiler's future tasks."""
 
+from collections.abc import Callable, Generator, Sequence
 from concurrent import futures
 from functools import partial
-from typing import Any, Callable, Dict, Generator, Optional, Sequence, Tuple, Union
+from typing import Any
 
 from rio_tiler.constants import MAX_THREADS
 from rio_tiler.logger import logger
 from rio_tiler.models import ImageData, PointData
 
-TaskType = Sequence[Tuple[Union[futures.Future, Callable], Any]]
+TaskType = Sequence[tuple[futures.Future | Callable, Any]]
 
 
 def filter_tasks(
     tasks: TaskType,
-    allowed_exceptions: Optional[Tuple] = None,
+    allowed_exceptions: tuple | None = None,
 ) -> Generator:
     """Filter Tasks to remove Exceptions.
 
@@ -60,7 +61,7 @@ def multi_arrays(
     reader: Callable[..., ImageData],
     *args: Any,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Optional[Tuple] = None,
+    allowed_exceptions: tuple | None = None,
     **kwargs: Any,
 ) -> ImageData:
     """Merge arrays returned from tasks."""
@@ -75,7 +76,7 @@ def multi_points(
     reader: Callable[..., PointData],
     *args: Any,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Optional[Tuple] = None,
+    allowed_exceptions: tuple | None = None,
     **kwargs: Any,
 ) -> PointData:
     """Merge points returned from tasks."""
@@ -90,9 +91,9 @@ def multi_values(
     reader: Callable,
     *args: Any,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Optional[Tuple] = None,
+    allowed_exceptions: tuple | None = None,
     **kwargs: Any,
-) -> Dict:
+) -> dict:
     """Merge values returned from tasks."""
     tasks = create_tasks(reader, asset_list, threads, *args, **kwargs)
     return {
@@ -106,7 +107,7 @@ def multi_values_list(
     reader: Callable,
     *args: Any,
     threads: int = MAX_THREADS,
-    allowed_exceptions: Optional[Tuple] = None,
+    allowed_exceptions: tuple | None = None,
     **kwargs: Any,
 ) -> list[tuple[Any, Any]]:
     """Merge values returned from tasks."""

rio_tiler/types.py

@@ -1,34 +1,31 @@
 """rio-tiler types."""
 
-from typing import Any, Dict, Literal, Optional, Sequence, Tuple, TypedDict, Union
+from collections.abc import Sequence
+from typing import Any, Literal, TypedDict
 
 import numpy
 
-NumType = Union[float, int]
+NumType = float | int
 
-BBox = Tuple[float, float, float, float]
-NoData = Union[float, int, str]
-Indexes = Union[Sequence[int], int]
+BBox = tuple[float, float, float, float]
+NoData = float | int | str
+Indexes = Sequence[int] | int
 
-DataMaskType = Tuple[numpy.ndarray, numpy.ndarray]
+DataMaskType = tuple[numpy.ndarray, numpy.ndarray]
 
-ColorTuple = Tuple[int, int, int, int]  # (red, green, blue, alpha)
-IntervalTuple = Tuple[NumType, NumType]  # (0, 100)
+ColorTuple = tuple[int, int, int, int]  # (red, green, blue, alpha)
+IntervalTuple = tuple[NumType, NumType]  # (0, 100)
 
 # ColorMap Dict: {1: (0, 0, 0, 255), ...}
-GDALColorMapType = Dict[int, ColorTuple]
+GDALColorMapType = dict[int, ColorTuple]
 
 # Discrete Colormap, like GDALColorMapType but accept Float: {0.1: (0, 0, 0, 255), ...}
-DiscreteColorMapType = Dict[NumType, ColorTuple]
+DiscreteColorMapType = dict[NumType, ColorTuple]
 
 # Intervals ColorMap: [((0, 1), (0, 0, 0, 0)), ...]
-IntervalColorMapType = Sequence[Tuple[IntervalTuple, ColorTuple]]
+IntervalColorMapType = Sequence[tuple[IntervalTuple, ColorTuple]]
 
-ColorMapType = Union[
-    GDALColorMapType,
-    DiscreteColorMapType,
-    IntervalColorMapType,
-]
+ColorMapType = GDALColorMapType | DiscreteColorMapType | IntervalColorMapType
 
 # RasterIO() resampling method.
 # ref: https://gdal.org/api/raster_c_api.html#_CPPv418GDALRIOResampleAlg
@@ -69,6 +66,6 @@ class AssetInfo(TypedDict, total=False):
 
     url: Any
     media_type: str
-    env: Optional[Dict]
-    metadata: Optional[Dict]
-    dataset_statistics: Optional[Sequence[Tuple[float, float]]]
+    env: dict | None
+    metadata: dict | None
+    dataset_statistics: Sequence[tuple[float, float]] | None