diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 979 |
1 files changed, 513 insertions, 466 deletions
diff --git a/public/bundle.js b/public/bundle.js index 84fe51b..2602201 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -2962,6 +2962,246 @@ var uploadFiles = exports.uploadFiles = function uploadFiles(files) { /***/ }), +/***/ "./app/client/dataset/dataset.component.js": +/*!*************************************************!*\ + !*** ./app/client/dataset/dataset.component.js ***! + \*************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +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 util = _interopRequireWildcard(_util); + +var _actions = __webpack_require__(/*! ../actions */ "./app/client/actions.js"); + +var _actions2 = _interopRequireDefault(_actions); + +var _dataset = __webpack_require__(/*! ./dataset.form */ "./app/client/dataset/dataset.form.js"); + +var _dataset2 = _interopRequireDefault(_dataset); + +var _dataset3 = __webpack_require__(/*! ./dataset.new */ "./app/client/dataset/dataset.new.js"); + +var _dataset4 = _interopRequireDefault(_dataset3); + +var _fileList = __webpack_require__(/*! ../common/fileList.component */ "./app/client/common/fileList.component.js"); + +var _loading = __webpack_require__(/*! ../common/loading.component */ "./app/client/common/loading.component.js"); + +var _loading2 = _interopRequireDefault(_loading); + +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; } } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +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 DatasetComponent = function (_Component) { + _inherits(DatasetComponent, _Component); + + function DatasetComponent() { + _classCallCheck(this, DatasetComponent); + + return _possibleConstructorReturn(this, (DatasetComponent.__proto__ || Object.getPrototypeOf(DatasetComponent)).apply(this, arguments)); + } + + _createClass(DatasetComponent, [{ + key: 'render', + value: function render() { + var _props = this.props, + loading = _props.loading, + progress = _props.progress, + module = _props.module, + data = _props.data, + folder = _props.folder, + match = _props.match, + history = _props.history; + + if (loading) { + return (0, _preact.h)(_loading2.default, { progress: progress }); + } + if (!data.folders.length) { + console.log('no folders, redirect to /new'); + return history.push('/' + module.name + '/new/'); + } + if (!folder || !folder.name) return; + return (0, _preact.h)( + 'div', + { 'class': 'rows params datasets' }, + (0, _preact.h)( + 'div', + { 'class': 'row row-heading dataset' }, + (0, _preact.h)( + 'div', + { 'class': 'col' }, + 'input' + ), + (0, _preact.h)( + 'div', + { 'class': 'col' }, + 'status' + ), + (0, _preact.h)( + 'div', + { 'class': 'col' }, + 'checkpoint' + ), + (0, _preact.h)( + 'div', + { 'class': 'col' }, + 'output' + ) + ), + this.renderGroups() + ); + } + }, { + key: 'renderGroups', + value: function renderGroups() { + var _this2 = this; + + var _props2 = this.props, + module = _props2.module, + data = _props2.data, + folder = _props2.folder, + runner = _props2.runner, + onPickDataset = _props2.onPickDataset, + onPickFile = _props2.onPickFile, + datasetActions = _props2.datasetActions; + var datasetLookup = data.datasetLookup, + fileLookup = data.fileLookup; + + var _util$sort$orderByFn = util.sort.orderByFn('date desc'), + mapFn = _util$sort$orderByFn.mapFn, + sortFn = _util$sort$orderByFn.sortFn; + + var moduleOnCPU = runner && runner.cpu.task && runner.cpu.task.module === module.name; + var moduleOnGPU = runner && runner.gpu.task && runner.gpu.task.module === module.name; + var datasets = folder.datasets.map(function (name) { + return datasetLookup[name]; + }).map(mapFn).sort(sortFn).map(function (pair) { + var dataset = pair[1]; + var status = ''; + var isProcessing = false, + isFetching = false; + if (moduleOnGPU && runner.gpu.task.dataset === dataset) { + status = util.gerund(runner.gpu.task.activity); + isProcessing = true; + } else if (moduleOnCPU && runner.cpu.task.activity === 'fetch' && runner.cpu.task.opt.file_id === dataset.input[0]) { + isProcessing = true; + isFetching = true; + } + return (0, _preact.h)( + 'div', + { key: dataset.name, className: 'row dataset', onClick: function onClick() { + return onPickDataset && onPickDataset(dataset); + } }, + _this2.props.beforeRow && _this2.props.beforeRow(dataset), + (0, _preact.h)( + 'div', + { className: 'col' }, + !!dataset.input.length && (0, _preact.h)(_fileList.FileList, { + files: dataset.input.map(function (id) { + return fileLookup[id]; + }), + className: 'input_files', + fileListClassName: '', + rowClassName: 'input_file', + fields: 'name date size delete', + onClick: onPickFile, + onDelete: function onDelete(file) { + return _this2.onDeleteFile(file); + } + }) + ), + (0, _preact.h)( + 'div', + { className: ['col', 'quiet', dataset.isBuilt ? 'built' : 'not_built', isProcessing ? 'processing' : 'not_processing'].join(' ') }, + _this2.props.datasetActions && _this2.props.datasetActions(dataset, isFetching, isProcessing), + status + ), + (0, _preact.h)( + 'div', + { className: 'col checkpoint' }, + !!dataset.checkpoints.length && (0, _preact.h)(_fileList.FileRow, { + file: dataset.checkpoints[0], + fields: 'name date epoch', + className: 'row checkpoint' + }) + ), + (0, _preact.h)( + 'div', + { className: 'col' }, + !!dataset.output.length && (0, _preact.h)(_fileList.FileList, { + files: dataset.output.map(function (id) { + return fileLookup[id]; + }), + orderBy: 'epoch desc', + fields: 'name date epoch size', + onPickFile: onPickFile, + onDelete: function onDelete(file) { + return _this2.onDeleteFile(file); + } + }) + ), + _this2.props.afterRow && _this2.props.afterRow(dataset) + ); + }); + return datasets; + } + }, { + key: 'onDeleteFile', + value: function onDeleteFile(file) { + var yes = confirm('Are you sure you want to delete this file?'); + if (yes) { + console.log('delete: confirmed'); + if (this.props.onDeleteFile) { + console.log('calling custom deletefile function'); + this.props.onDeleteFile(file); + } else { + _actions2.default.file.destroy(file); + } + } + } + }]); + + return DatasetComponent; +}(_preact.Component); + +var mapStateToProps = function mapStateToProps(state) { + return { + runner: state.system.runner + }; +}; + +var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { + return {}; +}; + +exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(DatasetComponent); + +/***/ }), + /***/ "./app/client/dataset/dataset.form.js": /*!********************************************!*\ !*** ./app/client/dataset/dataset.form.js ***! @@ -3112,7 +3352,7 @@ var DatasetForm = function (_Component) { }(_preact.Component); var mapStateToProps = function mapStateToProps(state) { - return state.dataset; + return state.upload; }; var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { @@ -3366,20 +3606,222 @@ Object.defineProperty(exports, "__esModule", { value: true }); +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 _types = __webpack_require__(/*! ../types */ "./app/client/types.js"); var _types2 = _interopRequireDefault(_types); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var datasetInitialState = { +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +/* + Note: + This is a sub-reducer intended to process the folder-file API output from the DB. + Please run this from inside your module reducers :) +*/ + +var datasetInitialState = function datasetInitialState() { + return { + loading: true, + error: null, + data: null + }; +}; + +var datasetReducer = function datasetReducer() { + var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : datasetInitialState(); + var action = arguments[1]; + + switch (action.type) { + case _types2.default.dataset.load: + return _extends({}, state, { + loading: false, + data: action.data + }); + + case _types2.default.folder.create: + if (action.data.module === 'samplernn') { + return _extends({}, state, { + loading: false, + data: { + folders: state.data.folders.concat([action.data.id]), + folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data)) + } + }); + } + return state; + + case _types2.default.file.create: + if (action.data.module === 'samplernn') { + console.log(action.data); + var dataset = void 0, + old_dataset = void 0, + folder = void 0, + old_folder = void 0; + var dataset_name = void 0; + if (action.data.dataset) { + dataset_name = action.data.dataset; + } else if (action.data.name) { + dataset_name = action.data.name.split('.')[0]; + } else if (action.data.url) { + dataset_name = action.data.url; + } else { + dataset_name = null; + } + if (dataset_name in state.data.datasetLookup) { + old_dataset = state.data.datasetLookup[dataset_name]; + dataset = _extends({}, old_dataset, { + input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input), + output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output) + }); + } else { + console.log(action.data.created_at, action.data.date); + dataset = { + name: dataset_name, + date: action.data.created_at || action.data.date, + input: action.data.generated ? [] : [action.data.id], + checkpoints: [], + output: !action.data.generated ? [] : [action.data.id] + }; + } + old_folder = state.data.folderLookup[action.data.folder_id]; + folder = _extends({}, old_folder, { + datasets: old_folder.datasets.concat([dataset_name]), + files: old_folder.files.concat([action.data.id]) + }); + return _extends({}, state, { + loading: false, + data: _extends({}, state.data, { + files: state.data.files.concat([action.data.id]), + folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)), + fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)), + datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset)) + }) + }); + } + return state; + + case _types2.default.file.update: + if (action.data.module === 'samplernn') { + var _extends6; + + var _old_dataset = void 0; + var new_dataset = state.data.datasetLookup[action.data.dataset]; + var old_file = state.data.fileLookup[action.data.id]; + var new_dataset_update = void 0; + if (old_file && action.data.dataset !== old_file.dataset) { + if (state.data.datasetLookup[old_file.dataset]) { + _old_dataset = state.data.datasetLookup[old_file.dataset]; + old_dataset_update = _extends({}, _old_dataset, { + input: _old_dataset.input.filter(function (id) { + return id !== action.data.id; + }), + output: _old_dataset.output.filter(function (id) { + return id !== action.data.id; + }) + }); + } + new_dataset_update = _extends({}, new_dataset, { + input: action.data.generated ? [] : [action.data.id], + output: !action.data.generated ? [] : [action.data.id] + }); + } + console.log('old_dataset', old_dataset_update.name); + console.log('new_dataset', new_dataset_update.name); + return _extends({}, state, { + loading: false, + data: _extends({}, state.data, { + datasetLookup: _old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, _old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup, + fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)) + }) + }); + } + return state; + + case _types2.default.file.destroy: + if (action.data.module === 'samplernn') { + // delete the key from fileLookup + var fileLookup = _extends({}, state.data.fileLookup); + var datasetLookup = _extends({}, state.data.datasetLookup); + var folderLookup = _extends({}, state.data.folderLookup); + var _old_file = fileLookup[action.data.id]; + if (!_old_file) return state; + var _old_dataset2 = state.data.datasetLookup[_old_file.dataset]; + var _dataset = void 0; + if (_old_dataset2) { + _dataset = _extends({}, _old_dataset2, { + input: _old_dataset2.input.filter(function (id) { + return id !== _old_file.id; + }), + output: _old_dataset2.output.filter(function (id) { + return id !== _old_file.id; + }) + }); + if (!_dataset.input.length && !_dataset.checkpoints.length && !_dataset.output.length) { + delete datasetLookup[_old_file.dataset]; + var _old_folder = folderLookup[_old_file.folder_id]; + folderLookup[_old_file.folder_id] = _extends({}, _old_folder, { + datasets: _old_folder.datasets.filter(function (name) { + return name !== _old_file.dataset; + }) + }); + } else { + console.log('dataset just needs sweeping'); + datasetLookup[_old_file.dataset] = _dataset; + } + } + delete fileLookup[_old_file.id]; + + return _extends({}, state, { + loading: false, + data: _extends({}, state.data, { + folderLookup: folderLookup, + fileLookup: fileLookup, + datasetLookup: datasetLookup + }) + }); + } + return state; + + default: + return state; + } +}; + +exports.default = datasetReducer; + +/***/ }), + +/***/ "./app/client/dataset/upload.reducer.js": +/*!**********************************************!*\ + !*** ./app/client/dataset/upload.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); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var uploadInitialState = { loading: false, error: null, status: '' }; -var datasetReducer = function datasetReducer() { - var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : datasetInitialState; +var uploadReducer = function uploadReducer() { + var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : uploadInitialState; var action = arguments[1]; switch (action.type) { @@ -3419,29 +3861,19 @@ var datasetReducer = function datasetReducer() { loading: true, status: 'Creating file...' }; - case _types2.default.socket.status: - return datasetSocket(state, action.data); default: return state; } }; -var datasetSocket = function datasetSocket(state, action) { - console.log(action); - switch (action.key) { - default: - return state; - } -}; - -exports.default = datasetReducer; +exports.default = uploadReducer; /***/ }), -/***/ "./app/client/dataset/dataset.status.js": -/*!**********************************************!*\ - !*** ./app/client/dataset/dataset.status.js ***! - \**********************************************/ +/***/ "./app/client/dataset/upload.status.js": +/*!*********************************************!*\ + !*** ./app/client/dataset/upload.status.js ***! + \*********************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { @@ -3464,7 +3896,7 @@ var _loading2 = _interopRequireDefault(_loading); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function DatasetStatus(props) { +function UploadStatus(props) { return (0, _preact.h)( 'div', { 'class': 'status' }, @@ -3473,14 +3905,14 @@ function DatasetStatus(props) { } var mapStateToProps = function mapStateToProps(state) { - return state.dataset; + return state.upload; }; var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { return {}; }; -exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(DatasetStatus); +exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(UploadStatus); /***/ }), @@ -5350,8 +5782,9 @@ var load_directories = exports.load_directories = function load_directories(id) }); dispatch({ - type: _types2.default.samplernn.init, + type: _types2.default.dataset.load, data: { + module: module, folderLookup: folderLookup, fileLookup: fileLookup, datasetLookup: datasetLookup, @@ -5499,252 +5932,6 @@ var fetch_url = exports.fetch_url = function fetch_url(url) { /***/ }), -/***/ "./app/client/modules/samplernn/samplernn.datasets.js": -/*!************************************************************!*\ - !*** ./app/client/modules/samplernn/samplernn.datasets.js ***! - \************************************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - -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 util = _interopRequireWildcard(_util); - -var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js"); - -var samplernnActions = _interopRequireWildcard(_samplernn); - -var _actions = __webpack_require__(/*! ../../actions */ "./app/client/actions.js"); - -var _actions2 = _interopRequireDefault(_actions); - -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 _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js"); - -var _loading = __webpack_require__(/*! ../../common/loading.component */ "./app/client/common/loading.component.js"); - -var _loading2 = _interopRequireDefault(_loading); - -var _samplernn2 = __webpack_require__(/*! ./samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js"); - -var _samplernn3 = _interopRequireDefault(_samplernn2); - -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; } } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } - -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 SampleRNNDatasets = function (_Component) { - _inherits(SampleRNNDatasets, _Component); - - function SampleRNNDatasets() { - _classCallCheck(this, SampleRNNDatasets); - - return _possibleConstructorReturn(this, (SampleRNNDatasets.__proto__ || Object.getPrototypeOf(SampleRNNDatasets)).apply(this, arguments)); - } - - _createClass(SampleRNNDatasets, [{ - key: 'render', - value: function render() { - var _props = this.props, - samplernn = _props.samplernn, - folder = _props.folder, - match = _props.match, - history = _props.history; - - if (samplernn.loading) { - return (0, _preact.h)(_loading2.default, { progress: samplernn.progress }); - } - if (!samplernn.data.folders.length) { - console.log('no folders, redirect to /new'); - return history.push('/samplernn/new/'); - } - if (!folder || !folder.name) return; - return (0, _preact.h)( - 'div', - { 'class': 'rows params datasets' }, - (0, _preact.h)( - 'div', - { 'class': 'row row-heading dataset' }, - (0, _preact.h)( - 'div', - { 'class': 'col' }, - 'input' - ), - (0, _preact.h)( - 'div', - { 'class': 'col' }, - 'status' - ), - (0, _preact.h)( - 'div', - { 'class': 'col' }, - 'checkpoint' - ), - (0, _preact.h)( - 'div', - { 'class': 'col' }, - 'output' - ) - ), - this.renderGroups() - ); - } - }, { - key: 'renderGroups', - value: function renderGroups() { - var _this2 = this; - - var _props2 = this.props, - samplernn = _props2.samplernn, - folder = _props2.folder, - runner = _props2.runner, - onPickDataset = _props2.onPickDataset, - onPickFile = _props2.onPickFile, - datasetActions = _props2.datasetActions; - var _samplernn$data = samplernn.data, - datasetLookup = _samplernn$data.datasetLookup, - fileLookup = _samplernn$data.fileLookup; - - var _util$sort$orderByFn = util.sort.orderByFn('date desc'), - mapFn = _util$sort$orderByFn.mapFn, - sortFn = _util$sort$orderByFn.sortFn; - - var moduleOnCPU = runner && runner.cpu.task && runner.cpu.task.module === _samplernn3.default.name; - var moduleOnGPU = runner && runner.gpu.task && runner.gpu.task.module === _samplernn3.default.name; - var datasets = folder.datasets.map(function (name) { - return datasetLookup[name]; - }).map(mapFn).sort(sortFn).map(function (pair) { - var dataset = pair[1]; - var status = ''; - var isProcessing = false, - isFetching = false; - if (moduleOnGPU && runner.gpu.task.dataset === dataset) { - status = util.gerund(runner.gpu.task.activity); - isProcessing = true; - } else if (moduleOnCPU && runner.cpu.task.activity === 'fetch' && runner.cpu.task.opt.file_id === dataset.input[0]) { - isProcessing = true; - isFetching = true; - } - return (0, _preact.h)( - 'div', - { key: dataset.name, className: 'row dataset', onClick: function onClick() { - return onPickDataset && onPickDataset(dataset); - } }, - _this2.props.beforeRow && _this2.props.beforeRow(dataset), - (0, _preact.h)( - 'div', - { className: 'col' }, - !!dataset.input.length && (0, _preact.h)(_fileList.FileList, { - files: dataset.input.map(function (id) { - return fileLookup[id]; - }), - className: 'input_files', - fileListClassName: '', - rowClassName: 'input_file', - fields: 'name date size delete', - onClick: onPickFile, - onDelete: function onDelete(file) { - return _this2.onDeleteFile(file); - } - }) - ), - (0, _preact.h)( - 'div', - { className: ['col', 'quiet', dataset.isBuilt ? 'built' : 'not_built', isProcessing ? 'processing' : 'not_processing'].join(' ') }, - _this2.props.datasetActions && _this2.props.datasetActions(dataset, isFetching, isProcessing), - status - ), - (0, _preact.h)( - 'div', - { className: 'col checkpoint' }, - !!dataset.checkpoints.length && (0, _preact.h)(_fileList.FileRow, { - file: dataset.checkpoints[0], - fields: 'name date epoch', - className: 'row checkpoint' - }) - ), - (0, _preact.h)( - 'div', - { className: 'col' }, - !!dataset.output.length && (0, _preact.h)(_fileList.FileList, { - files: dataset.output.map(function (id) { - return fileLookup[id]; - }), - orderBy: 'epoch desc', - fields: 'name date epoch size', - onPickFile: onPickFile, - onDelete: function onDelete(file) { - return _this2.onDeleteFile(file); - } - }) - ), - _this2.props.afterRow && _this2.props.afterRow(dataset) - ); - }); - return datasets; - } - }, { - key: 'onDeleteFile', - value: function onDeleteFile(file) { - var yes = confirm('Are you sure you want to delete this file?'); - if (yes) { - console.log('delete: confirmed'); - if (this.props.onDeleteFile) { - console.log('calling custom deletefile function'); - this.props.onDeleteFile(file); - } else { - _actions2.default.file.destroy(file); - } - } - } - }]); - - return SampleRNNDatasets; -}(_preact.Component); - -var mapStateToProps = function mapStateToProps(state) { - return { - samplernn: state.module.samplernn, - runner: state.system.runner - }; -}; - -var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { - return {}; -}; - -exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNDatasets); - -/***/ }), - /***/ "./app/client/modules/samplernn/samplernn.module.js": /*!**********************************************************!*\ !*** ./app/client/modules/samplernn/samplernn.module.js ***! @@ -5787,9 +5974,11 @@ var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js"); var _types2 = _interopRequireDefault(_types); -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var _dataset = __webpack_require__(/*! ../../dataset/dataset.reducer */ "./app/client/dataset/dataset.reducer.js"); -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } +var _dataset2 = _interopRequireDefault(_dataset); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var samplernnInitialState = { loading: true, @@ -5805,161 +5994,11 @@ var samplernnReducer = function samplernnReducer() { var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : samplernnInitialState; var action = arguments[1]; - // console.log(action.type) - switch (action.type) { - case _types2.default.samplernn.init: - return _extends({}, state, { - loading: false, - data: action.data - }); - - case _types2.default.folder.create: - if (action.data.module === 'samplernn') { - return _extends({}, state, { - loading: false, - data: { - folders: state.data.folders.concat([action.data.id]), - folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data)) - }, - folder: _extends({}, action.data, { - datasets: [], - files: [] - }) - }); - } - return state; - - case _types2.default.file.create: - if (action.data.module === 'samplernn') { - console.log(action.data); - var dataset = void 0, - old_dataset = void 0, - folder = void 0, - old_folder = void 0; - var dataset_name = void 0; - if (action.data.dataset) { - dataset_name = action.data.dataset; - } else if (action.data.name) { - dataset_name = action.data.name.split('.')[0]; - } else if (action.data.url) { - dataset_name = action.data.url; - } else { - dataset_name = null; - } - if (dataset_name in state.data.datasetLookup) { - old_dataset = state.data.datasetLookup[dataset_name]; - dataset = _extends({}, old_dataset, { - input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input), - output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output) - }); - } else { - console.log(action.data.created_at, action.data.date); - dataset = { - name: dataset_name, - date: action.data.created_at || action.data.date, - input: action.data.generated ? [] : [action.data.id], - checkpoints: [], - output: !action.data.generated ? [] : [action.data.id] - }; - } - old_folder = state.data.folderLookup[action.data.folder_id]; - folder = _extends({}, old_folder, { - datasets: old_folder.datasets.concat([dataset_name]), - files: old_folder.files.concat([action.data.id]) - }); - return _extends({}, state, { - loading: false, - data: _extends({}, state.data, { - files: state.data.files.concat([action.data.id]), - folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)), - fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)), - datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset)) - }) - }); - } - return state; - - case _types2.default.file.update: - if (action.data.module === 'samplernn') { - var _extends6; - - var _old_dataset = void 0; - var new_dataset = state.data.datasetLookup[action.data.dataset]; - var old_file = state.data.fileLookup[action.data.id]; - var new_dataset_update = void 0; - if (old_file && action.data.dataset !== old_file.dataset) { - if (state.data.datasetLookup[old_file.dataset]) { - _old_dataset = state.data.datasetLookup[old_file.dataset]; - old_dataset_update = _extends({}, _old_dataset, { - input: _old_dataset.input.filter(function (id) { - return id !== action.data.id; - }), - output: _old_dataset.output.filter(function (id) { - return id !== action.data.id; - }) - }); - } - new_dataset_update = _extends({}, new_dataset, { - input: action.data.generated ? [] : [action.data.id], - output: !action.data.generated ? [] : [action.data.id] - }); - } - console.log('old_dataset', old_dataset_update.name); - console.log('new_dataset', new_dataset_update.name); - return _extends({}, state, { - loading: false, - data: _extends({}, state.data, { - datasetLookup: _old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, _old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup, - fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)) - }) - }); - } - return state; - - case _types2.default.file.destroy: - if (action.data.module === 'samplernn') { - // delete the key from fileLookup - var fileLookup = _extends({}, state.data.fileLookup); - var datasetLookup = _extends({}, state.data.datasetLookup); - var folderLookup = _extends({}, state.data.folderLookup); - var _old_file = fileLookup[action.data.id]; - if (!_old_file) return state; - var _old_dataset2 = state.data.datasetLookup[_old_file.dataset]; - var _dataset = void 0; - if (_old_dataset2) { - _dataset = _extends({}, _old_dataset2, { - input: _old_dataset2.input.filter(function (id) { - return id !== _old_file.id; - }), - output: _old_dataset2.output.filter(function (id) { - return id !== _old_file.id; - }) - }); - if (!_dataset.input.length && !_dataset.checkpoints.length && !_dataset.output.length) { - delete datasetLookup[_old_file.dataset]; - var _old_folder = folderLookup[_old_file.folder_id]; - folderLookup[_old_file.folder_id] = _extends({}, _old_folder, { - datasets: _old_folder.datasets.filter(function (name) { - return name !== _old_file.dataset; - }) - }); - } else { - console.log('dataset just needs sweeping'); - datasetLookup[_old_file.dataset] = _dataset; - } - } - delete fileLookup[_old_file.id]; + if (action.data && action.data.module === 'samplernn') { + return (0, _dataset2.default)(state, action); + } - return _extends({}, state, { - loading: false, - data: _extends({}, state.data, { - folderLookup: folderLookup, - fileLookup: fileLookup, - datasetLookup: datasetLookup - }) - }); - } - return state; + switch (action.type) { case _types2.default.samplernn.set_folder: return _extends({}, state, { @@ -6359,9 +6398,9 @@ var _button = __webpack_require__(/*! ../../../common/button.component */ "./app var _button2 = _interopRequireDefault(_button); -var _samplernn2 = __webpack_require__(/*! ../samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js"); +var _dataset = __webpack_require__(/*! ../../../dataset/dataset.component */ "./app/client/dataset/dataset.component.js"); -var _samplernn3 = _interopRequireDefault(_samplernn2); +var _dataset2 = _interopRequireDefault(_dataset); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6496,7 +6535,11 @@ var SampleRNNImport = function (_Component) { ) ) ), - (0, _preact.h)(_samplernn3.default, { + (0, _preact.h)(_dataset2.default, { + loading: samplernn.loading, + progress: samplernn.progress, + module: samplernnModule, + data: samplernn.data, id: 'unsorted', folder: folder, history: this.props.history, @@ -6892,19 +6935,19 @@ var _dataset3 = __webpack_require__(/*! ../../../dataset/dataset.new */ "./app/c var _dataset4 = _interopRequireDefault(_dataset3); -var _dataset5 = __webpack_require__(/*! ../../../dataset/dataset.status */ "./app/client/dataset/dataset.status.js"); +var _upload = __webpack_require__(/*! ../../../dataset/upload.status */ "./app/client/dataset/upload.status.js"); -var _dataset6 = _interopRequireDefault(_dataset5); +var _upload2 = _interopRequireDefault(_upload); var _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js"); -var _samplernn3 = __webpack_require__(/*! ../samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js"); +var _dataset5 = __webpack_require__(/*! ../../../dataset/dataset.component */ "./app/client/dataset/dataset.component.js"); -var _samplernn4 = _interopRequireDefault(_samplernn3); +var _dataset6 = _interopRequireDefault(_dataset5); -var _samplernn5 = __webpack_require__(/*! ../samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js"); +var _samplernn3 = __webpack_require__(/*! ../samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js"); -var _samplernn6 = _interopRequireDefault(_samplernn5); +var _samplernn4 = _interopRequireDefault(_samplernn3); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6974,17 +7017,21 @@ var SampleRNNShow = function (_Component) { null, folder ? folder.name : (0, _preact.h)(_loading2.default, null) ), - (0, _preact.h)(_dataset6.default, null) + (0, _preact.h)(_upload2.default, null) ) ), folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, { title: 'Add Files', - module: _samplernn6.default, + module: _samplernn4.default, folder: folder, canUpload: true, canAddURL: true }), - (0, _preact.h)(_samplernn4.default, { + (0, _preact.h)(_dataset6.default, { + loading: samplernn.loading, + progress: samplernn.progress, id: samplernn.folder_id, + module: _samplernn4.default, + data: samplernn.data, folder: folder, history: history, onPickFile: function onPickFile(file, e) { @@ -7893,9 +7940,9 @@ var _live = __webpack_require__(/*! ./live/live.reducer */ "./app/client/live/li var _live2 = _interopRequireDefault(_live); -var _dataset = __webpack_require__(/*! ./dataset/dataset.reducer */ "./app/client/dataset/dataset.reducer.js"); +var _upload = __webpack_require__(/*! ./dataset/upload.reducer */ "./app/client/dataset/upload.reducer.js"); -var _dataset2 = _interopRequireDefault(_dataset); +var _upload2 = _interopRequireDefault(_upload); var _queue = __webpack_require__(/*! ./queue/queue.reducer */ "./app/client/queue/queue.reducer.js"); @@ -7913,7 +7960,7 @@ var appReducer = (0, _redux.combineReducers)({ system: _system2.default, dashboard: _dashboard2.default, live: _live2.default, - dataset: _dataset2.default, + upload: _upload2.default, queue: _queue2.default, router: _reactRouterRedux.routerReducer, module: _module.moduleReducer, @@ -8699,13 +8746,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _system$app$folder$fi; - var _crud = __webpack_require__(/*! ./api/crud.types */ "./app/client/api/crud.types.js"); -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -exports.default = (_system$app$folder$fi = { +exports.default = { system: { load_site: 'SYSTEM_LOAD_SITE', running_command: 'SYSTEM_RUNNING_COMMAND', @@ -8725,7 +8768,6 @@ exports.default = (_system$app$folder$fi = { }, folder: (0, _crud.crud_type)('folder', []), file: (0, _crud.crud_type)('file', []), - dataset: (0, _crud.crud_type)('dataset', []), task: (0, _crud.crud_type)('task', ['starting_task', 'stopping_task', 'task_begin', 'task_finish', 'start_queue', 'stop_queue', 'starting_queue', 'stopping_queue', 'progress', 'epoch']), socket: { connect: 'SOCKET_CONNECT', @@ -8771,27 +8813,32 @@ exports.default = (_system$app$folder$fi = { pause: 'AUDIO_PAUSE', resume: 'AUDIO_RESUME', enqueue: 'AUDIO_ENQUEUE' + }, + dataset: { + load: 'DATASET_LOAD', + upload_files: 'DATASET_UPLOAD_FILES', + file_progress: 'DATASET_FILE_PROGRESS', + file_uploaded: 'DATASET_FILE_UPLOADED', + fetch_url: 'DATASET_FETCH_URL', + fetch_progress: 'DATASET_FETCH_PROGRESS' + }, + samplernn: { + init: 'SAMPLERNN_INIT', + set_folder: 'SAMPLERNN_SET_FOLDER', + load_loss: 'SAMPLERNN_LOAD_LOSS' + // queue and train + // update checkpoint settings + // reset checkpoint settings + // queue new checkpoint + // + }, + pix2pix: { + init: 'PIX2PIX_INIT' + }, + pix2wav: { + init: 'PIX2WAV_INIT' } -}, _defineProperty(_system$app$folder$fi, 'dataset', { - upload_files: 'UPLOAD_FILES', - file_progress: 'FILE_PROGRESS', - file_uploaded: 'FILE_UPLOADED', - fetch_url: 'FETCH_URL', - fetch_progress: 'FETCH_PROGRESS' -}), _defineProperty(_system$app$folder$fi, 'samplernn', { - init: 'SAMPLERNN_INIT', - set_folder: 'SAMPLERNN_SET_FOLDER', - load_loss: 'SAMPLERNN_LOAD_LOSS' - // queue and train - // update checkpoint settings - // reset checkpoint settings - // queue new checkpoint - // -}), _defineProperty(_system$app$folder$fi, 'pix2pix', { - init: 'PIX2PIX_INIT' -}), _defineProperty(_system$app$folder$fi, 'pix2wav', { - init: 'PIX2WAV_INIT' -}), _system$app$folder$fi); +}; /***/ }), |