rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use @marshal_with for capture action

Browse source
This commit is contained in:
Joel Collins 2019-12-31 16:25:33 +00:00
parent 7174e6a60a
commit dad89c0779
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openflexure_microscope/api/v2/views/actions/camera.py
View file

@ -1,7 +1,7 @@
from openflexure_microscope.api.utilities import get_bool, JsonResponse from openflexure_microscope.api.utilities import get_bool, JsonResponse
from openflexure_microscope.common.flask_labthings.resource import Resource 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.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.common.flask_labthings import fields
from openflexure_microscope.utilities import filter_dict from openflexure_microscope.utilities import filter_dict
@ -27,6 +27,7 @@ class CaptureAPI(Resource):
"resize": fields.Dict(missing=None), # TODO: Validate keys "resize": fields.Dict(missing=None), # TODO: Validate keys
} }
) )
@marshal_with(capture_schema)
def post(self, args): def post(self, args):
microscope = find_device("openflexure_microscope") microscope = find_device("openflexure_microscope")
@ -62,7 +63,7 @@ class CaptureAPI(Resource):
# Insert custom tags # Insert custom tags
output.put_tags(args.get("tags")) output.put_tags(args.get("tags"))
return capture_schema.jsonify(output) return output
class GPUPreviewStartAPI(Resource): class GPUPreviewStartAPI(Resource):