Only render download link when computation is complete

Add featureset/model/prediction name & timestamp to default download file name

Add project name to default download file names

Author: acrellin

cesium_app/handlers/feature.py

@@ -20,16 +20,19 @@ class FeatureHandler(BaseHandler):
     @auth_or_token
     def get(self, featureset_id=None, action=None):
         if action == 'download':
-            fset_path = Featureset.get_if_owned_by(featureset_id,
-                                                   self.current_user).file_uri
+            featureset = Featureset.get_if_owned_by(featureset_id,
+                                                    self.current_user)
+            fset_path = featureset.file_uri
             print(fset_path)
             fset, data = featurize.load_featureset(fset_path)
             fset.index.name = 'ts_name'
             fset.columns = fset.columns.get_level_values(0)
             fset.columns.name = None
             self.set_header("Content-Type", 'text/csv; charset="utf-8"')
-            self.set_header("Content-Disposition", "attachment; "
-                            "filename=cesium_featureset.csv")
+            self.set_header(
+                "Content-Disposition", "attachment; "
+                f"filename=cesium_featureset_{featureset.project.name}"
+                f"_{featureset.name}_{featureset.finished}.csv")
             self.write(fset.to_csv(index=True))
         else:
             if featureset_id is not None:

cesium_app/handlers/model.py

@@ -74,13 +74,15 @@ class ModelHandler(BaseHandler):
     @auth_or_token
     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
+            model = Model.get_if_owned_by(model_id, self.current_user)
+            model_path = model.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.set_header(
+                "Content-Disposition", "attachment; "
+                f"filename=cesium_model__joblib_{model.project.name}"
+                f"_{model.name}_{model.finished}.pkl")
             self.write(model_data)
         else:
             if model_id is not None:

cesium_app/handlers/prediction.py

@@ -121,8 +121,8 @@ async def post(self):
     @auth_or_token
     def get(self, prediction_id=None, action=None):
         if action == 'download':
-            pred_path = Prediction.get_if_owned_by(prediction_id,
-                                                   self.current_user).file_uri
+            prediction = Prediction.get_if_owned_by(prediction_id, self.current_user)
+            pred_path = prediction.file_uri
             fset, data = featurize.load_featureset(pred_path)
             result = pd.DataFrame(({'label': data['labels']}
                                    if len(data['labels']) > 0 else None),
@@ -133,8 +133,11 @@ def get(self, prediction_id=None, action=None):
                 result['prediction'] = data['preds']
             result.index.name = 'ts_name'
             self.set_header("Content-Type", 'text/csv; charset="utf-8"')
-            self.set_header("Content-Disposition", "attachment; "
-                            "filename=cesium_prediction_results.csv")
+            self.set_header(
+                "Content-Disposition", "attachment; "
+                f"filename=cesium_prediction_results_{prediction.project.name}"
+                f"_{prediction.dataset.name}"
+                f"_{prediction.model.name}_{prediction.finished}.csv")
             self.write(result.to_csv(index=True))
         else:
             if prediction_id is None:

static/js/components/Features.jsx

@@ -259,7 +259,10 @@ export let FeatureTable = props => (
                 <td>{reformatDatetime(featureset.created_at)}</td>
                 {status}
                 <td>
-                  <Download url={`/features/${featureset.id}/download`} />
+                  {
+                    done &&
+                    <Download url={`/features/${featureset.id}/download`} />
+                  }
                   &nbsp;&nbsp;
                   <DeleteFeatureset ID={featureset.id} />
                 </td>

static/js/components/Models.jsx

@@ -239,7 +239,10 @@ export let ModelTable = props => (
               <td>{reformatDatetime(model.created_at)}</td>
               {status}
               <td>
-                <Download url={`/models/${model.id}/download`} />
+                {
+                  done &&
+                  <Download url={`/models/${model.id}/download`} />
+                }
                 &nbsp;&nbsp;
                 <DeleteModelButton ID={model.id} />
               </td>

static/js/components/Predictions.jsx

@@ -135,7 +135,10 @@ let PredictionsTable = props => (
               <td>{reformatDatetime(prediction.created_at)}</td>
               {status}
               <td>
-                <DownloadPredCSV ID={prediction.id} />
+                {
+                  done &&
+                  <DownloadPredCSV ID={prediction.id} />
+                }
                 &nbsp;&nbsp;
                 <DeletePrediction ID={prediction.id} />
               </td>