Restructured labthings

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

@@ -2,11 +2,6 @@
 Top-level representation of enabled actions
 """
 
-from flask import Blueprint, url_for, jsonify
-
-from openflexure_microscope.api.utilities import blueprint_for_module
-from openflexure_microscope.utilities import get_docstring, description_from_view
-
 from . import camera, stage, system
 
 _actions = {

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

@@ -1,6 +1,6 @@
 from openflexure_microscope.api.utilities import get_bool, JsonResponse
-from openflexure_microscope.common.labthings.resource import Resource
-from openflexure_microscope.common.labthings.find import find_device
+from openflexure_microscope.common.flask_labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.find import find_device
 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,6 +1,6 @@
 from openflexure_microscope.api.utilities import JsonResponse
-from openflexure_microscope.common.labthings.resource import Resource
-from openflexure_microscope.common.labthings.find import find_device
+from openflexure_microscope.common.flask_labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.find import find_device
 from openflexure_microscope.utilities import axes_to_array, filter_dict
 
 from flask import Blueprint, jsonify, request

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

@@ -1,4 +1,4 @@
-from openflexure_microscope.common.labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.resource import Resource
 import subprocess
 import os
 from sys import platform

openflexure_microscope/api/v2/views/captures.py

@@ -3,47 +3,12 @@ from flask import abort, request, redirect, url_for, send_file, jsonify
 
 from openflexure_microscope.api.utilities import get_bool, JsonResponse
 
-from openflexure_microscope.common.labthings.schema import Schema
-from openflexure_microscope.common.labthings import fields
-from openflexure_microscope.common.labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.schema import Schema
+from openflexure_microscope.common.flask_labthings import fields
+from openflexure_microscope.common.flask_labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.utilities import description_from_view
 
-from openflexure_microscope.common.labthings.find import find_device
-
-
-class CaptureSchema(Schema):
-    id = fields.String()
-    file = fields.String(data_key="path")
-    exists = fields.Bool(data_key="available")
-    filename = fields.String()
-    metadata = fields.Dict()
-
-    # TODO: Add HTTP methods
-    links = fields.Hyperlinks(
-        {
-            "self": {
-                "href": fields.AbsoluteUrlFor("CaptureResource", id="<id>"),
-                "mimetype": "application/json",
-            },
-            "tags": {
-                "href": fields.AbsoluteUrlFor("CaptureTags", id="<id>"),
-                "mimetype": "application/json",
-            },
-            "metadata": {
-                "href": fields.AbsoluteUrlFor("CaptureMetadata", id="<id>"),
-                "mimetype": "application/json",
-            },
-            "download": {
-                "href": fields.AbsoluteUrlFor(
-                    "CaptureDownload", id="<id>", filename="<filename>"
-                ),
-                "mimetype": "image/jpeg",
-            },
-        }
-    )
-
-
-capture_schema = CaptureSchema()
-capture_list_schema = CaptureSchema(many=True)
+from openflexure_microscope.common.flask_labthings.find import find_device
 
 
 class CaptureList(Resource):
@@ -182,6 +147,46 @@ class CaptureMetadata(Resource):
         return jsonify(capture_obj.metadata)
 
 
+class CaptureSchema(Schema):
+    id = fields.String()
+    file = fields.String(data_key="path")
+    exists = fields.Bool(data_key="available")
+    filename = fields.String()
+    metadata = fields.Dict()
+
+    # TODO: Add HTTP methods
+    links = fields.Hyperlinks(
+        {
+            "self": {
+                "href": fields.AbsoluteUrlFor(CaptureResource, id="<id>"),
+                "mimetype": "application/json",
+                **description_from_view(CaptureResource)
+            },
+            "tags": {
+                "href": fields.AbsoluteUrlFor(CaptureTags, id="<id>"),
+                "mimetype": "application/json",
+                **description_from_view(CaptureTags)
+            },
+            "metadata": {
+                "href": fields.AbsoluteUrlFor(CaptureMetadata, id="<id>"),
+                "mimetype": "application/json",
+                **description_from_view(CaptureMetadata)
+            },
+            "download": {
+                "href": fields.AbsoluteUrlFor(
+                    CaptureDownload, id="<id>", filename="<filename>"
+                ),
+                "mimetype": "image/jpeg",
+                **description_from_view(CaptureDownload)
+            },
+        }
+    )
+
+
+capture_schema = CaptureSchema()
+capture_list_schema = CaptureSchema(many=True)
+
+
 def add_captures_to_labthing(labthing, prefix=""):
     """
     Add all capture resources to a labthing

openflexure_microscope/api/v2/views/state.py

@@ -1,8 +1,8 @@
 from openflexure_microscope.api.utilities import JsonResponse
 from openflexure_microscope.utilities import get_by_path, set_by_path, create_from_path
 
-from openflexure_microscope.common.labthings.find import find_device
-from openflexure_microscope.common.labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.find import find_device
+from openflexure_microscope.common.flask_labthings.resource import Resource
 
 from flask import jsonify, request, abort
 import logging

openflexure_microscope/api/v2/views/streams.py

@@ -1,8 +1,8 @@
 from openflexure_microscope.api.utilities import gen, JsonResponse
 from openflexure_microscope.utilities import get_by_path, set_by_path, create_from_path
 
-from openflexure_microscope.common.labthings.find import find_device
-from openflexure_microscope.common.labthings.resource import Resource
+from openflexure_microscope.common.flask_labthings.find import find_device
+from openflexure_microscope.common.flask_labthings.resource import Resource
 
 from flask import jsonify, request, abort, Response
 import logging