From 6df7fe940524ce12165c2f876708fbba94db4b3e Mon Sep 17 00:00:00 2001 From: jtc42 Date: Fri, 24 Jan 2020 15:41:33 +0000 Subject: [PATCH] Blackened --- docs/source/conf.py | 2 +- .../api/default_extensions/__init__.py | 2 +- .../api/default_extensions/autofocus.py | 9 ++++----- .../picamera_autocalibrate/extension.py | 5 +---- openflexure_microscope/api/default_extensions/scan.py | 11 ++--------- .../api/default_extensions/zip_builder.py | 5 +---- .../api/example_extensions/ev_gui.py | 9 +++------ .../api/v2/views/actions/__init__.py | 2 +- openflexure_microscope/api/v2/views/actions/camera.py | 5 +---- openflexure_microscope/api/v2/views/actions/stage.py | 7 +------ openflexure_microscope/api/v2/views/actions/system.py | 5 +---- openflexure_microscope/api/v2/views/captures.py | 4 +--- openflexure_microscope/api/v2/views/state.py | 6 +----- openflexure_microscope/api/v2/views/streams.py | 6 +----- openflexure_microscope/microscope.py | 2 +- openflexure_microscope/stage/base.py | 6 +----- 16 files changed, 22 insertions(+), 64 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index ca5cecdf..cf5293a7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -226,7 +226,7 @@ intersphinx_mapping = { "openflexure_stage": ("https://openflexure-stage.readthedocs.io/en/latest/", None), "picamera": ("https://picamera.readthedocs.io/en/release-1.13/", None), "marshmallow": ("https://marshmallow.readthedocs.io/en/stable/", None), - "webargs": ("https://webargs.readthedocs.io/en/latest/", None) + "webargs": ("https://webargs.readthedocs.io/en/latest/", None), } # -- Options for todo extension ---------------------------------------------- diff --git a/openflexure_microscope/api/default_extensions/__init__.py b/openflexure_microscope/api/default_extensions/__init__.py index 6d9a592d..2b321f34 100644 --- a/openflexure_microscope/api/default_extensions/__init__.py +++ b/openflexure_microscope/api/default_extensions/__init__.py @@ -11,4 +11,4 @@ try: except Exception as e: logging.error( f"Exception loading builtin extension picamera_autocalibrate: \n{traceback.format_exc()}" - ) \ No newline at end of file + ) diff --git a/openflexure_microscope/api/default_extensions/autofocus.py b/openflexure_microscope/api/default_extensions/autofocus.py index 510272b7..ce873a7f 100644 --- a/openflexure_microscope/api/default_extensions/autofocus.py +++ b/openflexure_microscope/api/default_extensions/autofocus.py @@ -1,10 +1,7 @@ from labthings.server.find import find_component from labthings.server.extensions import BaseExtension from labthings.server.view import View -from labthings.server.decorators import ( - ThingAction, - ThingProperty, -) +from labthings.server.decorators import ThingAction, ThingProperty from openflexure_microscope.devel import JsonResponse, request, jsonify, taskify, abort from openflexure_microscope.utilities import set_properties @@ -359,7 +356,9 @@ class FastAutofocusAPI(View): abort(503, "No stage connected. Unable to autofocus.") -autofocus_extension_v2 = BaseExtension("org.openflexure.autofocus", version="2.0.0-beta.1") +autofocus_extension_v2 = BaseExtension( + "org.openflexure.autofocus", version="2.0.0-beta.1" +) autofocus_extension_v2.add_method(fast_autofocus, "fast_autofocus") autofocus_extension_v2.add_method(autofocus, "autofocus") diff --git a/openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py b/openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py index 2ac16466..37cbe8cb 100644 --- a/openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py +++ b/openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py @@ -1,10 +1,7 @@ from labthings.server.view import View from labthings.server.find import find_component from labthings.server.extensions import BaseExtension -from labthings.server.decorators import ( - marshal_task, - ThingAction, -) +from labthings.server.decorators import marshal_task, ThingAction from labthings.core.tasks import taskify diff --git a/openflexure_microscope/api/default_extensions/scan.py b/openflexure_microscope/api/default_extensions/scan.py index de57511e..26a7dd6f 100644 --- a/openflexure_microscope/api/default_extensions/scan.py +++ b/openflexure_microscope/api/default_extensions/scan.py @@ -5,16 +5,9 @@ from typing import Tuple from functools import reduce from openflexure_microscope.camera.base import generate_basename -from labthings.server.find import ( - find_component, - find_extension, -) +from labthings.server.find import find_component, find_extension from labthings.server.extensions import BaseExtension -from labthings.server.decorators import ( - marshal_task, - use_args, - ThingAction, -) +from labthings.server.decorators import marshal_task, use_args, ThingAction from labthings.server import fields from openflexure_microscope.devel import taskify, abort, update_task_progress diff --git a/openflexure_microscope/api/default_extensions/zip_builder.py b/openflexure_microscope/api/default_extensions/zip_builder.py index 2b2514f6..02032c65 100644 --- a/openflexure_microscope/api/default_extensions/zip_builder.py +++ b/openflexure_microscope/api/default_extensions/zip_builder.py @@ -17,10 +17,7 @@ import logging from labthings.server.find import find_component from labthings.server.view import View from labthings.server.extensions import BaseExtension -from labthings.server.decorators import ( - ThingAction, - ThingProperty, -) +from labthings.server.decorators import ThingAction, ThingProperty class ZipManager: diff --git a/openflexure_microscope/api/example_extensions/ev_gui.py b/openflexure_microscope/api/example_extensions/ev_gui.py index 1acb3f9f..70089ccf 100644 --- a/openflexure_microscope/api/example_extensions/ev_gui.py +++ b/openflexure_microscope/api/example_extensions/ev_gui.py @@ -1,9 +1,6 @@ from labthings.server.view import View from labthings.server.extensions import BaseExtension -from labthings.server.decorators import ( - ThingAction, - ThingProperty, -) +from labthings.server.decorators import ThingAction, ThingProperty from openflexure_microscope.api.utilities.gui import build_gui @@ -35,7 +32,7 @@ def dynamic_form(): "name": "val_int", "label": "Number value", "minValue": 0, - "value": val_int + "value": val_int, }, { "fieldType": "htmlBlock", @@ -66,7 +63,7 @@ static_form = { "name": "val_int", "label": "Number value", "minValue": 0, - "default": 1 + "default": 1, }, { "fieldType": "htmlBlock", diff --git a/openflexure_microscope/api/v2/views/actions/__init__.py b/openflexure_microscope/api/v2/views/actions/__init__.py index b256c60b..aa4a2ae9 100644 --- a/openflexure_microscope/api/v2/views/actions/__init__.py +++ b/openflexure_microscope/api/v2/views/actions/__init__.py @@ -76,7 +76,7 @@ class ActionsView(View): "self": { "href": current_labthing().url_for(action["view_class"]), "mimetype": "application/json", - **description_from_view(action["view_class"]) + **description_from_view(action["view_class"]), } }, "rule": action["rule"], diff --git a/openflexure_microscope/api/v2/views/actions/camera.py b/openflexure_microscope/api/v2/views/actions/camera.py index ec4445e2..e9912ad9 100644 --- a/openflexure_microscope/api/v2/views/actions/camera.py +++ b/openflexure_microscope/api/v2/views/actions/camera.py @@ -132,10 +132,7 @@ class RAMCaptureAPI(View): stream.seek(0) - return send_file( - io.BytesIO(stream.getbuffer()), - mimetype="image/jpeg" - ) + return send_file(io.BytesIO(stream.getbuffer()), mimetype="image/jpeg") @ThingAction diff --git a/openflexure_microscope/api/v2/views/actions/stage.py b/openflexure_microscope/api/v2/views/actions/stage.py index 446e719e..8b1020eb 100644 --- a/openflexure_microscope/api/v2/views/actions/stage.py +++ b/openflexure_microscope/api/v2/views/actions/stage.py @@ -1,12 +1,7 @@ from openflexure_microscope.api.utilities import JsonResponse from labthings.server.view import View from labthings.server.find import find_component -from labthings.server.decorators import ( - use_args, - marshal_with, - doc, - ThingAction, -) +from labthings.server.decorators import use_args, marshal_with, doc, ThingAction from labthings.server import fields from openflexure_microscope.utilities import axes_to_array, filter_dict diff --git a/openflexure_microscope/api/v2/views/actions/system.py b/openflexure_microscope/api/v2/views/actions/system.py index 43cf0ead..631c5c79 100644 --- a/openflexure_microscope/api/v2/views/actions/system.py +++ b/openflexure_microscope/api/v2/views/actions/system.py @@ -3,10 +3,7 @@ import subprocess import os from sys import platform -from labthings.server.decorators import ( - ThingAction, - doc_response, -) +from labthings.server.decorators import ThingAction, doc_response def is_raspberrypi(raise_on_errors=False): diff --git a/openflexure_microscope/api/v2/views/captures.py b/openflexure_microscope/api/v2/views/captures.py index e97e8765..f4831aa3 100644 --- a/openflexure_microscope/api/v2/views/captures.py +++ b/openflexure_microscope/api/v2/views/captures.py @@ -6,9 +6,7 @@ from openflexure_microscope.api.utilities import get_bool, JsonResponse from labthings.server.schema import Schema from labthings.server import fields from labthings.server.view import View -from labthings.server.utilities import ( - description_from_view, -) +from labthings.server.utilities import description_from_view from labthings.server.decorators import marshal_with, doc_response, Tag, ThingProperty from labthings.server.find import find_component diff --git a/openflexure_microscope/api/v2/views/state.py b/openflexure_microscope/api/v2/views/state.py index 6aa7f958..aa59ffdf 100644 --- a/openflexure_microscope/api/v2/views/state.py +++ b/openflexure_microscope/api/v2/views/state.py @@ -1,10 +1,6 @@ from openflexure_microscope.api.utilities import JsonResponse -from labthings.core.utilities import ( - get_by_path, - set_by_path, - create_from_path, -) +from labthings.core.utilities import get_by_path, set_by_path, create_from_path from labthings.server.find import find_component from labthings.server.view import View diff --git a/openflexure_microscope/api/v2/views/streams.py b/openflexure_microscope/api/v2/views/streams.py index 3061af62..4382e2ab 100644 --- a/openflexure_microscope/api/v2/views/streams.py +++ b/openflexure_microscope/api/v2/views/streams.py @@ -1,10 +1,6 @@ from openflexure_microscope.api.utilities import gen, JsonResponse -from labthings.core.utilities import ( - get_by_path, - set_by_path, - create_from_path, -) +from labthings.core.utilities import get_by_path, set_by_path, create_from_path from labthings.server.find import find_component from labthings.server.view import View diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py index dabf7033..31ea505c 100644 --- a/openflexure_microscope/microscope.py +++ b/openflexure_microscope/microscope.py @@ -28,7 +28,7 @@ class Microscope: # Initial attributes self.id = uuid.uuid4() #: Microscope UUID self.name = self.id #: Microscope name (modifiable) - self.fov = [0, 0] #: Microscope field-of-view in stage motor steps + self.fov = [0, 0] #: Microscope field-of-view in stage motor steps self.camera = None #: Currently connected camera object self.stage = None #: Currently connected stage object diff --git a/openflexure_microscope/stage/base.py b/openflexure_microscope/stage/base.py index 5821cff2..d5ef31f3 100644 --- a/openflexure_microscope/stage/base.py +++ b/openflexure_microscope/stage/base.py @@ -51,11 +51,7 @@ class BaseStage(metaclass=ABCMeta): @property def position_map(self): - return { - "x": self.position[0], - "y": self.position[1], - "z": self.position[2], - } + return {"x": self.position[0], "y": self.position[1], "z": self.position[2]} @property @abstractmethod