update lambda function handler

Author: Neil-YL

.gitignore

@@ -16,4 +16,7 @@ __pycache__/
 
 # Temp files or binary objects
 *.swp
-*.bak
+*.bak
+
+lambda_policy.json
+get_log.json

app.py

@@ -1,8 +1,7 @@
-#previously lambda_function.py
 import json
 import logging
 from chalice import Chalice
-from ytb_api_utils import (
+from chalicelib.ytb_api_utils import (
     init_youtube_service,
     create_broadcast_and_bind_stream,
     end_active_broadcasts_for_device
@@ -13,31 +12,31 @@
 
 app = Chalice(app_name="youtube-stream")
 
-@app.route("/", methods=["POST"], content_types=["application/json"])
-def handler():
-    logger.info("Chalice handler invoked")
-    request = app.current_request
-
+@app.lambda_function()
+def lambda_handler(event, context):
+    logger.info("Lambda handler invoked")
     try:
-        payload = request.json_body
-    except Exception:
-        return {
-            "statusCode": 400,
-            "body": json.dumps({"error": "Invalid JSON body"})
-        }
-
-    action = payload.get("action")
-    cam_name = payload.get("cam_name", "UnknownCam")
-    workflow_name = payload.get("workflow_name", "UnknownWorkflow")
-    privacy_status = payload.get("privacy_status", "private")
-
-    if action not in ("create", "end"):
-        return {
-            "statusCode": 400,
-            "body": json.dumps({"error": "Invalid or missing 'action'. Must be 'create' or 'end'."})
-        }
+        body = event.get("body")
+        if isinstance(body, str):
+            payload = json.loads(body)
+        elif isinstance(body, dict):
+            payload = body
+        else:
+            raise ValueError("Invalid body format")
+
+        logger.info(f"Received payload: {payload}")
+
+        action = payload.get("action")
+        cam_name = payload.get("cam_name", "UnknownCam")
+        workflow_name = payload.get("workflow_name", "UnknownWorkflow")
+        privacy_status = payload.get("privacy_status", "private")
+
+        if action not in ("create", "end"):
+            return {
+                "statusCode": 400,
+                "body": json.dumps({"error": "Invalid or missing 'action'. Must be 'create' or 'end'."})
+            }
 
-    try:
         init_youtube_service()
 
         if action == "create":
@@ -46,7 +45,6 @@ def handler():
                 "statusCode": 200,
                 "body": json.dumps({"status": "created", "result": result})
             }
-
         else:  # action == "end"
             ended = end_active_broadcasts_for_device(workflow_name)
             return {
@@ -55,7 +53,8 @@ def handler():
             }
 
     except Exception as e:
+        logger.exception("Error in lambda_handler")
         return {
-            "statusCode": 500,
-            "body": json.dumps({"error": f"Error during '{action}' for device '{workflow_name}': {str(e)}"})
+            "statusCode": 400,
+            "body": json.dumps({"error": f"Invalid JSON or internal error: {str(e)}"})
         }

chalicelib/__init__.py

@@ -0,0 +1 @@
+#empty

ytb_api_utils.py chalicelib/ytb_api_utils.pyytb_api_utils.py renamed to chalicelib/ytb_api_utils.py

@@ -9,7 +9,7 @@
 CHANNEL_ID = "UCHBzCfYpGwoqygH9YNh9A6g"
 
 YOUTUBE = None
-S3_BUCKET = "token-youtube-api"
+S3_BUCKET = "ac-token-youtube-api"
 S3_KEY = "token/token.pickle"
 
 def init_youtube_service():