diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 264 |
1 files changed, 159 insertions, 105 deletions
diff --git a/public/bundle.js b/public/bundle.js index 83c833b..c25f42d 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -995,10 +995,17 @@ var FileList = function (_Component) { files = _props.files, linkFiles = _props.linkFiles, title = _props.title, - _onClick = _props.onClick; + _onClick = _props.onClick, + _props$className = _props.className, + className = _props$className === undefined ? "" : _props$className; if (!files.length) return null; var fields = this.props.fields || defaultFields; + if (typeof fields === 'string') { + fields = new Set(fields.split(' ')); + } else if (!(fields instanceof Set)) { + fields = new Set(fields); + } var fileList = files.map(function (file) { var size = util.hush_size(file.size); var date = file.created_at; @@ -1062,13 +1069,30 @@ var FileList = function (_Component) { }); return (0, _preact.h)( 'div', - { className: 'filelist rows' }, - title && (0, _preact.h)( - 'h3', - null, - title + { className: 'rows ' + className }, + (0, _preact.h)( + 'div', + { 'class': 'row heading' }, + files.length ? (0, _preact.h)( + 'h3', + null, + title || Files + ) : (0, _preact.h)( + 'h4', + null, + 'No files' + ), + (0, _preact.h)( + 'div', + null, + (loading || error) && status + ) ), - fileList + (0, _preact.h)( + 'div', + { className: 'filelist rows' }, + fileList + ) ); } }]); @@ -2695,25 +2719,8 @@ var Dataset = function (_Component) { (0, _preact.h)( 'div', { className: 'params col' }, - (0, _preact.h)( - 'div', - { 'class': 'row heading' }, - files.length ? (0, _preact.h)( - 'h3', - null, - 'Files' - ) : (0, _preact.h)( - 'h4', - null, - 'No files' - ), - (0, _preact.h)( - 'div', - null, - (loading || error) && status - ) - ), (0, _preact.h)(_fileList2.default, { + title: 'Files', files: files, options: fileOptions, onClick: pickFile, @@ -4374,7 +4381,7 @@ exports.default = { Object.defineProperty(exports, "__esModule", { value: true }); -exports.fetch_url = exports.load_directories = undefined; +exports.fetch_url = exports.set_folder = 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"); } }; }(); @@ -4392,14 +4399,12 @@ var _actions2 = _interopRequireDefault(_actions); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); } + var load_directories = exports.load_directories = function load_directories() { return function (dispatch) { - // load datasets - // load directories from server - console.log(_actions2.default); + // console.log(actions) 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' }), _actions2.default.socket.run_script({ module: 'samplernn', activity: 'report' })]).then(function (res) { - console.log(res); - var _res = _slicedToArray(res, 6), folders = _res[0], files = _res[1], @@ -4408,31 +4413,122 @@ var load_directories = exports.load_directories = function load_directories() { datasets = _res[4], report = _res[5]; - console.log(datasets); + var folderLookup = folders.reduce(function (folderLookup, folder) { + folderLookup[folder.id] = folder; + folder.files = []; + folder.results = []; + return folderLookup; + }, { + 'unsorted': { + id: 0, + name: 'unsorted', + files: [], + results: [] + } + }); + + var processedFiles = files.filter(function (file) { + return file.processed; + }); + var unprocessedFiles = files.filter(function (file) { + return !file.processed; + }); + var fileLookup = unprocessedFiles.reduce(function (fileLookup, file) { + file.checkpoints = []; + if (!file.name) { + file.name = (file.opt || {}).token || 'unloaded'; + // fileLookup[(file.name || 'unsorted').split('.')[0]] = file + } else { + fileLookup[file.name.split('.')[0]] = file; + } + folderLookup[file.folder_id] && folderLookup[file.folder_id].files.push(file); + return fileLookup; + }, { + unsorted: { + checkpoints: [], + results: [] + } + }); + processedFiles.map(function (result) { + var pair = result.name.split('.')[0].split('-'); + var file = fileLookup[pair[0]]; + if (file) { + file.results.push(result); + } else { + folderLookup[file.folder_id] && folderLookup[file.folder_id].results.push(file); + } + result.epoch = result.epoch || pair[1]; + }); + folderLookup.unsorted.files.push(fileLookup.unsorted); + + // console.log(datasets) + // const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir) var builtDatasets = datasets.filter(function (s) { return s.dir; }); - var flatDatasets = datasets.filter(function (s) { - return s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir; + builtDatasets.forEach(function (dataset) { + var file = fileLookup[dataset.name] || fileLookup.unsorted; + file.hasDataset = true; }); + + // exp:coccokit_3-frame_sizes:8,2-n_rnn:2-dataset:coccokit_3 var checkpoints = results.filter(function (s) { return s.dir; + }).map(function (s) { + var checkpoint = s.name.split('-').map(function (s) { + return s.split(':'); + }).reduce(function (a, b) { + return (a[b[0]] = b[1]) && a; + }, {}); + checkpoint.dir = s; + var file = fileLookup[checkpoint.dataset] || fileLookup.unsorted; + file.checkpoints.push(checkpoint); + return checkpoint; }); - console.log(folders.length, files.length, tasks.length, results.length, datasets.length); - console.log(report); + + // console.log(folders.length, files.length, tasks.length, results.length, datasets.length) + // console.log(report) + report.stdout.split('\n\n').filter(function (a) { + return !!a; + }).forEach(function (data) { + var _data$split = data.split('\n'), + _data$split2 = _toArray(_data$split), + name = _data$split2[0], + lines = _data$split2.slice(1); + + var file = fileLookup[name] || fileLookup.unsorted; + file.log = lines.map(function (s) { + return s.split('\t'); + }).map(function (s) { + return s.split(': '); + }).reduce(function (a, b) { + return (a[b[0]] = b[1]) && a; + }, {}); + }); + dispatch({ type: _types2.default.samplernn.init, data: { - folders: folders, files: files, - checkpoints: checkpoints, - builtDatasets: builtDatasets, flatDatasets: flatDatasets, - report: report + folderLookup: folderLookup + // folders, files, + // checkpoints, + // builtDatasets, + // flatDatasets, + // report } }); + dispatch({ + type: _types2.default.samplernn.set_folder, + folder: folders[0].name + }); }); }; }; +var set_folder = exports.set_folder = function set_folder(folder) { + _types2.default.samplernn.set_folder, folder; +}; + var fetch_url = exports.fetch_url = function fetch_url(url) { return function (dispatch) { console.log(url); @@ -4602,16 +4698,18 @@ var SampleRNNDatasets = function (_Component) { linkFiles: true, fileOptions: this.fileOptions, onPick: this.handlePick, - folder: samplernn.input.folder, - files: samplernn.input.files - }), - this.renderData() + folder: samplernn.folder, + files: samplernn.folder.files + }) ); } }, { key: 'renderData', value: function renderData() { - var samplernn = this.props.samplernn; + // {this.renderData()} + var _props = this.props, + samplernn = _props.samplernn, + actions = _props.actions; if (samplernn.data === null) { return; @@ -4621,6 +4719,9 @@ var SampleRNNDatasets = function (_Component) { { 'class': 'row params' }, (0, _preact.h)(_fileList2.default, { title: 'Folders', + className: 'folders', + fields: 'name', + onPick: actions.set_folder, files: samplernn.data.folders }), (0, _preact.h)(_fileList2.default, { @@ -4683,20 +4784,10 @@ var _types2 = _interopRequireDefault(_types); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var samplernnInitialState = { - loading: false, + loading: true, error: null, - folder: {}, folders: [], - datasets: [], - results: [], - input: { - folder: {}, - files: [] - }, - output: { - folder: {}, - files: [] - }, + folder: {}, data: null }; @@ -4707,6 +4798,7 @@ var samplernnReducer = function samplernnReducer() { switch (action.type) { case _types2.default.samplernn.init: return _extends({}, state, { + loading: false, data: action.data }); case _types2.default.socket.connect: @@ -4731,6 +4823,12 @@ var samplernnReducer = function samplernnReducer() { return state; case _types2.default.socket.status: return samplernnSocket(state, action.data); + + case _types2.default.samplernn.set_folder: + return _extends({}, state, { + folder: action.folder + }); + default: return state; } @@ -5539,9 +5637,9 @@ var _live = __webpack_require__(/*! ../live/live.actions */ "./app/client/live/l var liveActions = _interopRequireWildcard(_live); -var _task = __webpack_require__(/*! ../task/task.actions */ "./app/client/task/task.actions.js"); +var _queue = __webpack_require__(/*! ../queue/queue.actions */ "./app/client/queue/queue.actions.js"); -var taskActions = _interopRequireWildcard(_task); +var queueActions = _interopRequireWildcard(_queue); 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; } } @@ -6081,51 +6179,6 @@ 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 _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/types.js": /*!*****************************!*\ !*** ./app/client/types.js ***! @@ -6212,7 +6265,8 @@ exports.default = (_system$app$folder$fi = { fetch_url: 'FETCH_URL', fetch_progress: 'FETCH_PROGRESS' }), _defineProperty(_system$app$folder$fi, 'samplernn', { - init: 'SAMPLERNN_INIT' + init: 'SAMPLERNN_INIT', + set_folder: 'SAMPLERNN_SET_FOLDER' // queue and train // update checkpoint settings // reset checkpoint settings |