Updated to Blender 3.1

Author: AlphaGit

Diff for: blender-lambda-consumer/Dockerfile

@@ -1,4 +1,4 @@
-FROM nytimes/blender:2.93-cpu-ubuntu18.04
+FROM nytimes/blender:3.1-cpu-ubuntu18.04
 
 ARG FUNCTION_DIR="/home/app"
 RUN mkdir -p $FUNCTION_DIR
@@ -7,7 +7,7 @@ WORKDIR ${FUNCTION_DIR}
 RUN pip install boto3
 RUN pip install awslambdaric --target ${FUNCTION_DIR}
 
-ENTRYPOINT [ "/bin/2.93/python/bin/python3.9", "-m", "awslambdaric" ]
+ENTRYPOINT [ "/bin/3.1/python/bin/python3.10", "-m", "awslambdaric" ]
 CMD [ "consumer_function.handler" ]
 
 COPY *.py ${FUNCTION_DIR}/

Diff for: blender-lambda-producer/Dockerfile

@@ -1,4 +1,4 @@
-FROM nytimes/blender:2.93-cpu-ubuntu18.04
+FROM nytimes/blender:3.1-cpu-ubuntu18.04
 
 ARG FUNCTION_DIR="/home/app"
 RUN mkdir -p $FUNCTION_DIR
@@ -7,7 +7,7 @@ WORKDIR ${FUNCTION_DIR}
 RUN pip install boto3
 RUN pip install awslambdaric --target ${FUNCTION_DIR}
 
-ENTRYPOINT [ "/bin/2.93/python/bin/python3.9", "-m", "awslambdaric" ]
+ENTRYPOINT [ "/bin/3.1/python/bin/python3.10", "-m", "awslambdaric" ]
 CMD [ "producer_function.handler" ]
 
 COPY *.py ${FUNCTION_DIR}/

Diff for: blender-lambda-producer/producer_function.py

@@ -93,9 +93,12 @@ def retrieve_file_from_s3(file_name):
     s3_bucket.download_file(file_name, LOCAL_RENDER_FILE)
 
 
-def assert_request_is_valid(render_request) -> Tuple[bool, str]:
+def assert_request_is_valid(render_request: dict) -> None:
     logger.debug(f'Validating request {render_request}')
 
+    if not isinstance(render_request, dict):
+        raise TypeError(f"data is not valid json, instead is {str(type(render_request))}")
+
     if 'file_name' not in render_request:
         raise TypeError("'file_name' parameter is missing")
 

Diff for: producer.tf

@@ -12,7 +12,7 @@ resource "aws_lambda_function" "producer_lambda" {
     package_type = "Image"
     image_uri = module.producer_docker_image.image_uri
     role = aws_iam_role.lambda_exec.arn
-    timeout = 60
+    timeout = 120
 
     environment {
         variables = {

Diff for: render.sh

@@ -10,9 +10,10 @@ done
 SUPPORT_FILES_STRING="${SUPPORT_FILES_STRING%?} ]"
 
 PUBLIC_URL=$(terraform output -raw public_url)
+DATA='{ "file_name": "'$BLENDER_FILE'", "support_files": '$SUPPORT_FILES_STRING' }'
 
 curl -s \
-    -X POST \
-    -H "Content-Type: application/json" \
-    -d '{ "file_name": "'$BLENDER_FILE'", "request_id": "'$REQUEST_ID'", "support_files": '$SUPPORT_FILES_STRING' }' \
-    "$PUBLIC_URL/render-job" | jq
+     -X POST \
+     -H "Content-Type: application/json" \
+     -d "$DATA" \
+     "$PUBLIC_URL/render-job"