add api end point to look up neurocout-cli most recent version tag. U…

…se this endpoint in front end when displaying example docker call in status tab
neuroscout · Oct 21, 2020 · f02e32e · f02e32e
1 parent cbf1172
commit f02e32e
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/neuroscout/core.py b/neuroscout/core.py
@@ -63,7 +63,8 @@
         ('UserPredictorCollectionResource', 'user/collections'),
         ('TaskResource', 'tasks/<int:task_id>'),
         ('TaskPredictorsResource', 'tasks/<int:task_id>/predictors'),
-        ('TaskListResource', 'tasks')
+        ('TaskListResource', 'tasks'),
+        ('ImageVersionResource', 'image_version')
     ])
 
 

diff --git a/neuroscout/frontend/src/analysis_builder/Status.tsx b/neuroscout/frontend/src/analysis_builder/Status.tsx
@@ -146,15 +146,20 @@ export class Submit extends React.Component<submitProps, {tosAgree: boolean, val
 
 type statusTabState = {
   compileTraceback: string,
-  nvUploads?: any
+  nvUploads?: any,
+  imageVersion: string
 };
 
 export class StatusTab extends React.Component<submitProps, statusTabState> {
   constructor(props) {
     super(props);
     this.state = {
       compileTraceback: '',
+      imageVersion: ''
     };
+  }
+
+  componentDidMount() {
     if ((this.props.analysisId !== undefined)) {
       this.getTraceback(this.props.analysisId);
       api.getNVUploads(this.props.analysisId).then(nvUploads => {
@@ -163,6 +168,11 @@ export class StatusTab extends React.Component<submitProps, statusTabState> {
         }
      });
     }
+    api.getImageVersion().then((version) => {
+      if (!!version) {
+        this.setState({imageVersion: `:${version}`});
+      }
+    });
   }
 
   getTraceback(id) {
@@ -277,7 +287,7 @@ export class StatusTab extends React.Component<submitProps, statusTabState> {
           <pre>
             <code>
               docker run --rm -it -v /local/outputdirectory:/out
-              neuroscout/neuroscout-cli run /out {this.props.analysisId}
+              {` neuroscout/neuroscout-cli${this.state.imageVersion}`} run /out {this.props.analysisId}
             </code>
           </pre>
           <Card size="small" title="System Requirements" style={{ width: 400 }}>

diff --git a/neuroscout/frontend/src/api.ts b/neuroscout/frontend/src/api.ts
@@ -236,5 +236,13 @@ export const api = {
   },
   getPublicProfile: (user_name: string): Promise<ApiUser & {statusCode: number}> => {
     return jwtFetch(`${domainRoot}/api/user/${user_name}`);
+  },
+  getImageVersion: (): Promise<string> => {
+    return jwtFetch(`${domainRoot}/api/image_version`).then((res) => {
+      if (res.version) {
+        return res.version;
+      }
+      return '';
+    });
   }
 };
diff --git a/neuroscout/resources/__init__.py b/neuroscout/resources/__init__.py
@@ -5,7 +5,7 @@
                        AnalysisBundleResource, AnalysisFullResource,
                        AnalysisResourcesResource, ReportResource,
                        AnalysisFillResource, AnalysisUploadResource,
-                       BibliographyResource)
+                       BibliographyResource, ImageVersionResource)
 from .dataset import DatasetResource, DatasetListResource
 from .predictor import (PredictorListResource, PredictorResource,
                         PredictorCollectionCreateResource,
@@ -54,5 +54,6 @@
     'TaskResource',
     'TaskPredictorsResource',
     'TaskListResource',
+    'ImageVersionResource',
     'prepare_upload'
 ]
diff --git a/neuroscout/resources/analysis/__init__.py b/neuroscout/resources/analysis/__init__.py
@@ -3,7 +3,8 @@
 from .endpoints import (AnalysisResource, AnalysisRootResource,
                         AnalysisBundleResource, CloneAnalysisResource,
                         AnalysisFullResource, AnalysisResourcesResource,
-                        AnalysisFillResource, BibliographyResource)
+                        AnalysisFillResource, BibliographyResource,
+                        ImageVersionResource)
 from .reports import (CompileAnalysisResource, ReportResource,
                       AnalysisUploadResource)
 
@@ -18,5 +19,6 @@
     'BibliographyResource',
     'CloneAnalysisResource',
     'CompileAnalysisResource',
-    'ReportResource'
+    'ReportResource',
+    'ImageVersionResource'
     ]
diff --git a/neuroscout/resources/analysis/endpoints.py b/neuroscout/resources/analysis/endpoints.py
@@ -7,6 +7,7 @@
 import datetime
 from webargs import fields
 import json
+import requests
 
 from ...utils.db import put_record
 from .bib import format_bibliography, find_predictor_citation, _flatten
@@ -250,3 +251,21 @@ def get(self, analysis):
         }
 
         return resp
+
+class ImageVersionResource(MethodResource):
+    @doc(tags=['analysis'], summary='Get latest version of neuroscout cli docker image')
+    def get(self):
+        url = "https://hub.docker.com/v2/repositories/neuroscout/neuroscout-cli/tags"
+        req = requests.get(url)
+        try:
+            req = req.json()
+        except ValueError:
+            return {}
+
+        if 'results' in req:
+            for res in req['results']:
+                if ('version' in res['name']):
+                    return {'version': res['name']}
+
+        return {}
+