Support multiple return types in the handler

Allow users to use the Flask Response object and other functions like `send_file`. This makes it possible to stream a response or return files. For backwards compatibility the response is still formated like before when a dict object type is returned by the handler. Signed-off-by: Han Verstraete (OpenFaaS Ltd) <[email protected]>
openfaas · Jan 11, 2024 · 686f769 · 686f769
1 parent 0cf62f9
commit 686f769
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/template/python3-http-debian/index.py b/template/python3-http-debian/index.py
@@ -57,14 +57,17 @@ def get_content_type(res):
 def format_response(res):
     if res == None:
         return ('', 200)
+
+    if type(resp) is dict:
+        statusCode = format_status_code(res)
+        content_type = get_content_type(res)
+        body = format_body(res, content_type)
 
-    statusCode = format_status_code(res)
-    content_type = get_content_type(res)
-    body = format_body(res, content_type)
+        headers = format_headers(res)
 
-    headers = format_headers(res)
+        return (body, statusCode, headers)
 
-    return (body, statusCode, headers)
+    return res
 
 @app.route('/', defaults={'path': ''}, methods=['GET', 'PUT', 'POST', 'PATCH', 'DELETE'])
 @app.route('/<path:path>', methods=['GET', 'PUT', 'POST', 'PATCH', 'DELETE'])

diff --git a/template/python3-http/index.py b/template/python3-http/index.py
@@ -48,12 +48,15 @@ def format_headers(resp):
 def format_response(resp):
     if resp == None:
         return ('', 200)
+
+    if type(resp) is dict:
+        statusCode = format_status_code(resp)
+        body = format_body(resp)
+        headers = format_headers(resp)
 
-    statusCode = format_status_code(resp)
-    body = format_body(resp)
-    headers = format_headers(resp)
+        return (body, statusCode, headers)
 
-    return (body, statusCode, headers)
+    return resp
 
 @app.route('/', defaults={'path': ''}, methods=['GET', 'PUT', 'POST', 'PATCH', 'DELETE'])
 @app.route('/<path:path>', methods=['GET', 'PUT', 'POST', 'PATCH', 'DELETE'])