From 8a46f8d6eddad5876f78088f043c108f431eeb39 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Mon, 10 Aug 2020 15:48:57 -0400
Subject: [PATCH] Port monitor to normalized streams

---
 piker/ui/kivy/monitor.py | 51 ++++++++++++++++++++--------------------
 piker/ui/kivy/tabular.py | 10 +++++---
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/piker/ui/kivy/monitor.py b/piker/ui/kivy/monitor.py
index 932b581e..47e52605 100644
--- a/piker/ui/kivy/monitor.py
+++ b/piker/ui/kivy/monitor.py
@@ -69,7 +69,6 @@ async def update_quotes(
             chngcell.color = color
             hdrcell.color = color
 
-
         # briefly highlight bg of certain cells on each trade execution
         unflash = set()
         tick_color = None
@@ -105,39 +104,37 @@ async def update_quotes(
 
     # initial coloring
     to_sort = set()
-    for sym, quote in first_quotes.items():
-        row = table.get_row(sym)
-        record, displayable = formatter(
-            quote, symbol_data=symbol_data)
-        row.update(record, displayable)
-        color_row(row, record, {})
+    for quote in first_quotes:
+        row = table.get_row(quote['symbol'])
+        row.update(quote)
+        color_row(row, quote, {})
         to_sort.add(row.widget)
 
     table.render_rows(to_sort)
 
     log.debug("Finished initializing update loop")
     task_status.started()
+
     # real-time cell update loop
     async for quotes in agen:  # new quotes data only
         to_sort = set()
         for symbol, quote in quotes.items():
             row = table.get_row(symbol)
-            record, displayable = formatter(
-                quote, symbol_data=symbol_data)
 
             # don't red/green the header cell in ``row.update()``
-            record.pop('symbol')
+            quote.pop('symbol')
+            quote.pop('key')
 
             # determine if sorting should happen
             sort_key = table.sort_key
             last = row.get_field(sort_key)
-            new = record.get(sort_key, last)
+            new = quote.get(sort_key, last)
             if new != last:
                 to_sort.add(row.widget)
 
             # update and color
-            cells = row.update(record, displayable)
-            color_row(row, record, cells)
+            cells = row.update(quote)
+            color_row(row, quote, cells)
 
         if to_sort:
             table.render_rows(to_sort)
@@ -179,18 +176,14 @@ async def _async_main(
     This is started with cli cmd `piker monitor`.
     '''
     feed = DataFeed(portal, brokermod)
-    quote_gen, quotes = await feed.open_stream(
+    quote_gen, first_quotes = await feed.open_stream(
         symbols,
         'stock',
         rate=rate,
         test=test,
     )
-
-    first_quotes, _ = feed.format_quotes(quotes)
-
-    if first_quotes[0].get('last') is None:
-        log.error("Broker API is down temporarily")
-        return
+    first_quotes_list = list(first_quotes.copy().values())
+    quotes = list(first_quotes.copy().values())
 
     # build out UI
     Window.set_title(f"monitor: {name}\t(press ? for help)")
@@ -202,7 +195,9 @@ async def _async_main(
     bidasks = brokermod._stock_bidasks
 
     # add header row
-    headers = first_quotes[0].keys()
+    headers = list(first_quotes_list[0].keys())
+    headers.remove('displayable')
+
     header = Row(
         {key: key for key in headers},
         headers=headers,
@@ -217,11 +212,17 @@ async def _async_main(
         cols=1,
         size_hint=(1, None),
     )
-    for ticker_record in first_quotes:
+    for ticker_record in first_quotes_list:
+        symbol = ticker_record['symbol']
         table.append_row(
-            ticker_record['symbol'],
-            Row(ticker_record, headers=('symbol',),
-                bidasks=bidasks, table=table)
+            symbol,
+            Row(
+                ticker_record,
+                headers=('symbol',),
+                bidasks=bidasks,
+                no_cell=('displayable',),
+                table=table
+            )
         )
     table.last_clicked_row = next(iter(table.symbols2rows.values()))
 
diff --git a/piker/ui/kivy/tabular.py b/piker/ui/kivy/tabular.py
index 5a5a6b3a..c11d6514 100644
--- a/piker/ui/kivy/tabular.py
+++ b/piker/ui/kivy/tabular.py
@@ -300,10 +300,10 @@ class Row(HoverBehavior, GridLayout):
             # handle bidask cells
             if key in layouts:
                 self.add_widget(layouts[key])
-            elif key in children_flat:
+            elif key in children_flat or key in no_cell:
                 # these cells have already been added to the `BidAskLayout`
                 continue
-            elif key not in no_cell:
+            else:
                 cell = self._append_cell(val, key, header=header)
                 cell.key = key
                 self._cell_widgets[key] = cell
@@ -329,7 +329,7 @@ class Row(HoverBehavior, GridLayout):
         self.add_widget(cell)
         return cell
 
-    def update(self, record, displayable):
+    def update(self, record):
         """Update this row's cells with new values from a quote
         ``record``.
 
@@ -341,7 +341,11 @@ class Row(HoverBehavior, GridLayout):
         fgreen = colorcode('forestgreen')
         red = colorcode('red2')
 
+        displayable = record['displayable']
+
         for key, val in record.items():
+            if key not in displayable:
+                continue
             last = self.get_field(key)
             color = gray
             try: