From 28e555ad9bdb3a31095a5e44700036984ea2142b Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Sun, 10 May 2020 16:35:16 +0100 Subject: [PATCH] Added explicit endpoints --- .../api/default_extensions/autofocus.py | 6 +++--- .../api/default_extensions/autostorage.py | 6 +++--- .../default_extensions/camera_stage_mapping/extension.py | 8 ++++---- openflexure_microscope/api/default_extensions/scan.py | 2 +- .../api/default_extensions/zip_builder.py | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openflexure_microscope/api/default_extensions/autofocus.py b/openflexure_microscope/api/default_extensions/autofocus.py index 97ea2e45..482d9c39 100644 --- a/openflexure_microscope/api/default_extensions/autofocus.py +++ b/openflexure_microscope/api/default_extensions/autofocus.py @@ -405,6 +405,6 @@ autofocus_extension_v2.add_method( ) autofocus_extension_v2.add_method(autofocus, "autofocus") -autofocus_extension_v2.add_view(MeasureSharpnessAPI, "/measure_sharpness") -autofocus_extension_v2.add_view(AutofocusAPI, "/autofocus") -autofocus_extension_v2.add_view(FastAutofocusAPI, "/fast_autofocus") +autofocus_extension_v2.add_view(MeasureSharpnessAPI, "/measure_sharpness", endpoint="measure_sharpness") +autofocus_extension_v2.add_view(AutofocusAPI, "/autofocus", endpoint="autofocus") +autofocus_extension_v2.add_view(FastAutofocusAPI, "/fast_autofocus", endpoint="fast_autofocus") diff --git a/openflexure_microscope/api/default_extensions/autostorage.py b/openflexure_microscope/api/default_extensions/autostorage.py index a00109bd..c949b9c3 100644 --- a/openflexure_microscope/api/default_extensions/autostorage.py +++ b/openflexure_microscope/api/default_extensions/autostorage.py @@ -266,9 +266,9 @@ def dynamic_form(): } -autostorage_extension_v2.add_view(GetLocationsView, "list-locations") -autostorage_extension_v2.add_view(PreferredLocationView, "location") -autostorage_extension_v2.add_view(PreferredLocationGUIView, "location-from-title") +autostorage_extension_v2.add_view(GetLocationsView, "/list-locations") +autostorage_extension_v2.add_view(PreferredLocationView, "/location") +autostorage_extension_v2.add_view(PreferredLocationGUIView, "/location-from-title") autostorage_extension_v2.add_meta( "gui", build_gui(dynamic_form, autostorage_extension_v2) ) diff --git a/openflexure_microscope/api/default_extensions/camera_stage_mapping/extension.py b/openflexure_microscope/api/default_extensions/camera_stage_mapping/extension.py index cbb02235..6ffe44d0 100644 --- a/openflexure_microscope/api/default_extensions/camera_stage_mapping/extension.py +++ b/openflexure_microscope/api/default_extensions/camera_stage_mapping/extension.py @@ -157,7 +157,7 @@ class Calibrate1DView(View): return task -csm_extension.add_view(Calibrate1DView, "/calibrate_1d") +csm_extension.add_view(Calibrate1DView, "/calibrate_1d", endpoint="calibrate_1d") @ThingAction @@ -170,7 +170,7 @@ class CalibrateXYView(View): return task -csm_extension.add_view(CalibrateXYView, "/calibrate_xy") +csm_extension.add_view(CalibrateXYView, "/calibrate_xy", endpoint="calibrate_xy") @ThingAction @@ -199,7 +199,7 @@ class MoveInImageCoordinatesView(View): return csm_extension.microscope.state["stage"]["position"] -csm_extension.add_view(MoveInImageCoordinatesView, "/move_in_image_coordinates") +csm_extension.add_view(MoveInImageCoordinatesView, "/move_in_image_coordinates", endpoint="move_in_image_coordinates") @ThingProperty @@ -216,4 +216,4 @@ class GetCalibrationFile(View): return {} -csm_extension.add_view(GetCalibrationFile, "/get_calibration") +csm_extension.add_view(GetCalibrationFile, "/get_calibration", endpoint="get_calibration") diff --git a/openflexure_microscope/api/default_extensions/scan.py b/openflexure_microscope/api/default_extensions/scan.py index 88fcf771..9ccc7fb4 100644 --- a/openflexure_microscope/api/default_extensions/scan.py +++ b/openflexure_microscope/api/default_extensions/scan.py @@ -349,4 +349,4 @@ class TileScanAPI(View): scan_extension_v2 = BaseExtension("org.openflexure.scan", version="2.0.0") -scan_extension_v2.add_view(TileScanAPI, "/tile") +scan_extension_v2.add_view(TileScanAPI, "/tile", endpoint="tile") diff --git a/openflexure_microscope/api/default_extensions/zip_builder.py b/openflexure_microscope/api/default_extensions/zip_builder.py index 0ac6de82..d0e27c41 100644 --- a/openflexure_microscope/api/default_extensions/zip_builder.py +++ b/openflexure_microscope/api/default_extensions/zip_builder.py @@ -205,7 +205,7 @@ zip_extension_v2 = BaseExtension( description="Build and download capture collections as ZIP files", ) -zip_extension_v2.add_view(ZipGetterAPIView, "/get/") -zip_extension_v2.add_view(ZipListAPIView, "/get") +zip_extension_v2.add_view(ZipGetterAPIView, "/get/", endpoint="get_id") +zip_extension_v2.add_view(ZipListAPIView, "/get", endpoint="get") -zip_extension_v2.add_view(ZipBuilderAPIView, "/build") +zip_extension_v2.add_view(ZipBuilderAPIView, "/build", endpoint="build")