Blackened

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 ----------------------------------------------

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()}"
-    )
+    )

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 (
+from labthings.server.decorators import ThingAction, ThingProperty
-    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")

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 (
+from labthings.server.decorators import marshal_task, ThingAction
-    marshal_task,
-    ThingAction,
-)
 
 from labthings.core.tasks import taskify
 

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 (
+from labthings.server.find import find_component, find_extension
-    find_component,
-    find_extension,
-)
 from labthings.server.extensions import BaseExtension
-from labthings.server.decorators import (
+from labthings.server.decorators import marshal_task, use_args, ThingAction
-    marshal_task,
-    use_args,
-    ThingAction,
-)
 from labthings.server import fields
 
 from openflexure_microscope.devel import taskify, abort, update_task_progress

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 (
+from labthings.server.decorators import ThingAction, ThingProperty
-    ThingAction,
-    ThingProperty,
-)
 
 
 class ZipManager:

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 (
+from labthings.server.decorators import ThingAction, ThingProperty
-    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",

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"],

openflexure_microscope/api/v2/views/actions/camera.py

@@ -132,10 +132,7 @@ class RAMCaptureAPI(View):
 
             stream.seek(0)
 
-            return send_file(
+            return send_file(io.BytesIO(stream.getbuffer()), mimetype="image/jpeg")
-                io.BytesIO(stream.getbuffer()),
-                mimetype="image/jpeg"
-            )
 
 
 @ThingAction

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 (
+from labthings.server.decorators import use_args, marshal_with, doc, ThingAction
-    use_args,
-    marshal_with,
-    doc,
-    ThingAction,
-)
 from labthings.server import fields
 
 from openflexure_microscope.utilities import axes_to_array, filter_dict

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 (
+from labthings.server.decorators import ThingAction, doc_response
-    ThingAction,
-    doc_response,
-)
 
 
 def is_raspberrypi(raise_on_errors=False):

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 (
+from labthings.server.utilities import description_from_view
-    description_from_view,
-)
 from labthings.server.decorators import marshal_with, doc_response, Tag, ThingProperty
 
 from labthings.server.find import find_component

openflexure_microscope/api/v2/views/state.py

@@ -1,10 +1,6 @@
 from openflexure_microscope.api.utilities import JsonResponse
 
-from labthings.core.utilities import (
+from labthings.core.utilities import get_by_path, set_by_path, create_from_path
-    get_by_path,
-    set_by_path,
-    create_from_path,
-)
 
 from labthings.server.find import find_component
 from labthings.server.view import View

openflexure_microscope/api/v2/views/streams.py

@@ -1,10 +1,6 @@
 from openflexure_microscope.api.utilities import gen, JsonResponse
 
-from labthings.core.utilities import (
+from labthings.core.utilities import get_by_path, set_by_path, create_from_path
-    get_by_path,
-    set_by_path,
-    create_from_path,
-)
 
 from labthings.server.find import find_component
 from labthings.server.view import View

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
 

openflexure_microscope/stage/base.py

@@ -51,11 +51,7 @@ class BaseStage(metaclass=ABCMeta):
 
     @property
     def position_map(self):
-        return {
+        return {"x": self.position[0], "y": self.position[1], "z": self.position[2]}
-            "x": self.position[0],
-            "y": self.position[1],
-            "z": self.position[2],
-        }
 
     @property
     @abstractmethod