Merge branch 'staging' into thanks_dependbot

Author: dmannarino

.github/workflows/terraform_build.yaml

@@ -17,7 +17,6 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_dev }}
         AWS_REGION: ${{ secrets.aws_region_dev }}
         LOCALSTACK_AUTH_TOKEN: ${{ secrets.localstack_auth_token }}
-        PLANET_API_KEY: ${{secrets.planet_api_key }}
       run: |
         ./scripts/test
 

README.md

@@ -15,7 +15,7 @@ Raster and vector tile API for datasets in the [GFW Data API](https://github.com
 
 {bastion_host} might be something like: `ec2-18-215-196-0.compute-1.amazonaws.com`
 
-* Set the environment variables for the **read only** credentials of the above database. The environment variables are `GFW_DB_NAME`,  `GFW_DB_USER_RO`, `GFW_DB_PASSWORD_RO`, and `PLANET_API_KEY`. These are also listed in the `docker-compose.dev.yml` file. You get the values of secrets from the secrets manager of the appropriate AWS environment (production, staging, etc.)
+* Set the environment variables for the **read only** credentials of the above database. The environment variables are `GFW_DB_NAME`,  `GFW_DB_USER_RO`, and `GFW_DB_PASSWORD_RO`. These are also listed in the `docker-compose.dev.yml` file. You get the values of secrets from the secrets manager of the appropriate AWS environment (production, staging, etc.)
 
 * In `docker-compose.dev.yml`, set `DATA_LAKE_BUCKET`  to the desired environment's bucket name. By default, the `staging` environment bucket (`gfw-data-lake-staging`)  will be used.
 

app/main.py

@@ -36,7 +36,6 @@
     raster_tiles as umd_glad_sentinel2_alerts_raster_tiles,
 )
 from .routes.wur_radd_alerts import raster_tiles as wur_radd_alerts_raster_tiles
-from .routes.planet import raster_tiles as planet_raster_tiles
 from .routes import wmts
 from .routes import preview
 
@@ -85,7 +84,6 @@
     umd_glad_landsat_alerts_raster_tiles.router,
     umd_glad_sentinel2_alerts_raster_tiles.router,
     wur_radd_alerts_raster_tiles.router,
-    planet_raster_tiles.router,
     raster_tiles.router,
     wmts.router,
     viirs_esri_vector_tile_server.router,

app/routes/planet/__init__.py

@@ -97,7 +97,7 @@ def create_mask(self):
             condition are masked.
         """
 
-        mask = self.alert_drivers > 0
+        mask = ~self.no_data * (self.alert_drivers > 0)
 
         if self.alert_confidence:
             confidence_mask = (

app/routes/planet/raster_tiles.py

@@ -2,7 +2,8 @@
 from typing import Optional, Tuple
 
 from aenum import Enum, extend_enum
-from fastapi import APIRouter, Depends, Query, Response
+from fastapi import APIRouter, Depends, Query, Response, HTTPException
+from rio_tiler.errors import TileOutsideBounds
 from titiler.core.resources.enums import ImageType
 from titiler.core.utils import render_image
 
@@ -81,7 +82,10 @@ async def gfw_integrated_alerts_drivers_raster_tile(
     folder: str = f"s3://{DATA_LAKE_BUCKET}/gfw_integrated_alerts/{integrated_alerts_version}/raster/epsg-4326/cog"
     with AlertsReader(input=folder) as reader:
         tile_x, tile_y, zoom = xyz
-        image_data = reader.tile(tile_x, tile_y, zoom, bands=bands)
+        try:
+            image_data = reader.tile(tile_x, tile_y, zoom, bands=bands)
+        except TileOutsideBounds:
+            raise HTTPException(status_code=404, detail="Tile outside of bounds of this dataset")
 
     integrated_alerts_drivers = IntegratedAlertsDrivers(
         start_date=start_date,
@@ -93,11 +97,10 @@ async def gfw_integrated_alerts_drivers_raster_tile(
     with COGReader(
         f"s3://{DATA_LAKE_BUCKET}/wur_integration_alert_drivers_class/{version}/raster/epsg-4326/cog/class.tif"
     ) as reader:
-        if reader.tile_exists(tile_x, tile_y, zoom):
+        try:
             integrated_alerts_drivers.alert_drivers = reader.tile(tile_x, tile_y, zoom).data[0]
-        else:
-            print("Non-existent tile, wur_integration_alert_drivers_class")
-            integrated_alerts_drivers.alert_drivers = None
+        except TileOutsideBounds:
+            raise HTTPException(status_code=404, detail="Tile outside of bounds of this dataset")
 
     processed_image = integrated_alerts_drivers(image_data)
 

app/routes/titiler/algorithms/integrated_alerts_drivers.py

@@ -74,7 +74,6 @@ class Globals(BaseSettings):
         None, description="AWS service endpoint URL"
     )
     lambda_host: Optional[str] = Field(None, description="AWS Lamdba host URL")
-    planet_api_key: Optional[str] = Field(None, description="Planet Api key")
     tile_cache_url: Optional[str] = Field(None, description="Tile Cache URL")
     sql_request_timeout: int = Field(
         58000, description="SQL timeout time (server side)"

app/routes/titiler/gfw_integrated_alerts_drivers.py

@@ -21,7 +21,6 @@ services:
       - LOG_LEVEL=debug
       - RASTER_TILER_LAMBDA_NAME=test
       - ENV=dev
-      - PLANET_API_KEY
     ports:
       - 8088:80
     entrypoint: wait_for_postgres.sh /app/start.sh

app/settings/globals.py

@@ -24,7 +24,6 @@ services:
       - LOG_LEVEL=debug
       - RASTER_TILER_LAMBDA_NAME=test
       - ENV=dev
-      - PLANET_API_KEY=${PLANET_API_KEY}
       - AWS_REQUEST_PAYER=requester
       - 'DIST_ALERTS_FOREST_FILTERS={"tree_cover_loss": {"dataset": "umd_tree_cover_loss", "version": "v1.10.1"}, "tree_cover_height": {"dataset": "umd_tree_cover_height_2020", "version": "v2022"}, "tree_cover_density": {"dataset": "umd_tree_cover_density_2010", "version": "v1.6"}}'
     ports: