From 48fd78bdd1ddd5fbfff053c138d7abff9d23db7e Mon Sep 17 00:00:00 2001 From: janf Date: Wed, 22 Nov 2023 15:03:48 +0100 Subject: [PATCH 1/2] added stac endpoint and stac cog extension --- .github/workflows/build_and_deploy.yml | 14 +------------- src/cogserver/server.py | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index c22d460..72441d6 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -3,6 +3,7 @@ name: Build, publish and deploy on: push: branches: ['main'] + tags: ['v*'] pull_request: env: REGISTRY: ghcr.io @@ -14,8 +15,6 @@ jobs: permissions: contents: read packages: write - - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -33,17 +32,6 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} -# - name: Copy .env file -# run: cp "gdal_rio.env" gdal_rio.env - -# - name: Read gdal_rio.env file and set environment variables -# run: | -# while IFS= read -r line; -# do -# export $(echo "$line" | grep -v '^#' | xargs) -# done < gdal_rio.env - - - name: Build and push Docker image uses: docker/build-push-action@v5 with: diff --git a/src/cogserver/server.py b/src/cogserver/server.py index 1b8f2c0..01727b3 100644 --- a/src/cogserver/server.py +++ b/src/cogserver/server.py @@ -1,14 +1,16 @@ from titiler.application import main as default from cogserver.dependencies import SignedDatasetPath +from rio_tiler.io import STACReader import logging from fastapi import FastAPI -from titiler.core.factory import TilerFactory, MultiBandTilerFactory +from titiler.core.factory import TilerFactory, MultiBandTilerFactory, MultiBaseTilerFactory from titiler.application import __version__ as titiler_version from cogserver.landing import setup_landing from starlette.middleware.cors import CORSMiddleware from titiler.mosaic.factory import MosaicTilerFactory from titiler.core.errors import DEFAULT_STATUS_CODES, add_exception_handlers from titiler.mosaic.errors import MOSAIC_STATUS_CODES +from titiler.extensions.stac import stacExtension logging.basicConfig() logger = logging.getLogger(__name__) @@ -46,7 +48,7 @@ extensions=[ # cogValidateExtension(), # cogViewerExtension(), - # stacExtension(), + stacExtension(), ], path_dependency=SignedDatasetPath ) @@ -68,6 +70,25 @@ ############################################################################### +############################# STAC ####################################### +# STAC endpoints +if not api_settings.disable_stac: + stac = MultiBaseTilerFactory( + reader=STACReader, + router_prefix="/stac", + extensions=[ + #stacViewerExtension(), + ], + path_dependency=SignedDatasetPath, + ) + + app.include_router( + stac.router, prefix="/stac", tags=["SpatioTemporal Asset Catalog"] + ) + +############################################################################### + + ############################# MultiBand ####################################### From 5c983e13aa46c1a84bf1b07621a366e3f8842595 Mon Sep 17 00:00:00 2001 From: janf Date: Wed, 22 Nov 2023 15:08:22 +0100 Subject: [PATCH 2/2] remove tag from cicd --- .github/workflows/build_and_deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 72441d6..c34fc39 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -3,7 +3,6 @@ name: Build, publish and deploy on: push: branches: ['main'] - tags: ['v*'] pull_request: env: REGISTRY: ghcr.io