Merge pull request #141 from developmentseed/updateRuntimesPydantic2.0

update runtimes and cdk requirements

Author: vincentsarago

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          python -m pip install pytest pytest-asyncio httpx pypgstac==0.7.1 psycopg[pool] brotlipy boto3 pytest-pgsql psycopg2
+          python -m pip install pytest pytest-asyncio httpx pypgstac==0.8.1 psycopg[pool] brotlipy boto3 pytest-pgsql psycopg2
 
       - name: Test CDK DB Bootstrap
         working-directory: ./infrastructure/aws

.github/workflows/data/noaa-emergency-response.json

@@ -1 +1 @@
-{"id":"noaa-emergency-response", "title": "NOAA Emergency Response Imagery", "description":"NOAA Emergency Response Imagery hosted on AWS Public Dataset.","stac_version":"1.0.0","license":"public-domain","links":[],"extent":{"spatial":{"bbox":[[-180,-90,180,90]]},"temporal":{"interval":[["2005-01-01T00:00:00Z","null"]]}}}
+{"id":"noaa-emergency-response", "title": "NOAA Emergency Response Imagery", "description":"NOAA Emergency Response Imagery hosted on AWS Public Dataset.","stac_version":"1.0.0","license":"public-domain","links":[],"extent":{"spatial":{"bbox":[[-180,-90,180,90]]},"temporal":{"interval":[["2005-01-01T00:00:00Z",null]]}}}

docker-compose.yml

@@ -128,7 +128,7 @@ services:
 
   database:
     container_name: eoapi.db
-    image: ghcr.io/stac-utils/pgstac:v0.7.10
+    image: ghcr.io/stac-utils/pgstac:v0.8.1
     environment:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password

infrastructure/aws/.env.example

@@ -3,7 +3,7 @@ CDK_EOAPI_NAME=eoAPI
 CDK_EOAPI_FUNCTIONS='["stac","raster","vector"]'
 
 # DB
-CDK_EOAPI_DB_PGSTAC_VERSION="0.7.1"
+CDK_EOAPI_DB_PGSTAC_VERSION="0.8.1"
 CDK_EOAPI_DB_PGSTAC_MOSAIC_INDEX=TRUE
 
 # STAC API

infrastructure/aws/cdk/config.py

@@ -3,7 +3,7 @@
 from enum import Enum
 from typing import Dict, List, Optional
 
-import pydantic
+from pydantic_settings import BaseSettings
 
 
 class functionName(str, Enum):
@@ -14,24 +14,24 @@ class functionName(str, Enum):
     vector = "vector"
 
 
-class eoAPISettings(pydantic.BaseSettings):
+class eoAPISettings(BaseSettings):
     """Application settings"""
 
     name: str = "eoapi"
     stage: str = "production"
-    owner: Optional[str]
-    client: Optional[str]
+    owner: Optional[str] = None
+    client: Optional[str] = None
     functions: List[functionName] = [functionName.stac, functionName.raster]
 
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "CDK_EOAPI_"
-        use_enum_values = True
+    model_config = {
+        "env_prefix": "CDK_EOAPI_",
+        "env_file": ".env",
+        "extra": "ignore",
+        "use_enum_values": True,
+    }
 
 
-class eoDBSettings(pydantic.BaseSettings):
+class eoDBSettings(BaseSettings):
     """Application settings"""
 
     dbname: str = "eoapi"
@@ -43,29 +43,27 @@ class eoDBSettings(pydantic.BaseSettings):
     context: bool = True
     mosaic_index: bool = True
 
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "CDK_EOAPI_DB_"
+    model_config = {
+        "env_prefix": "CDK_EOAPI_DB_",
+        "env_file": ".env",
+    }
 
 
-class eoSTACSettings(pydantic.BaseSettings):
+class eoSTACSettings(BaseSettings):
     """Application settings"""
 
     env: Dict = {}
 
     timeout: int = 10
     memory: int = 256
 
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "CDK_EOAPI_STAC_"
+    model_config = {
+        "env_prefix": "CDK_EOAPI_STAC_",
+        "env_file": ".env",
+    }
 
 
-class eoRasterSettings(pydantic.BaseSettings):
+class eoRasterSettings(BaseSettings):
     """Application settings"""
 
     # Default options are optimized for CloudOptimized GeoTIFF
@@ -98,23 +96,21 @@ class eoRasterSettings(pydantic.BaseSettings):
     timeout: int = 10
     memory: int = 3008
 
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "CDK_EOAPI_RASTER_"
+    model_config = {
+        "env_prefix": "CDK_EOAPI_RASTER_",
+        "env_file": ".env",
+    }
 
 
-class eoVectorSettings(pydantic.BaseSettings):
+class eoVectorSettings(BaseSettings):
     """Application settings"""
 
     env: Dict = {}
 
     timeout: int = 10
     memory: int = 512
 
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "CDK_EOAPI_VECTOR_"
+    model_config = {
+        "env_prefix": "CDK_EOAPI_VECTOR_",
+        "env_file": ".env",
+    }

infrastructure/aws/requirements-cdk.txt

@@ -5,5 +5,5 @@ aws_cdk-aws_apigatewayv2_integrations_alpha==2.94.0a0
 constructs>=10.0.0
 
 # pydantic settings
-pydantic~=1.0
-python-dotenv
+pydantic~=2.0
+pydantic-settings~=2.0

runtime/eoapi/raster/eoapi/raster/config.py

@@ -1,9 +1,10 @@
 """API settings."""
 
-import pydantic
+from pydantic import field_validator
+from pydantic_settings import BaseSettings
 
 
-class ApiSettings(pydantic.BaseSettings):
+class ApiSettings(BaseSettings):
     """API settings"""
 
     name: str = "eoAPI-raster"
@@ -12,13 +13,9 @@ class ApiSettings(pydantic.BaseSettings):
     debug: bool = False
     root_path: str = ""
 
-    @pydantic.validator("cors_origins")
+    model_config = {"env_prefix": "EOAPI_RASTER_", "env_file": ".env"}
+
+    @field_validator("cors_origins")
     def parse_cors_origin(cls, v):
         """Parse CORS origins."""
         return [origin.strip() for origin in v.split(",")]
-
-    class Config:
-        """model config"""
-
-        env_file = ".env"
-        env_prefix = "EOAPI_RASTER_"

runtime/eoapi/raster/pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "titiler.pgstac==0.5.1",
+    "titiler.pgstac==0.7.0",
     "starlette-cramjam>=0.3,<0.4",
     "importlib_resources>=1.1.0;python_version<'3.9'",
 ]

runtime/eoapi/vector/eoapi/vector/app.py

@@ -98,6 +98,7 @@ async def lifespan(app: FastAPI):
 if settings.catalog_ttl:
     app.add_middleware(
         CatalogUpdateMiddleware,
+        func=register_collection_catalog,
         ttl=settings.catalog_ttl,
         schemas=["public"],
         exclude_function_schemas=["public"],

runtime/eoapi/vector/eoapi/vector/config.py

@@ -1,10 +1,11 @@
 """API settings."""
 
 
-import pydantic
+from pydantic import field_validator
+from pydantic_settings import BaseSettings
 
 
-class ApiSettings(pydantic.BaseSettings):
+class ApiSettings(BaseSettings):
     """API settings"""
 
     name: str = "eoAPI-vector"
@@ -14,13 +15,9 @@ class ApiSettings(pydantic.BaseSettings):
 
     catalog_ttl: int = 300
 
-    @pydantic.validator("cors_origins")
+    model_config = {"env_prefix": "EOAPI_VECTOR_", "env_file": ".env"}
+
+    @field_validator("cors_origins")
     def parse_cors_origin(cls, v):
         """Parse CORS origins."""
         return [origin.strip() for origin in v.split(",")]
-
-    class Config:
-        """model config"""
-
-        env_prefix = "EOAPI_VECTOR_"
-        env_file = ".env"