Moved combineImg to own module; created AWS dockerfile; added combination_method config

combineImg/Dockerfile

@@ -0,0 +1,33 @@
+FROM public.ecr.aws/lambda/python:3.8
+RUN yum -y install git && yum clean all
+RUN yum -y install tar gzip zlib freetype-devel \
+    gcc \
+    ghostscript \
+    lcms2-devel \
+    libffi-devel \
+    libimagequant-devel \
+    libjpeg-devel \
+    libraqm-devel \
+    libtiff-devel \
+    libwebp-devel \
+    make \
+    openjpeg2-devel \
+    rh-python36 \
+    rh-python36-python-virtualenv \
+    sudo \
+    tcl-devel \
+    tk-devel \
+    tkinter \
+    which \
+    xorg-x11-server-Xvfb \
+    zlib-devel \
+    && yum clean all
+RUN pip install -U --force-reinstall pillow-simd
+RUN pip install requests
+
+
+# Copy function code
+COPY __init__.py ${LAMBDA_TASK_ROOT}/app.py
+
+# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
+CMD [ "app.lambda_handler" ] 

combineImg/__init__.py

@@ -0,0 +1,117 @@
+import json
+from weakref import finalize
+from PIL import Image, ImageOps, ImageFilter
+import requests
+from io import BytesIO
+import io
+import base64
+
+# find the highest res image in an array of images
+def findImageWithMostPixels(imageArray):
+    maxPixels = 0
+    maxImage = None
+    for image in imageArray:
+        pixels = image.size[0] * image.size[1]
+        if pixels > maxPixels:
+            maxPixels = pixels
+            maxImage = image
+    return maxImage
+
+def getTotalImgSize(imageArray): # take the image with the most pixels, multiply it by the number of images, and return the width and height
+    maxImage = findImageWithMostPixels(imageArray)
+    if (len(imageArray) == 1):
+        return (maxImage.size[0], maxImage.size[1])
+    elif (len(imageArray) == 2):
+        return (maxImage.size[0] * 2, maxImage.size[1])
+    else:
+        return (maxImage.size[0] * 2, maxImage.size[1]*2)
+
+def scaleAllImagesToSameSize(imageArray,targetWidth,targetHeight,pad=True): # scale all images in the array to the same size, preserving aspect ratio
+    newImageArray = []
+    for image in imageArray:
+        if pad:
+            image = image.convert('RGBA')
+            newImg = ImageOps.pad(image, (targetWidth, targetHeight),color=(0, 0, 0, 0))
+        else:
+            newImg = ImageOps.fit(image, (targetWidth, targetHeight)) # scale + crop
+        newImageArray.append(newImg)
+    return newImageArray
+
+def blurImage(image, radius):
+    return image.filter(ImageFilter.GaussianBlur(radius=radius))
+
+def combineImages(imageArray, totalWidth, totalHeight,pad=True):
+    x = 0
+    y = 0
+    if (len(imageArray) == 1): # if there is only one image, just return it
+        return imageArray[0]
+    # image generation is needed
+    topImg = findImageWithMostPixels(imageArray)
+    newImage = Image.new("RGBA", (totalWidth, totalHeight),(0, 0, 0, 0))
+    imageArray = scaleAllImagesToSameSize(imageArray,topImg.size[0],topImg.size[1],pad)
+    if (len(imageArray) == 2): # if there are two images, combine them horizontally
+        for image in imageArray:
+            newImage.paste(image, (x, y))
+            x += image.size[0]
+    elif (len(imageArray) == 3): # the elusive 3 image upload
+        # if there are three images, combine the first two horizontally, then combine the last one vertically
+        imageArray[2] = scaleAllImagesToSameSize([imageArray[2]],totalWidth,topImg.size[1],pad)[0] # take the last image, treat it like an image array and scale it to the total width, but same height as all individual images
+        for image in imageArray[0:2]:
+            newImage.paste(image, (x, y))
+            x += image.size[0]
+        y += imageArray[0].size[1]
+        x = 0
+        newImage.paste(imageArray[2], (x, y))
+    elif (len(imageArray) == 4): # if there are four images, combine the first two horizontally, then combine the last two vertically
+        for image in imageArray[0:2]:
+            newImage.paste(image, (x, y))
+            x += image.size[0]
+        y += imageArray[0].size[1]
+        x = 0
+        for image in imageArray[2:4]:
+            newImage.paste(image, (x, y))
+            x += image.size[0]
+    else:
+        for image in imageArray:
+            newImage.paste(image, (x, y))
+            x += image.size[0]
+    return newImage
+
+def saveImage(image, name):
+    image.save(name)
+
+# combine up to four images into a single image
+def genImage(imageArray):
+    combined = combineImages(imageArray, *getTotalImgSize(imageArray))
+    combinedBG = combineImages(imageArray, *getTotalImgSize(imageArray),False)
+    combinedBG = blurImage(combinedBG,50)
+    finalImg = Image.alpha_composite(combinedBG,combined)
+    finalImg = ImageOps.pad(finalImg, findImageWithMostPixels(imageArray).size,color=(0, 0, 0, 0))
+    finalImg = finalImg.convert('RGB')
+    return finalImg
+
+def genImageFromURL(urlArray):
+    # this method avoids storing the images in disk, instead they're stored in memory
+    # no cache means that they'll have to be downloaded again if the image is requested again
+    # TODO: cache?
+    imageArray = []
+    for url in urlArray:
+        imageArray.append(Image.open(BytesIO(requests.get(url).content)))
+    return genImage(imageArray)
+    
+def lambda_handler(event, context):
+    # TODO implement
+    images = event["queryStringParameters"].get("imgs","").split(",")
+    combined = genImageFromURL(images)
+    buffered = BytesIO()
+    combined.save(buffered,format="JPEG")
+    combined_str=base64.b64encode(buffered.getvalue()).decode('ascii')
+    return {
+        'statusCode': 200,
+        "headers": 
+        {
+            "Content-Type": "image/jpg"
+        },
+        'body': combined_str,
+        'isBase64Encoded': True
+    }