upgrade to tipg==0.10.1 and titiler-pgstac==1.7.1

Author: hrodmn

lib/tipg-api/runtime/requirements.txt

@@ -1 +1 @@
-tipg==0.9.0
+tipg==0.10.1

lib/tipg-api/runtime/src/handler.py

@@ -6,31 +6,26 @@
 import os
 
 from mangum import Mangum
+from tipg.collections import register_collection_catalog
+from tipg.database import connect_to_db
+from tipg.main import app
+from tipg.settings import (
+    CustomSQLSettings,
+    DatabaseSettings,
+    PostgresSettings,
+)
 from utils import get_secret_dict
 
 secret = get_secret_dict(secret_arn_env_var="PGSTAC_SECRET_ARN")
-os.environ.update(
-    {
-        "postgres_host": secret["host"],
-        "postgres_dbname": secret["dbname"],
-        "postgres_user": secret["username"],
-        "postgres_pass": secret["password"],
-        "postgres_port": str(secret["port"]),
-    }
-)
 
-from tipg.collections import register_collection_catalog  # noqa: E402
-from tipg.database import connect_to_db  # noqa: E402
 
-# skipping linting rule that wants all imports at the top
-from tipg.main import app  # noqa: E402
-from tipg.settings import (
-    CustomSQLSettings,  # noqa: E402
-    DatabaseSettings,  # noqa: E402
-    PostgresSettings,  # noqa: E402; noqa: E402
+postgres_settings = PostgresSettings(
+    postgres_host=secret["host"],
+    postgres_dbname=secret["dbname"],
+    postgres_user=secret["username"],
+    postgres_pass=secret["password"],
+    postgres_port=str(secret["port"]),
 )
-
-postgres_settings = PostgresSettings()
 db_settings = DatabaseSettings()
 custom_sql_settings = CustomSQLSettings()
 

lib/titiler-pgstac-api/runtime/requirements.txt

@@ -1,2 +1,2 @@
-titiler.pgstac==1.7.0
+titiler.pgstac==1.7.1
 psycopg[binary, pool]

lib/titiler-pgstac-api/runtime/src/handler.py

@@ -6,27 +6,26 @@
 import os
 
 from mangum import Mangum
+from titiler.pgstac.db import connect_to_db
+from titiler.pgstac.main import app
+from titiler.pgstac.settings import PostgresSettings
 from utils import get_secret_dict
 
 secret = get_secret_dict(secret_arn_env_var="PGSTAC_SECRET_ARN")
-os.environ.update(
-    {
-        "postgres_host": secret["host"],
-        "postgres_dbname": secret["dbname"],
-        "postgres_user": secret["username"],
-        "postgres_pass": secret["password"],
-        "postgres_port": str(secret["port"]),
-    }
-)
 
-from titiler.pgstac.db import connect_to_db  # noqa: E402
-from titiler.pgstac.main import app  # noqa: E402
+postgres_settings = PostgresSettings(
+    postgres_host=secret["host"],
+    postgres_dbname=secret["dbname"],
+    postgres_user=secret["username"],
+    postgres_pass=secret["password"],
+    postgres_port=str(secret["port"]),
+)
 
 
 @app.on_event("startup")
 async def startup_event() -> None:
     """Connect to database on startup."""
-    await connect_to_db(app)
+    await connect_to_db(app, settings=postgres_settings)
 
 
 handler = Mangum(app, lifespan="off")