rio-tiler 7.4.0__tar.gz → 7.5.1__tar.gz

{rio_tiler-7.4.0 → rio_tiler-7.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rio-tiler
-Version: 7.4.0
+Version: 7.5.1
 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/
@@ -83,6 +83,7 @@ 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'
+Requires-Dist: vsifile>=0.2; extra == 'test'
 Requires-Dist: xarray; extra == 'test'
 Provides-Extra: tilebench
 Requires-Dist: pytest; extra == 'tilebench'

{rio_tiler-7.4.0 → rio_tiler-7.5.1}/pyproject.toml

@@ -38,7 +38,6 @@ dependencies = [
 test = [
     "pytest",
     "pytest-cov",
-
     # XarrayReader
     "xarray",
     "rioxarray",
@@ -47,6 +46,8 @@ test = [
     "boto3",
     # Some tests will fail with 5.0
     "morecantile>=6.0,<7.0",
+    # Experimental
+    "vsifile>=0.2",
 ]
 
 benchmark = [
@@ -160,7 +161,7 @@ exclude = [
 max-complexity = 14
 
 [tool.bumpversion]
-current_version = "7.4.0"
+current_version = "7.5.1"
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

{rio_tiler-7.4.0 → rio_tiler-7.5.1}/rio_tiler/__init__.py

@@ -1,6 +1,6 @@
 """rio-tiler."""
 
-__version__ = "7.4.0"
+__version__ = "7.5.1"
 
 from . import (  # noqa
     colormap,

{rio_tiler-7.4.0 → rio_tiler-7.5.1}/rio_tiler/errors.py

@@ -91,3 +91,7 @@ class MissingCRS(RioTilerError):
 
 class InvalidGeographicBounds(RioTilerError):
     """Invalid Geographic bounds."""
+
+
+class RioTilerExperimentalWarning(UserWarning):
+    """A rio-tiler specific experimental functionality warning."""

rio_tiler-7.5.1/rio_tiler/experimental/__init__.py

@@ -0,0 +1,10 @@
+"""The "experimental" module of rio-tiler contains potential new features that are subject to change."""
+
+import warnings
+
+from rio_tiler.errors import RioTilerExperimentalWarning
+
+warnings.warn(
+    "This module is experimental, its contents are subject to change and deprecation.",
+    category=RioTilerExperimentalWarning,
+)

rio_tiler-7.5.1/rio_tiler/experimental/vsifile.py

@@ -0,0 +1,36 @@
+"""rio_tiler.io.Reader with VSIFILE/Obstore Opener."""
+
+from typing import Union
+
+import attr
+import rasterio
+from rasterio.io import DatasetReader, DatasetWriter, MemoryFile
+from rasterio.vrt import WarpedVRT
+
+from rio_tiler.io import Reader
+
+try:
+    import vsifile
+    from vsifile.rasterio import opener
+except ImportError:  # pragma: nocover
+    vsifile = None  # type: ignore
+    opener = None  # type: ignore
+
+
+@attr.s
+class VSIReader(Reader):
+    """Rasterio Reader with VSIFILE opener."""
+
+    dataset: Union[DatasetReader, DatasetWriter, MemoryFile, WarpedVRT] = attr.ib(
+        default=None, init=False
+    )
+
+    def __attrs_post_init__(self):
+        """Use vsifile.rasterio.opener as Python file opener."""
+        assert vsifile is not None, "VSIFILE must be installed to use VSIReader"
+
+        self.dataset = self._ctx_stack.enter_context(
+            rasterio.open(self.input, opener=opener)
+        )
+
+        super().__attrs_post_init__()

{rio_tiler-7.4.0 → rio_tiler-7.5.1}/rio_tiler/utils.py

@@ -59,8 +59,8 @@ def _weighted_stdev(
     values: NDArray[numpy.floating],
     weights: NDArray[numpy.floating],
 ) -> float:
-    average = numpy.average(values, weights=weights)
-    variance = numpy.average((values - average) ** 2, weights=weights)
+    average = numpy.ma.average(values, weights=weights)
+    variance = numpy.ma.average((values - average) ** 2, weights=weights)
     return float(math.sqrt(variance))
 
 
@@ -174,35 +174,44 @@ def get_array_statistics(
                 _weighted_quantiles(data_comp, masked_coverage.compressed(), pp / 100.0)
                 for pp in percentiles
             ]
-        else:
-            percentiles_values = [numpy.nan] * len(percentiles_names)
-
-        if valid_pixels:
             majority = float(keys[counts.tolist().index(counts.max())].tolist())
             minority = float(keys[counts.tolist().index(counts.min())].tolist())
+            std = _weighted_stdev(data_comp, masked_coverage.compressed())
+            med = _weighted_quantiles(data_comp, masked_coverage.compressed())
+            _min = float(data[b].min())
+            _max = float(data[b].max())
+            _mean = float(data_cov.sum() / masked_coverage.sum())
+            _count = float(masked_coverage.sum())
+            _sum = float(data_cov.sum())
+
         else:
+            percentiles_values = [numpy.nan] * len(percentiles_names)
             majority = numpy.nan
             minority = numpy.nan
-
-        _count = masked_coverage.sum()
-        _sum = data_cov.sum()
+            std = numpy.nan
+            med = numpy.nan
+            _min = numpy.nan
+            _max = numpy.nan
+            _count = 0
+            _sum = 0
+            _mean = numpy.nan
 
         output.append(
             {
                 # Minimum value, not taking coverage fractions into account.
-                "min": float(data[b].min()),
+                "min": _min,
                 # Maximum value, not taking coverage fractions into account.
-                "max": float(data[b].max()),
+                "max": _max,
                 # Mean value, weighted by the percent of each cell that is covered.
-                "mean": float(_sum / _count),
+                "mean": _mean,
                 # Sum of all non-masked cell coverage fractions.
-                "count": float(_count),
+                "count": _count,
                 # Sum of values, weighted by their coverage fractions.
-                "sum": float(_sum),
+                "sum": _sum,
                 # Population standard deviation of cell values, taking into account coverage fraction.
-                "std": _weighted_stdev(data_comp, masked_coverage.compressed()),
+                "std": std,
                 # Median value of cells, weighted by the percent of each cell that is covered.
-                "median": _weighted_quantiles(data_comp, masked_coverage.compressed()),
+                "median": med,
                 # The value occupying the greatest number of cells.
                 "majority": majority,
                 # The value occupying the least number of cells.
@@ -773,14 +782,15 @@ def resize_array(
             category=NotGeoreferencedWarning,
             module="rasterio",
         )
-        with rasterio.open(datasetname, "r+") as src:
-            # if a 2D array is passed, using indexes=1 makes sure we return an 2D array
-            indexes = 1 if len(data.shape) == 2 else None
-            return src.read(
-                out_shape=out_shape,
-                indexes=indexes,
-                resampling=Resampling[resampling_method],
-            )
+        with rasterio.Env(GDAL_MEM_ENABLE_OPEN=True):
+            with rasterio.open(datasetname, "r+") as src:
+                # if a 2D array is passed, using indexes=1 makes sure we return an 2D array
+                indexes = 1 if len(data.shape) == 2 else None
+                return src.read(
+                    out_shape=out_shape,
+                    indexes=indexes,
+                    resampling=Resampling[resampling_method],
+                )
 
 
 def normalize_bounds(bounds: BBox) -> BBox: