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

Updated to use api_microscope.rc.asdict(), and minor formatting changes

Browse source
This commit is contained in:
Joel Collins 2019-01-31 13:26:56 +00:00
parent 36b0cb0be0
commit 323c48858d
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
openflexure_microscope/api/app.py
View file

@ -37,13 +37,15 @@ logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
# Create a dummy microscope object, with no hardware attachments # Create a dummy microscope object, with no hardware attachments
api_microscope = Microscope(None, None) api_microscope = Microscope(None, None)
# Generate API URI based on version from filename # Generate API URI based on version from filename
def uri(suffix, api_version, base=None): def uri(suffix, api_version, base=None):
if not base: if not base:
base = "/api/{}".format(api_version) base = "/api/{}".format(api_version)
uri = base + suffix return_uri = base + suffix
logging.debug("Created app route: {}".format(uri)) logging.debug("Created app route: {}".format(return_uri))
return uri return return_uri
# Create flask app # Create flask app
app = Flask(__name__) app = Flask(__name__)
@ -54,6 +56,7 @@ CORS(app, resources=r'/api/*')
# Make errors more API friendly # Make errors more API friendly
handler = JSONExceptionHandler(app) handler = JSONExceptionHandler(app)
# After app starts, but before first request, attach hardware to global microscope # After app starts, but before first request, attach hardware to global microscope
@app.before_first_request @app.before_first_request
def attach_microscope(): def attach_microscope():
@ -62,7 +65,7 @@ def attach_microscope():
logging.debug("First request made. Populating microscope with hardware...") logging.debug("First request made. Populating microscope with hardware...")
logging.debug("Creating camera object...") logging.debug("Creating camera object...")
api_camera = StreamingCamera(config=api_microscope.rc.config) api_camera = StreamingCamera(config=api_microscope.rc.asdict())
logging.debug("Creating stage object...") logging.debug("Creating stage object...")
api_stage = Stage("/dev/ttyUSB0") api_stage = Stage("/dev/ttyUSB0")
@ -111,9 +114,6 @@ app.register_blueprint(plugin_blueprint, url_prefix=uri('/plugin', 'v1'))
task_blueprint = blueprints.task.construct_blueprint(api_microscope) task_blueprint = blueprints.task.construct_blueprint(api_microscope)
app.register_blueprint(task_blueprint, url_prefix=uri('/task', 'v1')) app.register_blueprint(task_blueprint, url_prefix=uri('/task', 'v1'))
# List all routes
#list_routes(app)
# Automatically clean up microscope at exit # Automatically clean up microscope at exit
def cleanup(): def cleanup():
@ -123,6 +123,7 @@ def cleanup():
# Close down the microscope # Close down the microscope
api_microscope.close() api_microscope.close()
atexit.register(cleanup) atexit.register(cleanup)
if __name__ == "__main__": if __name__ == "__main__":