rio-tiler 6.8.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

rio_tiler/models.py

@@ -21,6 +21,7 @@ from rasterio.io import MemoryFile
 from rasterio.plot import reshape_as_image
 from rasterio.transform import from_bounds
 from rasterio.warp import transform_geom
+from typing_extensions import Self
 
 from rio_tiler.colormap import apply_cmap
 from rio_tiler.constants import WGS84_CRS
@@ -44,32 +45,14 @@ from rio_tiler.utils import (
 )
 
 
-class RioTilerBaseModel(BaseModel):
-    """Provides dictionary access for pydantic models, for backwards compatability."""
-
-    def __getitem__(self, item):
-        """Access item like in Dict."""
-        warnings.warn(
-            "'key' access will has been deprecated and will be removed in rio-tiler 7.0.",
-            DeprecationWarning,
-        )
-        return {**self.__dict__, **self.__pydantic_extra__}[item]
-
-
-class Bounds(RioTilerBaseModel):
+class Bounds(BaseModel):
     """Dataset Bounding box"""
 
-    bounds: BoundingBox
-
-
-class SpatialInfo(Bounds):
-    """Dataset SpatialInfo"""
+    bounds: BBox
+    crs: str
 
-    minzoom: int
-    maxzoom: int
 
-
-class Info(SpatialInfo):
+class Info(Bounds):
     """Dataset Info."""
 
     band_metadata: List[Tuple[str, Dict]]
@@ -84,7 +67,7 @@ class Info(SpatialInfo):
     model_config = {"extra": "allow"}
 
 
-class BandStatistics(RioTilerBaseModel):
+class BandStatistics(BaseModel):
     """Band statistics"""
 
     min: float
@@ -218,7 +201,7 @@ class PointData:
         return self.array.shape[0]
 
     @classmethod
-    def create_from_list(cls, data: Sequence["PointData"]):
+    def create_from_list(cls, data: Sequence["PointData"]) -> Self:
         """Create PointData from a sequence of PointsData objects.
 
         Args:
@@ -263,15 +246,6 @@ class PointData:
             metadata=metadata,
         )
 
-    def as_masked(self) -> numpy.ma.MaskedArray:
-        """return a numpy masked array."""
-        warnings.warn(
-            "'PointData.as_masked' has been deprecated and will be removed"
-            "in rio-tiler 7.0. You can get the masked array directly with `PointData.array` attribute.",
-            DeprecationWarning,
-        )
-        return self.array
-
     def apply_expression(self, expression: str) -> "PointData":
         """Apply expression to the image data."""
         blocks = get_expression_blocks(expression)
@@ -361,22 +335,7 @@ class ImageData:
             yield i
 
     @classmethod
-    def from_array(cls, arr: numpy.ndarray) -> "ImageData":
-        """Create ImageData from a numpy array.
-
-        Args:
-            arr (numpy.ndarray): Numpy array or Numpy masked array.
-
-        """
-        warnings.warn(
-            "'ImageData.from_array()' has been deprecated and will be removed"
-            "in rio-tiler 7.0.",
-            DeprecationWarning,
-        )
-        return cls(arr)
-
-    @classmethod
-    def from_bytes(cls, data: bytes) -> "ImageData":
+    def from_bytes(cls, data: bytes) -> Self:
         """Create ImageData from bytes.
 
         Args:
@@ -425,7 +384,7 @@ class ImageData:
                     )
 
     @classmethod
-    def create_from_list(cls, data: Sequence["ImageData"]) -> "ImageData":
+    def create_from_list(cls, data: Sequence["ImageData"]) -> Self:
         """Create ImageData from a sequence of ImageData objects.
 
         Args:
@@ -498,15 +457,6 @@ class ImageData:
             metadata=metadata,
         )
 
-    def as_masked(self) -> numpy.ma.MaskedArray:
-        """return a numpy masked array."""
-        warnings.warn(
-            "'ImageData.as_masked' has been deprecated and will be removed"
-            "in rio-tiler 7.0. You can get the masked array directly with `ImageData.array` attribute.",
-            DeprecationWarning,
-        )
-        return self.array
-
     def data_as_image(self) -> numpy.ndarray:
         """Return the data array reshaped into an image processing/visualization software friendly order.
 
@@ -531,7 +481,7 @@ class ImageData:
         return self.array.shape[0]
 
     @property
-    def transform(self):
+    def transform(self) -> Affine:
         """Returns the affine transform."""
         return (
             from_bounds(*self.bounds, self.width, self.height)
@@ -544,7 +494,7 @@ class ImageData:
         in_range: Sequence[IntervalTuple],
         out_range: Sequence[IntervalTuple] = ((0, 255),),
         out_dtype: Union[str, numpy.number] = "uint8",
-    ):
+    ) -> Self:
         """Rescale data in place."""
         self.array = rescale_image(
             self.array.copy(),
@@ -552,6 +502,7 @@ class ImageData:
             out_range=out_range,
             out_dtype=out_dtype,
         )
+        return self
 
     def apply_colormap(self, colormap: ColorMapType) -> "ImageData":
         """Apply colormap to the image data."""
@@ -570,7 +521,7 @@ class ImageData:
             metadata=self.metadata,
         )
 
-    def apply_color_formula(self, color_formula: Optional[str]):
+    def apply_color_formula(self, color_formula: Optional[str]) -> Self:
         """Apply color-operations formula in place."""
         out = self.array.data.copy()
         out[out < 0] = 0
@@ -581,6 +532,7 @@ class ImageData:
         data = numpy.ma.MaskedArray(out)
         data.mask = self.array.mask
         self.array = data
+        return self
 
     def apply_expression(self, expression: str) -> "ImageData":
         """Apply expression to the image data."""
@@ -796,9 +748,8 @@ class ImageData:
         """Post-process image data.
 
         Args:
-            in_range (tuple): input min/max bounds value to rescale from.
-            out_dtype (str, optional): output datatype after rescaling. Defaults to `uint8`.
-            color_formula (str, optional): color-ops formula (see: https://github.com/vincentsarago/color-ops).
+            shape (Dict): GeoJSON geometry or Feature.
+            shape_crs (rasterio.crs.CRS): Coordinates Reference System of shape.
             cover_scale (int, optional):
                 Scale used when generating coverage estimates of each
                 raster cell by vector feature. Coverage is generated by

rio_tiler/reader.py

@@ -23,6 +23,7 @@ from rio_tiler.types import BBox, Indexes, NoData, RIOResampling, WarpResampling
 from rio_tiler.utils import _requested_tile_aligned_with_internal_tile as is_aligned
 from rio_tiler.utils import (
     _round_window,
+    cast_to_sequence,
     get_vrt_transform,
     has_alpha_band,
     non_alpha_indexes,
@@ -120,8 +121,7 @@ def read(
         ImageData
 
     """
-    if isinstance(indexes, int):
-        indexes = (indexes,)
+    indexes = cast_to_sequence(indexes)
 
     if max_size and width and height:
         warnings.warn(
@@ -529,8 +529,7 @@ def point(
         PointData
 
     """
-    if isinstance(indexes, int):
-        indexes = (indexes,)
+    indexes = cast_to_sequence(indexes)
 
     with contextlib.ExitStack() as ctx:
         # Use WarpedVRT when User provided Nodata or VRT Option (cutline)

rio_tiler/types.py

@@ -1,6 +1,6 @@
 """rio-tiler types."""
 
-from typing import Dict, Literal, Optional, Sequence, Tuple, TypedDict, Union
+from typing import Any, Dict, Literal, Optional, Sequence, Tuple, TypedDict, Union
 
 import numpy
 
@@ -58,7 +58,8 @@ WarpResampling = Literal[
 class AssetInfo(TypedDict, total=False):
     """Asset Reader Options."""
 
-    url: str
+    url: Any
+    media_type: str
     env: Optional[Dict]
     metadata: Optional[Dict]
     dataset_statistics: Optional[Sequence[Tuple[float, float]]]

rio_tiler/utils.py

@@ -305,6 +305,7 @@ def get_vrt_transform(
         tuple: VRT transform (affine.Affine), width (int) and height (int)
 
     """
+    # 1. Get the Dataset Resolution in the output crs
     if src_dst.crs != dst_crs:
         src_width = src_dst.width
         src_height = src_dst.height
@@ -358,6 +359,7 @@ def get_vrt_transform(
     else:
         dst_transform = src_dst.transform
 
+    # 2. adjust output bounds if needed
     # If bounds window is aligned with the dataset internal tile we align the bounds with the pixels.
     # This is to limit the number of internal block fetched.
     if _requested_tile_aligned_with_internal_tile(src_dst, bounds, bounds_crs=dst_crs):
@@ -384,6 +386,7 @@ def get_vrt_transform(
 
     w, s, e, n = bounds
 
+    # 3. Calculate the VRT Height/Width
     # When no output size (resolution) - Use Dataset Resolution
     # NOTE: When we don't `fix` the output width/height, we're using the reprojected dataset resolution
     # to calculate what is the size/transform of the VRT
@@ -397,18 +400,13 @@ def get_vrt_transform(
         output_transform = from_bounds(w, s, e, n, width, height)
 
         # NOTE: Here we check if the Output Resolution is higher thant the dataset resolution (OverZoom)
-        # When not overzooming we don't want to use the output Width/Height to calculate the transform
+        # When not over-zooming we don't want to use the output Width/Height to calculate the transform
         # See issues https://github.com/cogeotiff/rio-tiler/pull/648
-        w_res = (
-            output_transform.a
-            if abs(output_transform.a) < abs(dst_transform.a)
-            else dst_transform.a
-        )
-        h_res = (
-            output_transform.e
-            if abs(output_transform.e) < abs(dst_transform.e)
-            else dst_transform.e
-        )
+        if abs(dst_transform.a) > abs(output_transform.a):
+            w_res = output_transform.a
+
+        if abs(dst_transform.e) > abs(output_transform.e):
+            h_res = output_transform.e
 
     vrt_width = max(1, round((e - w) / w_res))
     vrt_height = max(1, round((s - n) / h_res))
@@ -477,7 +475,7 @@ def _requested_tile_aligned_with_internal_tile(
     bounds_crs: CRS = WEB_MERCATOR_CRS,
 ) -> bool:
     """Check if tile is aligned with internal tiles."""
-    if not src_dst.is_tiled:
+    if src_dst.block_shapes and src_dst.block_shapes[0][1] == src_dst.width:
         return False
 
     if src_dst.crs != bounds_crs:
@@ -783,3 +781,29 @@ def _validate_shape_input(shape: Dict) -> Dict:
         raise RioTilerError("Invalid geometry")
 
     return shape
+
+
+def cast_to_sequence(val: Optional[Any] = None) -> Sequence:
+    """Cast input to sequence if not Tuple of List."""
+    if val is not None and not isinstance(val, (list, tuple)):
+        val = (val,)
+
+    return val
+
+
+def CRS_to_uri(crs: CRS) -> Optional[str]:
+    """Convert CRS to URI.
+
+    Code adapted from https://github.com/developmentseed/morecantile/blob/1829fe12408e4a1feee7493308f3f02257ef4caf/morecantile/models.py#L148-L161
+    """
+    # attempt to grab the authority, version, and code from the CRS
+    if authority_code := crs.to_authority(confidence_threshold=70):
+        version = "0"
+        authority, code = authority_code
+        # if we have a version number in the authority, split it out
+        if "_" in authority:
+            authority, version = authority.split("_")
+
+        return f"http://www.opengis.net/def/crs/{authority}/{version}/{code}"
+
+    return None

{rio_tiler-6.8.0.dist-info → rio_tiler-7.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rio-tiler
-Version: 6.8.0
+Version: 7.0.0
 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/
@@ -55,12 +55,13 @@ Requires-Dist: cachetools
 Requires-Dist: color-operations
 Requires-Dist: httpx
 Requires-Dist: importlib-resources>=1.1.0; python_version < '3.9'
-Requires-Dist: morecantile<6.0,>=5.0
+Requires-Dist: morecantile<7.0,>=5.0
 Requires-Dist: numexpr
 Requires-Dist: numpy
 Requires-Dist: pydantic~=2.0
 Requires-Dist: pystac>=0.5.4
 Requires-Dist: rasterio>=1.3.0
+Requires-Dist: typing-extensions
 Provides-Extra: benchmark
 Requires-Dist: pytest; extra == 'benchmark'
 Requires-Dist: pytest-benchmark; extra == 'benchmark'
@@ -68,15 +69,17 @@ Provides-Extra: dev
 Requires-Dist: bump-my-version; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
 Provides-Extra: docs
-Requires-Dist: mkdocs; extra == 'docs'
-Requires-Dist: mkdocs-jupyter; extra == 'docs'
-Requires-Dist: mkdocs-material; extra == 'docs'
-Requires-Dist: nbconvert; extra == 'docs'
+Requires-Dist: griffe-inherited-docstrings>=1.0.0; extra == 'docs'
+Requires-Dist: mkdocs-jupyter>=0.24.5; extra == 'docs'
+Requires-Dist: mkdocs-material[imaging]>=9.5; extra == 'docs'
+Requires-Dist: mkdocs>=1.4.3; extra == 'docs'
+Requires-Dist: mkdocstrings[python]>=0.25.1; extra == 'docs'
 Requires-Dist: pygments; extra == 'docs'
 Provides-Extra: s3
 Requires-Dist: boto3; extra == 's3'
 Provides-Extra: test
 Requires-Dist: boto3; extra == 'test'
+Requires-Dist: morecantile<7.0,>=6.0; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-cov; extra == 'test'
 Requires-Dist: rioxarray; extra == 'test'
@@ -260,8 +263,8 @@ At the low level, `rio-tiler` is *just* a wrapper around the [rasterio](https://
 You can install `rio-tiler` using pip
 
 ```bash
-$ pip install -U pip
-$ pip install -U rio-tiler
+$ python -m pip install -U pip
+$ python -m pip install -U rio-tiler
 ```
 
 or install from source:
@@ -269,8 +272,8 @@ or install from source:
 ```bash
 $ git clone https://github.com/cogeotiff/rio-tiler.git
 $ cd rio-tiler
-$ pip install -U pip
-$ pip install -e .
+$ python -m pip install -U pip
+$ python -m pip install -e .
 ```
 
 ## Plugins

{rio_tiler-6.8.0.dist-info → rio_tiler-7.0.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-rio_tiler/__init__.py,sha256=WefaHHGITJ0r36AfTpJwoVUhiaJ44_3n4Pc0yGes0so,192
-rio_tiler/colormap.py,sha256=uXeK2p-h6fMqTaCogHWkDP6AqJDtKCpCHa5ylRdEnj0,9775
+rio_tiler/__init__.py,sha256=aPeEGMQpVX93krXti2rZ8cQmXMVjDgepeUDvqG9eUgg,192
+rio_tiler/colormap.py,sha256=xx43D4A5w3VgYB2CvuKvYFmAsYSuZLWbIfextsVYDB4,11085
 rio_tiler/constants.py,sha256=55i-7JZDupTXZdLgxL03KsgM4lAzuGuIVP1zZKktzp0,426
 rio_tiler/errors.py,sha256=4I3i0e1FtkLX5sIX6dfhUMUj3SWWoKqkjCkSG7k5i2M,1901
 rio_tiler/expression.py,sha256=EVHWgjMqIn4TTPfqT_HV1RWCQlxqOj3OtEr1iUDiFHE,2282
 rio_tiler/logger.py,sha256=RR8lnW3uVXkFkPa3nNJS_tTndmdiNNDVXpCDGDxGf0A,81
-rio_tiler/models.py,sha256=slIxi1xjIdJ0fr1UmOxZzD3KGkJ3DADsC9DKEO5CjJM,28173
+rio_tiler/models.py,sha256=Y1IohWm4KtpdS7qngOe7nuijqcLFr6sutEtw5FGiNN0,26442
 rio_tiler/profiles.py,sha256=EAx2JdcaOcMw5PZjxbCqQBXXWMac9mjtpHoVFPJEDNQ,1562
 rio_tiler/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rio_tiler/reader.py,sha256=JgaLEjNp35-pEVSQFwUnSD3MmuQYl3SXzJcNKGLPeV8,22743
+rio_tiler/reader.py,sha256=FiDQQU_v8mDk2JTxBpLmsTqaCQFOsjOw0LocasLeXjk,22721
 rio_tiler/tasks.py,sha256=tiQo24rZHBVxids40QkNInuMzDFEei08zYW3I_pkSVE,3157
-rio_tiler/types.py,sha256=508_E5R-nKrAo8TWB-6h7pF6SYwNM8kJPiHjQw-k-tA,1443
-rio_tiler/utils.py,sha256=3TBlnQVFA-2igDpMrwxhjN_Quvc8t21xv7sQkM7e6dQ,27748
+rio_tiler/types.py,sha256=HbgECLqI4KoYVdMZv2pHSME4aiVvWea1ircqP9jQQCA,1468
+rio_tiler/utils.py,sha256=FyOP7sbTZnWVB8fPOs19cJlABL15oJ66tce5pIpNO3c,28713
 rio_tiler/cmap_data/__init__.py,sha256=8FtVmfpTjXlvhxQ5QesN0UC1m_B3MuF3LbGbhMC5Rw4,1039
 rio_tiler/cmap_data/accent.npy,sha256=Qde1ldOoXghe4L05v1QbVvnMA1ldwNjKWPf5xCBbmI4,1152
 rio_tiler/cmap_data/accent_r.npy,sha256=ba-GWSMSPRAcm9CGzlXJeNG4ABbBHDCV602hAWV2idc,1152
@@ -224,17 +224,17 @@ rio_tiler/cmap_data/ylorbr_r.npy,sha256=LjRoulX86uju7woCI_m4zzmAJMDpg-ky7p4f9vUk
 rio_tiler/cmap_data/ylorrd.npy,sha256=9ImXljw40oe60w8uV4EMDPY4aFFVkGbyCBi6SlTX83w,1152
 rio_tiler/cmap_data/ylorrd_r.npy,sha256=K5uiHNHbLxV5SizyT09cSVAxldE-BW5GpOXxUp7UsTE,1152
 rio_tiler/io/__init__.py,sha256=_L4iILm6vSiJ14GEDDOvkuUHRtbWC9oqx6Bu8PxHhvA,270
-rio_tiler/io/base.py,sha256=5VW27CGXkYN45pTegacCZpl0tv9liAFLeWOSchOeFZg,45651
-rio_tiler/io/rasterio.py,sha256=J0DyUq2lBrsmaey2411abBZw5Kp8V4PD2Y0dlTRU7S0,32038
-rio_tiler/io/stac.py,sha256=yzbHnlzVdMft9PZmS0Pi79aZo_lFgerguMQS_O91ul4,11722
-rio_tiler/io/xarray.py,sha256=B6W03YJIkgdsGR-2_GcYt3q4vRCYJ728IbAhQoVWPX4,18514
+rio_tiler/io/base.py,sha256=nyaAtfodM-5fXd1WsGG5Qh544PNv9Hy4FLQ_nPj8hw8,52154
+rio_tiler/io/rasterio.py,sha256=9GtbUPialsFMnxVUKrJ8ZItC3sWS8zddrO8aiPG07AU,29011
+rio_tiler/io/stac.py,sha256=b7RASmoJHGnHvn3LBNaBlMzigZr_qNn1efczxD-Zplc,12629
+rio_tiler/io/xarray.py,sha256=TgQ34hGEpsZv_j3hivzl5decPisQvseFN8HS9zuOBQo,13997
 rio_tiler/mosaic/__init__.py,sha256=Yj6CKpnFl8PJhLSp-a55wo33hKZ8-6OOBJtWA1HZVy8,118
 rio_tiler/mosaic/reader.py,sha256=_YBwTJwHvXOzKwpNpOmmh0F4yicyxgWo9vHyof3w_Do,9686
 rio_tiler/mosaic/methods/__init__.py,sha256=tgkXM9skaTLXIm5QFoheOEznQXM97KGflcAWHfkrt1g,612
 rio_tiler/mosaic/methods/base.py,sha256=9YZJWVRwH5Fk9KO9q5CW52Q8Mf60tAJ21oM4ixEDXBo,1424
 rio_tiler/mosaic/methods/defaults.py,sha256=z34lna2wGXnAPwculjk_6hDrloqS8wzer68FFoIo7pg,6744
-rio_tiler-6.8.0.dist-info/METADATA,sha256=-8MnnRnyMujOnmYzecic3Ik7eYU-Ch61pM44GiU7_ZI,11967
-rio_tiler-6.8.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-rio_tiler-6.8.0.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
-rio_tiler-6.8.0.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
-rio_tiler-6.8.0.dist-info/RECORD,,
+rio_tiler-7.0.0.dist-info/METADATA,sha256=cnnDZJzFmoSypX6FdXK8wzg95s7ZbqDDoR9bCLCMd3s,12209
+rio_tiler-7.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+rio_tiler-7.0.0.dist-info/licenses/AUTHORS.txt,sha256=FCVd4Tjg-8syl0ZugCunpXER8X2-XonW2ZfllyTnRvE,158
+rio_tiler-7.0.0.dist-info/licenses/LICENSE,sha256=vq8Tt4KoYQT9JxAjQ4yXMmmhFYRTsBRgrOj-ao-bC5o,1517
+rio_tiler-7.0.0.dist-info/RECORD,,