eoapi-cdk 11.4.1 → 11.6.0

package/lib/utils/utils.py

@@ -1,30 +1,64 @@
+import asyncio
 import base64
 import json
 import os
+from typing import Any
 
 import boto3
 
 
-def get_secret_dict(secret_arn_env_var: str):
-    """Retrieve secrets from AWS Secrets Manager
+def get_secret_dict_by_name(secret_name: str) -> dict[str, Any]:
+    """Retrieve a JSON secret from AWS Secrets Manager by secret name or ARN."""
+    session = boto3.session.Session()
+    client = session.client(service_name="secretsmanager")
+    response = client.get_secret_value(SecretId=secret_name)
 
-    Args:
-        secret_arn_env_var (str): environment variable that contains the secret ARN
+    if "SecretString" in response:
+        return json.loads(response["SecretString"])
 
-    Returns:
-        secrets (dict): decrypted secrets in dict
-    """
+    return json.loads(base64.b64decode(response["SecretBinary"]))
+
+
+def get_secret_dict(secret_arn_env_var: str) -> dict[str, Any]:
+    """Retrieve a JSON secret from AWS Secrets Manager using an env var name."""
     secret_arn = os.environ.get(secret_arn_env_var)
     if not secret_arn:
         raise ValueError(f"{secret_arn_env_var} is not set!")
 
-    # Create a Secrets Manager client
-    session = boto3.session.Session()
-    client = session.client(service_name="secretsmanager")
+    return get_secret_dict_by_name(secret_arn)
+
 
-    get_secret_value_response = client.get_secret_value(SecretId=secret_arn)
+def ensure_event_loop() -> asyncio.AbstractEventLoop:
+    """Return the current event loop, creating and installing one if needed.
+
+    Lambda request handling may enter synchronous code paths that need a current
+    loop for container-scoped async initialization before control reaches the
+    ASGI adapter.
+    """
+    try:
+        return asyncio.get_running_loop()
+    except RuntimeError:
+        pass
+
+    try:
+        return asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        return loop
+
+
+def run_async(coro: Any) -> Any:
+    """Run an async coroutine from synchronous Lambda setup code.
+
+    This uses the installed reusable loop instead of ``asyncio.run(...)`` so
+    long-lived async resources are not created on a temporary loop that is then
+    closed immediately.
+    """
+    try:
+        asyncio.get_running_loop()
+    except RuntimeError:
+        loop = ensure_event_loop()
+        return loop.run_until_complete(coro)
 
-    if "SecretString" in get_secret_value_response:
-        return json.loads(get_secret_value_response["SecretString"])
-    else:
-        return json.loads(base64.b64decode(get_secret_value_response["SecretBinary"]))
+    raise RuntimeError("Cannot run Lambda initialization inside an active event loop")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoapi-cdk",
-  "version": "11.4.1",
+  "version": "11.6.0",
   "description": "A set of constructs deploying pgSTAC with CDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,9 +45,9 @@
     "@types/node": "^25.5.0",
     "aws-cdk-lib": "2.220.0",
     "constructs": "10.4.2",
-    "jsii": "5.9.34",
-    "jsii-docgen": "10.11.14",
-    "jsii-pacmak": "1.127.0",
+    "jsii": "5.9.40",
+    "jsii-docgen": "10.11.19",
+    "jsii-pacmak": "1.129.0",
     "nodemon": "^3.1.10",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.6.2",

package/pyproject.toml

@@ -8,11 +8,13 @@ dependencies = [
     "titiler-pgstac-api",
     "stac-loader",
     "stactools-item-generator",
+    "ingestor-api",
 ]
 
 [tool.uv.sources]
 stactools-item-generator = { path = "lib/stactools-item-generator/runtime" }
 stac-loader = { path = "lib/stac-loader/runtime" }
+ingestor-api = { path = "lib/ingestor-api/runtime" }
 tipg-api = { path = "lib/tipg-api/runtime" }
 titiler-pgstac-api = { path = "lib/titiler-pgstac-api/runtime" }
 stac-api = { path = "lib/stac-api/runtime" }
@@ -31,6 +33,7 @@ deploy = [
 dev = [
     "aws-lambda-typing>=2.20.0",
     "httpx>=0.28.1",
+    "moto[dynamodb,ssm]>=4.0,<5.0",
     "pytest>=8.3.5",
     "pytest-mock>=3.14.0",
     "pytest-postgresql>=7.0.1",
@@ -42,6 +45,7 @@ pythonpath = "."
 testpaths = [
     "lib/stactools-item-generator/runtime/tests",
     "lib/stac-loader/runtime/tests",
+    "lib/ingestor-api/runtime/tests",
 ]