Removed automatic schema generator

Author: Joel Collins

src/labthings/server/representations.py

@@ -19,7 +19,10 @@ def default(self, o):
         if isinstance(o, set):
             return list(o)
         if isinstance(o, bytes):
-            return b64encode(o).decode()
+            try:  # Try unicode
+                return o.decode()
+            except UnicodeDecodeError:  # Otherwise, base64
+                return b64encode(o).decode()
         return JSONEncoder.default(self, o)
 
 
@@ -32,7 +35,7 @@ def output_json(data, code, headers=None):
     """Makes a Flask response with a JSON encoded body, using app JSON settings"""
 
     settings = current_app.config.get("LABTHINGS_JSON", {})
-    encoder = current_app.json_encoder
+    encoder = LabThingsJSONEncoder
 
     if current_app.debug:
         settings.setdefault("indent", 4)
@@ -55,7 +58,6 @@ def output_cbor(data, code, headers=None):
     """Makes a Flask response with a CBOR encoded body, using app CBOR settings"""
 
     settings = current_app.config.get("LABTHINGS_CBOR", {})
-
     dumped = encode_cbor(data, **settings)
 
     resp = make_response(dumped, code)

src/labthings/server/types/__init__.py

@@ -1,6 +1,7 @@
 from flask.views import MethodView
 from flask import request
 from werkzeug.wrappers import Response as ResponseBase
+from werkzeug.exceptions import BadRequest
 
 from collections import OrderedDict
 
@@ -77,7 +78,6 @@ def represent_response(self, response):
             response = representations[mediatype](data, code, headers)
             response.headers["Content-Type"] = mediatype
             return response
-
         return response
 
 
@@ -95,7 +95,10 @@ def dispatch_request(self, *args, **kwargs):
         task = taskify(meth)(*args, **kwargs)
 
         # Keep a copy of the raw, unmarshalled JSON input in the task
-        task.input = request.json
+        try:
+            task.input = request.json
+        except BadRequest:
+            task.input = None
 
         # Wait up to 2 second for the action to complete or error
         try: