Fix unicode error (#283)

core/gf/Dockerfile

@@ -14,4 +14,4 @@ RUN mkdir /grammars && gf --output-dir=/grammars -n LangEng -make alltenses/Lang
 ADD *.py ./
 ADD test_grammars test_grammars/
 
-CMD ["gunicorn", "-b 0.0.0.0:8000", "server"]
+CMD ["gunicorn", "-b 0.0.0.0:8000", "server", "--access-logfile", "-", "--error-logfile", "-"]

core/gf/server.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import logging
 import argparse
 
@@ -7,7 +8,6 @@
 from utils import (response_404, json_request, json_response, route, routes)
 from gf import generate_results, parse_text, GFError
 
-
 logger = logging.getLogger("server")
 
 
@@ -18,14 +18,8 @@
 def generate(environ, start_response, data):
     content = data["content"]
     name = data["module"]
-    try:
-        results = generate_results(name, content)
-        return {"results": results}
-    except GFError as error:
-        return {"error": error.message}
-    except Exception as ex:
-        logger.exception(ex)
-        return {"error": str(ex).strip()}
+    results = generate_results(name, content)
+    return {"results": results}
 
 
 
@@ -36,15 +30,8 @@ def parse(environ, start_response, data):
     content = data["content"]
     name = data["module"]
     text = data["text"]
-    try:
-        results = parse_text(name, content, text)
-        return {"results": results}
-    except GFError as error:
-        return {"error": error.message}
-    except Exception as ex:
-        logger.exception(ex)
-        return {"error": str(ex).strip()}
-
+    results = parse_text(name, content, text)
+    return {"results": results}
 
 
 @route("/health", "GET")
@@ -53,9 +40,9 @@ def ping(*args):
     return {"status": "OK"}
 
 
-
 def application(environ, start_response):
     setup_testing_defaults(environ)
+    logging.basicConfig(level=logging.INFO)
     for (m, p), fn in routes.items():
         if environ["REQUEST_METHOD"] == m and environ["PATH_INFO"] == p:
             return fn(environ, start_response)

core/gf/utils.py

@@ -1,4 +1,12 @@
+import sys
 import json
+import six
+import traceback
+import logging
+
+from gf import GFError
+
+logger = logging.getLogger(__name__)
 
 routes = {}
 
@@ -10,17 +18,11 @@ def response_404(environ, start_response):
     return ""
 
 
-
-
 def route(path, method):
     def inject(fn):
         routes[(method, path)] = fn
         def wrapper(environ, *args, **kwargs):
             return fn(*args, **kwargs)
-            # if environ["REQUEST_METHOD"] == "POST":
-            #     return fn(environ, *args, **kwargs)
-            # else:
-            #     return response_404(environ, *args, **kwargs)
 
         return wrapper
     return inject
@@ -33,7 +35,7 @@ def wrapper(environ, start_response):
         except ValueError:
             request_body_size = 0
 
-        request_body = environ["wsgi.input"].read(request_body_size)
+        request_body = six.text_type(environ["wsgi.input"].read(request_body_size).decode("UTF-8"))
         return fn(environ, start_response, json.loads(request_body))
 
     return wrapper
@@ -44,8 +46,14 @@ def wrapper(environ, start_response, *args):
         status = "200 OK"
         try:
             response = fn(environ, start_response, *args)
+        except GFError as error:
+            status = "400 Bad Request"
+            response = {"error": error.message}
         except Exception as ex:
-            response = {"error": True, "message": str(ex)}
+            status = "500 Internal Server Error"
+            logger.error(ex)
+            traceback.print_exc(file=sys.stdout)
+            response = {"error": str(ex)}
 
         output = json.dumps(response).encode("UTF-8")
         response_headers = [