Coroutine support (#25)

denismakogon · web-flow · commit 41e10b768033 · 2018-03-07T00:01:14.000+02:00
diff --git a/fdk/__init__.py b/fdk/__init__.py
@@ -24,7 +24,7 @@ def handle(handle_func, loop=None):
             asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
             loop = asyncio.get_event_loop()
         try:
-            cls = runner.JSONProtocol.with_handler(handle_func)
+            cls = runner.JSONProtocol.with_handler(handle_func, loop=loop)
             stdin_pipe_reader = loop.connect_read_pipe(cls, stdin)
             loop.run_until_complete(stdin_pipe_reader)
             loop.run_forever()
diff --git a/fdk/runner.py b/fdk/runner.py
@@ -17,13 +17,26 @@
 import ujson
 import os
 import traceback
+import types
 
 from fdk import context
 from fdk import errors
 from fdk import headers
 from fdk import response
 
 
+def handle_callable(ctx, handle_func, data=None,
+                    loop: asyncio.AbstractEventLoop=None):
+    r = handle_func(ctx, data=data, loop=loop)
+
+    if isinstance(r, types.CoroutineType):
+        print("function appeared to be a coroutine, awaiting...",
+              file=sys.stderr, flush=True)
+        return loop.run_until_complete(r)
+
+    return r
+
+
 def from_request(handle_func, incoming_request, loop=None):
     print("request parsed", file=sys.stderr, flush=True)
     json_headers = headers.GoLikeHeaders(
@@ -39,11 +52,10 @@ def from_request(handle_func, incoming_request, loop=None):
                               config=os.environ, headers=json_headers)
 
     print("context allocated", file=sys.stderr, flush=True)
-
     print("starting the function", file=sys.stderr, flush=True)
     print(incoming_request.get("body"), file=sys.stderr, flush=True)
-    response_data = handle_func(
-        ctx, data=incoming_request.get("body"), loop=loop)
+    response_data = handle_callable(
+        ctx, handle_func, data=incoming_request.get("body"), loop=loop)
 
     if isinstance(response_data, response.RawResponse):
         return response_data
diff --git a/fdk/tests/test_json.py b/fdk/tests/test_json.py
@@ -12,8 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import asyncio
 import json
 import testtools
+import uvloop
 
 from fdk import runner
 from fdk import response
@@ -36,6 +38,10 @@ def expectioner(ctx, data=None, loop=None):
     raise Exception("custom_error")
 
 
+async def coroutine_func(ctx, data=None, loop=None):
+    return "OK"
+
+
 class TestJSONRequestParser(testtools.TestCase):
 
     def setUp(self):
@@ -69,3 +75,12 @@ def test_errored_func(self):
         r = runner.handle_request(expectioner, in_bytes)
         self.assertIsNotNone(r)
         self.assertEqual(500, r.status())
+
+    def test_corotuine_func(self):
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+        loop = asyncio.get_event_loop()
+        in_bytes = data.raw_request_without_body.encode('utf8')
+        r = runner.handle_request(coroutine_func, in_bytes, loop=loop)
+        self.assertIsNotNone(r)
+        self.assertEqual(200, r.status())
+        self.assertIn("OK", r.body())
diff --git a/realease.sh b/realease.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+
+git checkout -b v${FDK_VERSION}-stable
+PBR_VERSION=${FDK_VERSION} python setup.py sdist bdist_wheel
+twine upload dist/fdk-${FDK_VERSION}*
