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

Moved to a LabThings dependency for server

Browse source
This commit is contained in:
jtc42 2020-01-17 15:13:32 +00:00
parent a1223d8b28
commit 36334ed743
65 changed files with 546 additions and 2364 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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