Merge pull request 'feat: explicit session_id propagation in logs (#326)' (#336) from feature/issue-326-session-id-explicit-propagation into feature/v3-session-policy-stream
Some checks failed
Gitea CI / test (push) Has been cancelled
Some checks failed
Gitea CI / test (push) Has been cancelled
Reviewed-on: #336
This commit was merged in pull request #336.
This commit is contained in:
22
src/db.py
22
src/db.py
@@ -109,6 +109,7 @@ def init_db(db_path: str) -> sqlite3.Connection:
|
|||||||
stock_code TEXT NOT NULL,
|
stock_code TEXT NOT NULL,
|
||||||
market TEXT NOT NULL,
|
market TEXT NOT NULL,
|
||||||
exchange_code TEXT NOT NULL,
|
exchange_code TEXT NOT NULL,
|
||||||
|
session_id TEXT DEFAULT 'UNKNOWN',
|
||||||
action TEXT NOT NULL,
|
action TEXT NOT NULL,
|
||||||
confidence INTEGER NOT NULL,
|
confidence INTEGER NOT NULL,
|
||||||
rationale TEXT NOT NULL,
|
rationale TEXT NOT NULL,
|
||||||
@@ -121,6 +122,27 @@ def init_db(db_path: str) -> sqlite3.Connection:
|
|||||||
)
|
)
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
decision_columns = {
|
||||||
|
row[1]
|
||||||
|
for row in conn.execute("PRAGMA table_info(decision_logs)").fetchall()
|
||||||
|
}
|
||||||
|
if "session_id" not in decision_columns:
|
||||||
|
conn.execute("ALTER TABLE decision_logs ADD COLUMN session_id TEXT DEFAULT 'UNKNOWN'")
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
UPDATE decision_logs
|
||||||
|
SET session_id = 'UNKNOWN'
|
||||||
|
WHERE session_id IS NULL OR session_id = ''
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
if "outcome_pnl" not in decision_columns:
|
||||||
|
conn.execute("ALTER TABLE decision_logs ADD COLUMN outcome_pnl REAL")
|
||||||
|
if "outcome_accuracy" not in decision_columns:
|
||||||
|
conn.execute("ALTER TABLE decision_logs ADD COLUMN outcome_accuracy INTEGER")
|
||||||
|
if "reviewed" not in decision_columns:
|
||||||
|
conn.execute("ALTER TABLE decision_logs ADD COLUMN reviewed INTEGER DEFAULT 0")
|
||||||
|
if "review_notes" not in decision_columns:
|
||||||
|
conn.execute("ALTER TABLE decision_logs ADD COLUMN review_notes TEXT")
|
||||||
|
|
||||||
conn.execute(
|
conn.execute(
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ class DecisionLog:
|
|||||||
stock_code: str
|
stock_code: str
|
||||||
market: str
|
market: str
|
||||||
exchange_code: str
|
exchange_code: str
|
||||||
|
session_id: str
|
||||||
action: str
|
action: str
|
||||||
confidence: int
|
confidence: int
|
||||||
rationale: str
|
rationale: str
|
||||||
@@ -47,6 +48,7 @@ class DecisionLogger:
|
|||||||
rationale: str,
|
rationale: str,
|
||||||
context_snapshot: dict[str, Any],
|
context_snapshot: dict[str, Any],
|
||||||
input_data: dict[str, Any],
|
input_data: dict[str, Any],
|
||||||
|
session_id: str | None = None,
|
||||||
) -> str:
|
) -> str:
|
||||||
"""Log a trading decision with full context.
|
"""Log a trading decision with full context.
|
||||||
|
|
||||||
@@ -59,20 +61,22 @@ class DecisionLogger:
|
|||||||
rationale: Reasoning for the decision
|
rationale: Reasoning for the decision
|
||||||
context_snapshot: L1-L7 context snapshot at decision time
|
context_snapshot: L1-L7 context snapshot at decision time
|
||||||
input_data: Market data inputs (price, volume, orderbook, etc.)
|
input_data: Market data inputs (price, volume, orderbook, etc.)
|
||||||
|
session_id: Runtime session identifier
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
decision_id: Unique identifier for this decision
|
decision_id: Unique identifier for this decision
|
||||||
"""
|
"""
|
||||||
decision_id = str(uuid.uuid4())
|
decision_id = str(uuid.uuid4())
|
||||||
timestamp = datetime.now(UTC).isoformat()
|
timestamp = datetime.now(UTC).isoformat()
|
||||||
|
resolved_session = session_id or "UNKNOWN"
|
||||||
|
|
||||||
self.conn.execute(
|
self.conn.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO decision_logs (
|
INSERT INTO decision_logs (
|
||||||
decision_id, timestamp, stock_code, market, exchange_code,
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
action, confidence, rationale, context_snapshot, input_data
|
session_id, action, confidence, rationale, context_snapshot, input_data
|
||||||
)
|
)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
""",
|
""",
|
||||||
(
|
(
|
||||||
decision_id,
|
decision_id,
|
||||||
@@ -80,6 +84,7 @@ class DecisionLogger:
|
|||||||
stock_code,
|
stock_code,
|
||||||
market,
|
market,
|
||||||
exchange_code,
|
exchange_code,
|
||||||
|
resolved_session,
|
||||||
action,
|
action,
|
||||||
confidence,
|
confidence,
|
||||||
rationale,
|
rationale,
|
||||||
@@ -106,7 +111,7 @@ class DecisionLogger:
|
|||||||
query = """
|
query = """
|
||||||
SELECT
|
SELECT
|
||||||
decision_id, timestamp, stock_code, market, exchange_code,
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
action, confidence, rationale, context_snapshot, input_data,
|
session_id, action, confidence, rationale, context_snapshot, input_data,
|
||||||
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
FROM decision_logs
|
FROM decision_logs
|
||||||
WHERE reviewed = 0 AND confidence >= ?
|
WHERE reviewed = 0 AND confidence >= ?
|
||||||
@@ -168,7 +173,7 @@ class DecisionLogger:
|
|||||||
"""
|
"""
|
||||||
SELECT
|
SELECT
|
||||||
decision_id, timestamp, stock_code, market, exchange_code,
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
action, confidence, rationale, context_snapshot, input_data,
|
session_id, action, confidence, rationale, context_snapshot, input_data,
|
||||||
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
FROM decision_logs
|
FROM decision_logs
|
||||||
WHERE decision_id = ?
|
WHERE decision_id = ?
|
||||||
@@ -196,7 +201,7 @@ class DecisionLogger:
|
|||||||
"""
|
"""
|
||||||
SELECT
|
SELECT
|
||||||
decision_id, timestamp, stock_code, market, exchange_code,
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
action, confidence, rationale, context_snapshot, input_data,
|
session_id, action, confidence, rationale, context_snapshot, input_data,
|
||||||
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
FROM decision_logs
|
FROM decision_logs
|
||||||
WHERE confidence >= ?
|
WHERE confidence >= ?
|
||||||
@@ -223,13 +228,14 @@ class DecisionLogger:
|
|||||||
stock_code=row[2],
|
stock_code=row[2],
|
||||||
market=row[3],
|
market=row[3],
|
||||||
exchange_code=row[4],
|
exchange_code=row[4],
|
||||||
action=row[5],
|
session_id=row[5] or "UNKNOWN",
|
||||||
confidence=row[6],
|
action=row[6],
|
||||||
rationale=row[7],
|
confidence=row[7],
|
||||||
context_snapshot=json.loads(row[8]),
|
rationale=row[8],
|
||||||
input_data=json.loads(row[9]),
|
context_snapshot=json.loads(row[9]),
|
||||||
outcome_pnl=row[10],
|
input_data=json.loads(row[10]),
|
||||||
outcome_accuracy=row[11],
|
outcome_pnl=row[11],
|
||||||
reviewed=bool(row[12]),
|
outcome_accuracy=row[12],
|
||||||
review_notes=row[13],
|
reviewed=bool(row[13]),
|
||||||
|
review_notes=row[14],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -217,6 +217,7 @@ async def sync_positions_from_broker(
|
|||||||
price=avg_price,
|
price=avg_price,
|
||||||
market=log_market,
|
market=log_market,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=get_session_info(market).session_id,
|
||||||
mode=settings.MODE,
|
mode=settings.MODE,
|
||||||
)
|
)
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -1368,10 +1369,12 @@ async def trading_cycle(
|
|||||||
"pnl_pct": pnl_pct,
|
"pnl_pct": pnl_pct,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
runtime_session_id = get_session_info(market).session_id
|
||||||
decision_id = decision_logger.log_decision(
|
decision_id = decision_logger.log_decision(
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
market=market.code,
|
market=market.code,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=runtime_session_id,
|
||||||
action=decision.action,
|
action=decision.action,
|
||||||
confidence=decision.confidence,
|
confidence=decision.confidence,
|
||||||
rationale=decision.rationale,
|
rationale=decision.rationale,
|
||||||
@@ -1636,6 +1639,7 @@ async def trading_cycle(
|
|||||||
pnl=0.0,
|
pnl=0.0,
|
||||||
market=market.code,
|
market=market.code,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=runtime_session_id,
|
||||||
mode=settings.MODE if settings else "paper",
|
mode=settings.MODE if settings else "paper",
|
||||||
)
|
)
|
||||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||||
@@ -1690,6 +1694,7 @@ async def trading_cycle(
|
|||||||
pnl=trade_pnl,
|
pnl=trade_pnl,
|
||||||
market=market.code,
|
market=market.code,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=runtime_session_id,
|
||||||
selection_context=selection_context,
|
selection_context=selection_context,
|
||||||
decision_id=decision_id,
|
decision_id=decision_id,
|
||||||
mode=settings.MODE if settings else "paper",
|
mode=settings.MODE if settings else "paper",
|
||||||
@@ -2497,10 +2502,12 @@ async def run_daily_session(
|
|||||||
"pnl_pct": pnl_pct,
|
"pnl_pct": pnl_pct,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
runtime_session_id = get_session_info(market).session_id
|
||||||
decision_id = decision_logger.log_decision(
|
decision_id = decision_logger.log_decision(
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
market=market.code,
|
market=market.code,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=runtime_session_id,
|
||||||
action=decision.action,
|
action=decision.action,
|
||||||
confidence=decision.confidence,
|
confidence=decision.confidence,
|
||||||
rationale=decision.rationale,
|
rationale=decision.rationale,
|
||||||
@@ -2777,6 +2784,7 @@ async def run_daily_session(
|
|||||||
pnl=trade_pnl,
|
pnl=trade_pnl,
|
||||||
market=market.code,
|
market=market.code,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
|
session_id=runtime_session_id,
|
||||||
decision_id=decision_id,
|
decision_id=decision_id,
|
||||||
mode=settings.MODE,
|
mode=settings.MODE,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -329,3 +329,53 @@ def test_log_trade_unknown_market_falls_back_to_unknown_session() -> None:
|
|||||||
row = conn.execute("SELECT session_id FROM trades ORDER BY id DESC LIMIT 1").fetchone()
|
row = conn.execute("SELECT session_id FROM trades ORDER BY id DESC LIMIT 1").fetchone()
|
||||||
assert row is not None
|
assert row is not None
|
||||||
assert row[0] == "UNKNOWN"
|
assert row[0] == "UNKNOWN"
|
||||||
|
|
||||||
|
|
||||||
|
def test_decision_logs_session_id_migration_backfills_unknown() -> None:
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(suffix=".db", delete=False) as f:
|
||||||
|
db_path = f.name
|
||||||
|
try:
|
||||||
|
old_conn = sqlite3.connect(db_path)
|
||||||
|
old_conn.execute(
|
||||||
|
"""
|
||||||
|
CREATE TABLE decision_logs (
|
||||||
|
decision_id TEXT PRIMARY KEY,
|
||||||
|
timestamp TEXT NOT NULL,
|
||||||
|
stock_code TEXT NOT NULL,
|
||||||
|
market TEXT NOT NULL,
|
||||||
|
exchange_code TEXT NOT NULL,
|
||||||
|
action TEXT NOT NULL,
|
||||||
|
confidence INTEGER NOT NULL,
|
||||||
|
rationale TEXT NOT NULL,
|
||||||
|
context_snapshot TEXT NOT NULL,
|
||||||
|
input_data TEXT NOT NULL
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
old_conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO decision_logs (
|
||||||
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
|
action, confidence, rationale, context_snapshot, input_data
|
||||||
|
) VALUES (
|
||||||
|
'd1', '2026-01-01T00:00:00+00:00', 'AAPL', 'US_NASDAQ', 'NASD',
|
||||||
|
'BUY', 80, 'legacy row', '{}', '{}'
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
old_conn.commit()
|
||||||
|
old_conn.close()
|
||||||
|
|
||||||
|
conn = init_db(db_path)
|
||||||
|
columns = {row[1] for row in conn.execute("PRAGMA table_info(decision_logs)").fetchall()}
|
||||||
|
assert "session_id" in columns
|
||||||
|
row = conn.execute(
|
||||||
|
"SELECT session_id FROM decision_logs WHERE decision_id='d1'"
|
||||||
|
).fetchone()
|
||||||
|
assert row is not None
|
||||||
|
assert row[0] == "UNKNOWN"
|
||||||
|
conn.close()
|
||||||
|
finally:
|
||||||
|
os.unlink(db_path)
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ def test_log_decision_creates_record(logger: DecisionLogger, db_conn: sqlite3.Co
|
|||||||
|
|
||||||
# Verify record exists in database
|
# Verify record exists in database
|
||||||
cursor = db_conn.execute(
|
cursor = db_conn.execute(
|
||||||
"SELECT decision_id, action, confidence FROM decision_logs WHERE decision_id = ?",
|
"SELECT decision_id, action, confidence, session_id FROM decision_logs WHERE decision_id = ?",
|
||||||
(decision_id,),
|
(decision_id,),
|
||||||
)
|
)
|
||||||
row = cursor.fetchone()
|
row = cursor.fetchone()
|
||||||
@@ -57,6 +57,7 @@ def test_log_decision_creates_record(logger: DecisionLogger, db_conn: sqlite3.Co
|
|||||||
assert row[0] == decision_id
|
assert row[0] == decision_id
|
||||||
assert row[1] == "BUY"
|
assert row[1] == "BUY"
|
||||||
assert row[2] == 85
|
assert row[2] == 85
|
||||||
|
assert row[3] == "UNKNOWN"
|
||||||
|
|
||||||
|
|
||||||
def test_log_decision_stores_context_snapshot(logger: DecisionLogger) -> None:
|
def test_log_decision_stores_context_snapshot(logger: DecisionLogger) -> None:
|
||||||
@@ -84,6 +85,24 @@ def test_log_decision_stores_context_snapshot(logger: DecisionLogger) -> None:
|
|||||||
assert decision is not None
|
assert decision is not None
|
||||||
assert decision.context_snapshot == context_snapshot
|
assert decision.context_snapshot == context_snapshot
|
||||||
assert decision.input_data == input_data
|
assert decision.input_data == input_data
|
||||||
|
assert decision.session_id == "UNKNOWN"
|
||||||
|
|
||||||
|
|
||||||
|
def test_log_decision_stores_explicit_session_id(logger: DecisionLogger) -> None:
|
||||||
|
decision_id = logger.log_decision(
|
||||||
|
stock_code="AAPL",
|
||||||
|
market="US_NASDAQ",
|
||||||
|
exchange_code="NASD",
|
||||||
|
action="BUY",
|
||||||
|
confidence=88,
|
||||||
|
rationale="session check",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
session_id="US_PRE",
|
||||||
|
)
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert decision.session_id == "US_PRE"
|
||||||
|
|
||||||
|
|
||||||
def test_get_unreviewed_decisions(logger: DecisionLogger) -> None:
|
def test_get_unreviewed_decisions(logger: DecisionLogger) -> None:
|
||||||
@@ -278,6 +297,7 @@ def test_decision_log_dataclass() -> None:
|
|||||||
stock_code="005930",
|
stock_code="005930",
|
||||||
market="KR",
|
market="KR",
|
||||||
exchange_code="KRX",
|
exchange_code="KRX",
|
||||||
|
session_id="KRX_REG",
|
||||||
action="BUY",
|
action="BUY",
|
||||||
confidence=85,
|
confidence=85,
|
||||||
rationale="Test",
|
rationale="Test",
|
||||||
@@ -286,6 +306,7 @@ def test_decision_log_dataclass() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
assert log.decision_id == "test-uuid"
|
assert log.decision_id == "test-uuid"
|
||||||
|
assert log.session_id == "KRX_REG"
|
||||||
assert log.action == "BUY"
|
assert log.action == "BUY"
|
||||||
assert log.confidence == 85
|
assert log.confidence == 85
|
||||||
assert log.reviewed is False
|
assert log.reviewed is False
|
||||||
|
|||||||
Reference in New Issue
Block a user