must be string

1 files changed, 216 insertions, 30 deletions

diff --git a/public/bundle.js b/public/bundle.js
index ecdc556..98e3d54 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2218,6 +2218,97 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
+/***/ "./app/client/common/currentTask.component.js":
+/*!****************************************************!*\
+  !*** ./app/client/common/currentTask.component.js ***!
+  \****************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
+
+var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js");
+
+var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
+
+var _util = __webpack_require__(/*! ../util */ "./app/client/util/index.js");
+
+var _util2 = _interopRequireDefault(_util);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// import { Loading, CurrentTask, FileList, FileRow } from '../../../common'
+
+function CurrentTask(_ref) {
+  var cpu = _ref.cpu,
+      gpu = _ref.gpu,
+      processor = _ref.processor;
+
+  var processor_name = processor === 'cpu' ? 'cpu' : 'gpu';
+  var p = processor === 'cpu' ? cpu : gpu;
+  if (!p) return null;
+  if (p.status === 'IDLE') {
+    return (0, _preact.h)(
+      'div',
+      null,
+      processor_name,
+      ' idle'
+    );
+  }
+  var last_message = p.last_message,
+      pid = p.pid,
+      task = p.task;
+  var _task = { task: task },
+      activity = _task.activity,
+      epoch = _task.epoch,
+      epochs = _task.epochs,
+      dataset = _task.dataset,
+      module = _task.module;
+
+  return (0, _preact.h)(
+    'div',
+    null,
+    '#',
+    pid,
+    ': ',
+    module,
+    ' ',
+    activity,
+    ' ',
+    dataset,
+    ' ',
+    epoch,
+    ' (',
+    epochs,
+    ')',
+    (0, _preact.h)('br', null),
+    last_message
+  );
+}
+
+var mapStateToProps = function mapStateToProps(state) {
+  return state.system.runner;
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
+  return {
+    // actions: bindActionCreators(samplernnActions, dispatch),
+    // remote: bindActionCreators(samplernnTasks, dispatch),
+    // audioPlayer: bindActionCreators(audioPlayerActions, dispatch),
+  };
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(CurrentTask);
+
+/***/ }),
+
 /***/ "./app/client/common/fileList.component.js":
 /*!*************************************************!*\
   !*** ./app/client/common/fileList.component.js ***!
@@ -2857,12 +2948,16 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Button = exports.Select = exports.Slider = exports.TextInput = exports.Param = exports.ParamGroup = exports.Group = exports.Player = exports.Gallery = exports.FileUpload = exports.FileRow = exports.FileList = exports.FolderList = exports.Header = exports.Progress = exports.Loading = exports.Views = undefined;
+exports.CurrentTask = exports.Button = exports.Select = exports.Slider = exports.TextInput = exports.Param = exports.ParamGroup = exports.Group = exports.Player = exports.Gallery = exports.FileUpload = exports.FileRow = exports.FileList = exports.FolderList = exports.Header = exports.Progress = exports.Loading = exports.Views = undefined;
 
 var _button = __webpack_require__(/*! ./button.component */ "./app/client/common/button.component.js");
 
 var _button2 = _interopRequireDefault(_button);
 
+var _currentTask = __webpack_require__(/*! ./currentTask.component */ "./app/client/common/currentTask.component.js");
+
+var _currentTask2 = _interopRequireDefault(_currentTask);
+
 var _fileList = __webpack_require__(/*! ./fileList.component */ "./app/client/common/fileList.component.js");
 
 var _fileUpload = __webpack_require__(/*! ./fileUpload.component */ "./app/client/common/fileUpload.component.js");
@@ -2942,6 +3037,7 @@ exports.TextInput = _textInput2.default;
 exports.Slider = _slider2.default;
 exports.Select = _select2.default;
 exports.Button = _button2.default;
+exports.CurrentTask = _currentTask2.default;
 
 /***/ }),
 
@@ -9719,9 +9815,90 @@ exports.default = samplernnReducer;
   !*** ./app/client/modules/samplernn/samplernn.tasks.js ***!
   \*********************************************************/
 /*! no static exports found */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clear_cache_task = exports.log_task = exports.fetch_task = exports.train_task = undefined;
 
-throw new Error("Module build failed: SyntaxError: Unexpected token, expected , (14:4)\n\n\u001b[0m \u001b[90m 12 | \u001b[39m    dataset\u001b[33m:\u001b[39m dataset\u001b[33m.\u001b[39mname\u001b[33m,\u001b[39m\n \u001b[90m 13 | \u001b[39m    epoch\u001b[33m:\u001b[39m dataset\u001b[33m.\u001b[39mcheckpoints\u001b[33m.\u001b[39mlength \u001b[33m?\u001b[39m dataset\u001b[33m.\u001b[39mcheckpoints[\u001b[35m0\u001b[39m]\u001b[33m.\u001b[39mepoch \u001b[33m||\u001b[39m \u001b[35m0\u001b[39m \u001b[33m:\u001b[39m \u001b[35m0\u001b[39m\n\u001b[31m\u001b[1m>\u001b[22m\u001b[39m\u001b[90m 14 | \u001b[39m    epochs\u001b[33m:\u001b[39m epochs\u001b[33m,\u001b[39m\n \u001b[90m    | \u001b[39m    \u001b[31m\u001b[1m^\u001b[22m\u001b[39m\n \u001b[90m 15 | \u001b[39m    opt\u001b[33m:\u001b[39m {\n \u001b[90m 16 | \u001b[39m      folder_id\u001b[33m:\u001b[39m folder_id\u001b[33m,\u001b[39m\n \u001b[90m 17 | \u001b[39m      sample_length\u001b[33m:\u001b[39m \u001b[35m44100\u001b[39m \u001b[33m*\u001b[39m \u001b[35m5\u001b[39m\u001b[33m,\u001b[39m\u001b[0m\n");
+var _v = __webpack_require__(/*! uuid/v1 */ "./node_modules/uuid/v1.js");
+
+var _v2 = _interopRequireDefault(_v);
+
+var _socket = __webpack_require__(/*! ../../socket */ "./app/client/socket/index.js");
+
+var _socket2 = _interopRequireDefault(_socket);
+
+var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
+
+var _types2 = _interopRequireDefault(_types);
+
+var _actions = __webpack_require__(/*! ../../actions */ "./app/client/actions.js");
+
+var _actions2 = _interopRequireDefault(_actions);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var train_task = exports.train_task = function train_task(dataset, folder_id) {
+  var epochs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'train',
+      dataset: dataset.name,
+      epoch: dataset.checkpoints.length ? dataset.checkpoints[0].epoch || 0 : 0,
+      epochs: epochs,
+      opt: {
+        folder_id: folder_id,
+        sample_length: 44100 * 5,
+        n_samples: 6,
+        keep_old_checkpoints: false
+      }
+    };
+    console.log(task);
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var fetch_task = exports.fetch_task = function fetch_task(url, file_id, dataset) {
+  return function (dispatch) {
+    if (!url) return console.log('input file inaccessible (no url)');
+    var task = {
+      module: 'samplernn',
+      activity: 'fetch',
+      dataset: dataset,
+      opt: {
+        url: url,
+        file_id: file_id,
+        dataset: dataset
+      }
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var log_task = exports.log_task = function log_task(dataset) {
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'log',
+      dataset: dataset.name
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var clear_cache_task = exports.clear_cache_task = function clear_cache_task(dataset) {
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'clear_cache',
+      dataset: dataset.name
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
 
 /***/ }),
 
@@ -10514,27 +10691,19 @@ var _audioPlayer = __webpack_require__(/*! ../../../common/audioPlayer/audioPlay
 
 var audioPlayerActions = _interopRequireWildcard(_audioPlayer);
 
-var _loading = __webpack_require__(/*! ../../../common/loading.component */ "./app/client/common/loading.component.js");
-
-var _loading2 = _interopRequireDefault(_loading);
+var _common = __webpack_require__(/*! ../../../common */ "./app/client/common/index.js");
 
 var _dataset = __webpack_require__(/*! ../../../dataset/dataset.form */ "./app/client/dataset/dataset.form.js");
 
 var _dataset2 = _interopRequireDefault(_dataset);
 
-var _dataset3 = __webpack_require__(/*! ../../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
-
-var _dataset4 = _interopRequireDefault(_dataset3);
-
 var _upload = __webpack_require__(/*! ../../../dataset/upload.status */ "./app/client/dataset/upload.status.js");
 
 var _upload2 = _interopRequireDefault(_upload);
 
-var _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js");
-
-var _dataset5 = __webpack_require__(/*! ../../../dataset/dataset.component */ "./app/client/dataset/dataset.component.js");
+var _dataset3 = __webpack_require__(/*! ../../../dataset/dataset.component */ "./app/client/dataset/dataset.component.js");
 
-var _dataset6 = _interopRequireDefault(_dataset5);
+var _dataset4 = _interopRequireDefault(_dataset3);
 
 var _samplernn3 = __webpack_require__(/*! ../samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
 
@@ -10590,37 +10759,44 @@ var SampleRNNShow = function (_Component) {
 
       var _props2 = this.props,
           samplernn = _props2.samplernn,
+          runner = _props2.runner,
           match = _props2.match,
           history = _props2.history;
 
       var _ref = samplernn.data || {},
           folderLookup = _ref.folderLookup;
 
+      console.log(runner);
       var folder = (folderLookup || {})[samplernn.folder_id] || {};
       return (0, _preact.h)(
         'div',
         { className: 'app samplernn' },
         (0, _preact.h)(
           'div',
-          { 'class': 'heading' },
+          { className: 'heading' },
+          (0, _preact.h)(
+            'h1',
+            null,
+            folder ? folder.name : (0, _preact.h)(_common.Loading, null)
+          )
+        ),
+        (0, _preact.h)(
+          'div',
+          { className: 'row' },
+          folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
+            title: 'Add Files',
+            module: _samplernn4.default,
+            folder: folder,
+            canUpload: true, canAddURL: true
+          }),
           (0, _preact.h)(
             'div',
-            { 'class': 'spaced' },
-            (0, _preact.h)(
-              'h1',
-              null,
-              folder ? folder.name : (0, _preact.h)(_loading2.default, null)
-            ),
-            (0, _preact.h)(_upload2.default, null)
+            null,
+            (0, _preact.h)(_upload2.default, null),
+            (0, _preact.h)(_common.CurrentTask, { processor: 'gpu' })
           )
         ),
-        folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
-          title: 'Add Files',
-          module: _samplernn4.default,
-          folder: folder,
-          canUpload: true, canAddURL: true
-        }),
-        (0, _preact.h)(_dataset6.default, {
+        (0, _preact.h)(_dataset4.default, {
           loading: samplernn.loading,
           progress: samplernn.progress,
           id: samplernn.folder_id,
@@ -10733,7 +10909,8 @@ var SampleRNNShow = function (_Component) {
 
 var mapStateToProps = function mapStateToProps(state) {
   return {
-    samplernn: state.module.samplernn
+    samplernn: state.module.samplernn,
+    runner: state.system.runner
   };
 };
 
@@ -12340,11 +12517,20 @@ var systemReducer = function systemReducer() {
         })
       });
     case _types2.default.system.stdout:
+      if (action.data.processor && state.runner[action.data.processor]) {
+        return _extends({}, state, {
+          runner: _extends({}, state.runner, _defineProperty({}, action.data.processor, _extends({}, state.runner[action.data.processor], {
+            last_message: action.data.data
+          }))),
+          stdout: state.stdout + action.data.data
+        });
+      }
       return _extends({}, state, {
         stdout: state.stdout + action.data.data
       });
     case _types2.default.system.stderr:
       return _extends({}, state, {
+        last_message: action.data.data,
         stderr: state.stderr + action.data.data
       });
     default: