visidata 3.0.2__py3-none-any.whl → 3.1.1__py3-none-any.whl

visidata/features/cmdpalette.py

@@ -58,12 +58,18 @@ def inputPalette(sheet, prompt, items,
                  formatter=lambda m, item, trigger_key: f'{trigger_key} {item}',
                  multiple=False,
                  **kwargs):
+    if sheet.options.disp_expert >= 5:
+        return vd.input(prompt,
+                completer=CompleteKey(sorted(item[value_key] for item in items)),
+                **kwargs)
+
     bindings = dict()
 
     tabitem = -1
 
     def tab(n, nitems):
         nonlocal tabitem
+        if not nitems: return None
         tabitem = (tabitem + n) % nitems
 
     def _draw_palette(value):
@@ -123,12 +129,14 @@ def inputPalette(sheet, prompt, items,
 
             if tabitem < 0 and palrows:
                 _ , topitem = palrows[0]
+                if not topitem: return
                 if multiple:
                     bindings[' '] = partial(add_to_input, value=topitem[value_key])
                     bindings['^J'] = partial(accept_input_if_subset, value=topitem[value_key])
                 else:
                     bindings['^J'] = partial(accept_input, value=topitem[value_key])
             elif item and i == tabitem:
+                if not item: return
                 if multiple:
                     bindings['^J'] = partial(accept_input_if_subset, value=item[value_key])
                     bindings[' '] = partial(add_to_input, value=item[value_key])
@@ -164,12 +172,12 @@ def inputLongname(sheet):
     prompt = 'command name: '
     # get set of commands possible in the sheet
     this_sheets_help = HelpSheet('', source=sheet)
-    this_sheets_help.ensureLoaded()
+    vd.sync(this_sheets_help.ensureLoaded())
 
     def _fmt_cmdpal_summary(match, row, trigger_key):
         keystrokes = this_sheets_help.revbinds.get(row.longname, [None])[0] or ' '
         formatted_longname = match.formatted.get('longname', row.longname) if match else row.longname
-        formatted_name = f'[:longname][:onclick {row.longname}]{formatted_longname}[/][/]'
+        formatted_name = f'[:bold][:onclick {row.longname}]{formatted_longname}[/][/]'
         if vd.options.debug and match:
             keystrokes = f'[{match.score}]'
         r = f' [:keystrokes]{keystrokes.rjust(len(prompt)-5)}[/]  '
@@ -190,6 +198,12 @@ def inputLongname(sheet):
                               help=vd.help_longname,
                               type='longname')
 
+@BaseSheet.api
+def inputLongnameSimple(sheet):
+    'Input a command longname without using the command palette.'
+    longnames = set(k for (k, obj), v in vd.commands.iter(sheet))
+    return vd.input("command name: ", completer=CompleteKey(sorted(longnames)), type='longname')
+
 
 @BaseSheet.api
 def exec_longname(sheet, longname):
@@ -199,3 +213,4 @@ def exec_longname(sheet, longname):
 
 
 vd.addCommand('Space', 'exec-longname', 'exec_longname(inputLongname())', 'execute command by its longname')
+vd.addCommand('zSpace', 'exec-longname-simple', 'exec_longname(inputLongnameSimple())', 'execute command by its longname')

visidata/features/colorsheet.py

@@ -44,4 +44,4 @@ BaseSheet.addCommand(None, 'open-colors', 'vd.push(vd.colorsSheet)', 'open Color
 
 @VisiData.lazy_property
 def colorsSheet(vd):
-    return ColorSheet()
+    return ColorSheet('colors')

visidata/features/dedupe.py

@@ -24,7 +24,7 @@ __author__ = "Jeremy Singer-Vine <jsvine@gmail.com>"
 
 from copy import copy
 
-from visidata import Sheet, BaseSheet, asyncthread, Progress, vd
+from visidata import Sheet, TableSheet, asyncthread, Progress, vd
 
 
 def gen_identify_duplicates(sheet):
@@ -103,8 +103,8 @@ def dedupe_rows(sheet):
 
 
 # Add longname-commands to VisiData to execute these methods
-BaseSheet.addCommand(None, "select-duplicate-rows", "sheet.select_duplicate_rows()", "select each row that is a duplicate of a prior row")
-BaseSheet.addCommand(None, "dedupe-rows", "vd.push(sheet.dedupe_rows())", "open new sheet in which only non-duplicate rows in the active sheet are included")
+TableSheet.addCommand(None, "select-duplicate-rows", "sheet.select_duplicate_rows()", "select each row that is a duplicate of a prior row")
+TableSheet.addCommand(None, "dedupe-rows", "vd.push(sheet.dedupe_rows())", "open new sheet in which only non-duplicate rows in the active sheet are included")
 
 vd.addMenuItems('''
     Row > Select > duplicate rows > select-duplicate-rows

visidata/features/go_col.py

@@ -0,0 +1,71 @@
+import itertools
+import re
+from visidata import vd, Sheet, AttrDict, dispwidth
+
+
+@Sheet.api
+def nextColRegex(sheet, colregex):
+    'Go to first visible column after the cursor matching `colregex`.'
+    pivot = sheet.cursorVisibleColIndex
+    for i in itertools.chain(range(pivot+1, len(sheet.visibleCols)), range(0, pivot+1)):
+        c = sheet.visibleCols[i]
+        if re.search(colregex, c.name, sheet.regex_flags()):
+            return i
+
+    vd.fail('no column name matches /%s/' % colregex)
+
+@Sheet.api
+def nextColName(sheet, show_cells=True):
+    if len(sheet.visibleCols) == 0: vd.fail('no columns to choose from')
+
+    prompt = 'choose column name: '
+    colnames = []
+    for c in sheet.visibleCols:
+        dv = None
+        if show_cells and len(sheet.rows) > 0:
+            dv = c.getDisplayValue(sheet.cursorRow)
+        #the underscore that starts _cursor_cell excludes it from being fuzzy matched
+        item = AttrDict(name_lower=c.name.lower(),
+                        name=c.name,
+                        _cursor_cell=dv)
+        colnames.append(item)
+
+    def _fmt_colname(match, row, trigger_key):
+        name = match.formatted.get('name', row.name) if match else row.name
+        r = ' '*(len(prompt)-3)
+        r += f'[:keystrokes]{trigger_key}[/]  '
+        if show_cells and len(sheet.rows) > 0:
+            # pad the right side with spaces
+            # use row.name, because name from match contains
+            # extra formatting characters that change its length
+            n_spaces = max(20 - dispwidth(row.name), 0)
+            r += name + n_spaces*' '
+            r += '   '
+            #todo:  does not show disp_note_none for None
+            r += row._cursor_cell
+        else:
+            r += name
+        return r
+    name = vd.activeSheet.inputPalette(prompt,
+            colnames,
+            value_key='name',
+            type='column_name',
+            formatter=_fmt_colname)
+
+    pivot = sheet.cursorVisibleColIndex
+    for i in itertools.chain(range(pivot+1, len(sheet.visibleCols)), range(0, pivot+1)):
+        if name == sheet.visibleCols[i].name:
+            return i
+
+    vd.warning(f'found no column with name: {name}')
+
+
+Sheet.addCommand('c', 'go-col-regex', 'sheet.cursorVisibleColIndex=nextColRegex(inputRegex("column name regex: ", type="regex-col", defaultLast=True))', 'go to next column with name matching regex')
+Sheet.addCommand('zc', 'go-col-number', 'sheet.cursorVisibleColIndex = int(input("move to column number: "))', 'go to given column number (0-based)')
+Sheet.addCommand('', 'go-col-name', 'sheet.cursorVisibleColIndex=nextColName()', 'go to next column with name matching string, case-insensitive')
+
+vd.addMenuItems('''
+    Column > Goto > by regex > go-col-regex
+    Column > Goto > by number > go-col-number
+    Column > Goto > by name > go-col-name
+''')

visidata/features/graph_seaborn.py

@@ -54,7 +54,7 @@ def ext_plot_seaborn(rows, xcols, ycols):
                 nplotted += 1
             except Exception:
                 nerrors += 1
-                if options.debug:
+                if vd.options.debug:
                     raise
 
     sns.scatterplot(

visidata/features/join.py

@@ -18,7 +18,8 @@ def ensureLoaded(vd, sheets):
 
 @asyncthread
 def _appendRowsAfterLoading(joinsheet, origsheets):
-    if vd.ensureLoaded(origsheets):
+    with Progress(gerund='loading'):
+        vd.ensureLoaded(origsheets)
         vd.sync()
 
     colnames = {c.name:c for c in joinsheet.visibleCols}
@@ -95,7 +96,7 @@ vd.jointypes = [AttrDict(key=k, desc=v) for k, v in {
     'append': 'all rows from all sheets; columns from all sheets',
     'concat': 'all rows from all sheets; columns and type from first sheet',
     'extend': 'only rows from first sheet; type from first sheet; columns from all sheets',
-    'merge': 'merge differences from other sheets into first sheet (including new rows)',
+    'merge': 'all rows from all sheets; where keys match, use latest truthy value',
 }.items()]
 
 def joinkey(sheetKeyCols, row):
@@ -154,7 +155,9 @@ class JoinKeyColumn(Column):
 
 
 class MergeColumn(Column):
+    # .cols is { sheet: col, ... } in sheet-join order
     def calcValue(self, row):
+        'Return value from last joined sheet with truth-y value in this column for the given row.'
         for vs, c in reversed(list(self.cols.items())):
             if c:
                 v = c.getTypedValue(row[vs])
@@ -167,7 +170,11 @@ class MergeColumn(Column):
 
     def isDiff(self, row, value):
         col = list(self.cols.values())[0]
-        return col and value != col.getValue(row[col.sheet])
+        if not col:
+            return False
+        if row[col.sheet] is None:
+            return True
+        return value != col.getValue(row[col.sheet])
 
 
 #### slicing and dicing
@@ -184,8 +191,9 @@ class JoinSheet(Sheet):
     def loader(self):
         sheets = self.sources
 
-        vd.ensureLoaded(sheets)
-        vd.sync()
+        with Progress(gerund='loading'):
+            vd.ensureLoaded(sheets)
+            vd.sync()
 
         # first item in joined row is the key tuple from the first sheet.
         # first columns are the key columns from the first sheet, using its row (0)
@@ -196,6 +204,7 @@ class JoinSheet(Sheet):
         self.setKeys(self.columns)
 
         allcols = collections.defaultdict(dict) # colname: { sheet: origcol, ... }
+        # MergeColumn relies on allcols having sheets in this specific order
         for sheetnum, vs in enumerate(sheets):
             for c in vs.visibleCols:
                 if c not in self.sheetKeyCols[vs]:
@@ -266,8 +275,9 @@ def ExtendedSheet_reload(self, sheets):
     # first item in joined row is the key tuple from the first sheet.
     # first columns are the key columns from the first sheet, using its row (0)
 
-    vd.ensureLoaded(sheets)
-    vd.sync()
+    with Progress(gerund='loading'):
+        vd.ensureLoaded(sheets)
+        vd.sync()
 
     self.columns = []
     for i, c in enumerate(sheets[0].keyCols):
@@ -331,11 +341,11 @@ class ConcatSheet(Sheet):
         # only one column with each name allowed per sheet
         keyedcols = collections.defaultdict(dict)  # name -> { sheet -> col }
 
+        with Progress(gerund='loading'):
+            vd.ensureLoaded(self.source)
+            vd.sync()
         with Progress(gerund='joining', sheet=self, total=sum(vs.nRows for vs in self.source)) as prog:
             for sheet in self.source:
-                if sheet.ensureLoaded():
-                    vd.sync()
-
                 for r in sheet.rows:
                     yield (sheet, r)
                     prog.addProgress(1)

visidata/features/layout.py

@@ -1,4 +1,4 @@
-from visidata import VisiData, vd, Column, Sheet, Fanout
+from visidata import VisiData, vd, Column, Sheet, Fanout, asyncthread
 
 @Column.api
 def setWidth(self, w):
@@ -35,6 +35,17 @@ def hide_col(vd, col):
     if not col: vd.fail("no columns to hide")
     col.hide()
 
+@Sheet.api
+@asyncthread
+def hide_uniform_cols(sheet):
+    if len(sheet.rows) < 2:
+        return
+    for col in sheet.visibleCols:
+        vals = (col.getTypedValue(r) for r in sheet.rows)
+        first = next(vals)
+        if all(v == first for v in vals):
+            col.hide()
+
 Sheet.addCommand('_', 'resize-col-max', 'if cursorCol: cursorCol.toggleWidth(cursorCol.getMaxWidth(visibleRows))', 'toggle width of current column between full and default width')
 Sheet.addCommand('z_', 'resize-col-input', 'width = int(input("set width= ", value=cursorCol.width)); cursorCol.setWidth(width)', 'adjust width of current column to N')
 Sheet.addCommand('g_', 'resize-cols-max', 'for c in visibleCols: c.setWidth(c.getMaxWidth(visibleRows))', 'toggle widths of all visible columns between full and default width')
@@ -42,6 +53,7 @@ Sheet.addCommand('gz_', 'resize-cols-input', 'width = int(input("set width= ", v
 
 Sheet.addCommand('-', 'hide-col', 'hide_col(cursorCol)', 'hide the current column')
 Sheet.addCommand('z-', 'resize-col-half', 'cursorCol.setWidth(cursorCol.width//2)', 'reduce width of current column by half')
+Sheet.addCommand(None, 'hide-uniform-cols', 'sheet.hide_uniform_cols()', 'hide any column that has multiple rows but only one distinct value')
 
 Sheet.addCommand('gv', 'unhide-cols', 'unhide_cols(columns, visibleRows)', 'unhide all hidden columns on current sheet')
 Sheet.addCommand('v', 'toggle-multiline', 'for c in visibleCols: c.toggleMultiline()', 'toggle multiline display')
@@ -49,8 +61,9 @@ Sheet.addCommand('zv', 'resize-height-input', 'Fanout(visibleCols).height=int(in
 Sheet.addCommand('gzv', 'resize-height-max', 'h=calc_height(cursorRow, {}, maxheight=windowHeight-1); vd.status(f"set height for all columns to {h}"); Fanout(visibleCols).height=h', 'resize row height to max height needed to see this row')
 
 vd.addMenuItems('''
-    Column > Hide > hide-col
-    Column > Unhide all > unhide-cols
+    Column > Hide > Hide > hide-col
+    Column > Hide > Hide uniform > hide-uniform-cols
+    Column > Hide > Unhide all > unhide-cols
     Column > Resize > half width > resize-col-half
     Column > Resize > current column width to max > resize-col-max
     Column > Resize > current column width to N > resize-col-input

visidata/features/ping.py

@@ -7,23 +7,23 @@ from statistics import mean
 
 from visidata import vd, VisiData, BaseSheet, Sheet, Column, AttrColumn, Progress
 
-vd.theme_option('color_shellcmd', '21 on 114 green', '')
-vd.theme_option('color_colname', 'underline', '')
-vd.theme_option('color_longname', 'bold 52 on 114 green', '')
-
-
 @VisiData.api
 def new_ping(vd, p):
     'Open a sheet with the round-trip time for each hop along the path to the given host.'
-    pingsheet = PingSheet(p.given, source=p.given)
-    return PingStatsSheet("traceroute_"+pingsheet.name, source=pingsheet)
+    return makePingStats(p.given)
 
+# open_ping() is called when a local file exists matching the path p, otherwise new_ping() is called
+vd.open_ping = vd.new_ping
+
+def makePingStats(ip):
+    pingsheet = PingSheet(ip, source=ip)
+    return PingStatsSheet("traceroute_"+pingsheet.name, source=pingsheet)
 
 class PingStatsSheet(Sheet):
     help='''# ping/traceroute
-This sheet runs {shellcmd}traceroute{} to generate intermediate hops, then runs {shellcmd}ping{} against each hop N times to get the {colname}avg_ms{} and {colname}max_ms{} ping time.
+This sheet runs `traceroute` to generate intermediate hops, then runs `ping` against each hop N times to get the `avg_ms` and `max_ms` ping time.
 
-{longname}open-source{} to open the raw ping data.
+- {help.commands.open_source} (for raw ping data)
 '''
     rowtype='hosts' # rowdef: PingColumn
     columns = [
@@ -36,7 +36,7 @@ This sheet runs {shellcmd}traceroute{} to generate intermediate hops, then runs
     ]
     def loader(self):
         sheet = self.source
-        sheet.ensureLoaded()
+        vd.sync(sheet.ensureLoaded())
 
         self.rows = sheet.columns
 
@@ -76,7 +76,7 @@ class PingSheet(Sheet):
     def ping_error(self, ip, data):
         if ip in self.sources:
             self.sources.remove(ip)
-            vd.warning("%s removed: %s" % (ip, data))
+            vd.warning("%s removed: %s" % (ip, data.rstrip()))
 
     def update_traces(self, row, ip):
         rtes = self.routes.get(ip)
@@ -150,7 +150,11 @@ vd.option('ping_count', 3, 'send this many pings to each host', sheettype=PingSh
 vd.option('ping_interval', 0.1, 'wait between ping rounds, in seconds', sheettype=PingSheet)
 
 PingSheet.options.null_value = False
-BaseSheet.addCommand('', 'open-ping', 'vd.push(openSource(input("ping: ", type="hostip"), filetype="ping"))', 'open sheet to ping input IP Address')
+BaseSheet.addCommand('', 'open-ping', 'vd.push(makePingStats(vd.input("ping: ", type="hostip")))', 'open sheet to ping input IP Address')
+
+vd.addGlobals(
+    makePingStats=makePingStats,
+)
 
 vd.addMenuItems('''
     System > Ping IP/hostname > open-ping

visidata/features/regex.py

@@ -126,12 +126,12 @@ def inputRegexSubst(vd, prompt):
                             after=dict(type='regex-replace', prompt='replace: ', help=prompt))
 
 
-Sheet.addCommand(':', 'addcol-split', 'addColumnAtCursor(RegexColumn(makeRegexSplitter, cursorCol, inputRegex("split regex: ", type="regex-split")))', 'Add column split by regex')
-Sheet.addCommand(';', 'addcol-capture', 'addColumnAtCursor(RegexColumn(makeRegexMatcher, cursorCol, inputRegex("capture regex: ", type="regex-capture")))', 'Add column captured by regex')
+Sheet.addCommand(':', 'addcol-split', 'addColumnAtCursor(RegexColumn(makeRegexSplitter, cursorCol, inputRegex("split regex: ", type="regex-split")))', 'add column split by regex')
+Sheet.addCommand(';', 'addcol-capture', 'addColumnAtCursor(RegexColumn(makeRegexMatcher, cursorCol, inputRegex("capture regex: ", type="regex-capture")))', 'add column captured by regex')
 
-Sheet.addCommand('*', 'addcol-regex-subst', 'addColumnAtCursor(Column(cursorCol.name + "_re", getter=regexTransform(cursorCol, **inputRegexSubst("regex transform column"))))', 'add column derived from current column, replacing regex with subst (may include \1 backrefs)')
-Sheet.addCommand('g*', 'setcol-regex-subst', 'setValuesFromRegex([cursorCol], someSelectedRows, **inputRegexSubst("regex transform column"))', 'regex/subst - modify selected rows in current column, replacing regex with subst, (may include backreferences \\1 etc)')
-Sheet.addCommand('gz*', 'setcol-regex-subst-all', 'setValuesFromRegex(visibleCols, someSelectedRows, **inputRegexSubst(f"regex transform {nVisibleCols} columns"))', 'modify selected rows in all visible columns, replacing regex with subst (may include \\1 backrefs)')
+Sheet.addCommand('*', 'addcol-regex-subst', 'addColumnAtCursor(Column(cursorCol.name + "_re", getter=regexTransform(cursorCol, **inputRegexSubst("regex transform column"))))', 'add column derived from current column, replacing `search` regex with `replace` (may include \\1 backrefs)')
+Sheet.addCommand('g*', 'setcol-regex-subst', 'setValuesFromRegex([cursorCol], someSelectedRows, **inputRegexSubst("regex transform column"))', 'modify selected rows in current column, replacing `search` regex with `replace`, (may include backreferences \\1 etc)')
+Sheet.addCommand('gz*', 'setcol-regex-subst-all', 'setValuesFromRegex(visibleCols, someSelectedRows, **inputRegexSubst(f"regex transform {nVisibleCols} columns"))', 'modify selected rows in all visible columns, replacing `search` regex with `replace` (may include \\1 backrefs)')
 
 
 vd.addMenuItems('''

visidata/features/status_source.py

@@ -5,7 +5,9 @@ from visidata import VisiData
 
 @VisiData.api
 def getStatusSource(vd):
-    stack = inspect.stack()
+    if not vd.options.debug:
+        return ''
+    stack = inspect.stack(context=0)  #2370
     for i, sf in enumerate(stack):
         if sf.function in 'status aside'.split():
             if stack[i+1].function in 'error fail warning debug'.split():

visidata/features/sysedit.py

@@ -30,7 +30,7 @@ def syseditCells_async(sheet, cols, rows, filetype=None):
         vd.sync(tempvs.ensureLoaded())
 
         while isinstance(tempvs, IndexSheet):
-            tempvs.ensureLoaded()
+            vd.sync(tempvs.ensureLoaded())
             tempvs = tempvs.rows[0]
 
         for col in sheet.visibleCols:

visidata/features/transpose.py

@@ -16,7 +16,8 @@ class TransposeSheet(Sheet):
         # rows become columns
         for row in Progress(self.source.rows, 'transposing'):
             self.addColumn(Column('_'.join(map(str, self.source.rowkey(row))),
-                                  getter=lambda c,origcol,row=row: origcol.getValue(row)))
+                                  getter=lambda c,origcol,row=row: origcol.getValue(row),
+                                  setter=lambda c,origcol,v,row=row: origcol.setValue(row, v)))
 
         # columns become rows
         self.rows = list(self.source.nonKeyVisibleCols)

visidata/features/type_ipaddr.py

@@ -7,8 +7,8 @@ from visidata import vd
 from visidata.sheets import Column, TableSheet
 
 
-vd.addType(ip_address, icon=":", formatter=lambda fmt, ip: str(ip))
-vd.addType(ip_network, icon="/", formatter=lambda fmt, ip: str(ip))
+vd.addType(ip_address, icon=":", formatter=lambda fmt, ip: str(ip), name='ip_address')
+vd.addType(ip_network, icon="/", formatter=lambda fmt, ip: str(ip), name='ip_network')
 
 
 def isSupernet(cell, network, isNull):
@@ -69,5 +69,3 @@ TableSheet.addCommand(
     'cursorCol.selectSupernets(input("ip or cidr block: "))',
     "select rows where the CIDR block value includes the input address space",
 )
-
-vd.addGlobals(ip_address=ip_address, ip_network=ip_network)

visidata/features/unfurl.py

@@ -25,6 +25,7 @@ class UnfurledSheet(Sheet):
                 self.cursorVisibleColIndex = len(self.columns)-1
                 self.addColumn(ColumnItem(col.name + "_key", 1))
                 self.addColumn(ColumnItem(col.name + "_value", 2))
+                self.cursorVisibleColIndex = len(self.columns)-1
             else:
                 self.addColumn(SubColumnFunc(col.name, col, 0, keycol=col.keycol))
 

visidata/form.py

@@ -13,8 +13,8 @@ class FormSheet(VisiDataMetaSheet):
     rowtype='labels' # rowdef: { .x .y .text .color .command .input .key}
 
 @VisiData.api
-def replayCommand(vd, longname, sheet=None, col='', row=''):
-    vd.replayOne(vd.cmdlog.newRow(sheet=self.name, col=col, row=row, longname=r.command, input=r.input))
+def replayCommand(vd, longname, input=None, sheet=None, col='', row=''):
+    vd.replayOne(vd.cmdlog.newRow(sheet=sheet, col=col, row=row, longname=longname, input=input))
 
 
 class FormCanvas(BaseSheet):

visidata/freqtbl.py

@@ -1,7 +1,7 @@
 from copy import copy
 import itertools
 
-from visidata import vd, asyncthread, vlen, VisiData, Column, AttrColumn, Sheet, ColumnsSheet, ENTER
+from visidata import vd, asyncthread, vlen, VisiData, Column, AttrColumn, Sheet, ColumnsSheet, ENTER, Fanout
 from visidata.pivot import PivotSheet, PivotGroupRow
 
 
@@ -19,13 +19,19 @@ def valueNames(vd, discrete_vals, numeric_vals):
     return '+'.join(ret)
 
 class HistogramColumn(Column):
+    '.sourceCol is the column to be histogrammed'
     def calcValue(col, row):
         histogram = col.sheet.options.disp_histogram
         histolen = col.width-2
-        return histogram*(histolen*len(row.sourcerows)//col.sheet.largest)
+        return histogram*(histolen*col.sourceCol.getTypedValue(row)//col.largest)
+
+    def updateLargest(col, row):
+        col.largest = max(col.largest, col.sourceCol.getTypedValue(row))
 
 
 def makeFreqTable(sheet, *groupByCols):
+    if not any(groupByCols):
+        vd.fail('FreqTableSheet requires at least 1 column for grouping')
     return FreqTableSheet(sheet.name,
                           '%s_freq' % '-'.join(col.name for col in groupByCols),
                           groupByCols=groupByCols,
@@ -61,32 +67,31 @@ Each row on this sheet corresponds to a *bin* of rows on the source sheet that h
         self.source.unselect(row.sourcerows)
         return super().unselectRow(row)
 
-    def updateLargest(self, grouprow):
-        self.largest = max(self.largest, len(grouprow.sourcerows))
-
     def resetCols(self):
         super().resetCols()
 
         # add default bonus columns
+        countCol = AttrColumn('count', 'sourcerows', type=vlen)
         for c in [
-            AttrColumn('count', 'sourcerows', type=vlen),
+            countCol,
             Column('percent', type=float, getter=lambda col,row: len(row.sourcerows)*100/col.sheet.source.nRows),
         ]:
             self.addColumn(c)
 
         if self.options.disp_histogram:
-            c = HistogramColumn('histogram', type=str, width=self.options.default_width*2)
+            c = HistogramColumn('histogram', type=str, width=self.options.default_width*2, sourceCol=countCol)
             self.addColumn(c)
 
         # if non-numeric grouping, reverse sort by count at end of load
         if not any(vd.isNumeric(c) for c in self.groupByCols):
-            self._ordering = [('count', True)]
+            self._ordering = [(countCol, True)]
 
     def loader(self):
         'Generate frequency table.'
         # two more threads
+        histcols = [col for col in self.visibleCols if isinstance(col, HistogramColumn)]
         vd.sync(self.addAggregateCols(),
-                self.groupRows(self.updateLargest))
+                self.groupRows(lambda row, cols=Fanout(histcols): cols.updateLargest(row)))
 
     def afterLoad(self):
         super().afterLoad()
@@ -138,7 +143,7 @@ class FreqTablePreviewSheet(Sheet):
 FreqTableSheet.addCommand('', 'open-preview', 'vd.push(FreqTablePreviewSheet(sheet.name, "preview", source=sheet, columns=source.columns), pane=2); vd.options.disp_splitwin_pct=50', 'open split preview of source rows at cursor')
 
 Sheet.addCommand('F', 'freq-col', 'vd.push(makeFreqTable(sheet, cursorCol))', 'open Frequency Table grouped on current column, with aggregations of other columns')
-Sheet.addCommand('gF', 'freq-keys', 'vd.push(makeFreqTable(sheet, *keyCols))', 'open Frequency Table grouped by all key columns on source sheet, with aggregations of other columns')
+Sheet.addCommand('gF', 'freq-keys', 'vd.push(makeFreqTable(sheet, *keyCols)) if keyCols else vd.fail("there are no key columns to group by")', 'open Frequency Table grouped by all key columns on source sheet, with aggregations of other columns')
 Sheet.addCommand('zF', 'freq-summary', 'vd.push(makeFreqTableSheetSummary(sheet, Column("Total", sheet=sheet, getter=lambda col, row: "Total")))', 'open one-line summary for all rows and selected rows')
 
 ColumnsSheet.addCommand(ENTER, 'freq-row', 'vd.push(makeFreqTable(source[0], cursorRow))', 'open a Frequency Table sheet grouped on column referenced in current row')
@@ -148,7 +153,7 @@ FreqTableSheet.addCommand('gu', 'unselect-rows', 'unselect(selectedRows)', 'unse
 FreqTableSheet.addCommand('g'+ENTER, 'dive-selected', 'vd.push(openRows(selectedRows))', 'open copy of source sheet with rows that are grouped in selected rows')
 FreqTableSheet.addCommand('', 'select-first', 'for r in rows: source.select([r.sourcerows[0]])', 'select first source row in each bin')
 
-FreqTableSheet.init('largest', lambda: 1)
+HistogramColumn.init('largest', lambda: 1)
 
 vd.addGlobals(
     makeFreqTable=makeFreqTable,

visidata/fuzzymatch.py

@@ -374,6 +374,7 @@ def fuzzymatch(vd, haystack:"list[dict[str, str]]", needles:"list[str]) -> list[
         match = {}
         formatted_hay = {}
         for k, v in h.items():
+            if k[0] == '_': continue
             for p in needles:
                 mr = _fuzzymatch(v, p)
                 if mr.score > 0: