', 'vp-gb-naming-box'); if (columns && columns.length > 0) { - page.appendFormatLine('Replace {0} as ...', method); columns.forEach(col => { - page.appendFormatLine('

', 'vp-gb-naming-item'); + page.appendLine('

'); page.appendFormatLine('{0}', col); + methods.forEach(met => { + page.appendFormatLine('

', 'vp-gb-naming-item'); + page.appendFormatLine('{0}', met); + var previousValue = ''; + var key = col + '.' + met; + if (previousDict[key]) { + previousValue = previousDict[key]; + } + page.appendFormatLine('' + , 'vp-gb-naming-text', 'Name to replace ' + met, previousValue, key); + page.appendLine('

'); + }); + page.appendLine('

'); + }); + } else { + page.appendLine('Rename methods'); + methods.forEach(met => { + page.appendFormatLine('

', 'vp-gb-naming-item'); + page.appendFormatLine('{0}', met); var previousValue = ''; - if (previousDict[col]) { - previousValue = previousDict[col]; + var key = met; + if (previousDict[key]) { + previousValue = previousDict[key]; } page.appendFormatLine('' - , 'vp-gb-naming-text', 'Name to replace ' + method, previousValue, col); + , 'vp-gb-naming-text', 'Name to replace ' + met, previousValue, key); page.appendLine('

'); }); - } else { - var previousValue = ''; - if (previousDict[method]) { - previousValue = previousDict[method]; - } - page.appendFormatLine('

', 'vp-gb-naming-item'); - page.appendFormatLine('{0}', method); - page.appendFormatLine('' - , 'vp-gb-naming-text', 'Name to replace ' + method, previousValue, method); - page.appendLine('

'); } page.appendLine('

'); $(this.wrapSelector('.vp-inner-popup-body')).html(page.toString()); @@ -664,22 +770,26 @@ define([ if (advColumns && advColumns.length > 0) { advColumns = advColumns.map(col => col.code); } - var advMethod = $(advItemTags[i]).find('.vp-gb-adv-method').val(); + var advMethod = $(advItemTags[i]).find('.vp-gb-adv-method').data('list'); + var advUserMethod = $(advItemTags[i]).find('.vp-gb-adv-method').data('userList'); + advMethod = [ ...advMethod, ...advUserMethod ]; var advNaming = $(advItemTags[i]).find('.vp-gb-adv-naming').data('dict'); - if (!advMethod || advMethod == '' || advMethod == "''") { + if (!advMethod || advMethod.length <= 0) { continue; } if (advColumns && advColumns.length > 0) { advColumns.forEach(col => { - var naming = advNaming[col]; - if (naming && naming != '') { - naming = "'" + naming + "'"; - } - if (Object.keys(advColumnDict).includes(col)) { - advColumnDict[col].push({ method: advMethod, naming: naming}) - } else { - advColumnDict[col] = [{ method: advMethod, naming: naming}]; - } + advMethod.forEach(method => { + var naming = advNaming[col + '.' + method]; + if (naming && naming != '') { + naming = "'" + naming + "'"; + } + if (Object.keys(advColumnDict).includes(col)) { + advColumnDict[col].push({ method: method, naming: naming}) + } else { + advColumnDict[col] = [{ method: method, naming: naming}]; + } + }); }); } else { @@ -687,7 +797,13 @@ define([ if (naming && naming != '') { naming = "'" + naming + "'"; } - advColumnDict['nothing'].push({ method: advMethod, naming: naming}); + advMethod.forEach(method => { + var naming = advNaming[method]; + if (naming && naming != '') { + naming = "'" + naming + "'"; + } + advColumnDict['nothing'].push({ method: method, naming: naming}); + }); } } @@ -789,7 +905,7 @@ define([ var { variable, groupby, useGrouper, grouperNumber, grouperPeriod, display, method, advanced, allocateTo, toFrame, resetIndex, - advPageDom, advColList, advNamingList + advPageDom, advColList, advNamingList, advMethodList, advMethodUserList } = this.state; $(this.wrapSelector('#vp_gbVariable')).val(variable); @@ -821,6 +937,12 @@ define([ advColList.forEach((arr, idx) => { $($(this.wrapSelector('.vp-gb-adv-col'))[idx]).data('list', arr); }); + advMethodList.forEach((arr, idx) => { + $($(this.wrapSelector('.vp-gb-adv-method'))[idx]).data('list', arr); + }); + advMethodUserList.forEach((arr, idx) => { + $($(this.wrapSelector('.vp-gb-adv-method'))[idx]).data('userList', arr); + }); advNamingList.forEach((obj, idx) => { $($(this.wrapSelector('.vp-gb-adv-naming'))[idx]).data('dict', obj); }); @@ -859,18 +981,33 @@ define([ * @param {Object} targetSelector * @param {string} title * @param {Array} includeList + * @param {Array} excludeList */ - openColumnSelector(targetSelector, title='Select columns', includeList=[]) { + openColumnSelector(targetSelector, title='Select columns', includeList=[], excludeList=[]) { this.popup.type = 'column'; this.popup.targetSelector = targetSelector; var previousList = this.popup.targetSelector.data('list'); if (previousList) { previousList = previousList.map(col => col.code) } - this.renderMultiSelector(previousList, includeList); + this.renderMultiSelector(previousList, includeList, excludeList); this.openInnerPopup(title); } + /** + * Open Inner popup page for method selection + * @param {Object} targetSelector + * @param {string} title + */ + openMethodSelector(targetSelector, title='Select methods') { + this.popup.type = 'method'; + this.popup.targetSelector = targetSelector; + var previousList = this.popup.targetSelector.data('list'); + var userList = this.popup.targetSelector.data('userList'); + this.renderMethodSelector(previousList, userList); + this.openInnerPopup(title); + } + /** * Open Naming popup page * @param {Object} targetSelector @@ -893,7 +1030,31 @@ define([ $(this.popup.targetSelector).data('list', dataList); $(this.popup.targetSelector).trigger({ type: 'change', dataList: dataList }); this.closeInnerPopup(); - } else { + } else if (this.popup.type == 'method') { + var methodList = []; + var tags = $(this.wrapSelector('.vp-gb-method-checkbox:checked')); + for (var i = 0; i < tags.length; i++) { + var val = $(tags[i]).val(); + if (val && val != '') { + methodList.push(val); + } + } + + var userList = []; + tags = $(this.wrapSelector('.vp-gb-method-user-func:checked')); + for (var i = 0; i < tags.length; i++) { + var val = $(tags[i]).val(); + if (val && val != '') { + userList.push(val); + } + } + var targetValue = [ ...methodList, ...userList ].join(','); + $(this.popup.targetSelector).val(targetValue); + $(this.popup.targetSelector).data('list', methodList); + $(this.popup.targetSelector).data('userList', userList); + $(this.popup.targetSelector).trigger({ type: 'change', list: methodList, userList: userList }); + this.closeInnerPopup(); + } else if (this.popup.type == 'naming') { var dict = {}; // get dict var tags = $(this.wrapSelector('.vp-gb-naming-text')); diff --git a/visualpython/js/m_apps/Profiling.js b/visualpython/js/m_apps/Profiling.js index 019d1ef2..e1df8df3 100644 --- a/visualpython/js/m_apps/Profiling.js +++ b/visualpython/js/m_apps/Profiling.js @@ -9,6 +9,24 @@ * Change Date : */ +/** DEPRECATED on v2.3.4 + * - libraries.json + { + "id" : "apps_profiling", + "type" : "function", + "level": 1, + "name" : "Profiling", + "tag" : "PROFILING,PANDAS PROFILING,APPS", + "path" : "visualpython - apps - profiling", + "desc" : "Pandas Profiling", + "file" : "m_apps/Profiling", + "apps" : { + "color": 4, + "icon": "apps/apps_profiling.svg" + } + } + */ + //============================================================================ // [CLASS] Profiling //============================================================================ diff --git a/visualpython/js/m_apps/Sweetviz.js b/visualpython/js/m_apps/Sweetviz.js new file mode 100644 index 00000000..c0284f44 --- /dev/null +++ b/visualpython/js/m_apps/Sweetviz.js @@ -0,0 +1,368 @@ +/* + * Project Name : Visual Python + * Description : GUI-based Python code generator + * File Name : Sweetviz.js + * Author : Black Logic + * Note : Apps > Sweetviz + * License : GNU GPLv3 with Visual Python special exception + * Date : 2021. 11. 18 + * Change Date : + */ + +//============================================================================ +// [CLASS] Sweetviz +//============================================================================ +define([ + __VP_TEXT_LOADER__('vp_base/html/m_apps/sweetviz.html'), // INTEGRATION: unified version of text loader + __VP_CSS_LOADER__('vp_base/css/m_apps/sweetviz'), // INTEGRATION: unified version of css loader + 'vp_base/js/com/com_Const', + 'vp_base/js/com/com_String', + 'vp_base/js/com/com_interface', + 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/SuggestInput', + 'vp_base/js/com/component/FileNavigation' +], function(svHtml, svCss, com_Const, com_String, com_interface, PopupComponent, SuggestInput, FileNavigation) { + + const PROFILE_TYPE = { + NONE: -1, + GENERATE: 1 + } + + const LIST_MENU_ITEM = { + SHOW: 'show', + DELETE: 'delete', + SAVE: 'save' + } + + /** + * Sweetviz + */ + class Sweetviz extends PopupComponent { + _init() { + super._init(); + /** Write codes executed before rendering */ + this.config.installButton = true; + this.config.importButton = true; + this.config.codeview = false; + this.config.dataview = false; + this.config.runButton = false; + this.config.size = { width: 500, height: 500 }; + this.config.checkModules = ['sweetviz']; + + this.selectedReport = ''; + } + + _unbindEvent() { + super._unbindEvent(); + $(this.wrapSelector('.vp-sv-df-refresh')).off('click'); + $(this.wrapSelector('#vp_pfPathButton')).off('click'); + $(this.wrapSelector('.vp-sv-menu-item')).off('click'); + } + + _bindEvent() { + super._bindEvent(); + /** Implement binding events */ + let that = this; + + // refresh df + $(this.wrapSelector('.vp-sv-df-refresh')).on('click', function() { + that.loadVariableList(); + }); + + // click path + $(this.wrapSelector('#vp_pfPathButton')).on('click', function() { + let fileNavi = new FileNavigation({ + type: 'save', + extensions: ['html'], + finish: function(filesPath, status, error) { + let {file, path} = filesPath[0]; + + // set text + $(that.wrapSelector('#vp_pfPath')).data('file', file); + $(that.wrapSelector('#vp_pfPath')).val(path); + } + }); + fileNavi.open(); + }); + + // click menu + $(this.wrapSelector('.vp-sv-menu-item')).on('click', function() { + // check required filled + if (that.checkRequiredOption() === false) { + return ; + } + + var type = $(this).data('type'); + var df = $(that.wrapSelector('#vp_pfVariable')).val(); + var saveas = $(that.wrapSelector('#vp_pfReturn')).val(); + if (saveas == '') { + saveas = '_vp_sweetviz'; + } + var title = $(that.wrapSelector('#vp_pfTitle')).val(); + var filePath = $(that.wrapSelector('#vp_pfPath')).val(); + var openBrowser = $(that.wrapSelector('#vp_pfOpenBrowser')).prop('checked'); + var code = new com_String(); + switch(parseInt(type)) { + case PROFILE_TYPE.GENERATE: + // generate with/out title + if (title && title != '') { + code.appendFormatLine("{0} = sweetviz.analyze([{1}, '{2}'])", saveas, df, title); + } else { + code.appendFormatLine("{0} = sweetviz.analyze({1})", saveas, df); + } + // show html + code.appendFormat("{0}.show_html(", saveas); + if (filePath && filePath != '') { + code.appendFormat("filepath='{0}'", filePath); + } + if (openBrowser === false) { + code.append(", open_browser=False"); + } + code.appendLine(')'); + code.append(saveas); + break; + } + that.checkAndRunModules(true).then(function() { + com_interface.insertCell('code', code.toString(), true, 'Data Analysis > Sweetviz'); + that.loadReportList(); + }); + }); + } + + bindReportListEvent() { + let that = this; + // click list item menu + $(this.wrapSelector('.vp-sv-list-menu-item')).off('click'); + $(this.wrapSelector('.vp-sv-list-menu-item')).on('click', function(evt) { + var menu = $(this).data('menu'); + var itemTag = $(this).closest('.vp-sv-list-item'); + var varName = $(itemTag).data('name'); + + var code = new com_String(); + switch(menu) { + case LIST_MENU_ITEM.SHOW: + code.appendFormat("{0}.show_notebook()", varName); + break; + case LIST_MENU_ITEM.DELETE: + code.appendFormat("del {0}", varName); + break; + case LIST_MENU_ITEM.SAVE: + let fileNavi = new FileNavigation({ + type: 'save', + extensions: ['html'], + fileName: 'report', + finish: function(filesPath, status, error) { + filesPath.forEach( fileObj => { + var fileName = fileObj.file; + var path = fileObj.path; + if (varName == '') { + varName = '_vp_sweetviz'; + } + var code = new com_String(); + code.appendFormat("{0}.show_html(filepath='{1}')", varName, path); + com_interface.insertCell('code', code.toString(), true, 'Data Analysis > Sweetviz'); + + that.selectedReport = ''; + }); + } + }); + fileNavi.open(); + return; + default: + return; + } + com_interface.insertCell('code', code.toString(), true, 'Data Analysis > Sweetviz'); + that.loadReportList(); + }); + } + + templateForBody() { + return svHtml; + } + + render() { + super.render(); + + this.loadVariableList(); + this.loadReportList(); + this.checkInstalled(); + } + + generateInstallCode() { + return [ + '!pip install sweetviz' + ]; + } + + generateImportCode() { + return [ + 'import sweetviz' + ]; + } + + generateCode() { + return ""; + } + + loadVariableList() { + var that = this; + // load using kernel + var dataTypes = ['DataFrame']; + vpKernel.getDataList(dataTypes).then(function(resultObj) { + try { + let { result, msg } = resultObj; + var varList = JSON.parse(result); + // render variable list + // replace + $(that.wrapSelector('#vp_pfVariable')).replaceWith(function() { + return that.templateForVariableList(varList); + }); + $(that.wrapSelector('#vp_pfVariable')).trigger('change'); + } catch (ex) { + vpLog.display(VP_LOG_TYPE.ERROR, 'Sweetviz:', result); + } + }); + } + + templateForVariableList(varList) { + var beforeValue = $(this.wrapSelector('#vp_pfVariable')).val(); + if (beforeValue == null) { + beforeValue = ''; + } + + let mappedList = varList.map(obj => { return { label: obj.varName, value: obj.varName, dtype: obj.varType } }); + + var variableInput = new SuggestInput(); + variableInput.setComponentID('vp_pfVariable'); + variableInput.addClass('vp-sv-select'); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return mappedList; }); + variableInput.setNormalFilter(true); + variableInput.addAttribute('required', true); + variableInput.setValue(beforeValue); + + return variableInput.toTagString(); + } + + /** + * Toggle check button state + * @param {String} mode install/checking/installed + */ + toggleCheckState(mode='checking') { + let message = 'Checking...'; + let disable = true; + switch (mode) { + case 'install': + message = 'Install'; + disable = false; + break; + case 'installed': + message = 'Installed'; + disable = true; + break; + case 'installing': + message = 'Installing'; + disable = true; + break; + } + $(this.wrapSelector('.vp-sv-install-btn')).text(message); + if (disable) { + // set state as 'Checking' + // set disabled + if (!$(this.wrapSelector('.vp-sv-install-btn')).hasClass('disabled')) { + $(this.wrapSelector('.vp-sv-install-btn')).addClass('disabled'); + } + } else { + // set enabled + $(this.wrapSelector('.vp-sv-install-btn')).removeClass('disabled'); + } + } + + checkInstalled() { + var that = this; + // set state as 'Checking' + this.toggleCheckState(); + this.checking = true; + + // check installed + vpKernel.execute('!pip show sweetviz').then(function(resultObj) { + let { result, msg } = resultObj; + if (!that.checking) { + return; + } + if (msg.content['text'].includes('not found')) { + that.toggleCheckState('install'); + } else { + that.toggleCheckState('installed'); + } + that.checking = false; + }).catch(function(err) { + that.toggleCheckState('install'); + that.checking = false; + }); + } + + loadReportList() { + var that = this; + // load using kernel + vpKernel.getSweetvizList().then(function(resultObj) { + try { + let { result } = resultObj; + var varList = JSON.parse(result); + // render variable list + // replace + $(that.wrapSelector('.vp-sv-list-box')).replaceWith(function() { + return that.renderReportList(varList); + }); + + that.bindReportListEvent(); + } catch (ex) { + vpLog.display(VP_LOG_TYPE.ERROR, 'Sweetviz:', result); + // console.log(ex); + } + }); + } + + renderReportList = function(reportList=[]) { + var page = new com_String(); + page.appendFormatLine('

', 'vp-sv-list-box'); + page.appendFormatLine('

', 'vp-sv-list-header'); + page.appendFormatLine('

{1}

', 'vp-sv-list-header-item', 'Allocated to'); + page.appendFormatLine('

{1}

', 'vp-sv-list-header-item', 'Report Title'); + page.appendFormatLine('

{1}

', 'vp-sv-list-header-item', ''); + page.appendLine('

'); + page.appendFormatLine('

', 'vp-apiblock-scrollbar'); + page.appendFormatLine('

', 'vp-sv-list-body', 'vp-apiblock-scrollbar'); + reportList.forEach((report, idx) => { + var { varName, title } = report; + page.appendFormatLine('

', 'vp-sv-list-item', varName, title); + page.appendFormatLine('

{0}

', varName); + page.appendFormatLine('

{0}

', title); + // button box + page.appendFormatLine('

', 'vp-sv-list-button-box'); + // LAB: img to url + // page.appendFormatLine('

' + // , 'vp-sv-list-menu-item', LIST_MENU_ITEM.SHOW, 'Show report', com_Const.IMAGE_PATH + 'snippets/run.svg'); + // page.appendFormatLine('

' + // , 'vp-sv-list-menu-item', LIST_MENU_ITEM.DELETE, 'Delete report', com_Const.IMAGE_PATH + 'delete.svg'); + // page.appendFormatLine('

' + // , 'vp-sv-list-menu-item', LIST_MENU_ITEM.SAVE, 'Save report', com_Const.IMAGE_PATH + 'snippets/export.svg'); + page.appendFormatLine('

' + , 'vp-sv-list-menu-item', 'vp-icon-run', LIST_MENU_ITEM.SHOW, 'Show report'); + page.appendFormatLine('

' + , 'vp-sv-list-menu-item', 'vp-icon-delete', LIST_MENU_ITEM.DELETE, 'Delete report'); + page.appendFormatLine('

' + , 'vp-sv-list-menu-item', 'vp-icon-export', LIST_MENU_ITEM.SAVE, 'Save report'); + page.appendLine('

'); + page.appendLine('

'); + }); + page.appendLine('

'); // VP_PF_LIST_BODY + page.appendLine('

'); + page.appendLine('

'); // 'vp-sv-list-box' + return page.toString(); + } + + } + + return Sweetviz; +}); \ No newline at end of file diff --git a/visualpython/js/m_ml/DataSets.js b/visualpython/js/m_ml/DataSets.js index 6805ff0d..5f0bec3b 100644 --- a/visualpython/js/m_ml/DataSets.js +++ b/visualpython/js/m_ml/DataSets.js @@ -33,7 +33,7 @@ define([ this.config.checkModules = ['pd']; this.state = { - loadType: 'load_boston', + loadType: 'load_iris', userOption: '', allocateTo: 'ldata', ...this.state @@ -42,7 +42,8 @@ define([ this.mlConfig = ML_LIBRARIES; this.loadTypeList = { 'Load Data': [ - 'load_boston', 'load_iris', 'load_diabetes', 'load_digits', 'load_linnerud', 'load_wine', 'load_breast_cancer' + // 'load_boston', // `load_boston` has been removed from scikit-learn since version 1.2. + 'load_iris', 'load_diabetes', 'load_digits', 'load_linnerud', 'load_wine', 'load_breast_cancer' ], 'Create Data': [ 'make_classification', 'make_blobs', 'make_circles', 'make_moons' diff --git a/visualpython/js/m_ml/SaveLoad.js b/visualpython/js/m_ml/SaveLoad.js new file mode 100644 index 00000000..0940b028 --- /dev/null +++ b/visualpython/js/m_ml/SaveLoad.js @@ -0,0 +1,121 @@ +/* + * Project Name : Visual Python + * Description : GUI-based Python code generator + * File Name : SaveLoad.js + * Author : Black Logic + * Note : Save and load models + * License : GNU GPLv3 with Visual Python special exception + * Date : 2023. 03. 09 + * Change Date : + */ + +//============================================================================ +// [CLASS] DataSets +//============================================================================ +define([ + __VP_CSS_LOADER__('vp_base/css/m_ml/saveLoad'), + __VP_TEXT_LOADER__('vp_base/html/m_ml/saveLoad.html'), + 'vp_base/js/com/com_util', + 'vp_base/js/com/com_Const', + 'vp_base/js/com/com_String', + 'vp_base/js/com/com_generatorV2', + 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/FileNavigation', + 'vp_base/data/m_ml/mlLibrary', +], function(slCss, slHTML, com_util, com_Const, com_String, com_generator, PopupComponent, FileNavigation, ML_LIBRARIES) { + + /** + * SaveLoad + */ + class SaveLoad extends PopupComponent { + _init() { + super._init(); + this.config.sizeLevel = 2; + this.config.dataview = false; + this.config.checkModules = ['joblib']; + + this.state = { + modelio: 'model_save', // model_save / model_load + target: '', + allocateTo: '', + userOption: '', + savePath: '', + loadPath: '', + ...this.state + } + + this.mlConfig = ML_LIBRARIES; + } + + _bindEvent() { + super._bindEvent(); + let that = this; + + // select model + $(this.wrapSelector('#modelio')).on('change', function() { + let modelio = $(this).val(); + that.state.modelio = modelio; + $(that.wrapSelector('.vp-modelio-option-box')).html(that.templateForOption(modelio)); + + $(that.wrapSelector('#userOption')).val(''); + }); + + // user option + $(this.wrapSelector('#userOption')).on('change', function() { + that.state.userOption = $(this).val(); + }) + } + + templateForBody() { + let page = $(slHTML); + + // render option page + $(page).find('.vp-modelio-option-box').html(this.templateForOption(this.state.modelio)); + + $(page).find('#modelio').val(this.state.modelio); + $(page).find('#userOption').val(this.state.userOption); + + return page; + } + + templateForOption(modelio) { + let config = this.mlConfig[modelio]; + let state = this.state; + + let optBox = new com_String(); + // render tag + config.options.forEach(opt => { + optBox.appendFormatLine('{2}' + , opt.name, opt.name, opt.name); + let content = com_generator.renderContent(this, opt.component[0], opt, state); + optBox.appendLine(content[0].outerHTML); + }); + + // render file navigation + + + // show user option + if (config.code.includes('${etc}')) { + // render user option + optBox.appendFormatLine('{1}', 'userOption', 'User option'); + optBox.appendFormatLine('', + 'userOption', 'key=value, ...', this.state.userOption); + } + return optBox.toString(); + } + + generateCode() { + let { modelio, userOption } = this.state; + let code = new com_String(); + if (userOption && userOption != '') { + userOption = ', ' + userOption; + } + + let modelCode = com_generator.vp_codeGenerator(this, this.mlConfig[modelio], this.state, userOption); + code.append(modelCode); + return code.toString(); + } + } + + return SaveLoad; +}); \ No newline at end of file diff --git a/visualpython/js/m_ml/evaluation.js b/visualpython/js/m_ml/evaluation.js index f911159d..6231b4a3 100644 --- a/visualpython/js/m_ml/evaluation.js +++ b/visualpython/js/m_ml/evaluation.js @@ -215,7 +215,7 @@ define([ generateCode() { let codeCells = [ - ...this.generateImportCode() // run import codes + // ...this.generateImportCode() // run import codes ]; let code = new com_String(); let { diff --git a/visualpython/js/m_visualize/Seaborn.js b/visualpython/js/m_visualize/Seaborn.js index 555d29c7..bd217071 100644 --- a/visualpython/js/m_visualize/Seaborn.js +++ b/visualpython/js/m_visualize/Seaborn.js @@ -926,7 +926,8 @@ define([ etcOptionCode.push(com_util.formatString("marker='{0}'", markerStyle)); } if (showValues === true && chartType === 'barplot') { - etcOptionCode.push('ci=None'); + // etcOptionCode.push('ci=None'); // changed to errorbar + etcOptionCode.push('errorbar=None'); } if (setXY === false && sortType !== '') { let sortCode = ''; diff --git a/visualpython/python/pandasCommand.py b/visualpython/python/pandasCommand.py index 97158bca..888f1810 100644 --- a/visualpython/python/pandasCommand.py +++ b/visualpython/python/pandasCommand.py @@ -2,9 +2,9 @@ Pandas Objects Command """ import pandas as _vp_pd -import IPython +import IPython as _vp_ipython # LAB: prevent import error -_ipython_version = IPython.version_info +_ipython_version = _vp_ipython.version_info if _ipython_version[0] < 7 or ( _ipython_version[0] == 7 and _ipython_version[1] <= 13 ): from IPython.core.display import display else: diff --git a/visualpython/python/variableCommand.py b/visualpython/python/variableCommand.py index 26d5f906..f76e10c3 100644 --- a/visualpython/python/variableCommand.py +++ b/visualpython/python/variableCommand.py @@ -65,6 +65,17 @@ def _vp_get_variable_info(v): return {'ndim': v.ndim} return {} +def _vp_get_sweetviz_list(): + """ + Get sweetviz variable list + """ + varList = _vp_get_variables_list(['DataframeReport']) + result = [] + for v in varList: + title = eval(v['varName']).source_name + result.append({ 'varName': v['varName'], 'title': title }) + return result + def _vp_get_profiling_list(): """ Get profiling variable list @@ -74,7 +85,6 @@ def _vp_get_profiling_list(): for v in varList: title = eval(v['varName']).get_description()['analysis']['title'] result.append({ 'varName': v['varName'], 'title': title }) - return result import numpy as _vp_np