fix more inline tv nonsense

deeleeramone · deeleeramone · commit bae19f150204 · 2026-04-13T21:24:54.000-07:00
diff --git a/pywry/examples/pywry_demo_tvchart.ipynb b/pywry/examples/pywry_demo_tvchart.ipynb
@@ -7,8 +7,7 @@
    "source": [
     "# PyWry TradingView Lightweight Charts Demo\n",
     "\n",
-    "This notebook demonstrates displaying OHLCV candlestick charts with volume\n",
-    "using `show_tvchart()` from PyWry's inline module."
+    "This notebook demonstrates the minimum viable code required to render a TradingView chart using PyWry. It covers two concepts - static time series & UDF Adapter. "
    ]
   },
   {
@@ -54,16 +53,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pywry.inline import show_tvchart\n",
+    "from pywry import PyWry\n",
     "\n",
-    "widget = show_tvchart(\n",
-    "    data,\n",
-    "    title=\"OHLCV Demo\",\n",
-    "    height=500,\n",
-    "    callbacks={\n",
-    "        \"tvchart:click\": lambda d, t, l: print(f\"Clicked: time={d.get('time')}\"),\n",
-    "    },\n",
-    ")"
+    "app = PyWry()\n",
+    "widget = app.show_tvchart(data)"
    ]
   },
   {
@@ -86,9 +79,9 @@
    "source": [
     "from pywry.tvchart import build_tvchart_toolbars\n",
     "\n",
-    "widget2 = show_tvchart(\n",
+    "widget2 = app.show_tvchart(\n",
     "    data,\n",
-    "    title=\"Chart with Toolbars\",\n",
+    "    symbol=\"Mock Symbol\",\n",
     "    height=600,\n",
     "    toolbars=build_tvchart_toolbars(),\n",
     ")"
diff --git a/pywry/examples/pywry_demo_tvchart_yfinance.py b/pywry/examples/pywry_demo_tvchart_yfinance.py
@@ -807,6 +807,8 @@ def __init__(self, app: PyWry, cache: BarCache) -> None:
         self._stop = threading.Event()
         # symbol → delay in minutes (from exchangeDataDelayedBy)
         self._delay: dict[str, int] = {}
+        # Active marquee symbol — only this symbol may update the marquee.
+        self._active_marquee_symbol: str = ""
         # Periodic backfill timers (symbol → Timer)
         self._backfill_timers: dict[str, threading.Timer] = {}
 
@@ -830,7 +832,13 @@ def subscribe(self, guid: str, symbol: str, resolution: str, delay_minutes: int
             self._subs[guid] = {"symbol": symbol, "resolution": resolution}
             symbols = list({s["symbol"] for s in self._subs.values()})
 
-        if self._ws is None:
+        # (Re)create WebSocket if not running or if the listener died.
+        ws_alive = self._ws is not None and self._thread is not None and self._thread.is_alive()
+        if not ws_alive:
+            # Close stale handle if it exists
+            if self._ws is not None:
+                with contextlib.suppress(Exception):
+                    self._ws.close()
             self._ws = yf.WebSocket(verbose=False)
             self._ws.subscribe(symbols)
             self._stop.clear()
@@ -932,6 +940,9 @@ def _listen_loop(self) -> None:
         except Exception as exc:
             if not self._stop.is_set():
                 print(f"[websocket] Connection closed: {exc}")
+        finally:
+            # Mark WebSocket as dead so subscribe() recreates it.
+            self._ws = None
 
     def _on_message(self, msg: dict[str, Any]) -> None:
         """Handle a WebSocket tick message from Yahoo Finance.
@@ -991,8 +1002,11 @@ def _on_message(self, msg: dict[str, Any]) -> None:
             if not _is_overnight(bar_time, symbol):
                 self._cache.append_bar(symbol, "1m", bar)
 
-        # Push live fields to the marquee ticker strip
-        self._update_marquee(symbol, msg)
+        # Only update the marquee for the currently active symbol so that
+        # stale ticks from a previously subscribed symbol don't overwrite
+        # the freshly seeded marquee after a symbol change.
+        if symbol.upper() == self._active_marquee_symbol:
+            self._update_marquee(symbol, msg)
 
     def _update_marquee(self, symbol: str, msg: dict[str, Any]) -> None:
         """Emit marquee-set-item events for each live data field."""
@@ -1123,6 +1137,24 @@ def _emit(
             payload["styles"] = styles
         app.emit("toolbar:marquee-set-item", payload)
 
+    # -- Reset ALL marquee slots so stale data from the prior symbol
+    #    never persists (e.g. Mkt Cap from a stock showing on a future).
+    for slot in (
+        "ws-price",
+        "ws-change",
+        "ws-session",
+        "ws-ext-price",
+        "ws-ext-change",
+        "ws-open",
+        "ws-high",
+        "ws-low",
+        "ws-volume",
+        "ws-mktcap",
+        "ws-vol24",
+        "ws-symbol",
+    ):
+        _emit(slot, "")
+
     # Always show regular session close in the primary slots.
     reg_price = info.get("regularMarketPrice")
     reg_change = info.get("regularMarketChange")
@@ -1190,8 +1222,10 @@ def _emit(
         _emit("ws-volume", _fmt_volume(float(volume)))
 
     mkt_cap = info.get("marketCap")
-    if mkt_cap is not None:
+    if mkt_cap is not None and mkt_cap > 0:
         _emit("ws-mktcap", _fmt_number(float(mkt_cap), 2))
+    else:
+        _emit("ws-mktcap", "—")
 
     # Crypto-specific 24h volume
     is_crypto = (info.get("quoteType") or "").lower() == "cryptocurrency"
@@ -1290,6 +1324,9 @@ def on_resolve(data: dict[str, Any]) -> None:
                 symbol_info=info,
                 chart_id=chart_id,
             )
+            # Mark this symbol as the active marquee target BEFORE seeding
+            # so that stale WebSocket ticks for the old symbol are filtered.
+            streamer._active_marquee_symbol = symbol.upper()
             # Seed the marquee with snapshot data from ticker.info
             _seed_marquee(app, symbol)
 
diff --git a/pywry/pyproject.toml b/pywry/pyproject.toml
@@ -91,7 +91,7 @@ notebook = [
     "ipykernel>=7.2.0",
 ]
 mcp = [
-    "fastmcp>=3.0.0",
+    "fastmcp>=3.2.2",
 ]
 auth = [
     "authlib>=1.3.0",
diff --git a/pywry/pywry/frontend/src/tvchart-widget.js b/pywry/pywry/frontend/src/tvchart-widget.js
@@ -99,6 +99,28 @@ function render({ model, el }) {
                     }
                     el = el.parentElement;
                 }
+                // No sourceEl or DOM walk failed — resolve from data.chartId
+                // via the chart registry (covers tvchart emit calls that don't
+                // pass a source element, e.g. compare, symbol-change, intervals).
+                var chartId = data && data.chartId;
+                if (chartId && window.__PYWRY_TVCHARTS__) {
+                    var entry = window.__PYWRY_TVCHARTS__[chartId];
+                    if (entry) {
+                        if (entry.bridge) { entry.bridge.emit(type, data); return; }
+                        if (entry.container) {
+                            var w = entry.container.closest && entry.container.closest('.pywry-widget');
+                            if (w && w._pywryInstance) { w._pywryInstance.emit(type, data); return; }
+                        }
+                    }
+                }
+                // Last resort: find any widget instance on the page
+                var widgets = document.querySelectorAll('.pywry-widget');
+                for (var i = 0; i < widgets.length; i++) {
+                    if (widgets[i]._pywryInstance) {
+                        widgets[i]._pywryInstance.emit(type, data);
+                        return;
+                    }
+                }
                 console.warn('[PyWry] No bridge found for event:', type);
             },
             on: function() {},
@@ -131,7 +153,15 @@ function render({ model, el }) {
             if (event.type) {
                 pywry._fire(event.type, event.data);
             }
-        } catch(e) { /* ignore */ }
+        } catch(e) { console.error('[PyWry] change:_py_event parse error:', e); }
+    });
+
+    // Custom comm messages bypass trait sync/batching — primary delivery
+    // for Python→JS events when emit() runs inside a traitlets observer.
+    model.on('msg:custom', function(msg) {
+        if (msg && msg.type) {
+            pywry._fire(msg.type, msg.data || {});
+        }
     });
 
     // Alert/toast support
diff --git a/pywry/pywry/frontend/src/tvchart/02-datafeed.js b/pywry/pywry/frontend/src/tvchart/02-datafeed.js
@@ -644,7 +644,7 @@ function _tvInitDatafeedMode(entry, seriesList, theme) {
 
                         var _isDaily = function() {
                             var r = entry._currentResolution || '';
-                            return /^[1-9]?[DWM]$/i.test(r) || /^\d+[DWM]$/i.test(r);
+                            return /^[1-9]?[DWM]$/.test(r) || /^\d+[DWM]$/.test(r);
                         };
                         var _isoDate = function(d, tz) {
                             var y = d.toLocaleString('en-US', { timeZone: tz, year: 'numeric' });
diff --git a/pywry/pywry/frontend/src/tvchart/08-settings.js b/pywry/pywry/frontend/src/tvchart/08-settings.js
@@ -1918,7 +1918,7 @@ function _tvShowSeriesSettings(chartId, seriesId) {
     panel.appendChild(footer);
 
     renderBody();
-    document.body.appendChild(overlay);
+    _tvOverlayContainer(chartId).appendChild(overlay);
 }
 
 function _tvShowVolumeSettings(chartId) {
@@ -2380,7 +2380,7 @@ function _tvShowVolumeSettings(chartId) {
     footer.appendChild(okBtn);
     panel.appendChild(footer);
 
-    document.body.appendChild(overlay);
+    _tvOverlayContainer(chartId).appendChild(overlay);
 }
 
 function _tvShowChartSettings(chartId) {
@@ -3523,7 +3523,7 @@ function _tvShowChartSettings(chartId) {
         if (target.tagName === 'INPUT' || target.tagName === 'SELECT') scheduleSettingsPreview();
     });
 
-    document.body.appendChild(overlay);
+    _tvOverlayContainer(chartId).appendChild(overlay);
 }
 
 // ---------------------------------------------------------------------------
diff --git a/pywry/pywry/frontend/src/tvchart/11-legend.js b/pywry/pywry/frontend/src/tvchart/11-legend.js
@@ -15,6 +15,15 @@ function _tvSetupLegendControls(chartId) {
     var entry = resolved.entry;
     if (!entry.chart) return;
 
+    // Live entry accessor — always returns the current chart entry from the
+    // global registry.  The closure-captured `entry` can go stale when the
+    // chart is destroyed and recreated (e.g. on interval change).  Functions
+    // that read symbol metadata must use _liveEntry() to stay in sync.
+    function _liveEntry() {
+        var r = _tvResolveChartEntry(chartId);
+        return (r && r.entry) ? r.entry : entry;
+    }
+
     function scopedById(id) {
         return _tvScopedById(chartId, id);
     }
@@ -710,13 +719,14 @@ function _tvSetupLegendControls(chartId) {
         _legendCloseSecurityInfo();
         var sid = String(seriesId || '');
         if (!sid) return;
-        var info = (entry && entry._compareSymbolInfo && entry._compareSymbolInfo[sid])
-            ? entry._compareSymbolInfo[sid]
-            : (entry && entry._resolvedSymbolInfo && entry._resolvedSymbolInfo[sid])
-                ? entry._resolvedSymbolInfo[sid]
+        var e = _liveEntry();
+        var info = (e && e._compareSymbolInfo && e._compareSymbolInfo[sid])
+            ? e._compareSymbolInfo[sid]
+            : (e && e._resolvedSymbolInfo && e._resolvedSymbolInfo[sid])
+                ? e._resolvedSymbolInfo[sid]
                 : {};
         var label = _legendSeriesLabel(sid);
-        var rawSymbol = (entry && entry._compareSymbols && entry._compareSymbols[sid]) ? entry._compareSymbols[sid] : label;
+        var rawSymbol = (e && e._compareSymbols && e._compareSymbols[sid]) ? e._compareSymbols[sid] : label;
 
         var name = String(info.ticker || info.displaySymbol || label || '').trim() || 'Unknown';
         var description = String(info.fullName || info.description || '').trim() || 'Unavailable';
@@ -1203,23 +1213,25 @@ function _tvSetupLegendControls(chartId) {
     }
 
     function _legendTitleBase(ds) {
+        var e = _liveEntry();
         var base = (ds && ds.baseTitle) ? ds.baseTitle : '';
-        if (!base && entry && entry.payload && entry.payload.useDatafeed && entry.payload.series && entry.payload.series[0] && entry.payload.series[0].symbol) {
-            base = String(entry.payload.series[0].symbol);
+        if (!base && e && e.payload && e.payload.useDatafeed && e.payload.series && e.payload.series[0] && e.payload.series[0].symbol) {
+            base = String(e.payload.series[0].symbol);
         }
-        if (!base && entry && entry.payload && entry.payload.title) {
-            base = String(entry.payload.title);
+        if (!base && e && e.payload && e.payload.title) {
+            base = String(e.payload.title);
         }
-        if (!base && entry && entry.payload && entry.payload.series && entry.payload.series[0] && entry.payload.series[0].seriesId) {
-            var s0 = String(entry.payload.series[0].seriesId);
+        if (!base && e && e.payload && e.payload.series && e.payload.series[0] && e.payload.series[0].seriesId) {
+            var s0 = String(e.payload.series[0].seriesId);
             if (s0 && s0 !== 'main') base = s0;
         }
         if (!base) base = (mainKey === 'main' ? '' : mainKey);
         // Description mode replaces the base title with resolved symbol info
         if (ds && ds.description && ds.description !== 'Off') {
             var descMode = ds.description;
-            var symInfo = (entry && entry._resolvedSymbolInfo && entry._resolvedSymbolInfo.main)
-                || (entry && entry._mainSymbolInfo) || {};
+            var le = _liveEntry();
+            var symInfo = (le && le._resolvedSymbolInfo && le._resolvedSymbolInfo.main)
+                || (le && le._mainSymbolInfo) || {};
             var ticker = String(symInfo.ticker || symInfo.displaySymbol || symInfo.symbol || base || '').trim();
             var descText = String(symInfo.description || symInfo.fullName || '').trim();
             if (descMode === 'Description' && descText) {
@@ -1524,22 +1536,23 @@ function _tvSetupLegendControls(chartId) {
 
     function _legendSeriesLabel(seriesId) {
         var sid = String(seriesId || 'main');
+        var e = _liveEntry();
         if (sid === 'main') {
             var ds = _legendDataset() || {};
             var base = (ds && ds.baseTitle) ? String(ds.baseTitle) : '';
-            if (!base && entry && entry.payload && entry.payload.useDatafeed && entry.payload.series && entry.payload.series[0] && entry.payload.series[0].symbol) {
-                base = String(entry.payload.series[0].symbol);
+            if (!base && e && e.payload && e.payload.useDatafeed && e.payload.series && e.payload.series[0] && e.payload.series[0].symbol) {
+                base = String(e.payload.series[0].symbol);
             }
-            if (!base && entry && entry.payload && entry.payload.title) {
-                base = String(entry.payload.title);
+            if (!base && e && e.payload && e.payload.title) {
+                base = String(e.payload.title);
             }
             return base || 'Main';
         }
-        if (entry && entry._compareLabels && entry._compareLabels[sid]) {
-            return String(entry._compareLabels[sid]);
+        if (e && e._compareLabels && e._compareLabels[sid]) {
+            return String(e._compareLabels[sid]);
         }
-        if (entry && entry._compareSymbolInfo && entry._compareSymbolInfo[sid]) {
-            var info = entry._compareSymbolInfo[sid] || {};
+        if (e && e._compareSymbolInfo && e._compareSymbolInfo[sid]) {
+            var info = e._compareSymbolInfo[sid] || {};
             var display = String(info.displaySymbol || info.ticker || '').trim();
             if (display) return display.toUpperCase();
             var full = String(info.fullName || '').trim();
@@ -1551,8 +1564,8 @@ function _tvSetupLegendControls(chartId) {
                     : infoSymbol.toUpperCase();
             }
         }
-        if (entry && entry._compareSymbols && entry._compareSymbols[sid]) {
-            var raw = String(entry._compareSymbols[sid]);
+        if (e && e._compareSymbols && e._compareSymbols[sid]) {
+            var raw = String(e._compareSymbols[sid]);
             return raw.indexOf(':') >= 0 ? raw.split(':').pop().trim().toUpperCase() : raw.toUpperCase();
         }
         return sid;
@@ -1571,7 +1584,8 @@ function _tvSetupLegendControls(chartId) {
     }
 
     function _legendGetTimezone() {
-        var info = entry && entry._resolvedSymbolInfo && entry._resolvedSymbolInfo.main;
+        var e = _liveEntry();
+        var info = e && e._resolvedSymbolInfo && e._resolvedSymbolInfo.main;
         return (info && info.timezone) ? String(info.timezone).trim() : 'America/New_York';
     }
 
diff --git a/pywry/pywry/widget.py b/pywry/pywry/widget.py
diff --git a/pywry/tests/test_assets.py b/pywry/tests/test_assets.py

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ notebook = [`
`91`	`91`	`"ipykernel>=7.2.0",`
`92`	`92`	`]`
`93`	`93`	`mcp = [`
`94`		`- "fastmcp>=3.0.0",`
	`94`	`+ "fastmcp>=3.2.2",`
`95`	`95`	`]`
`96`	`96`	`auth = [`
`97`	`97`	`"authlib>=1.3.0",`
Original file line number	Diff line number	Diff line change
`@@ -1918,7 +1918,7 @@ function _tvShowSeriesSettings(chartId, seriesId) {`
`1918`	`1918`	`panel.appendChild(footer);`
`1919`	`1919`
`1920`	`1920`	`renderBody();`
`1921`		`- document.body.appendChild(overlay);`
	`1921`	`+ _tvOverlayContainer(chartId).appendChild(overlay);`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`	`1924`	`function _tvShowVolumeSettings(chartId) {`
`@@ -2380,7 +2380,7 @@ function _tvShowVolumeSettings(chartId) {`
`2380`	`2380`	`footer.appendChild(okBtn);`
`2381`	`2381`	`panel.appendChild(footer);`
`2382`	`2382`
`2383`		`- document.body.appendChild(overlay);`
	`2383`	`+ _tvOverlayContainer(chartId).appendChild(overlay);`
`2384`	`2384`	`}`
`2385`	`2385`
`2386`	`2386`	`function _tvShowChartSettings(chartId) {`
`@@ -3523,7 +3523,7 @@ function _tvShowChartSettings(chartId) {`
`3523`	`3523`	`if (target.tagName === 'INPUT' \|\| target.tagName === 'SELECT') scheduleSettingsPreview();`
`3524`	`3524`	`});`
`3525`	`3525`
`3526`		`- document.body.appendChild(overlay);`
	`3526`	`+ _tvOverlayContainer(chartId).appendChild(overlay);`
`3527`	`3527`	`}`
`3528`	`3528`
`3529`	`3529`	`// ---------------------------------------------------------------------------`