summaryrefslogtreecommitdiff
path: root/public/bundle.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/bundle.js')
-rw-r--r--public/bundle.js372
1 files changed, 216 insertions, 156 deletions
diff --git a/public/bundle.js b/public/bundle.js
index 9ff406d..2704647 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -89,14 +89,14 @@ var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"
var _api = __webpack_require__(/*! ./api */ "./app/client/api/index.js");
-var _task = __webpack_require__(/*! ./task/task.actions */ "./app/client/task/task.actions.js");
-
-var taskActions = _interopRequireWildcard(_task);
-
var _live = __webpack_require__(/*! ./live/live.actions */ "./app/client/live/live.actions.js");
var liveActions = _interopRequireWildcard(_live);
+var _queue = __webpack_require__(/*! ./queue/queue.actions */ "./app/client/queue/queue.actions.js");
+
+var queueActions = _interopRequireWildcard(_queue);
+
var _system = __webpack_require__(/*! ./system/system.actions */ "./app/client/system/system.actions.js");
var systemActions = _interopRequireWildcard(_system);
@@ -115,7 +115,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
exports.default = Object.keys(_api.actions).map(function (a) {
return [a, _api.actions[a]];
-}).concat([['task', taskActions], ['live', liveActions], ['system', systemActions], ['dataset', datasetActions]]).map(function (p) {
+}).concat([['live', liveActions], ['queue', queueActions], ['system', systemActions], ['dataset', datasetActions]]).map(function (p) {
return [p[0], (0, _redux.bindActionCreators)(p[1], _store.dispatch)];
}).concat([['socket', socketActions]]).reduce(function (a, b) {
return (a[b[0]] = b[1]) && a;
@@ -994,6 +994,7 @@ var FileList = function (_Component) {
var _props = this.props,
files = _props.files,
linkFiles = _props.linkFiles,
+ title = _props.title,
_onClick = _props.onClick;
if (!files.length) return null;
@@ -1062,6 +1063,11 @@ var FileList = function (_Component) {
return (0, _preact.h)(
'div',
{ className: 'filelist rows' },
+ title && (0, _preact.h)(
+ 'h3',
+ null,
+ title
+ ),
fileList
);
}
@@ -2078,7 +2084,7 @@ var Dashboard = function (_Component) {
key: 'render',
value: function render() {
var _props = this.props,
- tasks = _props.tasks,
+ queue = _props.queue,
files = _props.files,
images = _props.images,
site = _props.site;
@@ -2096,12 +2102,12 @@ var Dashboard = function (_Component) {
(0, _preact.h)(
_group2.default,
{ title: 'Completed Tasks' },
- (0, _preact.h)(_tasklist2.default, { tasks: tasks })
+ (0, _preact.h)(_tasklist2.default, { tasks: queue })
),
(0, _preact.h)(
_group2.default,
{ title: 'Upcoming Tasks' },
- (0, _preact.h)(_tasklist2.default, { tasks: tasks })
+ (0, _preact.h)(_tasklist2.default, { tasks: queue })
)
),
(0, _preact.h)(
@@ -2141,7 +2147,7 @@ var mapStateToProps = function mapStateToProps(state) {
site: state.system.site,
images: state.dashboard.images,
files: state.dashboard.files,
- tasks: state.task.tasks
+ queue: state.queue.queue
};
};
@@ -2335,7 +2341,6 @@ var DashboardHeader = function (_Component) {
var mapStateToProps = function mapStateToProps(state) {
return {
runner: state.system.runner,
- currentTask: state.task.currentTask,
site: state.system.site
};
};
@@ -4371,6 +4376,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.fetch_url = exports.load_directories = undefined;
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
var _socket = __webpack_require__(/*! ../../socket */ "./app/client/socket/index.js");
var _socket2 = _interopRequireDefault(_socket);
@@ -4385,27 +4392,25 @@ var _actions2 = _interopRequireDefault(_actions);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// bindActionCreators(actions.folder, dispatch),
-// bindActionCreators(actions.file, dispatch),
-// bindActionCreators(taskActions, dispatch),
-// bindActionCreators(systemActions, dispatch),
-
var load_directories = exports.load_directories = function load_directories() {
return function (dispatch) {
// load datasets
// load directories from server
console.log(_actions2.default);
- _actions2.default.folder.index({ module: 'samplernn' }).then(function (folders) {
- console.log('got folders');
- });
- _actions2.default.file.index({ module: 'samplernn' }).then(function (files) {
- console.log('got files');
- });
- _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }).then(function (dirs) {
- console.log('got results');
- });
- _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' }).then(function (dirs) {
- console.log('got datasets');
+ Promise.all([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' })]).then(function (res) {
+ console.log(res);
+
+ var _res = _slicedToArray(res, 4),
+ folders = _res[0],
+ files = _res[1],
+ results = _res[2],
+ datasets = _res[3];
+
+ console.log(folders.length, files.length, results.length, datasets.length);
+ dispatch({
+ type: _types2.default.samplernn.init,
+ data: { folders: folders, files: files, results: results, datasets: datasets }
+ });
});
};
};
@@ -4559,10 +4564,6 @@ var SampleRNNDatasets = function (_Component) {
// console.log(samplernn.upload)
// sort files??
- var module = {
- name: 'samplernn',
- datatype: 'audio'
- };
return (0, _preact.h)(
'div',
{ className: 'app' },
@@ -4583,9 +4584,38 @@ var SampleRNNDatasets = function (_Component) {
linkFiles: true,
fileOptions: this.fileOptions,
onPick: this.handlePick,
- module: module,
folder: samplernn.input.folder,
files: samplernn.input.files
+ }),
+ this.renderData()
+ );
+ }
+ }, {
+ key: 'renderData',
+ value: function renderData() {
+ var samplernn = this.props.samplernn;
+
+ if (samplernn.data === null) {
+ return;
+ }
+ return (0, _preact.h)(
+ 'div',
+ { 'class': 'row params' },
+ (0, _preact.h)(_fileList2.default, {
+ title: 'Folders',
+ files: samplernn.data.folders
+ }),
+ (0, _preact.h)(_fileList2.default, {
+ title: 'Files',
+ files: samplernn.data.files
+ }),
+ (0, _preact.h)(_fileList2.default, {
+ title: 'Datasets',
+ files: samplernn.data.datasets
+ }),
+ (0, _preact.h)(_fileList2.default, {
+ title: 'Results',
+ files: samplernn.data.results
})
);
}
@@ -4648,7 +4678,8 @@ var samplernnInitialState = {
output: {
folder: {},
files: []
- }
+ },
+ data: null
};
var samplernnReducer = function samplernnReducer() {
@@ -4656,25 +4687,16 @@ var samplernnReducer = function samplernnReducer() {
var action = arguments[1];
switch (action.type) {
+ case _types2.default.samplernn.init:
+ return _extends({}, state, {
+ data: action.data
+ });
case _types2.default.socket.connect:
return _extends({}, state);
case _types2.default.task.task_begin:
return _extends({}, state);
case _types2.default.task.task_finish:
return _extends({}, state);
- case _types2.default.folder.index:
- return _extends({}, state, {
- folders: action.data,
- folder: action.data[0]
- });
- case _types2.default.folder.update:
- return state;
-
- case _types2.default.file.index:
- return _extends({}, state, {
- files: action.data
- });
-
case _types2.default.file.create:
if (state.folder.id === action.data.folder_id) {
return _extends({}, state, {
@@ -4682,7 +4704,6 @@ var samplernnReducer = function samplernnReducer() {
});
}
return state;
-
case _types2.default.folder.upload_complete:
if (state.folder.id === action.folder) {
return _extends({}, state, {
@@ -4690,11 +4711,6 @@ var samplernnReducer = function samplernnReducer() {
});
}
return state;
-
- case _types2.default.system.list_directory:
- console.log('list directory', action.data);
- return _extends({}, state);
-
case _types2.default.socket.status:
return samplernnSocket(state, action.data);
default:
@@ -4716,6 +4732,141 @@ exports.default = samplernnReducer;
/***/ }),
+/***/ "./app/client/queue/queue.actions.js":
+/*!*******************************************!*\
+ !*** ./app/client/queue/queue.actions.js ***!
+ \*******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.stop_task = exports.start_task = undefined;
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+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);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var start_task = exports.start_task = function start_task(task) {
+ var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+ console.log('boo');
+ _socket2.default.task.start_task(task, opt);
+ console.log('zoo');
+ return _extends({ type: _types2.default.task.starting_task, task: task }, opt);
+};
+
+var stop_task = exports.stop_task = function stop_task(task) {
+ var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+ _socket2.default.task.stop_task(task, opt);
+ return _extends({ type: _types2.default.task.stopping_task, task: task }, opt);
+};
+
+/***/ }),
+
+/***/ "./app/client/queue/queue.reducer.js":
+/*!*******************************************!*\
+ !*** ./app/client/queue/queue.reducer.js ***!
+ \*******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+
+var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
+
+var _types2 = _interopRequireDefault(_types);
+
+var _moment = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
+
+var _moment2 = _interopRequireDefault(_moment);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var queueInitialState = {
+ loading: false,
+ error: null,
+
+ queue: [{
+ id: 1073,
+ activity: 'train',
+ module: 'samplernn',
+ dataset: 'bobby_brown_-_every_little_step',
+ epochs: 6
+ }, {
+ id: 1073,
+ activity: 'train',
+ module: 'pix2pix',
+ checkpoint: 'lyra_voice_layers',
+ dataset: 'audio/lyra_improv',
+ epochs: 30
+ }, {
+ id: 1073,
+ activity: 'train',
+ module: 'pix2pix',
+ checkpoint: 'lyra_melody_lines',
+ dataset: 'audio/lyra_improv',
+ epochs: 30
+ }, {
+ id: 1073,
+ activity: 'train',
+ module: 'pix2pix',
+ checkpoint: 'ensemble_chords',
+ dataset: 'audio/lyra_improv',
+ epochs: 30
+ }, {
+ id: 1073,
+ activity: 'generate',
+ module: 'samplernn',
+ dataset: 'coccoglass3',
+ opt: { time: 5, count: 6 }
+ }, {
+ id: 1073,
+ activity: 'train',
+ module: 'pix2pix',
+ dataset: 'video/woods_green',
+ epochs: 100
+ }, {
+ id: 1073,
+ activity: 'train',
+ module: 'samplernn',
+ dataset: 'bobby_brown_-_every_little_step',
+ epochs: 6
+ }]
+};
+
+var queueReducer = function queueReducer() {
+ var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : queueInitialState;
+ var action = arguments[1];
+
+ switch (action.type) {
+ default:
+ return state;
+ }
+};
+
+exports.default = queueReducer;
+
+/***/ }),
+
/***/ "./app/client/socket/index.js":
/*!************************************!*\
!*** ./app/client/socket/index.js ***!
@@ -4793,11 +4944,12 @@ _socket.socket.on('status', function (data) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.list_directory = undefined;
+exports.run_system_command = exports.list_directory = undefined;
var _socket = __webpack_require__(/*! ./socket.system */ "./app/client/socket/socket.system.js");
var list_directory = exports.list_directory = _socket.list_directory_async;
+var run_system_command = exports.run_system_command = _socket.run_system_command_async;
/***/ }),
@@ -5016,6 +5168,7 @@ exports.syscall_async = undefined;
exports.run_system_command = run_system_command;
exports.list_directory = list_directory;
exports.list_directory_async = list_directory_async;
+exports.run_system_command_async = run_system_command_async;
var _store = __webpack_require__(/*! ../store */ "./app/client/store.js");
@@ -5087,7 +5240,12 @@ function list_directory(opt) {
}
function list_directory_async(opt) {
- return syscall_async('list_directory', opt);
+ return syscall_async('list_directory', opt).then(function (res) {
+ return res.files;
+ });
+}
+function run_system_command_async(opt) {
+ return syscall_async('run_system_command', opt);
}
var syscall_async = exports.syscall_async = function syscall_async(tag, payload) {
@@ -5100,6 +5258,7 @@ var syscall_async = exports.syscall_async = function syscall_async(tag, payload)
reject('timeout');
}, ttl);
var cb = function cb(data) {
+ if (!data.uuid) return;
if (data.uuid === uuid) {
clearTimeout(timeout);
_socket.socket.off('system_res', cb);
@@ -5249,9 +5408,9 @@ var _dataset = __webpack_require__(/*! ./dataset/dataset.reducer */ "./app/clien
var _dataset2 = _interopRequireDefault(_dataset);
-var _task = __webpack_require__(/*! ./task/task.reducer */ "./app/client/task/task.reducer.js");
+var _queue = __webpack_require__(/*! ./queue/queue.reducer */ "./app/client/queue/queue.reducer.js");
-var _task2 = _interopRequireDefault(_task);
+var _queue2 = _interopRequireDefault(_queue);
var _module = __webpack_require__(/*! ./modules/module.reducer */ "./app/client/modules/module.reducer.js");
@@ -5263,7 +5422,7 @@ var appReducer = (0, _redux.combineReducers)({
dashboard: _dashboard2.default,
live: _live2.default,
dataset: _dataset2.default,
- task: _task2.default,
+ queue: _queue2.default,
router: _reactRouterRedux.routerReducer,
module: _module.moduleReducer
});
@@ -5945,106 +6104,6 @@ var stop_task = exports.stop_task = function stop_task(task) {
/***/ }),
-/***/ "./app/client/task/task.reducer.js":
-/*!*****************************************!*\
- !*** ./app/client/task/task.reducer.js ***!
- \*****************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-
-var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
-
-var _types2 = _interopRequireDefault(_types);
-
-var _moment = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
-
-var _moment2 = _interopRequireDefault(_moment);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var FileSaver = __webpack_require__(/*! file-saver */ "./node_modules/file-saver/FileSaver.js");
-
-var taskInitialState = {
- loading: false,
- error: null,
-
- currentTask: {
- id: 1072,
- activity: 'train',
- module: 'pix2pix',
- dataset: 'video/woods_final',
- epoch: 87,
- epochs: 100
- },
- tasks: [{
- id: 1073,
- activity: 'train',
- module: 'samplernn',
- dataset: 'bobby_brown_-_every_little_step',
- epochs: 6
- }, {
- id: 1073,
- activity: 'train',
- module: 'pix2pix',
- checkpoint: 'lyra_voice_layers',
- dataset: 'audio/lyra_improv',
- epochs: 30
- }, {
- id: 1073,
- activity: 'train',
- module: 'pix2pix',
- checkpoint: 'lyra_melody_lines',
- dataset: 'audio/lyra_improv',
- epochs: 30
- }, {
- id: 1073,
- activity: 'train',
- module: 'pix2pix',
- checkpoint: 'ensemble_chords',
- dataset: 'audio/lyra_improv',
- epochs: 30
- }, {
- id: 1073,
- activity: 'generate',
- module: 'samplernn',
- dataset: 'coccoglass3',
- opt: { time: 5, count: 6 }
- }, {
- id: 1073,
- activity: 'train',
- module: 'pix2pix',
- dataset: 'video/woods_green',
- epochs: 100
- }, {
- id: 1073,
- activity: 'train',
- module: 'samplernn',
- dataset: 'bobby_brown_-_every_little_step',
- epochs: 6
- }]
-};
-
-var taskReducer = function taskReducer() {
- var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : taskInitialState;
- var action = arguments[1];
-
- switch (action.type) {
- default:
- return state;
- }
-};
-
-exports.default = taskReducer;
-
-/***/ }),
-
/***/ "./app/client/types.js":
/*!*****************************!*\
!*** ./app/client/types.js ***!
@@ -6131,6 +6190,7 @@ exports.default = (_system$app$folder$fi = {
fetch_url: 'FETCH_URL',
fetch_progress: 'FETCH_PROGRESS'
}), _defineProperty(_system$app$folder$fi, 'samplernn', {
+ init: 'SAMPLERNN_INIT'
// queue and train
// update checkpoint settings
// reset checkpoint settings