diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py index 71c6bc94..ef97d475 100644 --- a/openflexure_microscope/api/app.py +++ b/openflexure_microscope/api/app.py @@ -105,10 +105,10 @@ for extension in find_extensions(OPENFLEXURE_EXTENSIONS_PATH): labthing.add_view(views.CaptureList, "/captures") labthing.add_root_link(views.CaptureList, "captures") -labthing.add_view(views.CaptureView, "/captures/") -labthing.add_view(views.CaptureDownload, "/captures//download/") -labthing.add_view(views.CaptureTags, "/captures//tags") -labthing.add_view(views.CaptureAnnotations, "/captures//annotations") +labthing.add_view(views.CaptureView, "/captures/") +labthing.add_view(views.CaptureDownload, "/captures//download/") +labthing.add_view(views.CaptureTags, "/captures//tags") +labthing.add_view(views.CaptureAnnotations, "/captures//annotations") # Attach settings and state resources labthing.add_view(views.SettingsProperty, "/instrument/settings") diff --git a/openflexure_microscope/api/v2/views/captures.py b/openflexure_microscope/api/v2/views/captures.py index 5728b49a..b906777a 100644 --- a/openflexure_microscope/api/v2/views/captures.py +++ b/openflexure_microscope/api/v2/views/captures.py @@ -49,18 +49,18 @@ class CaptureSchema(Schema): def generate_links(self, data, **_): data.links = { "self": { - "href": url_for(CaptureView.endpoint, id=data.id, _external=True), + "href": url_for(CaptureView.endpoint, id_=data.id, _external=True), "mimetype": "application/json", **description_from_view(CaptureView), }, "tags": { - "href": url_for(CaptureTags.endpoint, id=data.id, _external=True), + "href": url_for(CaptureTags.endpoint, id_=data.id, _external=True), "mimetype": "application/json", **description_from_view(CaptureTags), }, "annotations": { "href": url_for( - CaptureAnnotations.endpoint, id=data.id, _external=True + CaptureAnnotations.endpoint, id_=data.id, _external=True ), "mimetype": "application/json", **description_from_view(CaptureAnnotations), @@ -68,7 +68,7 @@ class CaptureSchema(Schema): "download": { "href": url_for( CaptureDownload.endpoint, - id=data.id, + id_=data.id, filename=data.name, _external=True, ),