popov/gogo2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better rewards, fixed TZ at last

Browse Source
This commit is contained in:
Dobromir Popov
2025-08-08 01:53:17 +03:00
parent ded7e7f008
commit b80e1c1eba
3 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
web/clean_dashboard.py
View File

@ -1996,12 +1996,15 @@ class CleanTradingDashboard:
try:
if hasattr(df_historical.index, 'tz') and df_historical.index.tz is not None:
df_historical_local = df_historical.tz_convert(_local_tz) if _local_tz else df_historical
# Drop tzinfo (tz-naive) for plotting
df_historical_local.index = df_historical_local.index.tz_localize(None)
else:
# Treat as UTC then convert to local
# Treat as UTC then convert to local tz, and make tz-naive
df_historical_local = df_historical.copy()
df_historical_local.index = df_historical_local.index.tz_localize('UTC')
if _local_tz:
df_historical_local = df_historical_local.tz_convert(_local_tz)
df_historical_local.index = df_historical_local.index.tz_localize(None)
except Exception:
df_historical_local = df_historical
@ -2010,11 +2013,13 @@ class CleanTradingDashboard:
try:
if hasattr(df_live.index, 'tz') and df_live.index.tz is not None:
df_live_local = df_live.tz_convert(_local_tz) if _local_tz else df_live
df_live_local.index = df_live_local.index.tz_localize(None)
else:
df_live_local = df_live.copy()
df_live_local.index = df_live_local.index.tz_localize('UTC')
if _local_tz:
df_live_local = df_live_local.tz_convert(_local_tz)
df_live_local.index = df_live_local.index.tz_localize(None)
except Exception:
df_live_local = df_live
@ -2030,8 +2035,13 @@ class CleanTradingDashboard:
df_main = df_historical_local
main_source = "Historical 1m"
elif df_live is not None and not df_live.empty:
# No historical data, use live only
# No historical data, use live only (ensure tz-naive)
df_main = df_live.tail(180)
try:
if hasattr(df_main.index, 'tz') and df_main.index.tz is not None:
df_main.index = df_main.index.tz_convert(_local_tz).tz_localize(None) if _local_tz else df_main.index.tz_localize(None)
except Exception:
pass
main_source = "Live 1m (WebSocket)"
else:
# No data at all
@ -2043,11 +2053,14 @@ class CleanTradingDashboard:
if ws_data_1s is not None and not ws_data_1s.empty:
try:
if hasattr(ws_data_1s.index, 'tz') and ws_data_1s.index.tz is not None:
ws_data_1s = ws_data_1s.tz_convert(_local_tz) if _local_tz else ws_data_1s
ws_data_1s = ws_data_1s.copy()
ws_data_1s.index = ws_data_1s.index.tz_convert(_local_tz).tz_localize(None) if _local_tz else ws_data_1s.index.tz_localize(None)
else:
ws_data_1s = ws_data_1s.copy()
ws_data_1s.index = ws_data_1s.index.tz_localize('UTC')
if _local_tz:
ws_data_1s = ws_data_1s.tz_convert(_local_tz)
ws_data_1s.index = ws_data_1s.index.tz_convert(_local_tz)
ws_data_1s.index = ws_data_1s.index.tz_localize(None)
except Exception:
pass
@ -2083,6 +2096,14 @@ class CleanTradingDashboard:
)
has_mini_chart = False
# Ensure main df_main index is local tz-naive to avoid offsets
try:
if hasattr(df_main.index, 'tz') and df_main.index.tz is not None:
df_main = df_main.copy()
df_main.index = df_main.index.tz_convert(_local_tz).tz_localize(None) if _local_tz else df_main.index.tz_localize(None)
except Exception:
pass
# Main 1-minute candlestick chart
fig.add_trace(
go.Candlestick(
@ -2128,7 +2149,7 @@ class CleanTradingDashboard:
ptype = getattr(p, 'type', 'low')
if ts is None or price is None:
continue
# Convert pivot timestamp to local tz to match chart axes
# Convert pivot timestamp to local tz and make tz-naive to match chart axes
try:
if hasattr(ts, 'tzinfo') and ts.tzinfo is not None:
pt = ts.astimezone(_local_tz) if _local_tz else ts
@ -2136,6 +2157,11 @@ class CleanTradingDashboard:
# Assume UTC then convert
pt = ts.replace(tzinfo=timezone.utc)
pt = pt.astimezone(_local_tz) if _local_tz else pt
# Drop tzinfo for plotting
try:
pt = pt.replace(tzinfo=None)
except Exception:
pass
except Exception:
pt = ts
if start_ts <= pt <= end_ts:
@ -2163,6 +2189,13 @@ class CleanTradingDashboard:
# Mini 1-second chart (if available)
if has_mini_chart and ws_data_1s is not None:
# Align mini chart to local tz-naive
try:
if hasattr(ws_data_1s.index, 'tz') and ws_data_1s.index.tz is not None:
ws_data_1s = ws_data_1s.copy()
ws_data_1s.index = ws_data_1s.index.tz_convert(_local_tz).tz_localize(None) if _local_tz else ws_data_1s.index.tz_localize(None)
except Exception:
pass
fig.add_trace(
go.Scatter(
x=ws_data_1s.index,
@ -3307,7 +3340,8 @@ class CleanTradingDashboard:
# Convert to DataFrame
df = pd.DataFrame(symbol_ticks)
df['datetime'] = pd.to_datetime(df['datetime'])
# Force UTC-aware timestamps for all websocket ticks
df['datetime'] = pd.to_datetime(df['datetime'], utc=True)
df.set_index('datetime', inplace=True)
# Get the price column (could be 'price', 'close', or 'c')