Merge branch 'main' into anywidget

.github/workflows/ecr.yml

@@ -0,0 +1,46 @@
+name: ECR Package
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+    branches:
+      - main
+
+env:
+  IMAGE_NAME: localtileserver
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-west-2
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+      - name: Extract metadata for the Docker image
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ steps.login-ecr.outputs.registry }}/${{ env.IMAGE_NAME }}
+          tags: |
+            # set latest tag for main branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+      - name: Build and push the Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/package.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push the Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
@@ -43,7 +43,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-jupyter
       - name: Build and push the Jupyter Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: jupyter.Dockerfile

localtileserver/client.py

@@ -1,8 +1,10 @@
 from collections.abc import Iterable
+import json
 import logging
 import pathlib
 from typing import List, Optional, Union
 
+from matplotlib.colors import Colormap, ListedColormap
 import rasterio
 import requests
 from rio_tiler.io import Reader
@@ -91,11 +93,17 @@ def band_names(self):
 
     @property
     def min_zoom(self):
-        return self.info.minzoom
+        if hasattr(self.info, "minzoom"):
+            return self.info.minzoom
+        else:
+            return self.reader.minzoom
 
     @property
     def max_zoom(self):
-        return self.info.maxzoom
+        if hasattr(self.info, "maxzoom"):
+            return self.info.maxzoom
+        else:
+            return self.reader.maxzoom
 
     @property
     def default_zoom(self):
@@ -420,7 +428,7 @@ def create_url(self, path: str, client: bool = False):
     def get_tile_url(
         self,
         indexes: Optional[List[int]] = None,
-        colormap: Optional[str] = None,
+        colormap: Optional[Union[str, Colormap, List[str]]] = None,
         vmin: Optional[Union[float, List[float]]] = None,
         vmax: Optional[Union[float, List[float]]] = None,
         nodata: Optional[Union[int, float]] = None,
@@ -450,8 +458,18 @@ def get_tile_url(
         if indexes is not None:
             params["indexes"] = indexes
         if colormap is not None:
-            # make sure palette is valid
-            palette_valid_or_raise(colormap)
+            if isinstance(colormap, ListedColormap):
+                colormap = json.dumps([c for c in colormap.colors])
+            elif isinstance(colormap, Colormap):
+                colormap = json.dumps(
+                    {k: tuple(v.tolist()) for k, v in enumerate(colormap(range(256), 1, 1))}
+                )
+            elif isinstance(colormap, list):
+                colormap = json.dumps(colormap)
+            else:
+                # make sure palette is valid
+                palette_valid_or_raise(colormap)
+
             params["colormap"] = colormap
         if vmin is not None:
             if isinstance(vmin, Iterable) and not isinstance(indexes, Iterable):

localtileserver/tiler/handler.py

@@ -1,7 +1,9 @@
 """Methods for working with images."""
+import json
 import pathlib
 from typing import Dict, List, Optional, Tuple, Union
 
+from matplotlib.colors import Colormap, LinearSegmentedColormap, ListedColormap
 import numpy as np
 import rasterio
 from rasterio.enums import ColorInterp
@@ -150,7 +152,23 @@ def _render_image(
     colormap: Optional[str] = None,
     img_format: str = "PNG",
 ):
-    colormap = cmap.get(colormap) if colormap else None
+    if colormap in cmap.list():
+        colormap = cmap.get(colormap)
+    elif isinstance(colormap, ListedColormap):
+        c = LinearSegmentedColormap.from_list("", colormap.colors, N=256)
+        colormap = {k: tuple(v) for k, v in enumerate(c(range(256), 1, 1))}
+    elif isinstance(colormap, Colormap):
+        colormap = {k: tuple(v) for k, v in enumerate(colormap(range(256), 1, 1))}
+    elif colormap:
+        c = json.loads(colormap)
+        if isinstance(c, list):
+            c = LinearSegmentedColormap.from_list("", c, N=256)
+            colormap = {k: tuple(v) for k, v in enumerate(c(range(256), 1, 1))}
+        else:
+            colormap = {}
+            for key, value in c.items():
+                colormap[int(key)] = tuple(value)
+
     if (
         not colormap
         and len(indexes) == 1

localtileserver/widgets.py

@@ -3,6 +3,7 @@
 from typing import List, Optional, Union
 import warnings
 
+from matplotlib.colors import Colormap
 import rasterio
 
 from localtileserver.client import TileClient, get_or_create_tile_client
@@ -23,7 +24,7 @@ def get_leaflet_tile_layer(
     port: Union[int, str] = "default",
     debug: bool = False,
     indexes: Optional[List[int]] = None,
-    colormap: Optional[str] = None,
+    colormap: Optional[Union[str, Colormap, List[str]]] = None,
     vmin: Optional[Union[float, List[float]]] = None,
     vmax: Optional[Union[float, List[float]]] = None,
     nodata: Optional[Union[int, float]] = None,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "localtileserver"
-version = "0.10.3"
+version = "0.10.5"
 description = "Locally serve geospatial raster tiles in the Slippy Map standard."
 readme = "README.md"
 authors = [
@@ -28,7 +28,7 @@ dependencies = [
     "flask>=2.0.0,<4",
     "Flask-Caching",
     "flask-cors",
-    "flask-restx>=0.5.0",
+    "flask-restx>=1.3.0",
     "rio-tiler",
     "rio-cogeo",
     "requests",

tests/test_rendering.py

@@ -1,3 +1,4 @@
+from matplotlib.colors import ListedColormap
 import pytest
 
 from .utilities import get_content
@@ -56,6 +57,24 @@ def test_tile_colormap(bahamas, compare, colormap, indexes):
     compare(direct_content)
 
 
+@pytest.mark.parametrize(
+    "colormap,indexes",
+    [
+        (ListedColormap(["red", "blue"]), None),
+        (ListedColormap(["blue", "green"]), 2),
+    ],
+)
+def test_custom_colormap(bahamas, compare, colormap, indexes):
+    # Get a tile over the REST API
+    tile_url = bahamas.get_tile_url(colormap=colormap, indexes=indexes).format(z=8, x=72, y=110)
+    rest_content = get_content(tile_url)
+    # Get tile directly
+    direct_content = bahamas.tile(z=8, x=72, y=110, colormap=colormap, indexes=indexes)
+    # Make sure they are the same
+    assert rest_content == direct_content
+    compare(direct_content)
+
+
 @pytest.mark.parametrize("vmin", [100, [100, 200, 250]])
 def test_tile_vmin(bahamas, compare, vmin):
     url = bahamas.get_tile_url(