Merge pull request #1237 from Tadaboody/master

Add numpy shape column

Author: jfbercher

src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js

@@ -129,22 +129,31 @@ function html_table(jsonVars) {
     var kernel_config = cfg.kernels_config[kernelLanguage];
     var varList = JSON.parse(String(jsonVars))
 
+    var shape_str = '';
+    var has_shape = false;
+    if (varList.some(listVar => "varShape" in listVar && listVar.varShape !== '')) { //if any of them have a shape
+        shape_str = '<th >Shape</th>';
+        has_shape = true;
+    }
     var beg_table = '<div class=\"inspector\"><table class=\"table fixed table-condensed table-nonfluid \"><col /> \
- <col  /><col /><thead><tr><th >X</th><th >Name</th><th >Type</th><th >Size</th><th >Value</th></tr></thead><tr><td> \
- </td></tr>'
-    var nb_vars = varList.length;
-    for (var i = 0; i < nb_vars; i++) {
-        beg_table = beg_table +
+ <col  /><col /><thead><tr><th >X</th><th >Name</th><th >Type</th><th >Size</th>' + shape_str + '<th >Value</th></tr></thead><tr><td> \
+ </td></tr>';
+    varList.forEach(listVar => {
+        var shape_col_str = '</td><td>';
+        if (has_shape) {
+            shape_col_str = '</td><td>' + listVar.varShape + '</td><td>';
+        }
+        beg_table +=
             '<tr><td><a href=\"#\" onClick=\"Jupyter.notebook.kernel.execute(\'' +
-            kernel_config.delete_cmd_prefix + varList[i].varName + kernel_config.delete_cmd_postfix + '\'' + '); ' +
+            kernel_config.delete_cmd_prefix + listVar.varName + kernel_config.delete_cmd_postfix + '\'' + '); ' +
             'Jupyter.notebook.events.trigger(\'varRefresh\'); \">x</a></td>' +
-            '<td>' + _trunc(varList[i].varName, cfg.cols.lenName) + '</td><td>' + _trunc(varList[i].varType, cfg.cols.lenType) +
-            '</td><td>' + varList[i].varSize + '</td><td>' + _trunc(varList[i].varContent, cfg.cols.lenVar) +
-            '</td></tr>'
+            '<td>' + _trunc(listVar.varName, cfg.cols.lenName) + '</td><td>' + _trunc(listVar.varType, cfg.cols.lenType) +
+            '</td><td>' + listVar.varSize + shape_col_str + _trunc(listVar.varContent, cfg.cols.lenVar) +
+            '</td></tr>';
+    });
+    var full_table = beg_table + '</table></div>';
+    return full_table;
     }
-    var full_table = beg_table + '</table></div>'
-    return full_table
-}
 
 
 

src/jupyter_contrib_nbextensions/nbextensions/varInspector/var_list.py

@@ -3,11 +3,14 @@
 
 from IPython import get_ipython
 from IPython.core.magics.namespace import NamespaceMagics
-
 _nms = NamespaceMagics()
 _Jupyter = get_ipython()
 _nms.shell = _Jupyter.kernel.shell
 
+try:
+    import numpy as np
+except ImportError:
+    pass    
 
 def _getsizeof(x):
     # return the size of variable x. Amended version of sys.getsizeof
@@ -19,12 +22,20 @@ def _getsizeof(x):
     else:
         return getsizeof(x)
 
+def _getshapeof(x):
+    #returns the shape of x if it has one
+    #returns None otherwise - might want to return an empty string for an empty collum
+    try:
+        return x.shape
+    except AttributeError: #x does not have a shape
+        return None
 
 def var_dic_list():
     types_to_exclude = ['module', 'function', 'builtin_function_or_method',
                         'instance', '_Feature', 'type', 'ufunc']
     values = _nms.who_ls()
-    vardic = [{'varName': v, 'varType': type(eval(v)).__name__, 'varSize': str(_getsizeof(eval(v))), 'varContent': str(eval(v))[:200]} # noqa
+    vardic = [{'varName': v, 'varType': type(eval(v)).__name__, 'varSize': str(_getsizeof(eval(v))), 'varShape': str(_getshapeof(eval(v))) if _getshapeof(eval(v)) else '', 'varContent': str(eval(v))[:200]}  # noqa
+    
     for v in values if (v not in ['_html', '_nms', 'NamespaceMagics', '_Jupyter']) & (type(eval(v)).__name__ not in types_to_exclude)] # noqa 
     return json.dumps(vardic)