Async (#8)

* use async/await for tiles

* more async

Author: vincentsarago

docker-compose.yml

@@ -15,9 +15,9 @@ services:
       - GDAL_HTTP_MULTIPLEX=YES
       - GDAL_HTTP_VERSION=2
       - MODULE_NAME=titiler.main
-      - MEMCACHE_HOST=0.0.0.0
+      - MEMCACHE_HOST=memcached
       - MEMCACHE_USERNAME=myuser
-      - MEMCACHE_USERNAME=mypassword
+      - MEMCACHE_PASSWORD=mypassword
       - PORT=8000
       - PYTHONWARNINGS=ignore
       - VARIABLE_NAME=app

titiler/api/api_v1/endpoints/metadata.py

@@ -4,6 +4,7 @@
 
 import os
 import re
+from functools import partial
 from urllib.parse import urlencode
 
 import numpy
@@ -13,12 +14,17 @@
 from fastapi import APIRouter, Query
 from starlette.requests import Request
 from starlette.responses import Response
-
+from starlette.concurrency import run_in_threadpool
 
 from titiler.core import config
 from titiler.models.mapbox import TileJSON
 from titiler.ressources.enums import ImageType
 
+
+_bounds = partial(run_in_threadpool, cogeo.bounds)
+_metadata = partial(run_in_threadpool, cogeo.metadata)
+_spatial_info = partial(run_in_threadpool, cogeo.spatial_info)
+
 router = APIRouter()
 
 
@@ -37,7 +43,7 @@
         "tiles",
     },  # https://github.com/tiangolo/fastapi/issues/528#issuecomment-589659378
 )
-def tilejson(
+async def tilejson(
     request: Request,
     response: Response,
     url: str = Query(..., description="Cloud Optimized GeoTIFF URL."),
@@ -66,7 +72,7 @@ def tilejson(
     else:
         tile_url = f"{scheme}://{host}/{{z}}/{{x}}/{{y}}@{tile_scale}x?{qs}"
 
-    meta = cogeo.spatial_info(url)
+    meta = await _spatial_info(url)
     response.headers["Cache-Control"] = "max-age=3600"
     return dict(
         bounds=meta["bounds"],
@@ -81,19 +87,19 @@ def tilejson(
 @router.get(
     "/bounds", responses={200: {"description": "Return the bounds of the COG."}}
 )
-def bounds(
+async def bounds(
     response: Response,
     url: str = Query(..., description="Cloud Optimized GeoTIFF URL."),
 ):
     """Handle /bounds requests."""
     response.headers["Cache-Control"] = "max-age=3600"
-    return cogeo.bounds(url)
+    return await _bounds(url)
 
 
 @router.get(
     "/metadata", responses={200: {"description": "Return the metadata of the COG."}}
 )
-def metadata(
+async def metadata(
     request: Request,
     response: Response,
     url: str = Query(..., description="Cloud Optimized GeoTIFF URL."),
@@ -132,7 +138,7 @@ def metadata(
         hist_options.update(dict(range=list(map(float, histogram_range.split(",")))))
 
     response.headers["Cache-Control"] = "max-age=3600"
-    return cogeo.metadata(
+    return await _metadata(
         url,
         pmin,
         pmax,

titiler/api/api_v1/endpoints/tiles.py

@@ -4,10 +4,12 @@
 
 import re
 from io import BytesIO
+from functools import partial
 
 import numpy
 
 from fastapi import APIRouter, Depends, Query, Path
+from starlette.concurrency import run_in_threadpool
 
 from rio_tiler.io import cogeo
 from rio_tiler.colormap import get_colormap
@@ -20,9 +22,13 @@
 from titiler.ressources.common import drivers, mimetype
 from titiler.ressources.responses import TileResponse
 
-router = APIRouter()
+
+_tile = partial(run_in_threadpool, cogeo.tile)
+_render = partial(run_in_threadpool, render)
+_postprocess = partial(run_in_threadpool, utils.postprocess)
 
 
+router = APIRouter()
 responses = {
     200: {
         "content": {
@@ -44,16 +50,14 @@
 @router.get(r"/{z}/{x}/{y}\.{ext}", **tile_routes_params)
 @router.get(r"/{z}/{x}/{y}@{scale}x", **tile_routes_params)
 @router.get(r"/{z}/{x}/{y}@{scale}x\.{ext}", **tile_routes_params)
-def tile(
+async def tile(
     z: int = Path(..., ge=0, le=30, description="Mercator tiles's zoom level"),
     x: int = Path(..., description="Mercator tiles's column"),
     y: int = Path(..., description="Mercator tiles's row"),
     scale: int = Query(
         1, gt=0, lt=4, description="Tile size scale. 1=256x256, 2=512x512..."
     ),
-    ext: Optional[ImageType] = Query(
-        None, description="Output image type. Default is auto."
-    ),
+    ext: ImageType = Query(None, description="Output image type. Default is auto."),
     url: str = Query(..., description="Cloud Optimized GeoTIFF URL."),
     bidx: Optional[str] = Query(None, description="Coma (',') delimited band indexes"),
     nodata: Optional[Union[str, int, float]] = Query(
@@ -97,14 +101,14 @@ def tile(
         if nodata is not None:
             nodata = numpy.nan if nodata == "nan" else float(nodata)
 
-        tile, mask = cogeo.tile(
+        tile, mask = await _tile(
             url, x, y, z, indexes=indexes, tilesize=tilesize, nodata=nodata
         )
 
         if not ext:
             ext = ImageType.jpg if mask.all() else ImageType.png
 
-        tile = utils.postprocess(
+        tile = await _postprocess(
             tile, mask, rescale=rescale, color_formula=color_formula
         )
 
@@ -122,7 +126,7 @@ def tile(
             if ext == ImageType.tif:
                 options = geotiff_options(x, y, z, tilesize=tilesize)
 
-            content = render(
+            content = await _render(
                 tile, mask, img_format=driver, colormap=color_map, **options
             )
 

titiler/templates/index.html

@@ -11,8 +11,6 @@
 
     <link href='https://api.mapbox.com/mapbox-assembly/v0.23.2/assembly.min.css' rel='stylesheet'>
     <script src='https://api.mapbox.com/mapbox-assembly/v0.23.2/assembly.js'></script>
-
-    <script src='https://npmcdn.com/@turf/turf/turf.min.js'></script>
     <script src="https://d3js.org/d3.v4.js"></script>
     <style>
         body {
@@ -680,10 +678,27 @@
                 })
         })
 
+        const bboxPolygon = (bounds)  => {
+            return {
+                'type': 'Feature',
+                'geometry': {
+                    'type': 'Polygon',
+                    'coordinates': [[
+                        [bounds[0], bounds[1]],
+                        [bounds[2], bounds[1]],
+                        [bounds[2], bounds[3]],
+                        [bounds[0], bounds[3]],
+                        [bounds[0], bounds[1]]
+                    ]]
+                },
+                'properties': {}
+            }
+        }
+
         const addAOI = (bounds) => {
             const geojson = {
                 type: "FeatureCollection",
-                features: [turf.bboxPolygon(bounds)]
+                features: [bboxPolygon(bounds)]
             }
 
             map.addSource('aoi', {