From bb9bb775362e320b5062a034c30fe20497970142 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Wed, 13 Nov 2019 14:06:41 +0000
Subject: [PATCH] Moved API views up a level

---
 docs/source/plugins/example/plugin.py                       | 2 +-
 openflexure_microscope/api/__init__.py                      | 4 ++--
 openflexure_microscope/api/app.py                           | 1 +
 openflexure_microscope/api/v1/blueprints/base.py            | 2 +-
 openflexure_microscope/api/v1/blueprints/camera/__init__.py | 2 --
 openflexure_microscope/api/v1/blueprints/camera/capture.py  | 4 ++--
 openflexure_microscope/api/v1/blueprints/camera/function.py | 2 +-
 openflexure_microscope/api/v1/blueprints/camera/preview.py  | 2 +-
 openflexure_microscope/api/v1/blueprints/plugins.py         | 4 ++--
 openflexure_microscope/api/v1/blueprints/stage.py           | 2 +-
 openflexure_microscope/api/v1/blueprints/task.py            | 2 +-
 openflexure_microscope/api/{v1 => }/views.py                | 0
 openflexure_microscope/devel/__init__.py                    | 2 +-
 openflexure_microscope/plugins/example/api.py               | 2 +-
 14 files changed, 15 insertions(+), 16 deletions(-)
 rename openflexure_microscope/api/{v1 => }/views.py (100%)

diff --git a/docs/source/plugins/example/plugin.py b/docs/source/plugins/example/plugin.py
index 5f1b5eb4..2c29c39c 100644
--- a/docs/source/plugins/example/plugin.py
+++ b/docs/source/plugins/example/plugin.py
@@ -1,5 +1,5 @@
 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
diff --git a/openflexure_microscope/api/__init__.py b/openflexure_microscope/api/__init__.py
index 05039c1d..9a39cfda 100644
--- a/openflexure_microscope/api/__init__.py
+++ b/openflexure_microscope/api/__init__.py
@@ -1,3 +1,3 @@
-__all__ = ["utilities"]
+__all__ = ["utilities", "views"]
 
-from . import utilities
+from . import utilities, views
diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py
index fb0e50cf..0d5e342e 100644
--- a/openflexure_microscope/api/app.py
+++ b/openflexure_microscope/api/app.py
@@ -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:
diff --git a/openflexure_microscope/api/v1/blueprints/base.py b/openflexure_microscope/api/v1/blueprints/base.py
index b43ca70a..35c6ad89 100644
--- a/openflexure_microscope/api/v1/blueprints/base.py
+++ b/openflexure_microscope/api/v1/blueprints/base.py
@@ -1,5 +1,5 @@
 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
diff --git a/openflexure_microscope/api/v1/blueprints/camera/__init__.py b/openflexure_microscope/api/v1/blueprints/camera/__init__.py
index 0b7f9010..34a1313f 100644
--- a/openflexure_microscope/api/v1/blueprints/camera/__init__.py
+++ b/openflexure_microscope/api/v1/blueprints/camera/__init__.py
@@ -1,5 +1,3 @@
-from openflexure_microscope.api.v1.views import MicroscopeView
-
 from flask import Blueprint
 
 from . import capture, record, preview, function
diff --git a/openflexure_microscope/api/v1/blueprints/camera/capture.py b/openflexure_microscope/api/v1/blueprints/camera/capture.py
index 1a6d6c6c..615ea009 100644
--- a/openflexure_microscope/api/v1/blueprints/camera/capture.py
+++ b/openflexure_microscope/api/v1/blueprints/camera/capture.py
@@ -1,8 +1,8 @@
 from openflexure_microscope.api.utilities import get_bool, JsonResponse
-from openflexure_microscope.api.v1.views import MicroscopeView
+from openflexure_microscope.api.views import MicroscopeView
 from openflexure_microscope.utilities import filter_dict
 
-from flask import Response, jsonify, request, abort, url_for, redirect, send_file
+from flask import jsonify, request, abort, url_for, redirect, send_file
 
 
 class ListAPI(MicroscopeView):
diff --git a/openflexure_microscope/api/v1/blueprints/camera/function.py b/openflexure_microscope/api/v1/blueprints/camera/function.py
index 15235409..f9e8f35f 100644
--- a/openflexure_microscope/api/v1/blueprints/camera/function.py
+++ b/openflexure_microscope/api/v1/blueprints/camera/function.py
@@ -1,4 +1,4 @@
-from openflexure_microscope.api.v1.views import MicroscopeView
+from openflexure_microscope.api.views import MicroscopeView
 from openflexure_microscope.api.utilities import JsonResponse
 
 from flask import jsonify, request
diff --git a/openflexure_microscope/api/v1/blueprints/camera/preview.py b/openflexure_microscope/api/v1/blueprints/camera/preview.py
index 8ca8bc6d..b099c496 100644
--- a/openflexure_microscope/api/v1/blueprints/camera/preview.py
+++ b/openflexure_microscope/api/v1/blueprints/camera/preview.py
@@ -1,5 +1,5 @@
 from openflexure_microscope.api.utilities import JsonResponse
-from openflexure_microscope.api.v1.views import MicroscopeView
+from openflexure_microscope.api.views import MicroscopeView
 
 from flask import jsonify, request
 import logging
diff --git a/openflexure_microscope/api/v1/blueprints/plugins.py b/openflexure_microscope/api/v1/blueprints/plugins.py
index 2dc458cf..0fffb9f3 100644
--- a/openflexure_microscope/api/v1/blueprints/plugins.py
+++ b/openflexure_microscope/api/v1/blueprints/plugins.py
@@ -1,7 +1,7 @@
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
+from openflexure_microscope.api.views import MicroscopeViewPlugin
 
 from flask import Blueprint, jsonify
-from openflexure_microscope.api.v1.views import MicroscopeView
+from openflexure_microscope.api.views import MicroscopeView
 
 import logging
 import warnings
diff --git a/openflexure_microscope/api/v1/blueprints/stage.py b/openflexure_microscope/api/v1/blueprints/stage.py
index f6759311..631e63c4 100644
--- a/openflexure_microscope/api/v1/blueprints/stage.py
+++ b/openflexure_microscope/api/v1/blueprints/stage.py
@@ -1,5 +1,5 @@
 from openflexure_microscope.api.utilities import JsonResponse
-from openflexure_microscope.api.v1.views import MicroscopeView
+from openflexure_microscope.api.views import MicroscopeView
 from openflexure_microscope.utilities import axes_to_array, filter_dict
 
 from flask import Blueprint, jsonify, request
diff --git a/openflexure_microscope/api/v1/blueprints/task.py b/openflexure_microscope/api/v1/blueprints/task.py
index ac9d018b..92d71a0f 100644
--- a/openflexure_microscope/api/v1/blueprints/task.py
+++ b/openflexure_microscope/api/v1/blueprints/task.py
@@ -1,4 +1,4 @@
-from openflexure_microscope.api.v1.views import MethodView
+from openflexure_microscope.api.views import MethodView
 from flask import jsonify, abort, Blueprint
 
 from openflexure_microscope.common import tasks
diff --git a/openflexure_microscope/api/v1/views.py b/openflexure_microscope/api/views.py
similarity index 100%
rename from openflexure_microscope/api/v1/views.py
rename to openflexure_microscope/api/views.py
diff --git a/openflexure_microscope/devel/__init__.py b/openflexure_microscope/devel/__init__.py
index eb7ca12c..95330291 100644
--- a/openflexure_microscope/devel/__init__.py
+++ b/openflexure_microscope/devel/__init__.py
@@ -7,7 +7,7 @@ as well as some Flask imports to simplify API route development
 
 # Plugin classes
 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
 
 # Task management
diff --git a/openflexure_microscope/plugins/example/api.py b/openflexure_microscope/plugins/example/api.py
index e68f21e8..1417359a 100644
--- a/openflexure_microscope/plugins/example/api.py
+++ b/openflexure_microscope/plugins/example/api.py
@@ -1,5 +1,5 @@
 from openflexure_microscope.api.utilities import JsonResponse
-from openflexure_microscope.api.v1.views import MicroscopeViewPlugin
+from openflexure_microscope.api.views import MicroscopeViewPlugin
 from openflexure_microscope.exceptions import TaskDeniedException
 
 from flask import request, Response, escape, jsonify, abort