New JSON parser! (#22)

no more HTTP or default protocols

Author: denismakogon

.gitignore

@@ -122,3 +122,4 @@ venv
 .venv
 ChangeLog
 AUTHORS
+.pytest_cache/

Dockerfile

@@ -7,5 +7,4 @@ RUN pip3 install -r /code/requirements.txt
 RUN pip3 install -e /code/
 
 WORKDIR /code/samples/hot/json/echo
-RUN ls -la
 ENTRYPOINT ["python3", "func.py"]

fdk/__init__.py

@@ -12,60 +12,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import functools
-import io
-import ujson
+import asyncio
+import uvloop
 
 from fdk import runner
 
-handle = runner.generic_handle
 
-
-def coerce_input_to_content_type(request_data_processor):
-
-    @functools.wraps(request_data_processor)
-    def app(context, data=None, loop=None):
-        """
-        Request handler app dispatcher decorator
-        :param context: request context
-        :type context: request.RequestContext
-        :param data: request body
-        :type data: io.BufferedIOBase
-        :param loop: asyncio event loop
-        :type loop: asyncio.AbstractEventLoop
-        :return: raw response
-        :rtype: response.RawResponse
-        :return:
-        """
-        body = data
-        content_type = context.Headers().get("content-type")
+def handle(handle_func, loop=None):
+    with open("/dev/stdin", "rb", buffering=0) as stdin:
+        if loop is None:
+            asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+            loop = asyncio.get_event_loop()
         try:
-
-            if hasattr(data, "readable"):
-                request_body = io.TextIOWrapper(data)
-            else:
-                request_body = data
-
-            if content_type == "application/json":
-                if isinstance(request_body, str):
-                    if len(request_body) > 0:
-                        body = ujson.loads(request_body)
-                    else:
-                        body = {}
-                else:
-                    body = ujson.load(request_body)
-            elif content_type in ["text/plain"]:
-                body = request_body.read()
-
-        except Exception as ex:
-            raise context.DispatchError(
-                context, 500, "Unexpected error: {}".format(str(ex)))
-
-        return request_data_processor(context, data=body, loop=loop)
-
-    return app
-
-
-__all__ = [
-    'handle'
-]
+            cls = runner.JSONProtocol.with_handler(handle_func)
+            stdin_pipe_reader = loop.connect_read_pipe(cls, stdin)
+            loop.run_until_complete(stdin_pipe_reader)
+            loop.run_forever()
+        finally:
+            loop.close()

fdk/context.py

@@ -12,9 +12,37 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from fdk import headers
+from fdk import response
 from fdk import errors
 
 
+class JSONDispatchException(Exception):
+
+    def __init__(self, context, status, message):
+        """
+        JSON response with error
+        :param status: HTTP status code
+        :param message: error message
+        """
+        self.status = status
+        self.message = message
+        self.context = context
+
+    def response(self):
+        resp_headers = headers.GoLikeHeaders({})
+        resp_headers.set("content-type", "text/plain; charset=utf-8")
+        return response.RawResponse(
+            self.context,
+            response_data={
+                "error": {
+                    "message": self.message,
+                }
+            },
+            headers=resp_headers,
+            status_code=self.status)
+
+
 class RequestContext(object):
 
     def __init__(self, app_name, route, call_id,
@@ -62,28 +90,6 @@ def ExecutionType(self):
         return self.__exec_type
 
 
-class HTTPContext(RequestContext):
-
-    def __init__(self, app_name, route,
-                 call_id, fntype="http",
-                 deadline=None, execution_type=None,
-                 config=None, headers=None,
-                 method=None, url=None,
-                 query_parameters=None,
-                 version=None):
-        arguments = {
-            "method": method,
-            "URL": url,
-            "query": query_parameters,
-            "http_version": version
-        }
-        self.DispatchError = errors.HTTPDispatchException
-        super(HTTPContext, self).__init__(
-            app_name, route, call_id, fntype,
-            execution_type=execution_type, deadline=deadline,
-            config=config, headers=headers, arguments=arguments)
-
-
 class JSONContext(RequestContext):
 
     def __init__(self, app_name, route, call_id,
@@ -95,10 +101,3 @@ def __init__(self, app_name, route, call_id,
             app_name, route, call_id, fntype,
             execution_type=execution_type,
             deadline=deadline, config=config, headers=headers)
-
-
-def fromType(fntype, *args, **kwargs):
-    if fntype == "json":
-        return JSONContext(*args, **kwargs)
-    if fntype == "http":
-        return HTTPContext(*args, **kwargs)

fdk/errors.py

@@ -16,28 +16,6 @@
 from fdk import response
 
 
-class HTTPDispatchException(Exception):
-
-    def __init__(self, context, status, message):
-        """
-        HTTP response with error
-        :param status: HTTP status code
-        :param message: error message
-        """
-        self.status = status
-        self.message = message
-        self.context = context
-
-    def response(self):
-        return response.RawResponse(
-            self.context,
-            status_code=self.status,
-            headers={
-                "content-type": "text/plain"
-            },
-            response_data=self.message)
-
-
 class JSONDispatchException(Exception):
 
     def __init__(self, context, status, message):

fdk/headers.py

@@ -30,7 +30,6 @@ def __init__(self, headers):
 
     def get(self, key, default=None):
         """
-
         :param key:
         :param default:
         :return:
@@ -44,7 +43,6 @@ def get(self, key, default=None):
 
     def set(self, key, value):
         """
-
         :param key:
         :param value:
         :return:
@@ -56,7 +54,6 @@ def set(self, key, value):
 
     def append(self, key, value):
         """
-
         :param key:
         :param value:
         :return: