diff --git a/combineImg/500.jpg b/combineImg/500.jpg new file mode 100644 index 0000000..c61fce1 Binary files /dev/null and b/combineImg/500.jpg differ diff --git a/combineImg/Dockerfile b/combineImg/Dockerfile index 5e66492..30e9c1c 100644 --- a/combineImg/Dockerfile +++ b/combineImg/Dockerfile @@ -26,9 +26,9 @@ RUN yum -y install tar gzip zlib freetype-devel \ RUN pip install -U --force-reinstall pillow-simd RUN pip install requests - # Copy function code COPY __init__.py ${LAMBDA_TASK_ROOT}/app.py +COPY 500.jpg ${LAMBDA_TASK_ROOT}/500.jpg # Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile) CMD [ "app.lambda_handler" ] \ No newline at end of file diff --git a/combineImg/__init__.py b/combineImg/__init__.py index ccd1ecc..ba35d22 100644 --- a/combineImg/__init__.py +++ b/combineImg/__init__.py @@ -93,6 +93,10 @@ def combineImages(imageArray, totalWidth, totalHeight,pad=True): def saveImage(image, name): image.save(name) +def get500ImgBase64(): + data = open("500.jpg","rb").read() + return (base64.b64encode(data)).decode('ascii') + # combine up to four images into a single image def genImage(imageArray): totalSize=getTotalImgSize(imageArray) @@ -140,7 +144,7 @@ def lambda_handler(event, context): return {'statusCode':400,'body':'Invalid image URL'} combined = genImageFromURL(images) if (combined == None): - return {'statusCode':500,'body':'Failed to download image(s)'} + return {'statusCode':200,'body':get500ImgBase64(),'isBase64Encoded':True,'headers':{"Content-Type": "image/jpeg","Cache-Control": "public, max-age=86400"}} buffered = BytesIO() combined.save(buffered,format="JPEG",quality=60) combined_str=base64.b64encode(buffered.getvalue()).decode('ascii')