Moved to a LabThings dependency for server

openflexure_microscope/api/app.py

@@ -22,8 +22,8 @@ from openflexure_microscope.paths import (
     settings_file_path,
 )
 
-from openflexure_microscope.common.flask_labthings.quick import create_app
-from openflexure_microscope.common.flask_labthings.extensions import find_extensions
+from labthings.server.quick import create_app
+from labthings.server.extensions import find_extensions
 
 from openflexure_microscope.api.microscope import default_microscope as api_microscope
 

openflexure_microscope/api/default_extensions/autofocus.py

@@ -1,7 +1,7 @@
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.decorators import (
+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,
 )

openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py

@@ -1,12 +1,12 @@
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
-from openflexure_microscope.common.flask_labthings.decorators import (
+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 openflexure_microscope.common.labthings_core.tasks import taskify
+from labthings.core.tasks import taskify
 
 from flask import abort
 

openflexure_microscope/api/default_extensions/scan.py

@@ -5,21 +5,21 @@ from typing import Tuple
 from functools import reduce
 
 from openflexure_microscope.camera.base import generate_basename
-from openflexure_microscope.common.flask_labthings.find import (
+from labthings.server.find import (
     find_component,
     find_extension,
 )
-from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
-from openflexure_microscope.common.flask_labthings.decorators import (
+from labthings.server.extensions import BaseExtension
+from labthings.server.decorators import (
     marshal_task,
     use_args,
     ThingAction,
 )
-from openflexure_microscope.common.flask_labthings import fields
+from labthings.server import fields
 
 from openflexure_microscope.devel import taskify, abort, update_task_progress
 
-from openflexure_microscope.common.flask_labthings.view import View
+from labthings.server.view import View
 import time
 
 

openflexure_microscope/api/default_extensions/zip_builder.py

@@ -14,10 +14,10 @@ import zipfile
 import tempfile
 import logging
 
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
-from openflexure_microscope.common.flask_labthings.decorators import (
+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,
 )

openflexure_microscope/api/example_extensions/ev_gui.py

@@ -1,6 +1,6 @@
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.extensions import BaseExtension
-from openflexure_microscope.common.flask_labthings.decorators import (
+from labthings.server.view import View
+from labthings.server.extensions import BaseExtension
+from labthings.server.decorators import (
     ThingAction,
     ThingProperty,
 )

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

@@ -4,10 +4,10 @@ Top-level representation of enabled actions
 
 from . import camera, stage, system
 
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.find import current_labthing
-from openflexure_microscope.common.flask_labthings.utilities import description_from_view
-from openflexure_microscope.common.flask_labthings.decorators import Tag
+from labthings.server.view import View
+from labthings.server.find import current_labthing
+from labthings.server.utilities import description_from_view
+from labthings.server.decorators import Tag
 
 _actions = {
     "capture": {

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

@@ -1,7 +1,7 @@
 from openflexure_microscope.api.utilities import get_bool, JsonResponse
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.decorators import (
+from labthings.server.view import View
+from labthings.server.find import find_component
+from labthings.server.decorators import (
     use_args,
     marshal_with,
     doc,
@@ -10,7 +10,7 @@ from openflexure_microscope.common.flask_labthings.decorators import (
     doc_response,
 )
 
-from openflexure_microscope.common.flask_labthings import fields
+from labthings.server import fields
 from openflexure_microscope.utilities import filter_dict
 
 from openflexure_microscope.api.v2.views.captures import capture_schema

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

@@ -1,13 +1,13 @@
 from openflexure_microscope.api.utilities import JsonResponse
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.decorators import (
+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 openflexure_microscope.common.flask_labthings import fields
+from labthings.server import fields
 
 from openflexure_microscope.utilities import axes_to_array, filter_dict
 

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

@@ -1,9 +1,9 @@
-from openflexure_microscope.common.flask_labthings.view import View
+from labthings.server.view import View
 import subprocess
 import os
 from sys import platform
 
-from openflexure_microscope.common.flask_labthings.decorators import (
+from labthings.server.decorators import (
     ThingAction,
     doc_response,
 )

openflexure_microscope/api/v2/views/captures.py

@@ -3,15 +3,15 @@ from flask import abort, request, redirect, url_for, send_file, jsonify
 
 from openflexure_microscope.api.utilities import get_bool, JsonResponse
 
-from openflexure_microscope.common.flask_labthings.schema import Schema
-from openflexure_microscope.common.flask_labthings import fields
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.utilities import (
+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 openflexure_microscope.common.flask_labthings.decorators import marshal_with, doc_response, Tag, ThingProperty
+from labthings.server.decorators import marshal_with, doc_response, Tag, ThingProperty
 
-from openflexure_microscope.common.flask_labthings.find import find_component
+from labthings.server.find import find_component
 
 from marshmallow import pre_dump
 

openflexure_microscope/api/v2/views/state.py

@@ -1,15 +1,15 @@
 from openflexure_microscope.api.utilities import JsonResponse
 
-from openflexure_microscope.common.labthings_core.utilities import (
+from labthings.core.utilities import (
     get_by_path,
     set_by_path,
     create_from_path,
 )
 
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.view import View
+from labthings.server.find import find_component
+from labthings.server.view import View
 
-from openflexure_microscope.common.flask_labthings.decorators import ThingProperty, Tag, doc_response
+from labthings.server.decorators import ThingProperty, Tag, doc_response
 
 from flask import jsonify, request, abort
 import logging

openflexure_microscope/api/v2/views/streams.py

@@ -1,14 +1,14 @@
 from openflexure_microscope.api.utilities import gen, JsonResponse
 
-from openflexure_microscope.common.labthings_core.utilities import (
+from labthings.core.utilities import (
     get_by_path,
     set_by_path,
     create_from_path,
 )
 
-from openflexure_microscope.common.flask_labthings.find import find_component
-from openflexure_microscope.common.flask_labthings.view import View
-from openflexure_microscope.common.flask_labthings.decorators import doc_response, ThingProperty
+from labthings.server.find import find_component
+from labthings.server.view import View
+from labthings.server.decorators import doc_response, ThingProperty
 
 from flask import Response