From dad89c0779546dd521c939fd34d04859cd21ef7d Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 31 Dec 2019 16:25:33 +0000 Subject: [PATCH] Use @marshal_with for capture action --- openflexure_microscope/api/v2/views/actions/camera.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openflexure_microscope/api/v2/views/actions/camera.py b/openflexure_microscope/api/v2/views/actions/camera.py index ba4b1ebe..948be81b 100644 --- a/openflexure_microscope/api/v2/views/actions/camera.py +++ b/openflexure_microscope/api/v2/views/actions/camera.py @@ -1,7 +1,7 @@ from openflexure_microscope.api.utilities import get_bool, JsonResponse from openflexure_microscope.common.flask_labthings.resource import Resource from openflexure_microscope.common.flask_labthings.find import find_device -from openflexure_microscope.common.flask_labthings.decorators import use_args +from openflexure_microscope.common.flask_labthings.decorators import use_args, marshal_with from openflexure_microscope.common.flask_labthings import fields from openflexure_microscope.utilities import filter_dict @@ -27,6 +27,7 @@ class CaptureAPI(Resource): "resize": fields.Dict(missing=None), # TODO: Validate keys } ) + @marshal_with(capture_schema) def post(self, args): microscope = find_device("openflexure_microscope") @@ -62,7 +63,7 @@ class CaptureAPI(Resource): # Insert custom tags output.put_tags(args.get("tags")) - return capture_schema.jsonify(output) + return output class GPUPreviewStartAPI(Resource):