Add download model functionality

Author: acrellin

cesium_app/app_server.py

@@ -57,7 +57,8 @@ def make_app(cfg, baselayer_handlers, baselayer_settings):
         (r'/project(/.*)?', ProjectHandler),
         (r'/dataset(/.*)?', DatasetHandler),
         (r'/features(/.*)?', FeatureHandler),
-        (r'/models(/.*)?', ModelHandler),
+        (r'/models(/[0-9]+)?', ModelHandler),
+        (r'/models/([0-9]+)/(download)', ModelHandler),
         (r'/predictions(/[0-9]+)?', PredictionHandler),
         (r'/predictions/([0-9]+)/(download)', PredictionHandler),
         (r'/predict_raw_data', PredictRawDataHandler),

cesium_app/handlers/model.py

@@ -72,14 +72,24 @@ def _build_model_compute_statistics(fset_path, model_type, model_params,
 
 class ModelHandler(BaseHandler):
     @auth_or_token
-    def get(self, model_id=None):
-        if model_id is not None:
-            model_info = Model.get_if_owned_by(model_id, self.current_user)
+    def get(self, model_id=None, action=None):
+        if action == 'download':
+            model_path = Model.get_if_owned_by(model_id,
+                                               self.current_user).file_uri
+            with open(model_path, 'rb') as f:
+                model_data = f.read()
+            self.set_header("Content-Type", "application/octet-stream")
+            self.set_header("Content-Disposition", "attachment; "
+                            "filename=cesium_model__joblib.pkl")
+            self.write(model_data)
         else:
-            model_info = [model for p in self.current_user.projects
-                          for model in p.models]
+            if model_id is not None:
+                model_info = Model.get_if_owned_by(model_id, self.current_user)
+            else:
+                model_info = [model for p in self.current_user.projects
+                              for model in p.models]
 
-        return self.success(model_info)
+            return self.success(model_info)
 
     @auth_or_token
     async def _await_model_statistics(self, model_stats_future, model):

static/css/base.css

@@ -33,4 +33,7 @@ body {
 .loginBox .logo {
     float: left;
     padding: 1em;
-}
+}
+a:hover {
+ cursor:pointer;
+}

static/js/components/Download.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+
+const Download = (props) => {
+  const style = {
+    display: 'inline-block'
+  };
+  return (
+    <a
+      href={props.url}
+      style={style}
+      onClick={
+        (e) => {
+          e.stopPropagation();
+        }
+      }
+    >
+      Download
+    </a>
+  );
+};
+Download.propTypes = {
+  ID: React.PropTypes.oneOfType([
+    React.PropTypes.number,
+    React.PropTypes.string]).isRequired,
+  url: React.PropTypes.string.isRequired
+};
+
+export default Download;

static/js/components/Models.jsx

@@ -10,6 +10,7 @@ import * as Validate from '../validate';
 import * as Action from '../actions';
 import Expand from './Expand';
 import Delete from './Delete';
+import Download from './Download';
 import { $try, reformatDatetime } from '../utils';
 import FoldableRow from './FoldableRow';
 
@@ -237,7 +238,11 @@ export let ModelTable = props => (
               <td>{model.name}</td>
               <td>{reformatDatetime(model.created_at)}</td>
               {status}
-              <td><DeleteModel ID={model.id} /></td>
+              <td>
+                <Download url={`/models/${model.id}/download`} />
+                &nbsp;&nbsp;
+                <DeleteModelButton ID={model.id} />
+              </td>
             </tr>
             {foldedContent}
           </FoldableRow>
@@ -265,11 +270,10 @@ const mtMapStateToProps = (state, ownProps) => (
 ModelTable = connect(mtMapStateToProps)(ModelTable);
 
 
-const dmMapDispatchToProps = dispatch => (
+const deleteMapDispatchToProps = dispatch => (
   { delete: id => dispatch(Action.deleteModel(id)) }
 );
-
-const DeleteModel = connect(null, dmMapDispatchToProps)(Delete);
+const DeleteModelButton = connect(null, deleteMapDispatchToProps)(Delete);
 
 
 export default ModelsTab;