diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 1014 |
1 files changed, 628 insertions, 386 deletions
diff --git a/public/bundle.js b/public/bundle.js index b83f3f8..b44ce93 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -93,9 +93,9 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); +var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/live.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var liveActions = _interopRequireWildcard(_live); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -335,18 +335,14 @@ var Param = function (_Component) { 'div', { className: 'button param' }, (0, _preact.h)( - 'label', + 'span', null, - (0, _preact.h)( - 'span', - null, - this.props.title - ), - (0, _preact.h)( - 'span', - null, - this.props.children - ) + this.props.title + ), + (0, _preact.h)( + 'span', + null, + this.props.children ) ); } @@ -381,9 +377,9 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); +var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/live.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var liveActions = _interopRequireWildcard(_live); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -519,9 +515,9 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); +var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/live.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var liveActions = _interopRequireWildcard(_live); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -644,9 +640,9 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); +var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/live.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var liveActions = _interopRequireWildcard(_live); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -787,10 +783,10 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)( /***/ }), -/***/ "./app/client/dashboard/actions.js": -/*!*****************************************!*\ - !*** ./app/client/dashboard/actions.js ***! - \*****************************************/ +/***/ "./app/client/dashboard/dashboard.actions.js": +/*!***************************************************!*\ + !*** ./app/client/dashboard/dashboard.actions.js ***! + \***************************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { @@ -863,9 +859,9 @@ var _gallery = __webpack_require__(/*! ./gallery.component */ "./app/client/dash var _gallery2 = _interopRequireDefault(_gallery); -var _actions = __webpack_require__(/*! ./actions */ "./app/client/dashboard/actions.js"); +var _dashboard = __webpack_require__(/*! ./dashboard.actions */ "./app/client/dashboard/dashboard.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var dashboardActions = _interopRequireWildcard(_dashboard); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -958,15 +954,15 @@ var Dashboard = function (_Component) { var mapStateToProps = function mapStateToProps(state) { return { site: state.system.site, - images: state.system.images, - tasks: state.system.tasks, - files: state.system.files + images: state.dashboard.images, + files: state.dashboard.files, + tasks: state.task.tasks }; }; var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { return { - actions: (0, _redux.bindActionCreators)(liveActions, dispatch) + actions: (0, _redux.bindActionCreators)(dashboardActions, dispatch) }; }; @@ -998,7 +994,20 @@ var FileSaver = __webpack_require__(/*! file-saver */ "./node_modules/file-saver var dashboardInitialState = { loading: false, - error: null + error: null, + + images: [{ + url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2125.png' + }, { + url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2146%20(1).png' + }, { + url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2149.png' + }, { + url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2150.png' + }, { + url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2146%20(1).png' + }], + files: [{ id: 2, module: 'samplernn', checkpoint: 'jwcglassbeat', dataset: 'jwcglassbeat', epoch: 18, duration: 30, batch_size: 5, filename: 'jwcglassbeat-ep18.mp3', size: 3 * 1024 * 1024, date: Date.now(), opt: "{}" }] }; var dashboardReducer = function dashboardReducer() { @@ -1037,10 +1046,6 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); - -var liveActions = _interopRequireWildcard(_actions); - var _util = __webpack_require__(/*! ../util */ "./app/client/util.js"); var util = _interopRequireWildcard(_util); @@ -1089,7 +1094,7 @@ var DashboardHeader = function (_Component) { 'Currently ', util.gerund(currentTask.activity), ' ', - currentTask.library, + currentTask.module, ' on ', currentTask.dataset, (0, _preact.h)('br', null), @@ -1116,7 +1121,7 @@ var DashboardHeader = function (_Component) { var mapStateToProps = function mapStateToProps(state) { return { - currentTask: state.system.currentTask, + currentTask: state.task.currentTask, site: state.system.site }; }; @@ -1396,7 +1401,7 @@ var TaskList = function (_Component) { { 'class': 'activity' }, task.activity, ' ', - task.library, + task.module, ' ', dataset_type ), @@ -1461,9 +1466,9 @@ var _reactRouterDom = __webpack_require__(/*! react-router-dom */ "./node_module var _store = __webpack_require__(/*! ./store */ "./app/client/store.js"); -var _socket = __webpack_require__(/*! ./socket */ "./app/client/socket.js"); +var _socket = __webpack_require__(/*! ./socket */ "./app/client/socket/index.js"); -var _socket2 = _interopRequireDefault(_socket); +var socket = _interopRequireWildcard(_socket); var _header = __webpack_require__(/*! ./common/header.component */ "./app/client/common/header.component.js"); @@ -1483,6 +1488,8 @@ var _pix2pix2 = _interopRequireDefault(_pix2pix); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + // import client from './client' var app = (0, _preact.h)( @@ -1510,10 +1517,10 @@ var app = (0, _preact.h)( /***/ }), -/***/ "./app/client/live/actions.js": -/*!************************************!*\ - !*** ./app/client/live/actions.js ***! - \************************************/ +/***/ "./app/client/live/live.actions.js": +/*!*****************************************!*\ + !*** ./app/client/live/live.actions.js ***! + \*****************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { @@ -1525,7 +1532,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.play = exports.pause = exports.seek = exports.load_epoch = exports.load_sequence = exports.list_sequences = exports.list_epochs = exports.list_checkpoints = exports.set_param = exports.get_params = undefined; -var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket.js"); +var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket/index.js"); var socket = _interopRequireWildcard(_socket); @@ -1590,120 +1597,10 @@ var play = exports.play = function play(frame) { /***/ }), -/***/ "./app/client/live/player.js": -/*!***********************************!*\ - !*** ./app/client/live/player.js ***! - \***********************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.startRecording = startRecording; -exports.stopRecording = stopRecording; -exports.saveFrame = saveFrame; -exports.onFrame = onFrame; - -var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); - -var _whammy = __webpack_require__(/*! ./whammy */ "./app/client/live/whammy.js"); - -var _whammy2 = _interopRequireDefault(_whammy); - -var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); - -var _types2 = _interopRequireDefault(_types); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var fps = 0, - last_frame = void 0; -var recording = false, - saving = false; -var videoWriter = void 0; - -function startRecording() { - videoWriter = new _whammy2.default.Video(10); - recording = true; - _store.store.dispatch({ - type: _types2.default.player.start_recording - }); -} - -function stopRecording() { - if (!recording) return; - recording = false; - _store.store.dispatch({ - type: _types2.default.player.saving_video - }); - videoWriter.compile(false, function (blob) { - // console.log(blob) - _store.store.dispatch({ - type: _types2.default.player.save_video, - blob: blob - }); - }); -} - -function saveFrame() { - saving = true; -} - -function onFrame(data) { - var blob = new Blob([data.frame], { type: 'image/jpg' }); - var url = URL.createObjectURL(blob); - var img = new Image(); - img.onload = function () { - img.onload = null; - last_frame = data.meta; - URL.revokeObjectURL(url); - var canvas = document.querySelector('.player canvas'); - if (!canvas) return console.error('no canvas for frame'); - var ctx = canvas.getContext('2d'); - ctx.drawImage(img, 0, 0, canvas.width, canvas.height); - if (recording) { - console.log('record frame'); - videoWriter.add(canvas); - _store.store.dispatch({ - type: _types2.default.player.add_record_frame - }); - } - if (saving) { - saving = false; - canvas.toBlob(function (blob) { - _store.store.dispatch({ - type: _types2.default.player.save_frame, - blob: blob - }); - }); - } - fps += 1; - }; - img.src = url; -} - -setInterval(function () { - _store.store.dispatch({ - type: _types2.default.player.set_fps, - fps: fps - }); - _store.store.dispatch({ - type: _types2.default.player.current_frame, - meta: last_frame - }); - fps = 0; -}, 1000); - -/***/ }), - -/***/ "./app/client/live/reducer.js": -/*!************************************!*\ - !*** ./app/client/live/reducer.js ***! - \************************************/ +/***/ "./app/client/live/live.reducer.js": +/*!*****************************************!*\ + !*** ./app/client/live/live.reducer.js ***! + \*****************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { @@ -1839,6 +1736,116 @@ exports.default = liveReducer; /***/ }), +/***/ "./app/client/live/player.js": +/*!***********************************!*\ + !*** ./app/client/live/player.js ***! + \***********************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.startRecording = startRecording; +exports.stopRecording = stopRecording; +exports.saveFrame = saveFrame; +exports.onFrame = onFrame; + +var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); + +var _whammy = __webpack_require__(/*! ./whammy */ "./app/client/live/whammy.js"); + +var _whammy2 = _interopRequireDefault(_whammy); + +var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); + +var _types2 = _interopRequireDefault(_types); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var fps = 0, + last_frame = void 0; +var recording = false, + saving = false; +var videoWriter = void 0; + +function startRecording() { + videoWriter = new _whammy2.default.Video(10); + recording = true; + _store.store.dispatch({ + type: _types2.default.player.start_recording + }); +} + +function stopRecording() { + if (!recording) return; + recording = false; + _store.store.dispatch({ + type: _types2.default.player.saving_video + }); + videoWriter.compile(false, function (blob) { + // console.log(blob) + _store.store.dispatch({ + type: _types2.default.player.save_video, + blob: blob + }); + }); +} + +function saveFrame() { + saving = true; +} + +function onFrame(data) { + var blob = new Blob([data.frame], { type: 'image/jpg' }); + var url = URL.createObjectURL(blob); + var img = new Image(); + img.onload = function () { + img.onload = null; + last_frame = data.meta; + URL.revokeObjectURL(url); + var canvas = document.querySelector('.player canvas'); + if (!canvas) return console.error('no canvas for frame'); + var ctx = canvas.getContext('2d'); + ctx.drawImage(img, 0, 0, canvas.width, canvas.height); + if (recording) { + console.log('record frame'); + videoWriter.add(canvas); + _store.store.dispatch({ + type: _types2.default.player.add_record_frame + }); + } + if (saving) { + saving = false; + canvas.toBlob(function (blob) { + _store.store.dispatch({ + type: _types2.default.player.save_frame, + blob: blob + }); + }); + } + fps += 1; + }; + img.src = url; +} + +setInterval(function () { + _store.store.dispatch({ + type: _types2.default.player.set_fps, + fps: fps + }); + _store.store.dispatch({ + type: _types2.default.player.current_frame, + meta: last_frame + }); + fps = 0; +}, 1000); + +/***/ }), + /***/ "./app/client/live/whammy.js": /*!***********************************!*\ !*** ./app/client/live/whammy.js ***! @@ -2443,9 +2450,9 @@ var _button2 = _interopRequireDefault(_button); var _player3 = __webpack_require__(/*! ../live/player */ "./app/client/live/player.js"); -var _actions = __webpack_require__(/*! ../live/actions */ "./app/client/live/actions.js"); +var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/live.actions.js"); -var liveActions = _interopRequireWildcard(_actions); +var liveActions = _interopRequireWildcard(_live); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -2534,7 +2541,7 @@ var LivePix2Pix = function (_Component) { (0, _preact.h)(_player2.default, { width: 424, height: 256 }), (0, _preact.h)( 'div', - { className: 'params' }, + { className: 'params row' }, (0, _preact.h)( 'div', { className: 'column' }, @@ -2747,10 +2754,10 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)( /***/ }), -/***/ "./app/client/socket.js": -/*!******************************!*\ - !*** ./app/client/socket.js ***! - \******************************/ +/***/ "./app/client/socket/index.js": +/*!************************************!*\ + !*** ./app/client/socket/index.js ***! + \************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { @@ -2760,37 +2767,76 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)( Object.defineProperty(exports, "__esModule", { value: true }); -exports.socket = 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; }; -exports.list_checkpoints = list_checkpoints; -exports.list_epochs = list_epochs; -exports.list_sequences = list_sequences; -exports.load_epoch = load_epoch; -exports.load_sequence = load_sequence; -exports.seek = seek; -exports.pause = pause; -exports.play = play; -exports.get_params = get_params; -exports.set_param = set_param; -exports.run_system_command = run_system_command; - -var _store = __webpack_require__(/*! ./store */ "./app/client/store.js"); +var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); -var _types = __webpack_require__(/*! ./types */ "./app/client/types.js"); +var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); var _types2 = _interopRequireDefault(_types); -var _player = __webpack_require__(/*! ./live/player */ "./app/client/live/player.js"); +var _socket = __webpack_require__(/*! ./socket.connection */ "./app/client/socket/socket.connection.js"); -var player = _interopRequireWildcard(_player); +var _socket2 = __webpack_require__(/*! ./socket.system */ "./app/client/socket/socket.system.js"); + +var system = _interopRequireWildcard(_socket2); + +var _socket3 = __webpack_require__(/*! ./socket.live */ "./app/client/socket/socket.live.js"); + +var live = _interopRequireWildcard(_socket3); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var socket = io.connect('/client'); +exports.default = { + socket: _socket.socket, + system: system, + live: live +}; + + +_socket.socket.on('status', function (data) { + console.log('got status', data.key, data.value); + _store.store.dispatch({ type: _types2.default.socket.status }); + switch (data.key) { + case 'processing': + _store.store.dispatch(_extends({ + type: 'SET_PARAM' + }, data)); + break; + default: + break; + } +}); + +/***/ }), + +/***/ "./app/client/socket/socket.connection.js": +/*!************************************************!*\ + !*** ./app/client/socket/socket.connection.js ***! + \************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.socket = undefined; + +var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); + +var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); + +var _types2 = _interopRequireDefault(_types); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var socket = exports.socket = io.connect('/client'); // SOCKET ACTIONS @@ -2819,36 +2865,78 @@ socket.on('error', function (error) { return _store.store.dispatch({ type: _types2.default.socket.error, error: error }); }); -socket.on('res', function (data) { +/***/ }), + +/***/ "./app/client/socket/socket.live.js": +/*!******************************************!*\ + !*** ./app/client/socket/socket.live.js ***! + \******************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.list_checkpoints = list_checkpoints; +exports.list_epochs = list_epochs; +exports.list_sequences = list_sequences; +exports.load_epoch = load_epoch; +exports.load_sequence = load_sequence; +exports.seek = seek; +exports.pause = pause; +exports.play = play; +exports.get_params = get_params; +exports.set_param = set_param; + +var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); + +var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); + +var _types2 = _interopRequireDefault(_types); + +var _player = __webpack_require__(/*! ../live/player */ "./app/client/live/player.js"); + +var player = _interopRequireWildcard(_player); + +var _socket = __webpack_require__(/*! ./socket.connection */ "./app/client/socket/socket.connection.js"); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +_socket.socket.on('res', function (data) { console.log(data.cmd); switch (data.cmd) { case 'get_last_frame': if (data.res !== 'working') { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'get_last_frame' }); } break; case 'get_params': - _store.store.dispatch({ + store.dispatch({ type: _types2.default.socket.load_params, opt: data.res }); break; case 'list_checkpoints': - _store.store.dispatch({ + store.dispatch({ type: _types2.default.socket.list_checkpoints, checkpoints: data.res }); break; case 'list_sequences': - _store.store.dispatch({ + store.dispatch({ type: _types2.default.socket.list_sequences, sequences: data.res }); break; case 'list_epochs': - _store.store.dispatch({ + store.dispatch({ type: _types2.default.socket.list_epochs, epochs: data.res }); @@ -2859,96 +2947,60 @@ socket.on('res', function (data) { console.log(data); }); -socket.on('system_res', function (data) { - console.log('system response', data); - switch (data.type) { - case 'relay_connected': - return _store.store.dispatch({ type: _types2.default.system.relay_connected }); - case 'relay_disconnected': - return _store.store.dispatch({ type: _types2.default.system.relay_disconnected }); - case 'rpc_connected': - return _store.store.dispatch({ type: _types2.default.system.rpc_connected, runner: data.runner }); - case 'rpc_disconnected': - return _store.store.dispatch({ type: _types2.default.system.rpc_disconnected }); - case 'relay_status': - return _store.store.dispatch({ type: data.rpc_connected ? _types2.default.system.rpc_connected : _types2.default.system.rpc_disconnected, runner: data.runner }); - case 'command_output': - _store.store.dispatch({ - type: _types2.default.system.command_output, - data: data - }); - break; - } -}); - -socket.on('frame', player.onFrame); - -socket.on('status', function (data) { - console.log('got status', data.key, data.value); - _store.store.dispatch({ type: _types2.default.socket.status }); - switch (data.key) { - case 'processing': - _store.store.dispatch(_extends({ - type: 'SET_PARAM' - }, data)); - break; - default: - break; - } -}); +_socket.socket.on('frame', player.onFrame); function list_checkpoints() { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'list_checkpoints' }); } function list_epochs(checkpoint_name) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'list_epochs', payload: checkpoint_name }); } function list_sequences() { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'list_sequences' }); } function load_epoch(checkpoint_name, epoch) { console.log(">> SWITCH CHECKPOINT", checkpoint_name, epoch); - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'load_epoch', payload: checkpoint_name + ':' + epoch }); } function load_sequence(sequence) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'load_sequence', payload: sequence }); } function seek(frame) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'seek', payload: frame }); } function pause(frame) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'pause' }); } function play(frame) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'play' }); } function get_params() { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'get_params' }); } function set_param(key, value) { - socket.emit('cmd', { + _socket.socket.emit('cmd', { cmd: 'set_param', payload: { 'key': key, @@ -2956,15 +3008,63 @@ function set_param(key, value) { } }); } + +/***/ }), + +/***/ "./app/client/socket/socket.system.js": +/*!********************************************!*\ + !*** ./app/client/socket/socket.system.js ***! + \********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.run_system_command = run_system_command; + +var _store = __webpack_require__(/*! ../store */ "./app/client/store.js"); + +var _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); + +var _types2 = _interopRequireDefault(_types); + +var _socket = __webpack_require__(/*! ./socket.connection */ "./app/client/socket/socket.connection.js"); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +_socket.socket.on('system_res', function (data) { + console.log('system response', data); + switch (data.type) { + case 'relay_connected': + return (0, _store.dispatch)({ type: _types2.default.system.relay_connected }); + case 'relay_disconnected': + return (0, _store.dispatch)({ type: _types2.default.system.relay_disconnected }); + case 'rpc_connected': + return (0, _store.dispatch)({ type: _types2.default.system.rpc_connected, runner: data.runner }); + case 'rpc_disconnected': + return (0, _store.dispatch)({ type: _types2.default.system.rpc_disconnected }); + case 'relay_status': + return (0, _store.dispatch)({ type: data.rpc_connected ? _types2.default.system.rpc_connected : _types2.default.system.rpc_disconnected, runner: data.runner }); + case 'command_output': + return (0, _store.dispatch)({ + type: _types2.default.system.command_output, + data: data + }); + break; + } +}); + function run_system_command(cmd) { - socket.emit('system', { + _socket.socket.emit('system', { cmd: 'run_system_command', payload: cmd }); } -exports.socket = socket; - /***/ }), /***/ "./app/client/store.js": @@ -2980,7 +3080,7 @@ exports.socket = socket; Object.defineProperty(exports, "__esModule", { value: true }); -exports.store = exports.history = undefined; +exports.dispatch = exports.store = exports.history = undefined; var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); @@ -3002,25 +3102,32 @@ var _dashboard = __webpack_require__(/*! ./dashboard/dashboard.reducer */ "./app var _dashboard2 = _interopRequireDefault(_dashboard); -var _reducer = __webpack_require__(/*! ./live/reducer */ "./app/client/live/reducer.js"); +var _live = __webpack_require__(/*! ./live/live.reducer */ "./app/client/live/live.reducer.js"); + +var _live2 = _interopRequireDefault(_live); + +var _task = __webpack_require__(/*! ./task/task.reducer */ "./app/client/task/task.reducer.js"); -var _reducer2 = _interopRequireDefault(_reducer); +var _task2 = _interopRequireDefault(_task); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +// import navReducer from './nav.reducer' var appReducer = (0, _redux.combineReducers)({ system: _system2.default, dashboard: _dashboard2.default, - live: _reducer2.default, + live: _live2.default, + task: _task2.default, router: _reactRouterRedux.routerReducer }); -// import navReducer from './nav.reducer' var history = exports.history = (0, _createBrowserHistory2.default)(); var store = exports.store = (0, _redux.createStore)(appReducer, (0, _redux.compose)((0, _redux.applyMiddleware)( // createLogger(), _reduxThunk2.default, (0, _reactRouterRedux.routerMiddleware)(history)))); +var dispatch = exports.dispatch = store.dispatch; + /***/ }), /***/ "./app/client/system/system.actions.js": @@ -3038,7 +3145,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.run = undefined; -var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket.js"); +var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket/index.js"); var socket = _interopRequireWildcard(_socket); @@ -3051,7 +3158,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } var run = exports.run = function run(cmd) { - socket.run_system_command(cmd); + socket.system.run_system_command(cmd); return { type: _types2.default.system.running_command, cmd: cmd }; }; @@ -3093,6 +3200,10 @@ var _system = __webpack_require__(/*! ./system.actions */ "./app/client/system/s var systemActions = _interopRequireWildcard(_system); +var _task = __webpack_require__(/*! ../task/task.actions */ "./app/client/task/task.actions.js"); + +var taskActions = _interopRequireWildcard(_task); + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -3103,6 +3214,16 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } +var cpu_test_task = { + id: 1073, + activity: 'train', + library: 'test', + dataset: 'test', + epochs: 1, + opt: {} +}; +var gpu_test_task = {}; + var System = function (_Component) { _inherits(System, _Component); @@ -3139,83 +3260,138 @@ var System = function (_Component) { 'div', { className: 'row params' }, (0, _preact.h)( - _group2.default, - { title: 'Status' }, - (0, _preact.h)( - _param2.default, - { title: 'Server' }, - server.status - ), - server.error && (0, _preact.h)( - _param2.default, - { title: 'Server error' }, - server.error.message - ), - (0, _preact.h)( - _param2.default, - { title: 'Relay' }, - relay.status - ), - (0, _preact.h)( - _param2.default, - { title: 'RPC' }, - rpc.status - ), - (0, _preact.h)( - _param2.default, - { title: 'CPU' }, - rpc.cpu_cmd - ), - (0, _preact.h)( - _param2.default, - { title: 'GPU' }, - rpc.gpu_cmd - ), - (0, _preact.h)( - _param2.default, - { title: 'Current Task' }, - 'train samplernn' - ) - ), - (0, _preact.h)( - _group2.default, - { title: 'Diagnostics' }, + 'div', + { className: 'column' }, (0, _preact.h)( - _param2.default, - { title: 'Check GPU' }, + _group2.default, + { title: 'Status' }, + (0, _preact.h)( + _param2.default, + { title: 'Server' }, + server.status + ), + server.error && (0, _preact.h)( + _param2.default, + { title: 'Server error' }, + server.error.message + ), + (0, _preact.h)( + _param2.default, + { title: 'Relay' }, + relay.status + ), + (0, _preact.h)( + _param2.default, + { title: 'RPC' }, + rpc.status + ), + (0, _preact.h)( + _param2.default, + { title: 'CPU' }, + rpc.cpu_cmd + ), + (0, _preact.h)( + _param2.default, + { title: 'GPU' }, + rpc.gpu_cmd + ), (0, _preact.h)( - 'button', - { onClick: function onClick() { - return actions.run('nvidia-smi'); - } }, - 'nvidia-smi' + _param2.default, + { title: 'Current Task' }, + 'train samplernn' ) ), (0, _preact.h)( - _param2.default, - { title: 'List processes' }, + _group2.default, + { title: 'Diagnostics' }, + (0, _preact.h)( + _param2.default, + { title: 'Check GPU' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.system.run('nvidia-smi'); + } }, + 'nvidia-smi' + ) + ), (0, _preact.h)( - 'button', - { onClick: function onClick() { - return actions.run('ps'); - } }, - 'ps' + _param2.default, + { title: 'List processes' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.system.run('ps'); + } }, + 'ps' + ) + ), + (0, _preact.h)( + _param2.default, + { title: 'List users' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.system.run('w'); + } }, + 'w' + ) + ), + (0, _preact.h)( + _param2.default, + { title: 'Disk free space' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.system.run('df'); + } }, + 'df' + ) ) ), (0, _preact.h)( - _param2.default, - { title: 'List users' }, + _group2.default, + { title: 'Test' }, (0, _preact.h)( - 'button', - { onClick: function onClick() { - return actions.run('w'); - } }, - 'w' + _param2.default, + { title: 'CPU Test Task' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.task.start_task(cpu_test_task); + } }, + 'Start' + ), + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.task.stop_task(cpu_test_task); + } }, + 'Stop' + ) + ), + (0, _preact.h)( + _param2.default, + { title: 'GPU Test Task' }, + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.task.start_task(gpu_test_task); + } }, + 'Start' + ), + (0, _preact.h)( + 'button', + { onClick: function onClick() { + return actions.task.stop_task(gpu_test_task); + } }, + 'Stop' + ) ) ) - ) - ), - this.renderCommandOutput() + ), + this.renderCommandOutput() + ) ); } }, { @@ -3258,7 +3434,10 @@ var mapStateToProps = function mapStateToProps(state) { var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { return { - actions: (0, _redux.bindActionCreators)(systemActions, dispatch) + actions: { + system: (0, _redux.bindActionCreators)(systemActions, dispatch), + task: (0, _redux.bindActionCreators)(taskActions, dispatch) + } }; }; @@ -3325,80 +3504,7 @@ var systemInitialState = { error: null, stdout: null, stderr: null - }, - - currentTask: { - id: 1072, - activity: 'train', - library: 'pix2pix', - dataset: 'video/woods_final', - epoch: 87, - epochs: 100 - }, - images: [{ - url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2125.png' - }, { - url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2146%20(1).png' - }, { - url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2149.png' - }, { - url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2150.png' - }, { - url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2146%20(1).png' - }], - tasks: [{ - id: 1073, - activity: 'train', - library: 'pix2pix', - dataset: 'video/woods_green', - epochs: 100 - }, { - id: 1073, - activity: 'train', - library: 'samplernn', - dataset: 'bobby_brown_-_every_little_step', - epochs: 6 - }, { - id: 1073, - activity: 'train', - library: 'pix2pix', - checkpoint: 'lyra_voice_layers', - dataset: 'audio/lyra_improv', - epochs: 30 - }, { - id: 1073, - activity: 'train', - library: 'pix2pix', - checkpoint: 'lyra_melody_lines', - dataset: 'audio/lyra_improv', - epochs: 30 - }, { - id: 1073, - activity: 'train', - library: 'pix2pix', - checkpoint: 'ensemble_chords', - dataset: 'audio/lyra_improv', - epochs: 30 - }, { - id: 1073, - activity: 'generate', - library: 'samplernn', - dataset: 'coccoglass3', - opt: { time: 5, count: 6 } - }, { - id: 1073, - activity: 'train', - library: 'pix2pix', - dataset: 'video/woods_green', - epochs: 100 - }, { - id: 1073, - activity: 'train', - library: 'samplernn', - dataset: 'bobby_brown_-_every_little_step', - epochs: 6 - }], - files: [{ id: 2, library: 'samplernn', checkpoint: 'jwcglassbeat', dataset: 'jwcglassbeat', epoch: 18, duration: 30, batch_size: 5, filename: 'jwcglassbeat-ep18.mp3', size: 3 * 1024 * 1024, date: Date.now(), opt: "{}" }] + } }; var systemReducer = function systemReducer() { @@ -3508,6 +3614,138 @@ exports.default = systemReducer; /***/ }), +/***/ "./app/client/task/task.actions.js": +/*!*****************************************!*\ + !*** ./app/client/task/task.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 _socket = __webpack_require__(/*! ../socket */ "./app/client/socket/index.js"); + +var _socket2 = _interopRequireDefault(_socket); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var start_task = exports.start_task = function start_task(task) { + _socket2.default.task.start_task(task); + return { type: types.task.starting_task, task: task }; +}; +var stop_task = exports.stop_task = function stop_task(task) { + _socket2.default.task.stop_task(task); + return { type: types.task.stopping_task, 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 ***! @@ -3530,6 +3768,10 @@ exports.default = { rpc_connected: 'SYSTEM_RPC_CONNECTED', rpc_disconnected: 'SYSTEM_RPC_DISCONNECTED' }, + task: { + starting_task: 'TASK_STARTING_TASK', + stopping_task: 'TASK_STOPPING_TASK' + }, socket: { connect: 'SOCKET_CONNECT', connect_error: 'SOCKET_CONNECT_ERROR', |
