update titiler (#35)

* update titiler

* add gunicorn

* add .env.example

Author: geospatial-jeff

.env.example

@@ -0,0 +1,11 @@
+ENVIRONMENT=local
+POSTGRES_USER=username
+POSTGRES_PASS=password
+POSTGRES_DBNAME=postgis
+POSTGRES_HOST_READER=host.docker.internal
+POSTGRES_HOST_WRITER=host.docker.internal
+POSTGRES_PORT=5432
+WEB_CONCURRENCY=10
+VSI_CACHE=TRUE
+GDAL_HTTP_MERGE_CONSECUTIVE_RANGES=YES
+GDAL_DISABLE_READDIR_ON_OPEN=EMPTY_DIR

Dockerfile

@@ -20,6 +20,8 @@ COPY . ./
 
 ENV APP_HOST=0.0.0.0
 ENV APP_PORT=80
+ENV RELOAD=""
 
 ENTRYPOINT ["pipenv", "run"]
-CMD uvicorn stac_api.app:app --host=${APP_HOST} --port=${APP_PORT} --reload
+CMD if [ "$RELOAD" ]; then uvicorn stac_api.app:app --host=${APP_HOST} --port=${APP_PORT} --reload ; \
+    else gunicorn stac_api.app:app --preload -k uvicorn.workers.UvicornWorker --bind ${APP_HOST}:${APP_PORT} --log-level info; fi

Makefile

@@ -7,13 +7,7 @@ run_docker = docker run -it --rm \
 				-v $(shell pwd):/app \
 				--env APP_HOST=${APP_HOST} \
 				--env APP_PORT=${APP_PORT} \
-				--env POSTGRES_USER=username \
-				--env POSTGRES_PASS=password \
-				--env POSTGRES_DBNAME=postgis \
-				--env POSTGRES_HOST_READER=host.docker.internal \
-				--env POSTGRES_HOST_WRITER=host.docker.internal \
-				--env POSTGRES_PORT=5432 \
-				--env ENVIRONMENT=development \
+				--env-file .env.example \
 				arturo-ai/stac-api:latest
 
 .PHONY: image

Pipfile

@@ -5,6 +5,7 @@ verify_ssl = "true"
 
 [packages]
 uvicorn = ">=0.11.7"
+gunicorn = "*"
 fastapi = {extras = ["all"],version = "*"}
 alembic = "*"
 psycopg2-binary = "*"
@@ -15,7 +16,7 @@ sqlakeyset = "*"
 stac-pydantic = ">=1.1.3"
 pydantic = {extras=["dotenv"], version="*"}
 cogeo-mosaic = "==3.0a10"
-titiler = "==0.1a0"
+titiler = "==0.1a2"
 
 [dev-packages]
 pytest = "*"

Pipfile.lock

@@ -5,17 +5,20 @@
 from sqlalchemy.orm import sessionmaker
 from starlette.requests import Request
 
+from stac_api.api.models import ItemUri
 from stac_api.api.routers import (
     create_core_router,
     create_tiles_router,
     create_transactions_router,
 )
+from stac_api.api.routes import create_endpoint_with_depends
 from stac_api.clients.postgres.core import CoreCrudClient
 from stac_api.clients.postgres.tokens import PaginationTokenClient
 from stac_api.clients.postgres.transactions import TransactionsClient
 from stac_api.clients.tiles.ogc import TilesClient
 from stac_api.config import AddOns, ApiExtensions, ApiSettings, inject_settings
 from stac_api.errors import DEFAULT_STATUS_CODES, add_exception_handlers
+from stac_api.models.ogc import TileSetResource
 from stac_api.openapi import config_openapi
 from stac_api.utils.dependencies import READER, WRITER
 
@@ -43,7 +46,17 @@ def create_app(settings: ApiSettings) -> FastAPI:
 
     if settings.add_on_is_enabled(AddOns.tiles):
         tiles_client = TilesClient()
-        app.include_router(create_tiles_router(tiles_client))
+        app.add_api_route(
+            name="Get OGC Tiles Resource",
+            path="/collections/{collectionId}/items/{itemId}/tiles",
+            response_model=TileSetResource,
+            response_model_exclude_none=True,
+            response_model_exclude_unset=True,
+            methods=["GET"],
+            endpoint=create_endpoint_with_depends(tiles_client.get_item_tiles, ItemUri),
+            tags=["OGC Tiles"],
+        )
+        app.include_router(create_tiles_router(), prefix="/titiler", tags=["Titiler"])
 
     config_openapi(app)
 
@@ -72,6 +85,8 @@ async def on_shutdown():
     @app.middleware("http")
     async def create_db_connection(request: Request, call_next):
         """Create a new database connection for each request"""
+        if "titiler" in str(request.url):
+            return await call_next(request)
         reader = request.app.state.DB_READER()
         writer = request.app.state.DB_WRITER()
         READER.set(reader)

stac_api/api/app.py

@@ -17,31 +17,19 @@
 )
 from stac_api.api.routes import create_endpoint_from_model, create_endpoint_with_depends
 from stac_api.clients.base import BaseCoreClient, BaseTransactionsClient
-from stac_api.clients.tiles.ogc import TilesClient
 from stac_api.config import ApiSettings
-from stac_api.models import ogc, schemas
+from stac_api.models import schemas
 from stac_pydantic import ItemCollection
 from stac_pydantic.api import ConformanceClasses, LandingPage
 
 
-def create_tiles_router(client: TilesClient) -> APIRouter:
+def create_tiles_router() -> APIRouter:
     """Create API router with OGC tiles endpoints"""
     from titiler.endpoints.stac import STACTiler
 
     template_dir = pkg_resources.resource_filename("titiler", "templates")
     templates = Jinja2Templates(directory=template_dir)
 
-    router = APIRouter()
-    router.add_api_route(
-        name="Get OGC Tiles Resource",
-        path="/collections/{collectionId}/items/{itemId}/tiles",
-        response_model=ogc.TileSetResource,
-        response_model_exclude_none=True,
-        response_model_exclude_unset=True,
-        methods=["GET"],
-        endpoint=create_endpoint_with_depends(client.get_item_tiles, ItemUri),
-        tags=["OGC Tiles"],
-    )
     titiler_router = STACTiler().router
 
     @titiler_router.get("/viewer", response_class=HTMLResponse)
@@ -57,9 +45,8 @@ def stac_demo(request: Request):
             media_type="text/html",
         )
 
-    router.include_router(titiler_router, tags=["Titiler"])
     # TODO: add titiler exception handlers
-    return router
+    return titiler_router
 
 
 def create_core_router(client: BaseCoreClient, settings: ApiSettings) -> APIRouter:

stac_api/api/routers.py

@@ -138,7 +138,8 @@ def tiles(self) -> OGCTileLink:
         """Create tiles link"""
         return OGCTileLink(
             href=urljoin(
-                self.base_url, f"/tiles/{{z}}/{{x}}/{{y}}.png?url={self.item_uri}",
+                self.base_url,
+                f"/titiler/tiles/{{z}}/{{x}}/{{y}}.png?url={self.item_uri}",
             ),
             rel=Relations.item,
             title="tiles",
@@ -149,7 +150,7 @@ def tiles(self) -> OGCTileLink:
     def viewer(self) -> OGCTileLink:
         """Create viewer link"""
         return OGCTileLink(
-            href=urljoin(self.base_url, f"/viewer?url={self.item_uri}"),
+            href=urljoin(self.base_url, f"/titiler/viewer?url={self.item_uri}"),
             rel=Relations.alternate,
             type=MimeTypes.html,
             title="viewer",
@@ -158,15 +159,18 @@ def viewer(self) -> OGCTileLink:
     def tilejson(self) -> OGCTileLink:
         """Create tilejson link"""
         return OGCTileLink(
-            href=urljoin(self.base_url, f"/tilejson.json?url={self.item_uri}"),
+            href=urljoin(self.base_url, f"/titiler/tilejson.json?url={self.item_uri}"),
             rel=Relations.alternate,
             type=MimeTypes.json,
             title="tilejson",
         )
 
     def wmts(self) -> OGCTileLink:
+        """Create wmts capabilities link"""
         return OGCTileLink(
-            href=urljoin(self.base_url, f"/WMTSCapabilities.xml?url={self.item_uri}"),
+            href=urljoin(
+                self.base_url, f"/titiler/WMTSCapabilities.xml?url={self.item_uri}"
+            ),
             rel=Relations.alternate,
             type=MimeTypes.xml,
             title="WMTS Capabilities",