fix(hub): align AI summary trades with records and restyle headings
- Query trade_records with trading-day window and reviewed fields instead of missing session_date column - Style summary headings and account names as red text with white stroke Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -3,10 +3,15 @@ from __future__ import annotations
|
||||
|
||||
import sqlite3
|
||||
import unittest
|
||||
|
||||
from hub_trades_lib import fetch_trades_for_trading_day, summarize_trades, trading_day_from_dt
|
||||
from datetime import datetime
|
||||
|
||||
from hub_trades_lib import (
|
||||
fetch_trades_for_trading_day,
|
||||
summarize_trades,
|
||||
trading_day_from_dt,
|
||||
trading_day_window_bounds,
|
||||
)
|
||||
|
||||
|
||||
class HubTradesLibTest(unittest.TestCase):
|
||||
def test_trading_day_reset(self):
|
||||
@@ -15,32 +20,44 @@ class HubTradesLibTest(unittest.TestCase):
|
||||
dt2 = datetime(2026, 6, 6, 8, 0, 0)
|
||||
self.assertEqual(trading_day_from_dt(dt2, 8), "2026-06-06")
|
||||
|
||||
def test_trading_day_window_bounds(self):
|
||||
start, end = trading_day_window_bounds("2026-06-06", 8)
|
||||
self.assertEqual(start, "2026-06-06 08:00:00")
|
||||
self.assertEqual(end, "2026-06-07 07:59:59")
|
||||
|
||||
def test_fetch_and_summarize(self):
|
||||
conn = sqlite3.connect(":memory:")
|
||||
conn.row_factory = sqlite3.Row
|
||||
conn.execute(
|
||||
"""CREATE TABLE trade_records (
|
||||
symbol TEXT, exchange_symbol TEXT, direction TEXT, result TEXT,
|
||||
pnl_amount REAL, closed_at TEXT, opened_at TEXT, session_date TEXT,
|
||||
monitor_type TEXT, actual_rr REAL, planned_rr REAL, trade_style TEXT, entry_reason TEXT
|
||||
symbol TEXT, direction TEXT, result TEXT, reviewed_result TEXT,
|
||||
pnl_amount REAL, reviewed_pnl_amount REAL, exchange_realized_pnl REAL,
|
||||
closed_at TEXT, reviewed_closed_at TEXT, opened_at TEXT, reviewed_opened_at TEXT,
|
||||
created_at TEXT, monitor_type TEXT, actual_rr REAL, planned_rr REAL,
|
||||
trade_style TEXT, entry_reason TEXT, reviewed_at TEXT
|
||||
)"""
|
||||
)
|
||||
conn.execute(
|
||||
"INSERT INTO trade_records VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||
"INSERT INTO trade_records VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||
(
|
||||
"ONDO/USDT",
|
||||
"ONDO/USDT:USDT",
|
||||
"short",
|
||||
"止损",
|
||||
None,
|
||||
-0.5,
|
||||
None,
|
||||
None,
|
||||
"2026-06-06 10:00:00",
|
||||
None,
|
||||
"2026-06-06 09:00:00",
|
||||
"2026-06-06",
|
||||
None,
|
||||
"2026-06-06 10:00:00",
|
||||
"趋势回调",
|
||||
None,
|
||||
None,
|
||||
"trend",
|
||||
"",
|
||||
None,
|
||||
),
|
||||
)
|
||||
conn.commit()
|
||||
@@ -52,6 +69,89 @@ class HubTradesLibTest(unittest.TestCase):
|
||||
self.assertAlmostEqual(stats["total_pnl_u"], -0.5)
|
||||
conn.close()
|
||||
|
||||
def test_early_morning_belongs_prev_trading_day(self):
|
||||
conn = sqlite3.connect(":memory:")
|
||||
conn.row_factory = sqlite3.Row
|
||||
conn.execute(
|
||||
"""CREATE TABLE trade_records (
|
||||
symbol TEXT, direction TEXT, result TEXT, reviewed_result TEXT,
|
||||
pnl_amount REAL, reviewed_pnl_amount REAL, exchange_realized_pnl REAL,
|
||||
closed_at TEXT, reviewed_closed_at TEXT, opened_at TEXT, reviewed_opened_at TEXT,
|
||||
created_at TEXT, monitor_type TEXT, actual_rr REAL, planned_rr REAL,
|
||||
trade_style TEXT, entry_reason TEXT, reviewed_at TEXT
|
||||
)"""
|
||||
)
|
||||
conn.execute(
|
||||
"INSERT INTO trade_records VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||
(
|
||||
"BTC/USDT",
|
||||
"long",
|
||||
"止盈",
|
||||
None,
|
||||
1.2,
|
||||
None,
|
||||
None,
|
||||
"2026-06-07 07:30:00",
|
||||
None,
|
||||
"2026-06-07 06:00:00",
|
||||
None,
|
||||
"2026-06-07 07:30:00",
|
||||
"关键位",
|
||||
None,
|
||||
None,
|
||||
"trend",
|
||||
"",
|
||||
None,
|
||||
),
|
||||
)
|
||||
conn.commit()
|
||||
self.assertEqual(len(fetch_trades_for_trading_day(conn, "2026-06-07")), 0)
|
||||
self.assertEqual(len(fetch_trades_for_trading_day(conn, "2026-06-06")), 1)
|
||||
conn.close()
|
||||
|
||||
def test_reviewed_fields_preferred(self):
|
||||
conn = sqlite3.connect(":memory:")
|
||||
conn.row_factory = sqlite3.Row
|
||||
conn.execute(
|
||||
"""CREATE TABLE trade_records (
|
||||
symbol TEXT, direction TEXT, result TEXT, reviewed_result TEXT,
|
||||
pnl_amount REAL, reviewed_pnl_amount REAL, exchange_realized_pnl REAL,
|
||||
closed_at TEXT, reviewed_closed_at TEXT, opened_at TEXT, reviewed_opened_at TEXT,
|
||||
created_at TEXT, monitor_type TEXT, actual_rr REAL, planned_rr REAL,
|
||||
trade_style TEXT, entry_reason TEXT, reviewed_at TEXT
|
||||
)"""
|
||||
)
|
||||
conn.execute(
|
||||
"INSERT INTO trade_records VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||
(
|
||||
"ETH/USDT",
|
||||
"long",
|
||||
"止损",
|
||||
"止盈",
|
||||
-0.5,
|
||||
2.0,
|
||||
None,
|
||||
"2026-06-06 09:00:00",
|
||||
"2026-06-06 11:00:00",
|
||||
"2026-06-06 08:00:00",
|
||||
None,
|
||||
"2026-06-06 11:00:00",
|
||||
"趋势回调",
|
||||
None,
|
||||
None,
|
||||
"trend",
|
||||
"",
|
||||
"2026-06-06 12:00:00",
|
||||
),
|
||||
)
|
||||
conn.commit()
|
||||
rows = fetch_trades_for_trading_day(conn, "2026-06-06")
|
||||
self.assertEqual(len(rows), 1)
|
||||
self.assertEqual(rows[0]["result"], "止盈")
|
||||
self.assertAlmostEqual(rows[0]["pnl_amount"], 2.0)
|
||||
self.assertTrue(rows[0]["reviewed"])
|
||||
conn.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user