rio-tiler 6.7.0__tar.gz → 7.0.0__tar.gz

{rio_tiler-6.7.0 → rio_tiler-7.0.0}/.gitignore

@@ -108,5 +108,4 @@ tests/benchmarks/data/*
 tests/fixtures/mask*
 .vscode/settings.json
 
-docs/src/api/*
 dev_notebooks/*

{rio_tiler-6.7.0 → rio_tiler-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rio-tiler
-Version: 6.7.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.7.0 → rio_tiler-7.0.0}/README.md

@@ -169,8 +169,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:
@@ -178,8 +178,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.7.0 → rio_tiler-7.0.0}/pyproject.toml

@@ -26,11 +26,12 @@ dependencies = [
     "httpx",
     "numexpr",
     "numpy",
-    "morecantile>=5.0,<6.0",
+    "morecantile>=5.0,<7.0",
     "pydantic~=2.0",
     "pystac>=0.5.4",
     "rasterio>=1.3.0",
     "color-operations",
+    "typing-extensions",
     "importlib_resources>=1.1.0; python_version < '3.9'",
 ]
 
@@ -44,6 +45,8 @@ test = [
     "rioxarray",
     # S3
     "boto3",
+    # Some tests will fail with 5.0
+    "morecantile>=6.0,<7.0",
 ]
 
 benchmark = [
@@ -68,10 +71,11 @@ xarray = [
     "rioxarray",
 ]
 docs = [
-    "nbconvert",
-    "mkdocs",
-    "mkdocs-jupyter",
-    "mkdocs-material",
+    "mkdocs>=1.4.3",
+    "mkdocs-jupyter>=0.24.5",
+    "mkdocs-material[imaging]>=9.5",
+    "griffe-inherited-docstrings>=1.0.0",
+    "mkdocstrings[python]>=0.25.1",
     "pygments",
 ]
 
@@ -153,7 +157,7 @@ ignore = [
 max-complexity = 14
 
 [tool.bumpversion]
-current_version = "6.7.0"
+current_version = "7.0.0"
 search = "{current_version}"
 replace = "{new_version}"
 regex = false

{rio_tiler-6.7.0 → rio_tiler-7.0.0}/rio_tiler/__init__.py

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

{rio_tiler-6.7.0 → rio_tiler-7.0.0}/rio_tiler/colormap.py

@@ -1,5 +1,6 @@
 """rio-tiler colormap functions and classes."""
 
+import json
 import os
 import pathlib
 import re
@@ -22,23 +23,30 @@ from rio_tiler.types import (
 )
 
 try:
-    from importlib.resources import files as resources_files  # type: ignore
+    from importlib.resources import as_file
+    from importlib.resources import files as resources_files
 except ImportError:
     # Try backported to PY<39 `importlib_resources`.
+    from importlib_resources import as_file  # type: ignore
     from importlib_resources import files as resources_files  # type: ignore
 
 
 EMPTY_COLORMAP: GDALColorMapType = {i: (0, 0, 0, 0) for i in range(256)}
 
-DEFAULT_CMAPS_FILES = {
-    f.stem: str(f)
-    for f in (resources_files(__package__) / "cmap_data").glob("*.npy")  # type: ignore
-}
+_RIO_CMAP_DIR = resources_files(__package__) / "cmap_data"
+with as_file(_RIO_CMAP_DIR) as p:
+    DEFAULT_CMAPS_FILES = {
+        f.stem: f for f in p.glob("**/*") if f.suffix in {".npy", ".json"}
+    }
 
 USER_CMAPS_DIR = os.environ.get("COLORMAP_DIRECTORY", None)
 if USER_CMAPS_DIR:
     DEFAULT_CMAPS_FILES.update(
-        {f.stem: str(f) for f in pathlib.Path(USER_CMAPS_DIR).glob("*.npy")}
+        {
+            f.stem: f
+            for f in pathlib.Path(USER_CMAPS_DIR).glob("**/*")
+            if f.suffix in {".npy", ".json"}
+        }
     )
 
 
@@ -129,7 +137,7 @@ def apply_discrete_cmap(data: numpy.ndarray, colormap: GDALColorMapType) -> Data
 
     Args:
         data (numpy.ndarray): 1D image array to translate to RGB.
-        color_map (dict): Discrete ColorMap dictionary.
+        colormap (GDALColorMapType): Discrete ColorMap dictionary.
 
     Returns:
         tuple: Data (numpy.ndarray) and Alpha band (numpy.ndarray).
@@ -168,7 +176,7 @@ def apply_intervals_cmap(
 
     Args:
         data (numpy.ndarray): 1D image array to translate to RGB.
-        color_map (Sequence): Sequence of intervals and color in form of [([min, max], [r, g, b, a]), ...].
+        colormap (IntervalColorMapType): Sequence of intervals and color in form of [([min, max], [r, g, b, a]), ...].
 
     Returns:
         tuple: Data (numpy.ndarray) and Alpha band (numpy.ndarray).
@@ -274,7 +282,7 @@ class ColorMaps:
 
     """
 
-    data: Dict[str, Union[str, ColorMapType]] = attr.ib(
+    data: Dict[str, Union[str, pathlib.Path, ColorMapType]] = attr.ib(
         default=attr.Factory(lambda: DEFAULT_CMAPS_FILES)
     )
 
@@ -288,17 +296,45 @@ class ColorMaps:
             dict: colormap dictionary.
 
         """
-        cmap = self.data.get(name.lower(), None)
+        cmap = self.data.get(name, None)
         if cmap is None:
             raise InvalidColorMapName(f"Invalid colormap name: {name}")
 
-        if isinstance(cmap, str):
-            colormap = numpy.load(cmap)
-            assert colormap.shape == (256, 4)
-            assert colormap.dtype == numpy.uint8
-            return {idx: tuple(value) for idx, value in enumerate(colormap)}  # type: ignore
-        else:
-            return cmap
+        if isinstance(cmap, (pathlib.Path, str)):
+            if isinstance(cmap, str):
+                cmap = pathlib.Path(cmap)
+
+            if cmap.suffix == ".npy":
+                colormap = numpy.load(cmap)
+                assert colormap.shape == (256, 4)
+                assert colormap.dtype == numpy.uint8
+                cmap_data = {idx: tuple(value) for idx, value in enumerate(colormap)}
+
+            elif cmap.suffix == ".json":
+                with cmap.open() as f:
+                    cmap_data = json.load(
+                        f,
+                        object_hook=lambda x: {
+                            int(k): parse_color(v) for k, v in x.items()
+                        },
+                    )
+
+                # Make sure to match colormap type
+                if isinstance(cmap_data, Sequence):
+                    cmap_data = [
+                        (tuple(inter), parse_color(v))  # type: ignore
+                        for (inter, v) in cmap_data
+                    ]
+
+            else:
+                raise ValueError(f"Not supported {cmap.suffix} extension for ColorMap")
+
+            # save the numpy array / dict / sequence in the data dict
+            # avoiding the need to re-load the data
+            self.data[name] = cmap_data
+            return cmap_data
+
+        return cmap
 
     def list(self) -> List[str]:
         """List registered Colormaps.
@@ -311,7 +347,7 @@ class ColorMaps:
 
     def register(
         self,
-        custom_cmap: Dict[str, Union[str, ColorMapType]],
+        custom_cmap: Dict[str, Union[str, pathlib.Path, ColorMapType]],
         overwrite: bool = False,
     ) -> "ColorMaps":
         """Register a custom colormap.