Add Python3 flask template

Adds Python3 flask template and adds pydoc to the handler for
both templates.

Signed-off-by: Alex Ellis (VMware) <[email protected]>

Author: alexellis

.gitignore

@@ -1 +1,2 @@
 *.pyc
+build

README.md

@@ -1,13 +1,22 @@
-# python27-flask-template
-Python 2.7 OpenFaaS template with Flask
+# python-flask-template
 
-To try this out:
+Python OpenFaaS template with Flask
+
+To try this out with either Python 2.7 or Python 3.6:
 
 ```bash
-faas template pull https://github.com/alexellis/python27-flask-template
-faas new --lang python27-flask myfunction
-mv myfunction.yml stack.yml
+faas template pull https://github.com/openfaas-incubator/python-flask-template
+faas new --list
+Languages available as templates:
+- python27-flask
+- python3-flask
+```
 
+Generate a function with one of the languages:
+
+```bash
+faas new --lang python3-flask myfunction
+mv myfunction.yml stack.yml
 ```
 
 Followed by the usual flow:

template/python27-flask/Dockerfile

@@ -3,7 +3,7 @@ FROM python:2.7-alpine
 # Alternatively use ADD https:// (which will not be cached by Docker builder)
 RUN apk --no-cache add curl \
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.2.1/of-watchdog > /usr/bin/fwatchdog \
+    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.2.3/of-watchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 

template/python27-flask/function/handler.py

@@ -1,3 +1,7 @@
-def handle(st):
-    return "You said: " + st
+def handle(req):
+    """handle a request to the function
+    Args:
+        req (str): request body
+    """
 
+    return req

template/python3-flask/Dockerfile

@@ -0,0 +1,33 @@
+FROM python:3.6-alpine
+
+# Alternatively use ADD https:// (which will not be cached by Docker builder)
+RUN apk --no-cache add curl \
+    && echo "Pulling watchdog binary from Github." \
+    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.2.3/of-watchdog > /usr/bin/fwatchdog \
+    && chmod +x /usr/bin/fwatchdog \
+    && apk del curl --no-cache
+
+WORKDIR /root/
+
+COPY requirements.txt   .
+RUN pip install -r requirements.txt
+COPY index.py           .
+
+RUN mkdir -p function
+RUN touch ./function/__init__.py
+WORKDIR /root/function/
+COPY function/requirements.txt	.
+RUN pip install -r requirements.txt
+
+WORKDIR /root/
+COPY function           function
+
+ENV fprocess="python index.py"
+ENV cgi_headers="true"
+ENV mode="http"
+ENV upstream_url="http://127.0.0.1:5000"
+
+
+HEALTHCHECK --interval=1s CMD [ -e /tmp/.lock ] || exit 1
+
+CMD ["fwatchdog"]

template/python3-flask/function/__init__.py

@@ -0,0 +1,7 @@
+def handle(req):
+    """handle a request to the function
+    Args:
+        req (str): request body
+    """
+
+    return req

template/python3-flask/function/handler.py

@@ -0,0 +1,15 @@
+# Copyright (c) Alex Ellis 2017. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+from flask import Flask, request
+from function import handler
+
+app = Flask(__name__)
+
+@app.route("/", methods=["POST", "GET"])
+def main_route():
+    ret = handler.handle(request.get_data())
+    return ret
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=5000, debug=False)

template/python3-flask/function/requirements.txt

@@ -0,0 +1,2 @@
+flask
+