Commit bb9bb775 authored by Joel Collins's avatar Joel Collins
Browse files

Moved API views up a level

parent e76dee23
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
from openflexure_microscope.plugins import MicroscopePlugin
from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
from openflexure_microscope.api.views import MicroscopeViewPlugin
from openflexure_microscope.api.utilities import JsonResponse

from openflexure_microscope.common.tasks import taskify
+2 −2
Original line number Diff line number Diff line
__all__ = ["utilities"]
__all__ = ["utilities", "views"]

from . import utilities
from . import utilities, views
+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ api_microscope.camera.images = build_captures_from_exif(

logging.debug("Microscope successfully attached!")


# Generate API URI based on version from filename
def uri(suffix, api_version, base=None):
    if not base:
+1 −1
Original line number Diff line number Diff line
from openflexure_microscope.api.utilities import gen, JsonResponse
from openflexure_microscope.api.v1.views import MicroscopeView
from openflexure_microscope.api.views import MicroscopeView

from flask import Response, Blueprint, jsonify, request
import logging
+0 −2
Original line number Diff line number Diff line
from openflexure_microscope.api.v1.views import MicroscopeView

from flask import Blueprint

from . import capture, record, preview, function
Loading