Add allowModule option to DataSelector app

minjk-bl · minjk-bl · commit dada3947e330 · 2023-04-04T18:26:47.000+09:00
diff --git a/visualpython/js/com/com_Kernel.js b/visualpython/js/com/com_Kernel.js
@@ -654,13 +654,13 @@ define([
             });
         }
 
-        getDataList(dataTypeList=[], excludeList=[]) {
+        getDataList(dataTypeList=[], excludeList=[], allowModule=false) {
             // use function command to get variable list of selected data types
             var cmdSB = '_vp_print(_vp_get_variables_list(None))';
             if (!dataTypeList || dataTypeList.length <= 0) {
                 dataTypeList = [];
             }
-            cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}, {1}))', JSON.stringify(dataTypeList), JSON.stringify(excludeList));
+            cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}, {1}, {2}))', JSON.stringify(dataTypeList), JSON.stringify(excludeList), allowModule?'True':'False');
             
             var that = this;
             return new Promise(function(resolve, reject) {
diff --git a/visualpython/js/com/component/DataSelector.js b/visualpython/js/com/component/DataSelector.js
@@ -55,11 +55,12 @@ define([
                 value: null,    // pre-defined value
                 finish: null,   // callback after selection (value, dtype)
                 select: null,   // callback after selection from suggestInput (value, dtype)
-                allowDataType: null,
+                allowDataType: null, // list of allowed data types
                 // additional options
                 classes: '',
                 placeholder: 'Select variable',
                 required: false,
+                allowModule: false,
                 ...this.prop
             }
 
@@ -312,13 +313,18 @@ define([
         loadVariables() {
             let that = this;
             // Searchable variable types
-            let types = [
+            let types = [];
+            if (this.prop.allowModule) {
+                types = ['module'];
+            }
+            types = [
+                ...types,
                 ...vpConfig.getDataTypes(),
                 // ML Data types
                 ...vpConfig.getMLDataTypes()
             ];
             
-            vpKernel.getDataList(types).then(function(resultObj) {
+            vpKernel.getDataList(types, [], this.prop.allowModule).then(function(resultObj) {
                 var varList = JSON.parse(resultObj.result);
                 // re-mapping variable list
                 varList = varList.map(obj => { 
diff --git a/visualpython/python/variableCommand.py b/visualpython/python/variableCommand.py
@@ -47,19 +47,22 @@ def _vp_get_type(var=None):
     return str(type(var).__name__)
 
 
-def _vp_get_variables_list(types, exclude_types=[]):
+def _vp_get_variables_list(types, exclude_types=[], allow_module=False):
     """
     Get Variable list in types
     """
     # notUsingVariables = ['_html', '_nms', 'NamespaceMagics', '_Jupyter', 'In', 'Out', 'exit', 'quit', 'get_ipython']
     # notUsingTypes = ['module', 'function', 'builtin_function_or_method', 'instance', '_Feature', 'type', 'ufunc']
+    not_using_types = _VP_NOT_USING_TYPES
 
     varList = []
     searchList = globals()
     if (type(types) == list) and (len(types) > 0):
         varList = [{'varName': v, 'varType': type(eval(v)).__name__, 'varInfo': _vp_get_variable_info(eval(v))} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in exclude_types) & (type(eval(v)).__name__ in types)]
     else:
-        varList = [{'varName': v, 'varType': type(eval(v)).__name__, 'varInfo': _vp_get_variable_info(eval(v))} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in exclude_types) & (type(eval(v)).__name__ not in _VP_NOT_USING_TYPES)]
+        if allow_module == True:
+            not_using_types.remove('module')
+        varList = [{'varName': v, 'varType': type(eval(v)).__name__, 'varInfo': _vp_get_variable_info(eval(v))} for v in searchList if (not v.startswith('_')) & (v not in _VP_NOT_USING_VAR) & (type(eval(v)).__name__ not in exclude_types) & (type(eval(v)).__name__ not in not_using_types)]
 
     return varList
 

Original file line number	Diff line number	Diff line change
`@@ -654,13 +654,13 @@ define([`
`654`	`654`	`});`
`655`	`655`	`}`
`656`	`656`
`657`		`- getDataList(dataTypeList=[], excludeList=[]) {`
	`657`	`+ getDataList(dataTypeList=[], excludeList=[], allowModule=false) {`
`658`	`658`	`// use function command to get variable list of selected data types`
`659`	`659`	`var cmdSB = '_vp_print(_vp_get_variables_list(None))';`
`660`	`660`	`if (!dataTypeList \|\| dataTypeList.length <= 0) {`
`661`	`661`	`dataTypeList = [];`
`662`	`662`	`}`
`663`		`- cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}, {1}))', JSON.stringify(dataTypeList), JSON.stringify(excludeList));`
	`663`	`+ cmdSB = com_util.formatString('_vp_print(_vp_get_variables_list({0}, {1}, {2}))', JSON.stringify(dataTypeList), JSON.stringify(excludeList), allowModule?'True':'False');`
`664`	`664`
`665`	`665`	`var that = this;`
`666`	`666`	`return new Promise(function(resolve, reject) {`