From 829c58d3fb329f41aa81ca65604cbac3499089be Mon Sep 17 00:00:00 2001 From: jtc42 Date: Mon, 6 Jan 2020 15:00:48 +0000 Subject: [PATCH] Blackened --- openflexure_microscope/api/default_extensions/__init__.py | 2 +- openflexure_microscope/api/default_extensions/scan.py | 5 ++++- .../api/default_extensions/zip_builder.py | 3 ++- openflexure_microscope/api/utilities.py | 4 +++- openflexure_microscope/common/flask_labthings/extensions.py | 6 ++++-- .../common/flask_labthings/views/extensions.py | 5 ++++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/openflexure_microscope/api/default_extensions/__init__.py b/openflexure_microscope/api/default_extensions/__init__.py index 3508bead..9ad73b3c 100644 --- a/openflexure_microscope/api/default_extensions/__init__.py +++ b/openflexure_microscope/api/default_extensions/__init__.py @@ -1,3 +1,3 @@ from .autofocus import autofocus_extension_v2 from .scan import scan_extension_v2 -from .zip_builder import zip_extension_v2 \ No newline at end of file +from .zip_builder import zip_extension_v2 diff --git a/openflexure_microscope/api/default_extensions/scan.py b/openflexure_microscope/api/default_extensions/scan.py index 8cb4dd71..0cf42084 100644 --- a/openflexure_microscope/api/default_extensions/scan.py +++ b/openflexure_microscope/api/default_extensions/scan.py @@ -6,7 +6,10 @@ from typing import Tuple from functools import reduce from openflexure_microscope.camera.base import generate_basename -from openflexure_microscope.common.flask_labthings.find import find_device, find_extension +from openflexure_microscope.common.flask_labthings.find import ( + find_device, + find_extension, +) from openflexure_microscope.common.flask_labthings.extensions import BaseExtension from openflexure_microscope.devel import ( diff --git a/openflexure_microscope/api/default_extensions/zip_builder.py b/openflexure_microscope/api/default_extensions/zip_builder.py index 26591a1f..45b119a2 100644 --- a/openflexure_microscope/api/default_extensions/zip_builder.py +++ b/openflexure_microscope/api/default_extensions/zip_builder.py @@ -86,9 +86,11 @@ class ZipManager: def zip_from_id(self, session_id): return self.session_zips[session_id]["fp"] + # Create a global ZIP manager default_zip_manager = ZipManager() + class ZipBuilderAPIView(Resource): def post(self): @@ -145,4 +147,3 @@ zip_extension_v2.add_view(ZipListAPIView, "/get") zip_extension_v2.add_view(ZipBuilderAPIView, "/build") zip_extension_v2.register_action(ZipBuilderAPIView) - diff --git a/openflexure_microscope/api/utilities.py b/openflexure_microscope/api/utilities.py index ada63330..d4d8c804 100644 --- a/openflexure_microscope/api/utilities.py +++ b/openflexure_microscope/api/utilities.py @@ -113,7 +113,9 @@ def init_default_extensions(extension_path): os.makedirs(os.path.dirname(extension_path), exist_ok=True) if not os.path.exists(extension_path): # If user extensions file doesn't exist - logging.warning("No extension file found at {}. Creating...".format(extension_path)) + logging.warning( + "No extension file found at {}. Creating...".format(extension_path) + ) create_file(extension_path) logging.info("Populating {}...".format(extension_path)) diff --git a/openflexure_microscope/common/flask_labthings/extensions.py b/openflexure_microscope/common/flask_labthings/extensions.py index 5571bd83..66dbfc4e 100644 --- a/openflexure_microscope/common/flask_labthings/extensions.py +++ b/openflexure_microscope/common/flask_labthings/extensions.py @@ -156,6 +156,8 @@ def find_extensions(extension_dir, module_name="extensions"): extension_paths = glob.glob(os.path.join(extension_dir, "*.py")) for extension_path in extension_paths: - extensions.extend(find_extensions_in_file(extension_path, module_name=module_name)) + extensions.extend( + find_extensions_in_file(extension_path, module_name=module_name) + ) - return extensions \ No newline at end of file + return extensions diff --git a/openflexure_microscope/common/flask_labthings/views/extensions.py b/openflexure_microscope/common/flask_labthings/views/extensions.py index a9bc14a0..f4f7c749 100644 --- a/openflexure_microscope/common/flask_labthings/views/extensions.py +++ b/openflexure_microscope/common/flask_labthings/views/extensions.py @@ -36,7 +36,10 @@ class ExtensionSchema(Schema): view_rule = view_data["rule"] # Make links dictionary if it doesn't yet exist d[view_id] = { - "href": url_for(ExtensionListResource.endpoint, **view_kwargs, _external=True) + view_rule, + "href": url_for( + ExtensionListResource.endpoint, **view_kwargs, _external=True + ) + + view_rule, **description_from_view(view_cls), }