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

Blackened

Browse source
This commit is contained in:
jtc42 2020-01-24 15:41:33 +00:00
parent ffc944fe99
commit 6df7fe9405
16 changed files with 22 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/default_extensions/__init__.py
View file

@ -11,4 +11,4 @@ try:
except Exception as e:
logging.error(
f"Exception loading builtin extension picamera_autocalibrate: \n{traceback.format_exc()}"
)
)

9
openflexure_microscope/api/default_extensions/autofocus.py
View file

@ -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")

5
openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py
View file

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

11
openflexure_microscope/api/default_extensions/scan.py
View file

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

5
openflexure_microscope/api/default_extensions/zip_builder.py
View file

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

9
openflexure_microscope/api/example_extensions/ev_gui.py
View file

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

2
openflexure_microscope/api/v2/views/actions/__init__.py
View file

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

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

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

7
openflexure_microscope/api/v2/views/actions/stage.py
View file

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

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

@ -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):

4
openflexure_microscope/api/v2/views/captures.py
View file

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

6
openflexure_microscope/api/v2/views/state.py
View file

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

6
openflexure_microscope/api/v2/views/streams.py
View file

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