Compare commits
7 Commits
05e8986ff5
...
feature/is
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae7195c829 | ||
|
|
2f9efdad64 | ||
|
|
6551d7af79 | ||
| 7515a5a314 | |||
|
|
254b543c89 | ||
|
|
917b68eb81 | ||
| 2becbddb4a |
@@ -22,6 +22,7 @@ python -m src.main --mode=paper
|
|||||||
- **[Workflow Guide](docs/workflow.md)** — Git workflow policy and agent-based development
|
- **[Workflow Guide](docs/workflow.md)** — Git workflow policy and agent-based development
|
||||||
- **[Command Reference](docs/commands.md)** — Common failures, build commands, troubleshooting
|
- **[Command Reference](docs/commands.md)** — Common failures, build commands, troubleshooting
|
||||||
- **[Architecture](docs/architecture.md)** — System design, components, data flow
|
- **[Architecture](docs/architecture.md)** — System design, components, data flow
|
||||||
|
- **[Context Tree](docs/context-tree.md)** — L1-L7 hierarchical memory system
|
||||||
- **[Testing](docs/testing.md)** — Test structure, coverage requirements, writing tests
|
- **[Testing](docs/testing.md)** — Test structure, coverage requirements, writing tests
|
||||||
- **[Agent Policies](docs/agents.md)** — Prime directives, constraints, prohibited actions
|
- **[Agent Policies](docs/agents.md)** — Prime directives, constraints, prohibited actions
|
||||||
|
|
||||||
|
|||||||
338
docs/context-tree.md
Normal file
338
docs/context-tree.md
Normal file
@@ -0,0 +1,338 @@
|
|||||||
|
# Context Tree: Multi-Layered Memory Management
|
||||||
|
|
||||||
|
The context tree implements **Pillar 2** of The Ouroboros: hierarchical memory management across 7 time horizons, from real-time market data to generational trading wisdom.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Instead of a flat memory structure, The Ouroboros maintains a **7-tier context tree** where each layer represents a different time horizon and level of abstraction:
|
||||||
|
|
||||||
|
```
|
||||||
|
L1 (Legacy) ← Cumulative wisdom across generations
|
||||||
|
↑
|
||||||
|
L2 (Annual) ← Yearly performance metrics
|
||||||
|
↑
|
||||||
|
L3 (Quarterly) ← Quarterly strategy adjustments
|
||||||
|
↑
|
||||||
|
L4 (Monthly) ← Monthly portfolio rebalancing
|
||||||
|
↑
|
||||||
|
L5 (Weekly) ← Weekly stock selection
|
||||||
|
↑
|
||||||
|
L6 (Daily) ← Daily trade logs
|
||||||
|
↑
|
||||||
|
L7 (Real-time) ← Live market data
|
||||||
|
```
|
||||||
|
|
||||||
|
Data flows **bottom-up**: real-time trades aggregate into daily summaries, which roll up to weekly, then monthly, quarterly, annual, and finally into permanent legacy knowledge.
|
||||||
|
|
||||||
|
## The 7 Layers
|
||||||
|
|
||||||
|
### L7: Real-time
|
||||||
|
**Retention**: 7 days
|
||||||
|
**Timeframe format**: `YYYY-MM-DD` (same-day)
|
||||||
|
**Content**: Current positions, live quotes, orderbook snapshots, tick-by-tick volatility
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Immediate execution decisions
|
||||||
|
- Stop-loss triggers
|
||||||
|
- Real-time P&L tracking
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `current_position_{stock_code}`: Current holdings
|
||||||
|
- `live_price_{stock_code}`: Latest quote
|
||||||
|
- `volatility_5m_{stock_code}`: 5-minute rolling volatility
|
||||||
|
|
||||||
|
### L6: Daily
|
||||||
|
**Retention**: 90 days
|
||||||
|
**Timeframe format**: `YYYY-MM-DD`
|
||||||
|
**Content**: Daily trade logs, end-of-day P&L, market summaries, decision accuracy
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Daily performance review
|
||||||
|
- Identify patterns in recent trading
|
||||||
|
- Backtest strategy adjustments
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `total_pnl`: Daily profit/loss
|
||||||
|
- `trade_count`: Number of trades
|
||||||
|
- `win_rate`: Percentage of profitable trades
|
||||||
|
- `avg_confidence`: Average Gemini confidence
|
||||||
|
|
||||||
|
### L5: Weekly
|
||||||
|
**Retention**: 1 year
|
||||||
|
**Timeframe format**: `YYYY-Www` (ISO week, e.g., `2026-W06`)
|
||||||
|
**Content**: Weekly stock selection, sector rotation, volatility regime classification
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Weekly strategy adjustment
|
||||||
|
- Sector momentum tracking
|
||||||
|
- Identify hot/cold markets
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `weekly_pnl`: Week's total P&L
|
||||||
|
- `top_performers`: Best-performing stocks
|
||||||
|
- `sector_focus`: Dominant sectors
|
||||||
|
- `avg_confidence`: Weekly average confidence
|
||||||
|
|
||||||
|
### L4: Monthly
|
||||||
|
**Retention**: 2 years
|
||||||
|
**Timeframe format**: `YYYY-MM`
|
||||||
|
**Content**: Monthly portfolio rebalancing, risk exposure analysis, drawdown recovery
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Monthly performance reporting
|
||||||
|
- Risk exposure adjustment
|
||||||
|
- Correlation analysis
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `monthly_pnl`: Month's total P&L
|
||||||
|
- `sharpe_ratio`: Risk-adjusted return
|
||||||
|
- `max_drawdown`: Largest peak-to-trough decline
|
||||||
|
- `rebalancing_notes`: Manual insights
|
||||||
|
|
||||||
|
### L3: Quarterly
|
||||||
|
**Retention**: 3 years
|
||||||
|
**Timeframe format**: `YYYY-Qn` (e.g., `2026-Q1`)
|
||||||
|
**Content**: Quarterly strategy pivots, market phase detection (bull/bear/sideways), macro regime changes
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Strategic pivots (e.g., growth → value)
|
||||||
|
- Macro regime classification
|
||||||
|
- Long-term pattern recognition
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `quarterly_pnl`: Quarter's total P&L
|
||||||
|
- `market_phase`: Bull/Bear/Sideways
|
||||||
|
- `strategy_adjustments`: Major changes made
|
||||||
|
- `lessons_learned`: Key insights
|
||||||
|
|
||||||
|
### L2: Annual
|
||||||
|
**Retention**: 10 years
|
||||||
|
**Timeframe format**: `YYYY`
|
||||||
|
**Content**: Yearly returns, Sharpe ratio, max drawdown, win rate, strategy effectiveness
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Annual performance review
|
||||||
|
- Multi-year trend analysis
|
||||||
|
- Strategy benchmarking
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `annual_pnl`: Year's total P&L
|
||||||
|
- `sharpe_ratio`: Annual risk-adjusted return
|
||||||
|
- `win_rate`: Yearly win percentage
|
||||||
|
- `best_strategy`: Most successful strategy
|
||||||
|
- `worst_mistake`: Biggest lesson learned
|
||||||
|
|
||||||
|
### L1: Legacy
|
||||||
|
**Retention**: Forever
|
||||||
|
**Timeframe format**: `LEGACY` (single timeframe)
|
||||||
|
**Content**: Cumulative trading history, core principles, generational wisdom
|
||||||
|
|
||||||
|
**Use cases**:
|
||||||
|
- Long-term philosophy
|
||||||
|
- Foundational rules
|
||||||
|
- Lessons that transcend market cycles
|
||||||
|
|
||||||
|
**Example keys**:
|
||||||
|
- `total_pnl`: All-time profit/loss
|
||||||
|
- `years_traded`: Trading longevity
|
||||||
|
- `avg_annual_pnl`: Long-term average return
|
||||||
|
- `core_principles`: Immutable trading rules
|
||||||
|
- `greatest_trades`: Hall of fame
|
||||||
|
- `never_again`: Permanent warnings
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Setting Context
|
||||||
|
|
||||||
|
```python
|
||||||
|
from src.context import ContextLayer, ContextStore
|
||||||
|
from src.db import init_db
|
||||||
|
|
||||||
|
conn = init_db("data/ouroboros.db")
|
||||||
|
store = ContextStore(conn)
|
||||||
|
|
||||||
|
# Store daily P&L
|
||||||
|
store.set_context(
|
||||||
|
layer=ContextLayer.L6_DAILY,
|
||||||
|
timeframe="2026-02-04",
|
||||||
|
key="total_pnl",
|
||||||
|
value=1234.56
|
||||||
|
)
|
||||||
|
|
||||||
|
# Store weekly insight
|
||||||
|
store.set_context(
|
||||||
|
layer=ContextLayer.L5_WEEKLY,
|
||||||
|
timeframe="2026-W06",
|
||||||
|
key="top_performers",
|
||||||
|
value=["005930", "000660", "035720"] # JSON-serializable
|
||||||
|
)
|
||||||
|
|
||||||
|
# Store legacy wisdom
|
||||||
|
store.set_context(
|
||||||
|
layer=ContextLayer.L1_LEGACY,
|
||||||
|
timeframe="LEGACY",
|
||||||
|
key="core_principles",
|
||||||
|
value=[
|
||||||
|
"Cut losses fast",
|
||||||
|
"Let winners run",
|
||||||
|
"Never average down on losing positions"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Retrieving Context
|
||||||
|
|
||||||
|
```python
|
||||||
|
# Get a specific value
|
||||||
|
pnl = store.get_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl")
|
||||||
|
# Returns: 1234.56
|
||||||
|
|
||||||
|
# Get all keys for a timeframe
|
||||||
|
daily_summary = store.get_all_contexts(ContextLayer.L6_DAILY, "2026-02-04")
|
||||||
|
# Returns: {"total_pnl": 1234.56, "trade_count": 10, "win_rate": 60.0, ...}
|
||||||
|
|
||||||
|
# Get all data for a layer (any timeframe)
|
||||||
|
all_daily = store.get_all_contexts(ContextLayer.L6_DAILY)
|
||||||
|
# Returns: {"total_pnl": 1234.56, "trade_count": 10, ...} (latest timeframes first)
|
||||||
|
|
||||||
|
# Get the latest timeframe
|
||||||
|
latest = store.get_latest_timeframe(ContextLayer.L6_DAILY)
|
||||||
|
# Returns: "2026-02-04"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Automatic Aggregation
|
||||||
|
|
||||||
|
The `ContextAggregator` rolls up data from lower to higher layers:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from src.context.aggregator import ContextAggregator
|
||||||
|
|
||||||
|
aggregator = ContextAggregator(conn)
|
||||||
|
|
||||||
|
# Aggregate daily metrics from trades
|
||||||
|
aggregator.aggregate_daily_from_trades("2026-02-04")
|
||||||
|
|
||||||
|
# Roll up weekly from daily
|
||||||
|
aggregator.aggregate_weekly_from_daily("2026-W06")
|
||||||
|
|
||||||
|
# Roll up all layers at once (bottom-up)
|
||||||
|
aggregator.run_all_aggregations()
|
||||||
|
```
|
||||||
|
|
||||||
|
**Aggregation schedule** (recommended):
|
||||||
|
- **L7 → L6**: Every midnight (daily rollup)
|
||||||
|
- **L6 → L5**: Every Sunday (weekly rollup)
|
||||||
|
- **L5 → L4**: First day of each month (monthly rollup)
|
||||||
|
- **L4 → L3**: First day of quarter (quarterly rollup)
|
||||||
|
- **L3 → L2**: January 1st (annual rollup)
|
||||||
|
- **L2 → L1**: On demand (major milestones)
|
||||||
|
|
||||||
|
### Context Cleanup
|
||||||
|
|
||||||
|
Expired contexts are automatically deleted based on retention policies:
|
||||||
|
|
||||||
|
```python
|
||||||
|
# Manual cleanup
|
||||||
|
deleted = store.cleanup_expired_contexts()
|
||||||
|
# Returns: {ContextLayer.L7_REALTIME: 42, ContextLayer.L6_DAILY: 15, ...}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Retention policies** (defined in `src/context/layer.py`):
|
||||||
|
- L1: Forever
|
||||||
|
- L2: 10 years
|
||||||
|
- L3: 3 years
|
||||||
|
- L4: 2 years
|
||||||
|
- L5: 1 year
|
||||||
|
- L6: 90 days
|
||||||
|
- L7: 7 days
|
||||||
|
|
||||||
|
## Integration with Gemini Brain
|
||||||
|
|
||||||
|
The context tree provides hierarchical memory for decision-making:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from src.brain.gemini_client import GeminiClient
|
||||||
|
|
||||||
|
# Build prompt with multi-layer context
|
||||||
|
def build_enhanced_prompt(stock_code: str, store: ContextStore) -> str:
|
||||||
|
# L7: Real-time data
|
||||||
|
current_price = store.get_context(ContextLayer.L7_REALTIME, "2026-02-04", f"live_price_{stock_code}")
|
||||||
|
|
||||||
|
# L6: Recent daily performance
|
||||||
|
yesterday_pnl = store.get_context(ContextLayer.L6_DAILY, "2026-02-03", "total_pnl")
|
||||||
|
|
||||||
|
# L5: Weekly trend
|
||||||
|
weekly_data = store.get_all_contexts(ContextLayer.L5_WEEKLY, "2026-W06")
|
||||||
|
|
||||||
|
# L1: Core principles
|
||||||
|
principles = store.get_context(ContextLayer.L1_LEGACY, "LEGACY", "core_principles")
|
||||||
|
|
||||||
|
return f"""
|
||||||
|
Analyze {stock_code} for trading decision.
|
||||||
|
|
||||||
|
Current price: {current_price}
|
||||||
|
Yesterday's P&L: {yesterday_pnl}
|
||||||
|
This week: {weekly_data}
|
||||||
|
|
||||||
|
Core principles:
|
||||||
|
{chr(10).join(f'- {p}' for p in principles)}
|
||||||
|
|
||||||
|
Decision (BUY/SELL/HOLD):
|
||||||
|
"""
|
||||||
|
```
|
||||||
|
|
||||||
|
## Database Schema
|
||||||
|
|
||||||
|
```sql
|
||||||
|
-- Context storage
|
||||||
|
CREATE TABLE contexts (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
layer TEXT NOT NULL, -- L1_LEGACY, L2_ANNUAL, ..., L7_REALTIME
|
||||||
|
timeframe TEXT NOT NULL, -- "LEGACY", "2026", "2026-Q1", "2026-02", "2026-W06", "2026-02-04"
|
||||||
|
key TEXT NOT NULL, -- "total_pnl", "win_rate", "core_principles", etc.
|
||||||
|
value TEXT NOT NULL, -- JSON-serialized value
|
||||||
|
created_at TEXT NOT NULL, -- ISO 8601 timestamp
|
||||||
|
updated_at TEXT NOT NULL, -- ISO 8601 timestamp
|
||||||
|
UNIQUE(layer, timeframe, key)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Layer metadata
|
||||||
|
CREATE TABLE context_metadata (
|
||||||
|
layer TEXT PRIMARY KEY,
|
||||||
|
description TEXT NOT NULL,
|
||||||
|
retention_days INTEGER, -- NULL = keep forever
|
||||||
|
aggregation_source TEXT -- Parent layer for rollup
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Indices for fast queries
|
||||||
|
CREATE INDEX idx_contexts_layer ON contexts(layer);
|
||||||
|
CREATE INDEX idx_contexts_timeframe ON contexts(timeframe);
|
||||||
|
CREATE INDEX idx_contexts_updated ON contexts(updated_at);
|
||||||
|
```
|
||||||
|
|
||||||
|
## Best Practices
|
||||||
|
|
||||||
|
1. **Write to leaf layers only** — Never manually write to L1-L5; let aggregation populate them
|
||||||
|
2. **Aggregate regularly** — Schedule aggregation jobs to keep higher layers fresh
|
||||||
|
3. **Query specific timeframes** — Use `get_context(layer, timeframe, key)` for precise retrieval
|
||||||
|
4. **Clean up periodically** — Run `cleanup_expired_contexts()` weekly to free space
|
||||||
|
5. **Preserve L1 forever** — Legacy wisdom should never expire
|
||||||
|
6. **Use JSON-serializable values** — Store dicts, lists, strings, numbers (not custom objects)
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
See `tests/test_context.py` for comprehensive test coverage (18 tests, 100% coverage on context modules).
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pytest tests/test_context.py -v
|
||||||
|
```
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- **Implementation**: `src/context/`
|
||||||
|
- `layer.py`: Layer definitions and metadata
|
||||||
|
- `store.py`: CRUD operations
|
||||||
|
- `aggregator.py`: Bottom-up aggregation logic
|
||||||
|
- **Database**: `src/db.py` (table initialization)
|
||||||
|
- **Tests**: `tests/test_context.py`
|
||||||
|
- **Related**: Pillar 2 (Multi-layered Context Management)
|
||||||
@@ -8,6 +8,7 @@ dependencies = [
|
|||||||
"pydantic>=2.5,<3",
|
"pydantic>=2.5,<3",
|
||||||
"pydantic-settings>=2.1,<3",
|
"pydantic-settings>=2.1,<3",
|
||||||
"google-genai>=1.0,<2",
|
"google-genai>=1.0,<2",
|
||||||
|
"scipy>=1.11,<2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
|
|||||||
10
src/context/__init__.py
Normal file
10
src/context/__init__.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
"""Multi-layered context management system for trading decisions.
|
||||||
|
|
||||||
|
The context tree implements Pillar 2: hierarchical memory management across
|
||||||
|
7 time horizons, from real-time quotes to generational wisdom.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from src.context.layer import ContextLayer
|
||||||
|
from src.context.store import ContextStore
|
||||||
|
|
||||||
|
__all__ = ["ContextLayer", "ContextStore"]
|
||||||
250
src/context/aggregator.py
Normal file
250
src/context/aggregator.py
Normal file
@@ -0,0 +1,250 @@
|
|||||||
|
"""Context aggregation logic for rolling up data from lower to higher layers."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
from datetime import UTC, datetime
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from src.context.layer import ContextLayer
|
||||||
|
from src.context.store import ContextStore
|
||||||
|
|
||||||
|
|
||||||
|
class ContextAggregator:
|
||||||
|
"""Aggregates context data from lower (finer) to higher (coarser) layers."""
|
||||||
|
|
||||||
|
def __init__(self, conn: sqlite3.Connection) -> None:
|
||||||
|
"""Initialize the aggregator with a database connection."""
|
||||||
|
self.conn = conn
|
||||||
|
self.store = ContextStore(conn)
|
||||||
|
|
||||||
|
def aggregate_daily_from_trades(self, date: str | None = None) -> None:
|
||||||
|
"""Aggregate L6 (daily) context from trades table.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
date: Date in YYYY-MM-DD format. If None, uses today.
|
||||||
|
"""
|
||||||
|
if date is None:
|
||||||
|
date = datetime.now(UTC).date().isoformat()
|
||||||
|
|
||||||
|
# Calculate daily metrics from trades
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT
|
||||||
|
COUNT(*) as trade_count,
|
||||||
|
SUM(CASE WHEN action = 'BUY' THEN 1 ELSE 0 END) as buys,
|
||||||
|
SUM(CASE WHEN action = 'SELL' THEN 1 ELSE 0 END) as sells,
|
||||||
|
SUM(CASE WHEN action = 'HOLD' THEN 1 ELSE 0 END) as holds,
|
||||||
|
AVG(confidence) as avg_confidence,
|
||||||
|
SUM(pnl) as total_pnl,
|
||||||
|
COUNT(DISTINCT stock_code) as unique_stocks,
|
||||||
|
SUM(CASE WHEN pnl > 0 THEN 1 ELSE 0 END) as wins,
|
||||||
|
SUM(CASE WHEN pnl < 0 THEN 1 ELSE 0 END) as losses
|
||||||
|
FROM trades
|
||||||
|
WHERE DATE(timestamp) = ?
|
||||||
|
""",
|
||||||
|
(date,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
|
||||||
|
if row and row[0] > 0: # At least one trade
|
||||||
|
trade_count, buys, sells, holds, avg_conf, total_pnl, stocks, wins, losses = row
|
||||||
|
|
||||||
|
# Store daily metrics in L6
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "trade_count", trade_count)
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "buys", buys)
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "sells", sells)
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "holds", holds)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L6_DAILY, date, "avg_confidence", round(avg_conf, 2)
|
||||||
|
)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L6_DAILY, date, "total_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "unique_stocks", stocks)
|
||||||
|
win_rate = round(wins / max(wins + losses, 1) * 100, 2)
|
||||||
|
self.store.set_context(ContextLayer.L6_DAILY, date, "win_rate", win_rate)
|
||||||
|
|
||||||
|
def aggregate_weekly_from_daily(self, week: str | None = None) -> None:
|
||||||
|
"""Aggregate L5 (weekly) context from L6 (daily).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
week: Week in YYYY-Www format (ISO week). If None, uses current week.
|
||||||
|
"""
|
||||||
|
if week is None:
|
||||||
|
week = datetime.now(UTC).strftime("%Y-W%V")
|
||||||
|
|
||||||
|
# Get all daily contexts for this week
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT key, value FROM contexts
|
||||||
|
WHERE layer = ? AND timeframe LIKE ?
|
||||||
|
""",
|
||||||
|
(ContextLayer.L6_DAILY.value, f"{week[:4]}-%"), # All days in the year
|
||||||
|
)
|
||||||
|
|
||||||
|
# Group by key and collect all values
|
||||||
|
import json
|
||||||
|
from collections import defaultdict
|
||||||
|
|
||||||
|
daily_data: dict[str, list[Any]] = defaultdict(list)
|
||||||
|
for row in cursor.fetchall():
|
||||||
|
daily_data[row[0]].append(json.loads(row[1]))
|
||||||
|
|
||||||
|
if daily_data:
|
||||||
|
# Sum all PnL values
|
||||||
|
if "total_pnl" in daily_data:
|
||||||
|
total_pnl = sum(daily_data["total_pnl"])
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L5_WEEKLY, week, "weekly_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Average all confidence values
|
||||||
|
if "avg_confidence" in daily_data:
|
||||||
|
conf_values = daily_data["avg_confidence"]
|
||||||
|
avg_conf = sum(conf_values) / len(conf_values)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L5_WEEKLY, week, "avg_confidence", round(avg_conf, 2)
|
||||||
|
)
|
||||||
|
|
||||||
|
def aggregate_monthly_from_weekly(self, month: str | None = None) -> None:
|
||||||
|
"""Aggregate L4 (monthly) context from L5 (weekly).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
month: Month in YYYY-MM format. If None, uses current month.
|
||||||
|
"""
|
||||||
|
if month is None:
|
||||||
|
month = datetime.now(UTC).strftime("%Y-%m")
|
||||||
|
|
||||||
|
# Get all weekly contexts for this month
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT key, value FROM contexts
|
||||||
|
WHERE layer = ? AND timeframe LIKE ?
|
||||||
|
""",
|
||||||
|
(ContextLayer.L5_WEEKLY.value, f"{month[:4]}-W%"),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Group by key and collect all values
|
||||||
|
import json
|
||||||
|
from collections import defaultdict
|
||||||
|
|
||||||
|
weekly_data: dict[str, list[Any]] = defaultdict(list)
|
||||||
|
for row in cursor.fetchall():
|
||||||
|
weekly_data[row[0]].append(json.loads(row[1]))
|
||||||
|
|
||||||
|
if weekly_data:
|
||||||
|
# Sum all weekly PnL values
|
||||||
|
if "weekly_pnl" in weekly_data:
|
||||||
|
total_pnl = sum(weekly_data["weekly_pnl"])
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L4_MONTHLY, month, "monthly_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
|
||||||
|
def aggregate_quarterly_from_monthly(self, quarter: str | None = None) -> None:
|
||||||
|
"""Aggregate L3 (quarterly) context from L4 (monthly).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
quarter: Quarter in YYYY-Qn format. If None, uses current quarter.
|
||||||
|
"""
|
||||||
|
if quarter is None:
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
now = datetime.now(UTC)
|
||||||
|
q = (now.month - 1) // 3 + 1
|
||||||
|
quarter = f"{now.year}-Q{q}"
|
||||||
|
|
||||||
|
# Get all monthly contexts for this quarter
|
||||||
|
# Q1: 01-03, Q2: 04-06, Q3: 07-09, Q4: 10-12
|
||||||
|
q_num = int(quarter.split("-Q")[1])
|
||||||
|
months = [f"{quarter[:4]}-{m:02d}" for m in range((q_num - 1) * 3 + 1, q_num * 3 + 1)]
|
||||||
|
|
||||||
|
total_pnl = 0.0
|
||||||
|
for month in months:
|
||||||
|
monthly_pnl = self.store.get_context(
|
||||||
|
ContextLayer.L4_MONTHLY, month, "monthly_pnl"
|
||||||
|
)
|
||||||
|
if monthly_pnl is not None:
|
||||||
|
total_pnl += monthly_pnl
|
||||||
|
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L3_QUARTERLY, quarter, "quarterly_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
|
||||||
|
def aggregate_annual_from_quarterly(self, year: str | None = None) -> None:
|
||||||
|
"""Aggregate L2 (annual) context from L3 (quarterly).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
year: Year in YYYY format. If None, uses current year.
|
||||||
|
"""
|
||||||
|
if year is None:
|
||||||
|
year = str(datetime.now(UTC).year)
|
||||||
|
|
||||||
|
# Get all quarterly contexts for this year
|
||||||
|
total_pnl = 0.0
|
||||||
|
for q in range(1, 5):
|
||||||
|
quarter = f"{year}-Q{q}"
|
||||||
|
quarterly_pnl = self.store.get_context(
|
||||||
|
ContextLayer.L3_QUARTERLY, quarter, "quarterly_pnl"
|
||||||
|
)
|
||||||
|
if quarterly_pnl is not None:
|
||||||
|
total_pnl += quarterly_pnl
|
||||||
|
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L2_ANNUAL, year, "annual_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
|
||||||
|
def aggregate_legacy_from_annual(self) -> None:
|
||||||
|
"""Aggregate L1 (legacy) context from all L2 (annual) data."""
|
||||||
|
# Get all annual PnL
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT timeframe, value FROM contexts
|
||||||
|
WHERE layer = ? AND key = ?
|
||||||
|
ORDER BY timeframe
|
||||||
|
""",
|
||||||
|
(ContextLayer.L2_ANNUAL.value, "annual_pnl"),
|
||||||
|
)
|
||||||
|
|
||||||
|
import json
|
||||||
|
|
||||||
|
annual_data = [(row[0], json.loads(row[1])) for row in cursor.fetchall()]
|
||||||
|
|
||||||
|
if annual_data:
|
||||||
|
total_pnl = sum(pnl for _, pnl in annual_data)
|
||||||
|
years_traded = len(annual_data)
|
||||||
|
avg_annual_pnl = total_pnl / years_traded
|
||||||
|
|
||||||
|
# Store in L1 (single "LEGACY" timeframe)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L1_LEGACY, "LEGACY", "total_pnl", round(total_pnl, 2)
|
||||||
|
)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L1_LEGACY, "LEGACY", "years_traded", years_traded
|
||||||
|
)
|
||||||
|
self.store.set_context(
|
||||||
|
ContextLayer.L1_LEGACY,
|
||||||
|
"LEGACY",
|
||||||
|
"avg_annual_pnl",
|
||||||
|
round(avg_annual_pnl, 2),
|
||||||
|
)
|
||||||
|
|
||||||
|
def run_all_aggregations(self) -> None:
|
||||||
|
"""Run all aggregations from L7 to L1 (bottom-up)."""
|
||||||
|
# L7 (trades) → L6 (daily)
|
||||||
|
self.aggregate_daily_from_trades()
|
||||||
|
|
||||||
|
# L6 (daily) → L5 (weekly)
|
||||||
|
self.aggregate_weekly_from_daily()
|
||||||
|
|
||||||
|
# L5 (weekly) → L4 (monthly)
|
||||||
|
self.aggregate_monthly_from_weekly()
|
||||||
|
|
||||||
|
# L4 (monthly) → L3 (quarterly)
|
||||||
|
self.aggregate_quarterly_from_monthly()
|
||||||
|
|
||||||
|
# L3 (quarterly) → L2 (annual)
|
||||||
|
self.aggregate_annual_from_quarterly()
|
||||||
|
|
||||||
|
# L2 (annual) → L1 (legacy)
|
||||||
|
self.aggregate_legacy_from_annual()
|
||||||
75
src/context/layer.py
Normal file
75
src/context/layer.py
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
"""Context layer definitions for multi-tier memory management."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
|
class ContextLayer(str, Enum):
|
||||||
|
"""7-tier context hierarchy from real-time to generational."""
|
||||||
|
|
||||||
|
L1_LEGACY = "L1_LEGACY" # Cumulative/generational wisdom
|
||||||
|
L2_ANNUAL = "L2_ANNUAL" # Yearly performance
|
||||||
|
L3_QUARTERLY = "L3_QUARTERLY" # Quarterly strategy adjustments
|
||||||
|
L4_MONTHLY = "L4_MONTHLY" # Monthly rebalancing
|
||||||
|
L5_WEEKLY = "L5_WEEKLY" # Weekly stock selection
|
||||||
|
L6_DAILY = "L6_DAILY" # Daily trade logs
|
||||||
|
L7_REALTIME = "L7_REALTIME" # Real-time market data
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class LayerMetadata:
|
||||||
|
"""Metadata for each context layer."""
|
||||||
|
|
||||||
|
layer: ContextLayer
|
||||||
|
description: str
|
||||||
|
retention_days: int | None # None = keep forever
|
||||||
|
aggregation_source: ContextLayer | None # Parent layer for aggregation
|
||||||
|
|
||||||
|
|
||||||
|
# Layer configuration
|
||||||
|
LAYER_CONFIG: dict[ContextLayer, LayerMetadata] = {
|
||||||
|
ContextLayer.L1_LEGACY: LayerMetadata(
|
||||||
|
layer=ContextLayer.L1_LEGACY,
|
||||||
|
description="Cumulative trading history and core lessons learned across generations",
|
||||||
|
retention_days=None, # Keep forever
|
||||||
|
aggregation_source=ContextLayer.L2_ANNUAL,
|
||||||
|
),
|
||||||
|
ContextLayer.L2_ANNUAL: LayerMetadata(
|
||||||
|
layer=ContextLayer.L2_ANNUAL,
|
||||||
|
description="Yearly returns, Sharpe ratio, max drawdown, win rate",
|
||||||
|
retention_days=365 * 10, # 10 years
|
||||||
|
aggregation_source=ContextLayer.L3_QUARTERLY,
|
||||||
|
),
|
||||||
|
ContextLayer.L3_QUARTERLY: LayerMetadata(
|
||||||
|
layer=ContextLayer.L3_QUARTERLY,
|
||||||
|
description="Quarterly strategy adjustments, market phase detection, sector rotation",
|
||||||
|
retention_days=365 * 3, # 3 years
|
||||||
|
aggregation_source=ContextLayer.L4_MONTHLY,
|
||||||
|
),
|
||||||
|
ContextLayer.L4_MONTHLY: LayerMetadata(
|
||||||
|
layer=ContextLayer.L4_MONTHLY,
|
||||||
|
description="Monthly portfolio rebalancing, risk exposure, drawdown recovery",
|
||||||
|
retention_days=365 * 2, # 2 years
|
||||||
|
aggregation_source=ContextLayer.L5_WEEKLY,
|
||||||
|
),
|
||||||
|
ContextLayer.L5_WEEKLY: LayerMetadata(
|
||||||
|
layer=ContextLayer.L5_WEEKLY,
|
||||||
|
description="Weekly stock selection, sector focus, volatility regime",
|
||||||
|
retention_days=365, # 1 year
|
||||||
|
aggregation_source=ContextLayer.L6_DAILY,
|
||||||
|
),
|
||||||
|
ContextLayer.L6_DAILY: LayerMetadata(
|
||||||
|
layer=ContextLayer.L6_DAILY,
|
||||||
|
description="Daily trade logs, P&L, market summaries, decision accuracy",
|
||||||
|
retention_days=90, # 90 days
|
||||||
|
aggregation_source=ContextLayer.L7_REALTIME,
|
||||||
|
),
|
||||||
|
ContextLayer.L7_REALTIME: LayerMetadata(
|
||||||
|
layer=ContextLayer.L7_REALTIME,
|
||||||
|
description="Real-time positions, quotes, orderbook, volatility, live P&L",
|
||||||
|
retention_days=7, # 7 days (real-time data is ephemeral)
|
||||||
|
aggregation_source=None, # No aggregation source (leaf layer)
|
||||||
|
),
|
||||||
|
}
|
||||||
193
src/context/store.py
Normal file
193
src/context/store.py
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
"""Context storage and retrieval for the 7-tier memory system."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sqlite3
|
||||||
|
from datetime import UTC, datetime
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from src.context.layer import LAYER_CONFIG, ContextLayer
|
||||||
|
|
||||||
|
|
||||||
|
class ContextStore:
|
||||||
|
"""Manages context data across the 7-tier hierarchy."""
|
||||||
|
|
||||||
|
def __init__(self, conn: sqlite3.Connection) -> None:
|
||||||
|
"""Initialize the context store with a database connection."""
|
||||||
|
self.conn = conn
|
||||||
|
self._init_metadata()
|
||||||
|
|
||||||
|
def _init_metadata(self) -> None:
|
||||||
|
"""Initialize context_metadata table with layer configurations."""
|
||||||
|
for config in LAYER_CONFIG.values():
|
||||||
|
self.conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT OR REPLACE INTO context_metadata
|
||||||
|
(layer, description, retention_days, aggregation_source)
|
||||||
|
VALUES (?, ?, ?, ?)
|
||||||
|
""",
|
||||||
|
(
|
||||||
|
config.layer.value,
|
||||||
|
config.description,
|
||||||
|
config.retention_days,
|
||||||
|
config.aggregation_source.value if config.aggregation_source else None,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
|
||||||
|
def set_context(
|
||||||
|
self,
|
||||||
|
layer: ContextLayer,
|
||||||
|
timeframe: str,
|
||||||
|
key: str,
|
||||||
|
value: Any,
|
||||||
|
) -> None:
|
||||||
|
"""Set a context value for a given layer and timeframe.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
layer: The context layer (L1-L7)
|
||||||
|
timeframe: Time identifier (e.g., "2026", "2026-Q1", "2026-01",
|
||||||
|
"2026-W05", "2026-02-04")
|
||||||
|
key: Context key (e.g., "sharpe_ratio", "win_rate", "lesson_learned")
|
||||||
|
value: Context value (will be JSON-serialized)
|
||||||
|
"""
|
||||||
|
now = datetime.now(UTC).isoformat()
|
||||||
|
value_json = json.dumps(value)
|
||||||
|
|
||||||
|
self.conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO contexts (layer, timeframe, key, value, created_at, updated_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)
|
||||||
|
ON CONFLICT(layer, timeframe, key)
|
||||||
|
DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at
|
||||||
|
""",
|
||||||
|
(layer.value, timeframe, key, value_json, now, now),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
|
||||||
|
def get_context(
|
||||||
|
self,
|
||||||
|
layer: ContextLayer,
|
||||||
|
timeframe: str,
|
||||||
|
key: str,
|
||||||
|
) -> Any | None:
|
||||||
|
"""Get a context value for a given layer and timeframe.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
layer: The context layer (L1-L7)
|
||||||
|
timeframe: Time identifier
|
||||||
|
key: Context key
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The context value (deserialized from JSON), or None if not found
|
||||||
|
"""
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT value FROM contexts
|
||||||
|
WHERE layer = ? AND timeframe = ? AND key = ?
|
||||||
|
""",
|
||||||
|
(layer.value, timeframe, key),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
if row:
|
||||||
|
return json.loads(row[0])
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_all_contexts(
|
||||||
|
self,
|
||||||
|
layer: ContextLayer,
|
||||||
|
timeframe: str | None = None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Get all context values for a given layer and optional timeframe.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
layer: The context layer (L1-L7)
|
||||||
|
timeframe: Optional time identifier filter
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dictionary of key-value pairs for the specified layer/timeframe
|
||||||
|
"""
|
||||||
|
if timeframe:
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT key, value FROM contexts
|
||||||
|
WHERE layer = ? AND timeframe = ?
|
||||||
|
ORDER BY key
|
||||||
|
""",
|
||||||
|
(layer.value, timeframe),
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT key, value FROM contexts
|
||||||
|
WHERE layer = ?
|
||||||
|
ORDER BY timeframe DESC, key
|
||||||
|
""",
|
||||||
|
(layer.value,),
|
||||||
|
)
|
||||||
|
|
||||||
|
return {row[0]: json.loads(row[1]) for row in cursor.fetchall()}
|
||||||
|
|
||||||
|
def get_latest_timeframe(self, layer: ContextLayer) -> str | None:
|
||||||
|
"""Get the most recent timeframe for a given layer.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
layer: The context layer (L1-L7)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The latest timeframe string, or None if no data exists
|
||||||
|
"""
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT timeframe FROM contexts
|
||||||
|
WHERE layer = ?
|
||||||
|
ORDER BY updated_at DESC
|
||||||
|
LIMIT 1
|
||||||
|
""",
|
||||||
|
(layer.value,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
return row[0] if row else None
|
||||||
|
|
||||||
|
def delete_old_contexts(self, layer: ContextLayer, cutoff_date: str) -> int:
|
||||||
|
"""Delete contexts older than the cutoff date for a given layer.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
layer: The context layer (L1-L7)
|
||||||
|
cutoff_date: ISO format date string (contexts before this will be deleted)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Number of rows deleted
|
||||||
|
"""
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
DELETE FROM contexts
|
||||||
|
WHERE layer = ? AND updated_at < ?
|
||||||
|
""",
|
||||||
|
(layer.value, cutoff_date),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
return cursor.rowcount
|
||||||
|
|
||||||
|
def cleanup_expired_contexts(self) -> dict[ContextLayer, int]:
|
||||||
|
"""Delete expired contexts based on retention policies.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dictionary mapping layer to number of deleted rows
|
||||||
|
"""
|
||||||
|
deleted_counts: dict[ContextLayer, int] = {}
|
||||||
|
|
||||||
|
for layer, config in LAYER_CONFIG.items():
|
||||||
|
if config.retention_days is None:
|
||||||
|
# Keep forever (e.g., L1_LEGACY)
|
||||||
|
deleted_counts[layer] = 0
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Calculate cutoff date
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
|
cutoff = datetime.now(UTC) - timedelta(days=config.retention_days)
|
||||||
|
deleted_counts[layer] = self.delete_old_contexts(layer, cutoff.isoformat())
|
||||||
|
|
||||||
|
return deleted_counts
|
||||||
64
src/db.py
64
src/db.py
@@ -39,6 +39,70 @@ def init_db(db_path: str) -> sqlite3.Connection:
|
|||||||
if "exchange_code" not in columns:
|
if "exchange_code" not in columns:
|
||||||
conn.execute("ALTER TABLE trades ADD COLUMN exchange_code TEXT DEFAULT 'KRX'")
|
conn.execute("ALTER TABLE trades ADD COLUMN exchange_code TEXT DEFAULT 'KRX'")
|
||||||
|
|
||||||
|
# Context tree tables for multi-layered memory management
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS contexts (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
layer TEXT NOT NULL,
|
||||||
|
timeframe TEXT NOT NULL,
|
||||||
|
key TEXT NOT NULL,
|
||||||
|
value TEXT NOT NULL,
|
||||||
|
created_at TEXT NOT NULL,
|
||||||
|
updated_at TEXT NOT NULL,
|
||||||
|
UNIQUE(layer, timeframe, key)
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
# Decision logging table for comprehensive audit trail
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS 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,
|
||||||
|
outcome_pnl REAL,
|
||||||
|
outcome_accuracy INTEGER,
|
||||||
|
reviewed INTEGER DEFAULT 0,
|
||||||
|
review_notes TEXT
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"""
|
||||||
|
CREATE TABLE IF NOT EXISTS context_metadata (
|
||||||
|
layer TEXT PRIMARY KEY,
|
||||||
|
description TEXT NOT NULL,
|
||||||
|
retention_days INTEGER,
|
||||||
|
aggregation_source TEXT
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create indices for efficient context queries
|
||||||
|
conn.execute("CREATE INDEX IF NOT EXISTS idx_contexts_layer ON contexts(layer)")
|
||||||
|
conn.execute("CREATE INDEX IF NOT EXISTS idx_contexts_timeframe ON contexts(timeframe)")
|
||||||
|
conn.execute("CREATE INDEX IF NOT EXISTS idx_contexts_updated ON contexts(updated_at)")
|
||||||
|
|
||||||
|
# Create indices for efficient decision log queries
|
||||||
|
conn.execute(
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_decision_logs_timestamp ON decision_logs(timestamp)"
|
||||||
|
)
|
||||||
|
conn.execute(
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_decision_logs_reviewed ON decision_logs(reviewed)"
|
||||||
|
)
|
||||||
|
conn.execute(
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_decision_logs_confidence ON decision_logs(confidence)"
|
||||||
|
)
|
||||||
conn.commit()
|
conn.commit()
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
"""Evolution engine for self-improving trading strategies."""
|
||||||
|
|
||||||
|
from src.evolution.ab_test import ABTester, ABTestResult, StrategyPerformance
|
||||||
|
from src.evolution.optimizer import EvolutionOptimizer
|
||||||
|
from src.evolution.performance_tracker import (
|
||||||
|
PerformanceDashboard,
|
||||||
|
PerformanceTracker,
|
||||||
|
StrategyMetrics,
|
||||||
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"EvolutionOptimizer",
|
||||||
|
"ABTester",
|
||||||
|
"ABTestResult",
|
||||||
|
"StrategyPerformance",
|
||||||
|
"PerformanceTracker",
|
||||||
|
"PerformanceDashboard",
|
||||||
|
"StrategyMetrics",
|
||||||
|
]
|
||||||
|
|||||||
220
src/evolution/ab_test.py
Normal file
220
src/evolution/ab_test.py
Normal file
@@ -0,0 +1,220 @@
|
|||||||
|
"""A/B Testing framework for strategy comparison.
|
||||||
|
|
||||||
|
Runs multiple strategies in parallel, tracks their performance,
|
||||||
|
and uses statistical significance testing to determine winners.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
import scipy.stats as stats
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class StrategyPerformance:
|
||||||
|
"""Performance metrics for a single strategy."""
|
||||||
|
|
||||||
|
strategy_name: str
|
||||||
|
total_trades: int
|
||||||
|
wins: int
|
||||||
|
losses: int
|
||||||
|
total_pnl: float
|
||||||
|
avg_pnl: float
|
||||||
|
win_rate: float
|
||||||
|
sharpe_ratio: float | None = None
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ABTestResult:
|
||||||
|
"""Result of an A/B test between two strategies."""
|
||||||
|
|
||||||
|
strategy_a: str
|
||||||
|
strategy_b: str
|
||||||
|
winner: str | None
|
||||||
|
p_value: float
|
||||||
|
confidence_level: float
|
||||||
|
is_significant: bool
|
||||||
|
performance_a: StrategyPerformance
|
||||||
|
performance_b: StrategyPerformance
|
||||||
|
|
||||||
|
|
||||||
|
class ABTester:
|
||||||
|
"""A/B testing framework for comparing trading strategies."""
|
||||||
|
|
||||||
|
def __init__(self, significance_level: float = 0.05) -> None:
|
||||||
|
"""Initialize A/B tester.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
significance_level: P-value threshold for statistical significance (default 0.05)
|
||||||
|
"""
|
||||||
|
self._significance_level = significance_level
|
||||||
|
|
||||||
|
def calculate_performance(
|
||||||
|
self, trades: list[dict[str, Any]], strategy_name: str
|
||||||
|
) -> StrategyPerformance:
|
||||||
|
"""Calculate performance metrics for a strategy.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
trades: List of trade records with pnl values
|
||||||
|
strategy_name: Name of the strategy
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
StrategyPerformance object with calculated metrics
|
||||||
|
"""
|
||||||
|
if not trades:
|
||||||
|
return StrategyPerformance(
|
||||||
|
strategy_name=strategy_name,
|
||||||
|
total_trades=0,
|
||||||
|
wins=0,
|
||||||
|
losses=0,
|
||||||
|
total_pnl=0.0,
|
||||||
|
avg_pnl=0.0,
|
||||||
|
win_rate=0.0,
|
||||||
|
sharpe_ratio=None,
|
||||||
|
)
|
||||||
|
|
||||||
|
total_trades = len(trades)
|
||||||
|
wins = sum(1 for t in trades if t.get("pnl", 0) > 0)
|
||||||
|
losses = sum(1 for t in trades if t.get("pnl", 0) < 0)
|
||||||
|
pnls = [t.get("pnl", 0.0) for t in trades]
|
||||||
|
total_pnl = sum(pnls)
|
||||||
|
avg_pnl = total_pnl / total_trades if total_trades > 0 else 0.0
|
||||||
|
win_rate = (wins / total_trades * 100) if total_trades > 0 else 0.0
|
||||||
|
|
||||||
|
# Calculate Sharpe ratio (risk-adjusted return)
|
||||||
|
sharpe_ratio = None
|
||||||
|
if len(pnls) > 1:
|
||||||
|
mean_return = avg_pnl
|
||||||
|
std_return = (
|
||||||
|
sum((p - mean_return) ** 2 for p in pnls) / (len(pnls) - 1)
|
||||||
|
) ** 0.5
|
||||||
|
if std_return > 0:
|
||||||
|
sharpe_ratio = mean_return / std_return
|
||||||
|
|
||||||
|
return StrategyPerformance(
|
||||||
|
strategy_name=strategy_name,
|
||||||
|
total_trades=total_trades,
|
||||||
|
wins=wins,
|
||||||
|
losses=losses,
|
||||||
|
total_pnl=round(total_pnl, 2),
|
||||||
|
avg_pnl=round(avg_pnl, 2),
|
||||||
|
win_rate=round(win_rate, 2),
|
||||||
|
sharpe_ratio=round(sharpe_ratio, 4) if sharpe_ratio else None,
|
||||||
|
)
|
||||||
|
|
||||||
|
def compare_strategies(
|
||||||
|
self,
|
||||||
|
trades_a: list[dict[str, Any]],
|
||||||
|
trades_b: list[dict[str, Any]],
|
||||||
|
strategy_a_name: str = "Strategy A",
|
||||||
|
strategy_b_name: str = "Strategy B",
|
||||||
|
) -> ABTestResult:
|
||||||
|
"""Compare two strategies using statistical testing.
|
||||||
|
|
||||||
|
Uses a two-sample t-test to determine if performance difference is significant.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
trades_a: List of trades from strategy A
|
||||||
|
trades_b: List of trades from strategy B
|
||||||
|
strategy_a_name: Name of strategy A
|
||||||
|
strategy_b_name: Name of strategy B
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ABTestResult with comparison details
|
||||||
|
"""
|
||||||
|
perf_a = self.calculate_performance(trades_a, strategy_a_name)
|
||||||
|
perf_b = self.calculate_performance(trades_b, strategy_b_name)
|
||||||
|
|
||||||
|
# Extract PnL arrays for statistical testing
|
||||||
|
pnls_a = [t.get("pnl", 0.0) for t in trades_a]
|
||||||
|
pnls_b = [t.get("pnl", 0.0) for t in trades_b]
|
||||||
|
|
||||||
|
# Perform two-sample t-test
|
||||||
|
if len(pnls_a) > 1 and len(pnls_b) > 1:
|
||||||
|
t_stat, p_value = stats.ttest_ind(pnls_a, pnls_b, equal_var=False)
|
||||||
|
is_significant = p_value < self._significance_level
|
||||||
|
confidence_level = (1 - p_value) * 100
|
||||||
|
else:
|
||||||
|
# Not enough data for statistical test
|
||||||
|
p_value = 1.0
|
||||||
|
is_significant = False
|
||||||
|
confidence_level = 0.0
|
||||||
|
|
||||||
|
# Determine winner based on average PnL
|
||||||
|
winner = None
|
||||||
|
if is_significant:
|
||||||
|
if perf_a.avg_pnl > perf_b.avg_pnl:
|
||||||
|
winner = strategy_a_name
|
||||||
|
elif perf_b.avg_pnl > perf_a.avg_pnl:
|
||||||
|
winner = strategy_b_name
|
||||||
|
|
||||||
|
return ABTestResult(
|
||||||
|
strategy_a=strategy_a_name,
|
||||||
|
strategy_b=strategy_b_name,
|
||||||
|
winner=winner,
|
||||||
|
p_value=round(p_value, 4),
|
||||||
|
confidence_level=round(confidence_level, 2),
|
||||||
|
is_significant=is_significant,
|
||||||
|
performance_a=perf_a,
|
||||||
|
performance_b=perf_b,
|
||||||
|
)
|
||||||
|
|
||||||
|
def should_deploy(
|
||||||
|
self,
|
||||||
|
result: ABTestResult,
|
||||||
|
min_win_rate: float = 60.0,
|
||||||
|
min_trades: int = 20,
|
||||||
|
) -> bool:
|
||||||
|
"""Determine if a winning strategy should be deployed.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
result: A/B test result
|
||||||
|
min_win_rate: Minimum win rate percentage for deployment (default 60%)
|
||||||
|
min_trades: Minimum number of trades required (default 20)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if the winning strategy meets deployment criteria
|
||||||
|
"""
|
||||||
|
if not result.is_significant or result.winner is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Get performance of winning strategy
|
||||||
|
if result.winner == result.strategy_a:
|
||||||
|
winning_perf = result.performance_a
|
||||||
|
else:
|
||||||
|
winning_perf = result.performance_b
|
||||||
|
|
||||||
|
# Check deployment criteria
|
||||||
|
has_enough_trades = winning_perf.total_trades >= min_trades
|
||||||
|
has_good_win_rate = winning_perf.win_rate >= min_win_rate
|
||||||
|
is_profitable = winning_perf.avg_pnl > 0
|
||||||
|
|
||||||
|
meets_criteria = has_enough_trades and has_good_win_rate and is_profitable
|
||||||
|
|
||||||
|
if meets_criteria:
|
||||||
|
logger.info(
|
||||||
|
"Strategy '%s' meets deployment criteria: "
|
||||||
|
"win_rate=%.2f%%, trades=%d, avg_pnl=%.2f",
|
||||||
|
result.winner,
|
||||||
|
winning_perf.win_rate,
|
||||||
|
winning_perf.total_trades,
|
||||||
|
winning_perf.avg_pnl,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.info(
|
||||||
|
"Strategy '%s' does NOT meet deployment criteria: "
|
||||||
|
"win_rate=%.2f%% (min %.2f%%), trades=%d (min %d), avg_pnl=%.2f",
|
||||||
|
result.winner if result.winner else "unknown",
|
||||||
|
winning_perf.win_rate if result.winner else 0.0,
|
||||||
|
min_win_rate,
|
||||||
|
winning_perf.total_trades if result.winner else 0,
|
||||||
|
min_trades,
|
||||||
|
winning_perf.avg_pnl if result.winner else 0.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
return meets_criteria
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
"""Evolution Engine — analyzes trade logs and generates new strategies.
|
"""Evolution Engine — analyzes trade logs and generates new strategies.
|
||||||
|
|
||||||
This module:
|
This module:
|
||||||
1. Reads trade_logs.db to identify failing patterns
|
1. Uses DecisionLogger.get_losing_decisions() to identify failing patterns
|
||||||
2. Asks Gemini to generate a new strategy class
|
2. Analyzes failure patterns by time, market conditions, stock characteristics
|
||||||
3. Runs pytest on the generated file
|
3. Asks Gemini to generate improved strategy recommendations
|
||||||
4. Creates a simulated PR if tests pass
|
4. Generates new strategy classes with enhanced decision-making logic
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
@@ -14,6 +14,7 @@ import logging
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
import subprocess
|
import subprocess
|
||||||
import textwrap
|
import textwrap
|
||||||
|
from collections import Counter
|
||||||
from datetime import UTC, datetime
|
from datetime import UTC, datetime
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any
|
from typing import Any
|
||||||
@@ -21,6 +22,8 @@ from typing import Any
|
|||||||
from google import genai
|
from google import genai
|
||||||
|
|
||||||
from src.config import Settings
|
from src.config import Settings
|
||||||
|
from src.db import init_db
|
||||||
|
from src.logging.decision_logger import DecisionLog, DecisionLogger
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -53,29 +56,105 @@ class EvolutionOptimizer:
|
|||||||
self._db_path = settings.DB_PATH
|
self._db_path = settings.DB_PATH
|
||||||
self._client = genai.Client(api_key=settings.GEMINI_API_KEY)
|
self._client = genai.Client(api_key=settings.GEMINI_API_KEY)
|
||||||
self._model_name = settings.GEMINI_MODEL
|
self._model_name = settings.GEMINI_MODEL
|
||||||
|
self._conn = init_db(self._db_path)
|
||||||
|
self._decision_logger = DecisionLogger(self._conn)
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Analysis
|
# Analysis
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
def analyze_failures(self, limit: int = 50) -> list[dict[str, Any]]:
|
def analyze_failures(self, limit: int = 50) -> list[dict[str, Any]]:
|
||||||
"""Find trades where high confidence led to losses."""
|
"""Find high-confidence decisions that resulted in losses.
|
||||||
conn = sqlite3.connect(self._db_path)
|
|
||||||
conn.row_factory = sqlite3.Row
|
Uses DecisionLogger.get_losing_decisions() to retrieve failures.
|
||||||
try:
|
"""
|
||||||
rows = conn.execute(
|
losing_decisions = self._decision_logger.get_losing_decisions(
|
||||||
"""
|
min_confidence=80, min_loss=-100.0
|
||||||
SELECT stock_code, action, confidence, pnl, rationale, timestamp
|
)
|
||||||
FROM trades
|
|
||||||
WHERE confidence >= 80 AND pnl < 0
|
# Limit results
|
||||||
ORDER BY pnl ASC
|
if len(losing_decisions) > limit:
|
||||||
LIMIT ?
|
losing_decisions = losing_decisions[:limit]
|
||||||
""",
|
|
||||||
(limit,),
|
# Convert to dict format for analysis
|
||||||
).fetchall()
|
failures = []
|
||||||
return [dict(r) for r in rows]
|
for decision in losing_decisions:
|
||||||
finally:
|
failures.append({
|
||||||
conn.close()
|
"decision_id": decision.decision_id,
|
||||||
|
"timestamp": decision.timestamp,
|
||||||
|
"stock_code": decision.stock_code,
|
||||||
|
"market": decision.market,
|
||||||
|
"exchange_code": decision.exchange_code,
|
||||||
|
"action": decision.action,
|
||||||
|
"confidence": decision.confidence,
|
||||||
|
"rationale": decision.rationale,
|
||||||
|
"outcome_pnl": decision.outcome_pnl,
|
||||||
|
"outcome_accuracy": decision.outcome_accuracy,
|
||||||
|
"context_snapshot": decision.context_snapshot,
|
||||||
|
"input_data": decision.input_data,
|
||||||
|
})
|
||||||
|
|
||||||
|
return failures
|
||||||
|
|
||||||
|
def identify_failure_patterns(
|
||||||
|
self, failures: list[dict[str, Any]]
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Identify patterns in losing decisions.
|
||||||
|
|
||||||
|
Analyzes:
|
||||||
|
- Time patterns (hour of day, day of week)
|
||||||
|
- Market conditions (volatility, volume)
|
||||||
|
- Stock characteristics (price range, market)
|
||||||
|
- Common failure modes in rationale
|
||||||
|
"""
|
||||||
|
if not failures:
|
||||||
|
return {"pattern_count": 0, "patterns": {}}
|
||||||
|
|
||||||
|
patterns = {
|
||||||
|
"markets": Counter(),
|
||||||
|
"actions": Counter(),
|
||||||
|
"hours": Counter(),
|
||||||
|
"avg_confidence": 0.0,
|
||||||
|
"avg_loss": 0.0,
|
||||||
|
"total_failures": len(failures),
|
||||||
|
}
|
||||||
|
|
||||||
|
total_confidence = 0
|
||||||
|
total_loss = 0.0
|
||||||
|
|
||||||
|
for failure in failures:
|
||||||
|
# Market distribution
|
||||||
|
patterns["markets"][failure.get("market", "UNKNOWN")] += 1
|
||||||
|
|
||||||
|
# Action distribution
|
||||||
|
patterns["actions"][failure.get("action", "UNKNOWN")] += 1
|
||||||
|
|
||||||
|
# Time pattern (extract hour from ISO timestamp)
|
||||||
|
timestamp = failure.get("timestamp", "")
|
||||||
|
if timestamp:
|
||||||
|
try:
|
||||||
|
dt = datetime.fromisoformat(timestamp)
|
||||||
|
patterns["hours"][dt.hour] += 1
|
||||||
|
except (ValueError, AttributeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Aggregate metrics
|
||||||
|
total_confidence += failure.get("confidence", 0)
|
||||||
|
total_loss += failure.get("outcome_pnl", 0.0)
|
||||||
|
|
||||||
|
patterns["avg_confidence"] = (
|
||||||
|
round(total_confidence / len(failures), 2) if failures else 0.0
|
||||||
|
)
|
||||||
|
patterns["avg_loss"] = (
|
||||||
|
round(total_loss / len(failures), 2) if failures else 0.0
|
||||||
|
)
|
||||||
|
|
||||||
|
# Convert Counters to regular dicts for JSON serialization
|
||||||
|
patterns["markets"] = dict(patterns["markets"])
|
||||||
|
patterns["actions"] = dict(patterns["actions"])
|
||||||
|
patterns["hours"] = dict(patterns["hours"])
|
||||||
|
|
||||||
|
return patterns
|
||||||
|
|
||||||
def get_performance_summary(self) -> dict[str, Any]:
|
def get_performance_summary(self) -> dict[str, Any]:
|
||||||
"""Return aggregate performance metrics from trade logs."""
|
"""Return aggregate performance metrics from trade logs."""
|
||||||
@@ -109,14 +188,25 @@ class EvolutionOptimizer:
|
|||||||
async def generate_strategy(self, failures: list[dict[str, Any]]) -> Path | None:
|
async def generate_strategy(self, failures: list[dict[str, Any]]) -> Path | None:
|
||||||
"""Ask Gemini to generate a new strategy based on failure analysis.
|
"""Ask Gemini to generate a new strategy based on failure analysis.
|
||||||
|
|
||||||
|
Integrates failure patterns and market conditions to create improved strategies.
|
||||||
Returns the path to the generated strategy file, or None on failure.
|
Returns the path to the generated strategy file, or None on failure.
|
||||||
"""
|
"""
|
||||||
|
# Identify failure patterns first
|
||||||
|
patterns = self.identify_failure_patterns(failures)
|
||||||
|
|
||||||
prompt = (
|
prompt = (
|
||||||
"You are a quantitative trading strategy developer.\n"
|
"You are a quantitative trading strategy developer.\n"
|
||||||
"Analyze these failed trades and generate an improved strategy.\n\n"
|
"Analyze these failed trades and their patterns, then generate an improved strategy.\n\n"
|
||||||
f"Failed trades:\n{json.dumps(failures, indent=2, default=str)}\n\n"
|
f"Failure Patterns:\n{json.dumps(patterns, indent=2)}\n\n"
|
||||||
"Generate a Python class that inherits from BaseStrategy.\n"
|
f"Sample Failed Trades (first 5):\n"
|
||||||
"The class must have an `evaluate(self, market_data: dict) -> dict` method.\n"
|
f"{json.dumps(failures[:5], indent=2, default=str)}\n\n"
|
||||||
|
"Based on these patterns, generate an improved trading strategy.\n"
|
||||||
|
"The strategy should:\n"
|
||||||
|
"1. Avoid the identified failure patterns\n"
|
||||||
|
"2. Consider market-specific conditions\n"
|
||||||
|
"3. Adjust confidence based on historical performance\n\n"
|
||||||
|
"Generate a Python method body that inherits from BaseStrategy.\n"
|
||||||
|
"The method signature is: evaluate(self, market_data: dict) -> dict\n"
|
||||||
"The method must return a dict with keys: action, confidence, rationale.\n"
|
"The method must return a dict with keys: action, confidence, rationale.\n"
|
||||||
"Respond with ONLY the method body (Python code), no class definition.\n"
|
"Respond with ONLY the method body (Python code), no class definition.\n"
|
||||||
)
|
)
|
||||||
@@ -147,10 +237,15 @@ class EvolutionOptimizer:
|
|||||||
# Indent the body for the class method
|
# Indent the body for the class method
|
||||||
indented_body = textwrap.indent(body, " ")
|
indented_body = textwrap.indent(body, " ")
|
||||||
|
|
||||||
|
# Generate rationale from patterns
|
||||||
|
rationale = f"Auto-evolved from {len(failures)} failures. "
|
||||||
|
rationale += f"Primary failure markets: {list(patterns.get('markets', {}).keys())}. "
|
||||||
|
rationale += f"Average loss: {patterns.get('avg_loss', 0.0)}"
|
||||||
|
|
||||||
content = STRATEGY_TEMPLATE.format(
|
content = STRATEGY_TEMPLATE.format(
|
||||||
name=version,
|
name=version,
|
||||||
timestamp=datetime.now(UTC).isoformat(),
|
timestamp=datetime.now(UTC).isoformat(),
|
||||||
rationale="Auto-evolved from failure analysis",
|
rationale=rationale,
|
||||||
class_name=class_name,
|
class_name=class_name,
|
||||||
body=indented_body.strip(),
|
body=indented_body.strip(),
|
||||||
)
|
)
|
||||||
|
|||||||
303
src/evolution/performance_tracker.py
Normal file
303
src/evolution/performance_tracker.py
Normal file
@@ -0,0 +1,303 @@
|
|||||||
|
"""Performance tracking system for strategy monitoring.
|
||||||
|
|
||||||
|
Tracks win rates, monitors improvement over time,
|
||||||
|
and provides performance metrics dashboard.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import sqlite3
|
||||||
|
from dataclasses import asdict, dataclass
|
||||||
|
from datetime import UTC, datetime, timedelta
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class StrategyMetrics:
|
||||||
|
"""Performance metrics for a strategy over a time period."""
|
||||||
|
|
||||||
|
strategy_name: str
|
||||||
|
period_start: str
|
||||||
|
period_end: str
|
||||||
|
total_trades: int
|
||||||
|
wins: int
|
||||||
|
losses: int
|
||||||
|
holds: int
|
||||||
|
win_rate: float
|
||||||
|
avg_pnl: float
|
||||||
|
total_pnl: float
|
||||||
|
best_trade: float
|
||||||
|
worst_trade: float
|
||||||
|
avg_confidence: float
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class PerformanceDashboard:
|
||||||
|
"""Comprehensive performance dashboard."""
|
||||||
|
|
||||||
|
generated_at: str
|
||||||
|
overall_metrics: StrategyMetrics
|
||||||
|
daily_metrics: list[StrategyMetrics]
|
||||||
|
weekly_metrics: list[StrategyMetrics]
|
||||||
|
improvement_trend: dict[str, Any]
|
||||||
|
|
||||||
|
|
||||||
|
class PerformanceTracker:
|
||||||
|
"""Tracks and monitors strategy performance over time."""
|
||||||
|
|
||||||
|
def __init__(self, db_path: str) -> None:
|
||||||
|
"""Initialize performance tracker.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
db_path: Path to the trade logs database
|
||||||
|
"""
|
||||||
|
self._db_path = db_path
|
||||||
|
|
||||||
|
def get_strategy_metrics(
|
||||||
|
self,
|
||||||
|
strategy_name: str | None = None,
|
||||||
|
start_date: str | None = None,
|
||||||
|
end_date: str | None = None,
|
||||||
|
) -> StrategyMetrics:
|
||||||
|
"""Get performance metrics for a strategy over a time period.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
strategy_name: Name of the strategy (None = all strategies)
|
||||||
|
start_date: Start date in ISO format (None = beginning of time)
|
||||||
|
end_date: End date in ISO format (None = now)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
StrategyMetrics object with performance data
|
||||||
|
"""
|
||||||
|
conn = sqlite3.connect(self._db_path)
|
||||||
|
conn.row_factory = sqlite3.Row
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Build query with optional filters
|
||||||
|
query = """
|
||||||
|
SELECT
|
||||||
|
COUNT(*) as total_trades,
|
||||||
|
SUM(CASE WHEN pnl > 0 THEN 1 ELSE 0 END) as wins,
|
||||||
|
SUM(CASE WHEN pnl < 0 THEN 1 ELSE 0 END) as losses,
|
||||||
|
SUM(CASE WHEN action = 'HOLD' THEN 1 ELSE 0 END) as holds,
|
||||||
|
COALESCE(AVG(CASE WHEN pnl IS NOT NULL THEN pnl END), 0) as avg_pnl,
|
||||||
|
COALESCE(SUM(CASE WHEN pnl IS NOT NULL THEN pnl ELSE 0 END), 0) as total_pnl,
|
||||||
|
COALESCE(MAX(pnl), 0) as best_trade,
|
||||||
|
COALESCE(MIN(pnl), 0) as worst_trade,
|
||||||
|
COALESCE(AVG(confidence), 0) as avg_confidence,
|
||||||
|
MIN(timestamp) as period_start,
|
||||||
|
MAX(timestamp) as period_end
|
||||||
|
FROM trades
|
||||||
|
WHERE 1=1
|
||||||
|
"""
|
||||||
|
params: list[Any] = []
|
||||||
|
|
||||||
|
if start_date:
|
||||||
|
query += " AND timestamp >= ?"
|
||||||
|
params.append(start_date)
|
||||||
|
|
||||||
|
if end_date:
|
||||||
|
query += " AND timestamp <= ?"
|
||||||
|
params.append(end_date)
|
||||||
|
|
||||||
|
# Note: Currently trades table doesn't have strategy_name column
|
||||||
|
# This is a placeholder for future extension
|
||||||
|
|
||||||
|
row = conn.execute(query, params).fetchone()
|
||||||
|
|
||||||
|
total_trades = row["total_trades"] or 0
|
||||||
|
wins = row["wins"] or 0
|
||||||
|
win_rate = (wins / total_trades * 100) if total_trades > 0 else 0.0
|
||||||
|
|
||||||
|
return StrategyMetrics(
|
||||||
|
strategy_name=strategy_name or "default",
|
||||||
|
period_start=row["period_start"] or "",
|
||||||
|
period_end=row["period_end"] or "",
|
||||||
|
total_trades=total_trades,
|
||||||
|
wins=wins,
|
||||||
|
losses=row["losses"] or 0,
|
||||||
|
holds=row["holds"] or 0,
|
||||||
|
win_rate=round(win_rate, 2),
|
||||||
|
avg_pnl=round(row["avg_pnl"], 2),
|
||||||
|
total_pnl=round(row["total_pnl"], 2),
|
||||||
|
best_trade=round(row["best_trade"], 2),
|
||||||
|
worst_trade=round(row["worst_trade"], 2),
|
||||||
|
avg_confidence=round(row["avg_confidence"], 2),
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
def get_daily_metrics(
|
||||||
|
self, days: int = 7, strategy_name: str | None = None
|
||||||
|
) -> list[StrategyMetrics]:
|
||||||
|
"""Get daily performance metrics for the last N days.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
days: Number of days to retrieve (default 7)
|
||||||
|
strategy_name: Name of the strategy (None = all strategies)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of StrategyMetrics, one per day
|
||||||
|
"""
|
||||||
|
metrics = []
|
||||||
|
end_date = datetime.now(UTC)
|
||||||
|
|
||||||
|
for i in range(days):
|
||||||
|
day_end = end_date - timedelta(days=i)
|
||||||
|
day_start = day_end - timedelta(days=1)
|
||||||
|
|
||||||
|
day_metrics = self.get_strategy_metrics(
|
||||||
|
strategy_name=strategy_name,
|
||||||
|
start_date=day_start.isoformat(),
|
||||||
|
end_date=day_end.isoformat(),
|
||||||
|
)
|
||||||
|
metrics.append(day_metrics)
|
||||||
|
|
||||||
|
return metrics
|
||||||
|
|
||||||
|
def get_weekly_metrics(
|
||||||
|
self, weeks: int = 4, strategy_name: str | None = None
|
||||||
|
) -> list[StrategyMetrics]:
|
||||||
|
"""Get weekly performance metrics for the last N weeks.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
weeks: Number of weeks to retrieve (default 4)
|
||||||
|
strategy_name: Name of the strategy (None = all strategies)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of StrategyMetrics, one per week
|
||||||
|
"""
|
||||||
|
metrics = []
|
||||||
|
end_date = datetime.now(UTC)
|
||||||
|
|
||||||
|
for i in range(weeks):
|
||||||
|
week_end = end_date - timedelta(weeks=i)
|
||||||
|
week_start = week_end - timedelta(weeks=1)
|
||||||
|
|
||||||
|
week_metrics = self.get_strategy_metrics(
|
||||||
|
strategy_name=strategy_name,
|
||||||
|
start_date=week_start.isoformat(),
|
||||||
|
end_date=week_end.isoformat(),
|
||||||
|
)
|
||||||
|
metrics.append(week_metrics)
|
||||||
|
|
||||||
|
return metrics
|
||||||
|
|
||||||
|
def calculate_improvement_trend(
|
||||||
|
self, metrics_history: list[StrategyMetrics]
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Calculate improvement trend from historical metrics.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
metrics_history: List of StrategyMetrics ordered from oldest to newest
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dictionary with trend analysis
|
||||||
|
"""
|
||||||
|
if len(metrics_history) < 2:
|
||||||
|
return {
|
||||||
|
"trend": "insufficient_data",
|
||||||
|
"win_rate_change": 0.0,
|
||||||
|
"pnl_change": 0.0,
|
||||||
|
"confidence_change": 0.0,
|
||||||
|
}
|
||||||
|
|
||||||
|
oldest = metrics_history[0]
|
||||||
|
newest = metrics_history[-1]
|
||||||
|
|
||||||
|
win_rate_change = newest.win_rate - oldest.win_rate
|
||||||
|
pnl_change = newest.avg_pnl - oldest.avg_pnl
|
||||||
|
confidence_change = newest.avg_confidence - oldest.avg_confidence
|
||||||
|
|
||||||
|
# Determine overall trend
|
||||||
|
if win_rate_change > 5.0 and pnl_change > 0:
|
||||||
|
trend = "improving"
|
||||||
|
elif win_rate_change < -5.0 or pnl_change < 0:
|
||||||
|
trend = "declining"
|
||||||
|
else:
|
||||||
|
trend = "stable"
|
||||||
|
|
||||||
|
return {
|
||||||
|
"trend": trend,
|
||||||
|
"win_rate_change": round(win_rate_change, 2),
|
||||||
|
"pnl_change": round(pnl_change, 2),
|
||||||
|
"confidence_change": round(confidence_change, 2),
|
||||||
|
"period_count": len(metrics_history),
|
||||||
|
}
|
||||||
|
|
||||||
|
def generate_dashboard(
|
||||||
|
self, strategy_name: str | None = None
|
||||||
|
) -> PerformanceDashboard:
|
||||||
|
"""Generate a comprehensive performance dashboard.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
strategy_name: Name of the strategy (None = all strategies)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
PerformanceDashboard with all metrics
|
||||||
|
"""
|
||||||
|
# Get overall metrics
|
||||||
|
overall_metrics = self.get_strategy_metrics(strategy_name=strategy_name)
|
||||||
|
|
||||||
|
# Get daily metrics (last 7 days)
|
||||||
|
daily_metrics = self.get_daily_metrics(days=7, strategy_name=strategy_name)
|
||||||
|
|
||||||
|
# Get weekly metrics (last 4 weeks)
|
||||||
|
weekly_metrics = self.get_weekly_metrics(weeks=4, strategy_name=strategy_name)
|
||||||
|
|
||||||
|
# Calculate improvement trend
|
||||||
|
improvement_trend = self.calculate_improvement_trend(weekly_metrics[::-1])
|
||||||
|
|
||||||
|
return PerformanceDashboard(
|
||||||
|
generated_at=datetime.now(UTC).isoformat(),
|
||||||
|
overall_metrics=overall_metrics,
|
||||||
|
daily_metrics=daily_metrics,
|
||||||
|
weekly_metrics=weekly_metrics,
|
||||||
|
improvement_trend=improvement_trend,
|
||||||
|
)
|
||||||
|
|
||||||
|
def export_dashboard_json(
|
||||||
|
self, dashboard: PerformanceDashboard
|
||||||
|
) -> str:
|
||||||
|
"""Export dashboard as JSON string.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dashboard: PerformanceDashboard object
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
JSON string representation
|
||||||
|
"""
|
||||||
|
data = {
|
||||||
|
"generated_at": dashboard.generated_at,
|
||||||
|
"overall_metrics": asdict(dashboard.overall_metrics),
|
||||||
|
"daily_metrics": [asdict(m) for m in dashboard.daily_metrics],
|
||||||
|
"weekly_metrics": [asdict(m) for m in dashboard.weekly_metrics],
|
||||||
|
"improvement_trend": dashboard.improvement_trend,
|
||||||
|
}
|
||||||
|
return json.dumps(data, indent=2)
|
||||||
|
|
||||||
|
def log_dashboard(self, dashboard: PerformanceDashboard) -> None:
|
||||||
|
"""Log dashboard summary to logger.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dashboard: PerformanceDashboard object
|
||||||
|
"""
|
||||||
|
logger.info("=" * 60)
|
||||||
|
logger.info("PERFORMANCE DASHBOARD")
|
||||||
|
logger.info("=" * 60)
|
||||||
|
logger.info("Generated: %s", dashboard.generated_at)
|
||||||
|
logger.info("")
|
||||||
|
logger.info("Overall Performance:")
|
||||||
|
logger.info(" Total Trades: %d", dashboard.overall_metrics.total_trades)
|
||||||
|
logger.info(" Win Rate: %.2f%%", dashboard.overall_metrics.win_rate)
|
||||||
|
logger.info(" Average P&L: %.2f", dashboard.overall_metrics.avg_pnl)
|
||||||
|
logger.info(" Total P&L: %.2f", dashboard.overall_metrics.total_pnl)
|
||||||
|
logger.info("")
|
||||||
|
logger.info("Improvement Trend (%s):", dashboard.improvement_trend["trend"])
|
||||||
|
logger.info(" Win Rate Change: %+.2f%%", dashboard.improvement_trend["win_rate_change"])
|
||||||
|
logger.info(" P&L Change: %+.2f", dashboard.improvement_trend["pnl_change"])
|
||||||
|
logger.info("=" * 60)
|
||||||
5
src/logging/__init__.py
Normal file
5
src/logging/__init__.py
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
"""Decision logging and audit trail for trade decisions."""
|
||||||
|
|
||||||
|
from src.logging.decision_logger import DecisionLog, DecisionLogger
|
||||||
|
|
||||||
|
__all__ = ["DecisionLog", "DecisionLogger"]
|
||||||
235
src/logging/decision_logger.py
Normal file
235
src/logging/decision_logger.py
Normal file
@@ -0,0 +1,235 @@
|
|||||||
|
"""Decision logging system with context snapshots for comprehensive audit trail."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sqlite3
|
||||||
|
import uuid
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from datetime import UTC, datetime
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class DecisionLog:
|
||||||
|
"""A logged trading decision with context and outcome."""
|
||||||
|
|
||||||
|
decision_id: str
|
||||||
|
timestamp: str
|
||||||
|
stock_code: str
|
||||||
|
market: str
|
||||||
|
exchange_code: str
|
||||||
|
action: str
|
||||||
|
confidence: int
|
||||||
|
rationale: str
|
||||||
|
context_snapshot: dict[str, Any]
|
||||||
|
input_data: dict[str, Any]
|
||||||
|
outcome_pnl: float | None = None
|
||||||
|
outcome_accuracy: int | None = None
|
||||||
|
reviewed: bool = False
|
||||||
|
review_notes: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class DecisionLogger:
|
||||||
|
"""Logs trading decisions with full context for review and evolution."""
|
||||||
|
|
||||||
|
def __init__(self, conn: sqlite3.Connection) -> None:
|
||||||
|
"""Initialize the decision logger with a database connection."""
|
||||||
|
self.conn = conn
|
||||||
|
|
||||||
|
def log_decision(
|
||||||
|
self,
|
||||||
|
stock_code: str,
|
||||||
|
market: str,
|
||||||
|
exchange_code: str,
|
||||||
|
action: str,
|
||||||
|
confidence: int,
|
||||||
|
rationale: str,
|
||||||
|
context_snapshot: dict[str, Any],
|
||||||
|
input_data: dict[str, Any],
|
||||||
|
) -> str:
|
||||||
|
"""Log a trading decision with full context.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
stock_code: Stock symbol
|
||||||
|
market: Market code (e.g., "KR", "US_NASDAQ")
|
||||||
|
exchange_code: Exchange code (e.g., "KRX", "NASDAQ")
|
||||||
|
action: Trading action (BUY/SELL/HOLD)
|
||||||
|
confidence: Confidence level (0-100)
|
||||||
|
rationale: Reasoning for the decision
|
||||||
|
context_snapshot: L1-L7 context snapshot at decision time
|
||||||
|
input_data: Market data inputs (price, volume, orderbook, etc.)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
decision_id: Unique identifier for this decision
|
||||||
|
"""
|
||||||
|
decision_id = str(uuid.uuid4())
|
||||||
|
timestamp = datetime.now(UTC).isoformat()
|
||||||
|
|
||||||
|
self.conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO decision_logs (
|
||||||
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
|
action, confidence, rationale, context_snapshot, input_data
|
||||||
|
)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
""",
|
||||||
|
(
|
||||||
|
decision_id,
|
||||||
|
timestamp,
|
||||||
|
stock_code,
|
||||||
|
market,
|
||||||
|
exchange_code,
|
||||||
|
action,
|
||||||
|
confidence,
|
||||||
|
rationale,
|
||||||
|
json.dumps(context_snapshot),
|
||||||
|
json.dumps(input_data),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
|
||||||
|
return decision_id
|
||||||
|
|
||||||
|
def get_unreviewed_decisions(
|
||||||
|
self, min_confidence: int = 80, limit: int | None = None
|
||||||
|
) -> list[DecisionLog]:
|
||||||
|
"""Get unreviewed decisions with high confidence.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
min_confidence: Minimum confidence threshold (default 80)
|
||||||
|
limit: Maximum number of results (None = unlimited)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of unreviewed DecisionLog objects
|
||||||
|
"""
|
||||||
|
query = """
|
||||||
|
SELECT
|
||||||
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
|
action, confidence, rationale, context_snapshot, input_data,
|
||||||
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
|
FROM decision_logs
|
||||||
|
WHERE reviewed = 0 AND confidence >= ?
|
||||||
|
ORDER BY timestamp DESC
|
||||||
|
"""
|
||||||
|
if limit is not None:
|
||||||
|
query += f" LIMIT {limit}"
|
||||||
|
|
||||||
|
cursor = self.conn.execute(query, (min_confidence,))
|
||||||
|
return [self._row_to_decision_log(row) for row in cursor.fetchall()]
|
||||||
|
|
||||||
|
def mark_reviewed(self, decision_id: str, notes: str) -> None:
|
||||||
|
"""Mark a decision as reviewed with notes.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
decision_id: Decision identifier
|
||||||
|
notes: Review notes and insights
|
||||||
|
"""
|
||||||
|
self.conn.execute(
|
||||||
|
"""
|
||||||
|
UPDATE decision_logs
|
||||||
|
SET reviewed = 1, review_notes = ?
|
||||||
|
WHERE decision_id = ?
|
||||||
|
""",
|
||||||
|
(notes, decision_id),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
|
||||||
|
def update_outcome(
|
||||||
|
self, decision_id: str, pnl: float, accuracy: int
|
||||||
|
) -> None:
|
||||||
|
"""Update the outcome of a decision after trade execution.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
decision_id: Decision identifier
|
||||||
|
pnl: Actual profit/loss realized
|
||||||
|
accuracy: 1 if decision was correct, 0 if wrong
|
||||||
|
"""
|
||||||
|
self.conn.execute(
|
||||||
|
"""
|
||||||
|
UPDATE decision_logs
|
||||||
|
SET outcome_pnl = ?, outcome_accuracy = ?
|
||||||
|
WHERE decision_id = ?
|
||||||
|
""",
|
||||||
|
(pnl, accuracy, decision_id),
|
||||||
|
)
|
||||||
|
self.conn.commit()
|
||||||
|
|
||||||
|
def get_decision_by_id(self, decision_id: str) -> DecisionLog | None:
|
||||||
|
"""Get a specific decision by ID.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
decision_id: Decision identifier
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
DecisionLog object or None if not found
|
||||||
|
"""
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT
|
||||||
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
|
action, confidence, rationale, context_snapshot, input_data,
|
||||||
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
|
FROM decision_logs
|
||||||
|
WHERE decision_id = ?
|
||||||
|
""",
|
||||||
|
(decision_id,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
return self._row_to_decision_log(row) if row else None
|
||||||
|
|
||||||
|
def get_losing_decisions(
|
||||||
|
self, min_confidence: int = 80, min_loss: float = -100.0
|
||||||
|
) -> list[DecisionLog]:
|
||||||
|
"""Get high-confidence decisions that resulted in losses.
|
||||||
|
|
||||||
|
Useful for identifying patterns in failed predictions.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
min_confidence: Minimum confidence threshold (default 80)
|
||||||
|
min_loss: Minimum loss amount (default -100.0, i.e., loss >= 100)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of losing DecisionLog objects
|
||||||
|
"""
|
||||||
|
cursor = self.conn.execute(
|
||||||
|
"""
|
||||||
|
SELECT
|
||||||
|
decision_id, timestamp, stock_code, market, exchange_code,
|
||||||
|
action, confidence, rationale, context_snapshot, input_data,
|
||||||
|
outcome_pnl, outcome_accuracy, reviewed, review_notes
|
||||||
|
FROM decision_logs
|
||||||
|
WHERE confidence >= ?
|
||||||
|
AND outcome_pnl IS NOT NULL
|
||||||
|
AND outcome_pnl <= ?
|
||||||
|
ORDER BY outcome_pnl ASC
|
||||||
|
""",
|
||||||
|
(min_confidence, min_loss),
|
||||||
|
)
|
||||||
|
return [self._row_to_decision_log(row) for row in cursor.fetchall()]
|
||||||
|
|
||||||
|
def _row_to_decision_log(self, row: tuple[Any, ...]) -> DecisionLog:
|
||||||
|
"""Convert a database row to a DecisionLog object.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
row: Database row tuple
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
DecisionLog object
|
||||||
|
"""
|
||||||
|
return DecisionLog(
|
||||||
|
decision_id=row[0],
|
||||||
|
timestamp=row[1],
|
||||||
|
stock_code=row[2],
|
||||||
|
market=row[3],
|
||||||
|
exchange_code=row[4],
|
||||||
|
action=row[5],
|
||||||
|
confidence=row[6],
|
||||||
|
rationale=row[7],
|
||||||
|
context_snapshot=json.loads(row[8]),
|
||||||
|
input_data=json.loads(row[9]),
|
||||||
|
outcome_pnl=row[10],
|
||||||
|
outcome_accuracy=row[11],
|
||||||
|
reviewed=bool(row[12]),
|
||||||
|
review_notes=row[13],
|
||||||
|
)
|
||||||
37
src/main.py
37
src/main.py
@@ -19,6 +19,7 @@ from src.broker.overseas import OverseasBroker
|
|||||||
from src.config import Settings
|
from src.config import Settings
|
||||||
from src.core.risk_manager import CircuitBreakerTripped, RiskManager
|
from src.core.risk_manager import CircuitBreakerTripped, RiskManager
|
||||||
from src.db import init_db, log_trade
|
from src.db import init_db, log_trade
|
||||||
|
from src.logging.decision_logger import DecisionLogger
|
||||||
from src.logging_config import setup_logging
|
from src.logging_config import setup_logging
|
||||||
from src.markets.schedule import MarketInfo, get_next_market_open, get_open_markets
|
from src.markets.schedule import MarketInfo, get_next_market_open, get_open_markets
|
||||||
|
|
||||||
@@ -42,6 +43,7 @@ async def trading_cycle(
|
|||||||
brain: GeminiClient,
|
brain: GeminiClient,
|
||||||
risk: RiskManager,
|
risk: RiskManager,
|
||||||
db_conn: Any,
|
db_conn: Any,
|
||||||
|
decision_logger: DecisionLogger,
|
||||||
market: MarketInfo,
|
market: MarketInfo,
|
||||||
stock_code: str,
|
stock_code: str,
|
||||||
) -> None:
|
) -> None:
|
||||||
@@ -101,6 +103,39 @@ async def trading_cycle(
|
|||||||
decision.confidence,
|
decision.confidence,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 2.5. Log decision with context snapshot
|
||||||
|
context_snapshot = {
|
||||||
|
"L1": {
|
||||||
|
"current_price": current_price,
|
||||||
|
"foreigner_net": foreigner_net,
|
||||||
|
},
|
||||||
|
"L2": {
|
||||||
|
"total_eval": total_eval,
|
||||||
|
"total_cash": total_cash,
|
||||||
|
"purchase_total": purchase_total,
|
||||||
|
"pnl_pct": pnl_pct,
|
||||||
|
},
|
||||||
|
# L3-L7 will be populated when context tree is implemented
|
||||||
|
}
|
||||||
|
input_data = {
|
||||||
|
"current_price": current_price,
|
||||||
|
"foreigner_net": foreigner_net,
|
||||||
|
"total_eval": total_eval,
|
||||||
|
"total_cash": total_cash,
|
||||||
|
"pnl_pct": pnl_pct,
|
||||||
|
}
|
||||||
|
|
||||||
|
decision_logger.log_decision(
|
||||||
|
stock_code=stock_code,
|
||||||
|
market=market.code,
|
||||||
|
exchange_code=market.exchange_code,
|
||||||
|
action=decision.action,
|
||||||
|
confidence=decision.confidence,
|
||||||
|
rationale=decision.rationale,
|
||||||
|
context_snapshot=context_snapshot,
|
||||||
|
input_data=input_data,
|
||||||
|
)
|
||||||
|
|
||||||
# 3. Execute if actionable
|
# 3. Execute if actionable
|
||||||
if decision.action in ("BUY", "SELL"):
|
if decision.action in ("BUY", "SELL"):
|
||||||
# Determine order size (simplified: 1 lot)
|
# Determine order size (simplified: 1 lot)
|
||||||
@@ -151,6 +186,7 @@ async def run(settings: Settings) -> None:
|
|||||||
brain = GeminiClient(settings)
|
brain = GeminiClient(settings)
|
||||||
risk = RiskManager(settings)
|
risk = RiskManager(settings)
|
||||||
db_conn = init_db(settings.DB_PATH)
|
db_conn = init_db(settings.DB_PATH)
|
||||||
|
decision_logger = DecisionLogger(db_conn)
|
||||||
|
|
||||||
shutdown = asyncio.Event()
|
shutdown = asyncio.Event()
|
||||||
|
|
||||||
@@ -218,6 +254,7 @@ async def run(settings: Settings) -> None:
|
|||||||
brain,
|
brain,
|
||||||
risk,
|
risk,
|
||||||
db_conn,
|
db_conn,
|
||||||
|
decision_logger,
|
||||||
market,
|
market,
|
||||||
stock_code,
|
stock_code,
|
||||||
)
|
)
|
||||||
|
|||||||
350
tests/test_context.py
Normal file
350
tests/test_context.py
Normal file
@@ -0,0 +1,350 @@
|
|||||||
|
"""Tests for the multi-layered context management system."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
from datetime import UTC, datetime, timedelta
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from src.context.aggregator import ContextAggregator
|
||||||
|
from src.context.layer import LAYER_CONFIG, ContextLayer
|
||||||
|
from src.context.store import ContextStore
|
||||||
|
from src.db import init_db, log_trade
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def db_conn() -> sqlite3.Connection:
|
||||||
|
"""Provide an in-memory database connection."""
|
||||||
|
return init_db(":memory:")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def store(db_conn: sqlite3.Connection) -> ContextStore:
|
||||||
|
"""Provide a ContextStore instance."""
|
||||||
|
return ContextStore(db_conn)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def aggregator(db_conn: sqlite3.Connection) -> ContextAggregator:
|
||||||
|
"""Provide a ContextAggregator instance."""
|
||||||
|
return ContextAggregator(db_conn)
|
||||||
|
|
||||||
|
|
||||||
|
class TestContextStore:
|
||||||
|
"""Test suite for ContextStore CRUD operations."""
|
||||||
|
|
||||||
|
def test_set_and_get_context(self, store: ContextStore) -> None:
|
||||||
|
"""Test setting and retrieving a context value."""
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl", 1234.56)
|
||||||
|
|
||||||
|
value = store.get_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl")
|
||||||
|
assert value == 1234.56
|
||||||
|
|
||||||
|
def test_get_nonexistent_context(self, store: ContextStore) -> None:
|
||||||
|
"""Test retrieving a non-existent context returns None."""
|
||||||
|
value = store.get_context(ContextLayer.L6_DAILY, "2026-02-04", "nonexistent")
|
||||||
|
assert value is None
|
||||||
|
|
||||||
|
def test_update_existing_context(self, store: ContextStore) -> None:
|
||||||
|
"""Test updating an existing context value."""
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl", 100.0)
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl", 200.0)
|
||||||
|
|
||||||
|
value = store.get_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl")
|
||||||
|
assert value == 200.0
|
||||||
|
|
||||||
|
def test_get_all_contexts_for_layer(self, store: ContextStore) -> None:
|
||||||
|
"""Test retrieving all contexts for a specific layer."""
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "total_pnl", 100.0)
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "trade_count", 10)
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-04", "win_rate", 60.5)
|
||||||
|
|
||||||
|
contexts = store.get_all_contexts(ContextLayer.L6_DAILY, "2026-02-04")
|
||||||
|
assert len(contexts) == 3
|
||||||
|
assert contexts["total_pnl"] == 100.0
|
||||||
|
assert contexts["trade_count"] == 10
|
||||||
|
assert contexts["win_rate"] == 60.5
|
||||||
|
|
||||||
|
def test_get_latest_timeframe(self, store: ContextStore) -> None:
|
||||||
|
"""Test getting the most recent timeframe for a layer."""
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-01", "total_pnl", 100.0)
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-03", "total_pnl", 200.0)
|
||||||
|
store.set_context(ContextLayer.L6_DAILY, "2026-02-02", "total_pnl", 150.0)
|
||||||
|
|
||||||
|
latest = store.get_latest_timeframe(ContextLayer.L6_DAILY)
|
||||||
|
# Latest by updated_at, which should be the last one set
|
||||||
|
assert latest == "2026-02-02"
|
||||||
|
|
||||||
|
def test_delete_old_contexts(
|
||||||
|
self, store: ContextStore, db_conn: sqlite3.Connection
|
||||||
|
) -> None:
|
||||||
|
"""Test deleting contexts older than a cutoff date."""
|
||||||
|
# Insert contexts with specific old timestamps
|
||||||
|
# (bypassing set_context which uses current time)
|
||||||
|
old_date = "2026-01-01T00:00:00+00:00"
|
||||||
|
new_date = "2026-02-01T00:00:00+00:00"
|
||||||
|
|
||||||
|
db_conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO contexts (layer, timeframe, key, value, created_at, updated_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)
|
||||||
|
""",
|
||||||
|
(ContextLayer.L6_DAILY.value, "2026-01-01", "total_pnl", "100.0", old_date, old_date),
|
||||||
|
)
|
||||||
|
db_conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO contexts (layer, timeframe, key, value, created_at, updated_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)
|
||||||
|
""",
|
||||||
|
(ContextLayer.L6_DAILY.value, "2026-02-01", "total_pnl", "200.0", new_date, new_date),
|
||||||
|
)
|
||||||
|
db_conn.commit()
|
||||||
|
|
||||||
|
# Delete contexts before 2026-01-15
|
||||||
|
cutoff = "2026-01-15T00:00:00+00:00"
|
||||||
|
deleted = store.delete_old_contexts(ContextLayer.L6_DAILY, cutoff)
|
||||||
|
|
||||||
|
# Should delete the 2026-01-01 context
|
||||||
|
assert deleted == 1
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, "2026-02-01", "total_pnl") == 200.0
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, "2026-01-01", "total_pnl") is None
|
||||||
|
|
||||||
|
def test_cleanup_expired_contexts(
|
||||||
|
self, store: ContextStore, db_conn: sqlite3.Connection
|
||||||
|
) -> None:
|
||||||
|
"""Test automatic cleanup based on retention policies."""
|
||||||
|
# Set old contexts for L7 (7 day retention)
|
||||||
|
old_date = (datetime.now(UTC) - timedelta(days=10)).isoformat()
|
||||||
|
db_conn.execute(
|
||||||
|
"""
|
||||||
|
INSERT INTO contexts (layer, timeframe, key, value, created_at, updated_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)
|
||||||
|
""",
|
||||||
|
(ContextLayer.L7_REALTIME.value, "2026-01-01", "price", "100.0", old_date, old_date),
|
||||||
|
)
|
||||||
|
db_conn.commit()
|
||||||
|
|
||||||
|
deleted_counts = store.cleanup_expired_contexts()
|
||||||
|
|
||||||
|
# Should delete the old L7 context (10 days > 7 day retention)
|
||||||
|
assert deleted_counts[ContextLayer.L7_REALTIME] == 1
|
||||||
|
|
||||||
|
# L1 has no retention limit, so nothing should be deleted
|
||||||
|
assert deleted_counts[ContextLayer.L1_LEGACY] == 0
|
||||||
|
|
||||||
|
def test_context_metadata_initialized(
|
||||||
|
self, store: ContextStore, db_conn: sqlite3.Connection
|
||||||
|
) -> None:
|
||||||
|
"""Test that context metadata is properly initialized."""
|
||||||
|
cursor = db_conn.execute("SELECT COUNT(*) FROM context_metadata")
|
||||||
|
count = cursor.fetchone()[0]
|
||||||
|
|
||||||
|
# Should have metadata for all 7 layers
|
||||||
|
assert count == 7
|
||||||
|
|
||||||
|
# Verify L1 metadata
|
||||||
|
cursor = db_conn.execute(
|
||||||
|
"SELECT description, retention_days FROM context_metadata WHERE layer = ?",
|
||||||
|
(ContextLayer.L1_LEGACY.value,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
assert row is not None
|
||||||
|
assert "Cumulative trading history" in row[0]
|
||||||
|
assert row[1] is None # No retention limit for L1
|
||||||
|
|
||||||
|
|
||||||
|
class TestContextAggregator:
|
||||||
|
"""Test suite for ContextAggregator."""
|
||||||
|
|
||||||
|
def test_aggregate_daily_from_trades(
|
||||||
|
self, aggregator: ContextAggregator, db_conn: sqlite3.Connection
|
||||||
|
) -> None:
|
||||||
|
"""Test aggregating daily metrics from trades."""
|
||||||
|
date = "2026-02-04"
|
||||||
|
|
||||||
|
# Create sample trades
|
||||||
|
log_trade(db_conn, "005930", "BUY", 85, "Good signal", quantity=10, price=70000, pnl=500)
|
||||||
|
log_trade(db_conn, "000660", "SELL", 90, "Take profit", quantity=5, price=50000, pnl=1500)
|
||||||
|
log_trade(db_conn, "035720", "HOLD", 75, "Wait", quantity=0, price=0, pnl=0)
|
||||||
|
|
||||||
|
# Manually set timestamps to the target date
|
||||||
|
db_conn.execute(
|
||||||
|
f"UPDATE trades SET timestamp = '{date}T10:00:00+00:00'"
|
||||||
|
)
|
||||||
|
db_conn.commit()
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_daily_from_trades(date)
|
||||||
|
|
||||||
|
# Verify L6 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "trade_count") == 3
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "buys") == 1
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "sells") == 1
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "holds") == 1
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "total_pnl") == 2000.0
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "unique_stocks") == 3
|
||||||
|
# 2 wins, 0 losses
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "win_rate") == 100.0
|
||||||
|
|
||||||
|
def test_aggregate_weekly_from_daily(self, aggregator: ContextAggregator) -> None:
|
||||||
|
"""Test aggregating weekly metrics from daily."""
|
||||||
|
week = "2026-W06"
|
||||||
|
|
||||||
|
# Set daily contexts
|
||||||
|
aggregator.store.set_context(ContextLayer.L6_DAILY, "2026-02-02", "total_pnl", 100.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L6_DAILY, "2026-02-03", "total_pnl", 200.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L6_DAILY, "2026-02-02", "avg_confidence", 80.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L6_DAILY, "2026-02-03", "avg_confidence", 85.0)
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_weekly_from_daily(week)
|
||||||
|
|
||||||
|
# Verify L5 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
weekly_pnl = store.get_context(ContextLayer.L5_WEEKLY, week, "weekly_pnl")
|
||||||
|
avg_conf = store.get_context(ContextLayer.L5_WEEKLY, week, "avg_confidence")
|
||||||
|
|
||||||
|
assert weekly_pnl == 300.0
|
||||||
|
assert avg_conf == 82.5
|
||||||
|
|
||||||
|
def test_aggregate_monthly_from_weekly(self, aggregator: ContextAggregator) -> None:
|
||||||
|
"""Test aggregating monthly metrics from weekly."""
|
||||||
|
month = "2026-02"
|
||||||
|
|
||||||
|
# Set weekly contexts
|
||||||
|
aggregator.store.set_context(ContextLayer.L5_WEEKLY, "2026-W05", "weekly_pnl", 100.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L5_WEEKLY, "2026-W06", "weekly_pnl", 200.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L5_WEEKLY, "2026-W07", "weekly_pnl", 150.0)
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_monthly_from_weekly(month)
|
||||||
|
|
||||||
|
# Verify L4 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
monthly_pnl = store.get_context(ContextLayer.L4_MONTHLY, month, "monthly_pnl")
|
||||||
|
assert monthly_pnl == 450.0
|
||||||
|
|
||||||
|
def test_aggregate_quarterly_from_monthly(self, aggregator: ContextAggregator) -> None:
|
||||||
|
"""Test aggregating quarterly metrics from monthly."""
|
||||||
|
quarter = "2026-Q1"
|
||||||
|
|
||||||
|
# Set monthly contexts for Q1 (Jan, Feb, Mar)
|
||||||
|
aggregator.store.set_context(ContextLayer.L4_MONTHLY, "2026-01", "monthly_pnl", 1000.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L4_MONTHLY, "2026-02", "monthly_pnl", 2000.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L4_MONTHLY, "2026-03", "monthly_pnl", 1500.0)
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_quarterly_from_monthly(quarter)
|
||||||
|
|
||||||
|
# Verify L3 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
quarterly_pnl = store.get_context(ContextLayer.L3_QUARTERLY, quarter, "quarterly_pnl")
|
||||||
|
assert quarterly_pnl == 4500.0
|
||||||
|
|
||||||
|
def test_aggregate_annual_from_quarterly(self, aggregator: ContextAggregator) -> None:
|
||||||
|
"""Test aggregating annual metrics from quarterly."""
|
||||||
|
year = "2026"
|
||||||
|
|
||||||
|
# Set quarterly contexts for all 4 quarters
|
||||||
|
aggregator.store.set_context(ContextLayer.L3_QUARTERLY, "2026-Q1", "quarterly_pnl", 4500.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L3_QUARTERLY, "2026-Q2", "quarterly_pnl", 5000.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L3_QUARTERLY, "2026-Q3", "quarterly_pnl", 4800.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L3_QUARTERLY, "2026-Q4", "quarterly_pnl", 5200.0)
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_annual_from_quarterly(year)
|
||||||
|
|
||||||
|
# Verify L2 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
annual_pnl = store.get_context(ContextLayer.L2_ANNUAL, year, "annual_pnl")
|
||||||
|
assert annual_pnl == 19500.0
|
||||||
|
|
||||||
|
def test_aggregate_legacy_from_annual(self, aggregator: ContextAggregator) -> None:
|
||||||
|
"""Test aggregating legacy metrics from all annual data."""
|
||||||
|
# Set annual contexts for multiple years
|
||||||
|
aggregator.store.set_context(ContextLayer.L2_ANNUAL, "2024", "annual_pnl", 10000.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L2_ANNUAL, "2025", "annual_pnl", 15000.0)
|
||||||
|
aggregator.store.set_context(ContextLayer.L2_ANNUAL, "2026", "annual_pnl", 20000.0)
|
||||||
|
|
||||||
|
# Aggregate
|
||||||
|
aggregator.aggregate_legacy_from_annual()
|
||||||
|
|
||||||
|
# Verify L1 contexts
|
||||||
|
store = aggregator.store
|
||||||
|
total_pnl = store.get_context(ContextLayer.L1_LEGACY, "LEGACY", "total_pnl")
|
||||||
|
years_traded = store.get_context(ContextLayer.L1_LEGACY, "LEGACY", "years_traded")
|
||||||
|
avg_annual_pnl = store.get_context(ContextLayer.L1_LEGACY, "LEGACY", "avg_annual_pnl")
|
||||||
|
|
||||||
|
assert total_pnl == 45000.0
|
||||||
|
assert years_traded == 3
|
||||||
|
assert avg_annual_pnl == 15000.0
|
||||||
|
|
||||||
|
def test_run_all_aggregations(
|
||||||
|
self, aggregator: ContextAggregator, db_conn: sqlite3.Connection
|
||||||
|
) -> None:
|
||||||
|
"""Test running all aggregations from L7 to L1."""
|
||||||
|
date = "2026-02-04"
|
||||||
|
|
||||||
|
# Create sample trades
|
||||||
|
log_trade(db_conn, "005930", "BUY", 85, "Good signal", quantity=10, price=70000, pnl=1000)
|
||||||
|
|
||||||
|
# Set timestamp
|
||||||
|
db_conn.execute(f"UPDATE trades SET timestamp = '{date}T10:00:00+00:00'")
|
||||||
|
db_conn.commit()
|
||||||
|
|
||||||
|
# Run all aggregations
|
||||||
|
aggregator.run_all_aggregations()
|
||||||
|
|
||||||
|
# Verify data exists in each layer
|
||||||
|
store = aggregator.store
|
||||||
|
assert store.get_context(ContextLayer.L6_DAILY, date, "total_pnl") == 1000.0
|
||||||
|
current_week = datetime.now(UTC).strftime("%Y-W%V")
|
||||||
|
assert store.get_context(ContextLayer.L5_WEEKLY, current_week, "weekly_pnl") is not None
|
||||||
|
# Further layers depend on time alignment, just verify no crashes
|
||||||
|
|
||||||
|
|
||||||
|
class TestLayerMetadata:
|
||||||
|
"""Test suite for layer metadata configuration."""
|
||||||
|
|
||||||
|
def test_all_layers_have_metadata(self) -> None:
|
||||||
|
"""Test that all 7 layers have metadata defined."""
|
||||||
|
assert len(LAYER_CONFIG) == 7
|
||||||
|
|
||||||
|
for layer in ContextLayer:
|
||||||
|
assert layer in LAYER_CONFIG
|
||||||
|
|
||||||
|
def test_layer_retention_policies(self) -> None:
|
||||||
|
"""Test layer retention policies are correctly configured."""
|
||||||
|
# L1 should have no retention limit
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L1_LEGACY].retention_days is None
|
||||||
|
|
||||||
|
# L7 should have the shortest retention (7 days)
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L7_REALTIME].retention_days == 7
|
||||||
|
|
||||||
|
# L2 should have a long retention (10 years)
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L2_ANNUAL].retention_days == 365 * 10
|
||||||
|
|
||||||
|
def test_layer_aggregation_chain(self) -> None:
|
||||||
|
"""Test that the aggregation chain is properly configured."""
|
||||||
|
# L7 has no source (leaf layer)
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L7_REALTIME].aggregation_source is None
|
||||||
|
|
||||||
|
# L6 aggregates from L7
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L6_DAILY].aggregation_source == ContextLayer.L7_REALTIME
|
||||||
|
|
||||||
|
# L5 aggregates from L6
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L5_WEEKLY].aggregation_source == ContextLayer.L6_DAILY
|
||||||
|
|
||||||
|
# L4 aggregates from L5
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L4_MONTHLY].aggregation_source == ContextLayer.L5_WEEKLY
|
||||||
|
|
||||||
|
# L3 aggregates from L4
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L3_QUARTERLY].aggregation_source == ContextLayer.L4_MONTHLY
|
||||||
|
|
||||||
|
# L2 aggregates from L3
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L2_ANNUAL].aggregation_source == ContextLayer.L3_QUARTERLY
|
||||||
|
|
||||||
|
# L1 aggregates from L2
|
||||||
|
assert LAYER_CONFIG[ContextLayer.L1_LEGACY].aggregation_source == ContextLayer.L2_ANNUAL
|
||||||
292
tests/test_decision_logger.py
Normal file
292
tests/test_decision_logger.py
Normal file
@@ -0,0 +1,292 @@
|
|||||||
|
"""Tests for decision logging and audit trail."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sqlite3
|
||||||
|
from datetime import UTC, datetime
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from src.db import init_db
|
||||||
|
from src.logging.decision_logger import DecisionLog, DecisionLogger
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def db_conn() -> sqlite3.Connection:
|
||||||
|
"""Provide an in-memory database with initialized schema."""
|
||||||
|
conn = init_db(":memory:")
|
||||||
|
return conn
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def logger(db_conn: sqlite3.Connection) -> DecisionLogger:
|
||||||
|
"""Provide a DecisionLogger instance."""
|
||||||
|
return DecisionLogger(db_conn)
|
||||||
|
|
||||||
|
|
||||||
|
def test_log_decision_creates_record(logger: DecisionLogger, db_conn: sqlite3.Connection) -> None:
|
||||||
|
"""Test that log_decision creates a database record."""
|
||||||
|
context_snapshot = {
|
||||||
|
"L1": {"quote": {"price": 100.0, "volume": 1000}},
|
||||||
|
"L2": {"orderbook": {"bid": [99.0], "ask": [101.0]}},
|
||||||
|
}
|
||||||
|
input_data = {"price": 100.0, "volume": 1000, "foreigner_net": 500}
|
||||||
|
|
||||||
|
decision_id = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Strong upward momentum",
|
||||||
|
context_snapshot=context_snapshot,
|
||||||
|
input_data=input_data,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify decision_id is a valid UUID
|
||||||
|
assert decision_id is not None
|
||||||
|
assert len(decision_id) == 36 # UUID v4 format
|
||||||
|
|
||||||
|
# Verify record exists in database
|
||||||
|
cursor = db_conn.execute(
|
||||||
|
"SELECT decision_id, action, confidence FROM decision_logs WHERE decision_id = ?",
|
||||||
|
(decision_id,),
|
||||||
|
)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
assert row is not None
|
||||||
|
assert row[0] == decision_id
|
||||||
|
assert row[1] == "BUY"
|
||||||
|
assert row[2] == 85
|
||||||
|
|
||||||
|
|
||||||
|
def test_log_decision_stores_context_snapshot(logger: DecisionLogger) -> None:
|
||||||
|
"""Test that context snapshot is stored as JSON."""
|
||||||
|
context_snapshot = {
|
||||||
|
"L1": {"real_time": "data"},
|
||||||
|
"L3": {"daily": "aggregate"},
|
||||||
|
"L7": {"legacy": "wisdom"},
|
||||||
|
}
|
||||||
|
input_data = {"price": 50000.0, "volume": 2000}
|
||||||
|
|
||||||
|
decision_id = logger.log_decision(
|
||||||
|
stock_code="035420",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="HOLD",
|
||||||
|
confidence=75,
|
||||||
|
rationale="Waiting for clearer signal",
|
||||||
|
context_snapshot=context_snapshot,
|
||||||
|
input_data=input_data,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Retrieve and verify context snapshot
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert decision.context_snapshot == context_snapshot
|
||||||
|
assert decision.input_data == input_data
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_unreviewed_decisions(logger: DecisionLogger) -> None:
|
||||||
|
"""Test retrieving unreviewed decisions with confidence filter."""
|
||||||
|
# Log multiple decisions with varying confidence
|
||||||
|
logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=90,
|
||||||
|
rationale="High confidence buy",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.log_decision(
|
||||||
|
stock_code="000660",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="SELL",
|
||||||
|
confidence=75,
|
||||||
|
rationale="Low confidence sell",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.log_decision(
|
||||||
|
stock_code="035420",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="HOLD",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Medium confidence hold",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get unreviewed decisions with default threshold (80)
|
||||||
|
unreviewed = logger.get_unreviewed_decisions()
|
||||||
|
assert len(unreviewed) == 2 # Only confidence >= 80
|
||||||
|
assert all(d.confidence >= 80 for d in unreviewed)
|
||||||
|
assert all(not d.reviewed for d in unreviewed)
|
||||||
|
|
||||||
|
# Get with lower threshold
|
||||||
|
unreviewed_all = logger.get_unreviewed_decisions(min_confidence=70)
|
||||||
|
assert len(unreviewed_all) == 3
|
||||||
|
|
||||||
|
|
||||||
|
def test_mark_reviewed(logger: DecisionLogger) -> None:
|
||||||
|
"""Test marking a decision as reviewed."""
|
||||||
|
decision_id = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Test decision",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Initially unreviewed
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert not decision.reviewed
|
||||||
|
assert decision.review_notes is None
|
||||||
|
|
||||||
|
# Mark as reviewed
|
||||||
|
review_notes = "Good decision, captured bullish momentum correctly"
|
||||||
|
logger.mark_reviewed(decision_id, review_notes)
|
||||||
|
|
||||||
|
# Verify updated
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert decision.reviewed
|
||||||
|
assert decision.review_notes == review_notes
|
||||||
|
|
||||||
|
# Should not appear in unreviewed list
|
||||||
|
unreviewed = logger.get_unreviewed_decisions()
|
||||||
|
assert all(d.decision_id != decision_id for d in unreviewed)
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_outcome(logger: DecisionLogger) -> None:
|
||||||
|
"""Test updating decision outcome with P&L and accuracy."""
|
||||||
|
decision_id = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=90,
|
||||||
|
rationale="Expecting price increase",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Initially no outcome
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert decision.outcome_pnl is None
|
||||||
|
assert decision.outcome_accuracy is None
|
||||||
|
|
||||||
|
# Update outcome (profitable trade)
|
||||||
|
logger.update_outcome(decision_id, pnl=5000.0, accuracy=1)
|
||||||
|
|
||||||
|
# Verify updated
|
||||||
|
decision = logger.get_decision_by_id(decision_id)
|
||||||
|
assert decision is not None
|
||||||
|
assert decision.outcome_pnl == 5000.0
|
||||||
|
assert decision.outcome_accuracy == 1
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_losing_decisions(logger: DecisionLogger) -> None:
|
||||||
|
"""Test retrieving high-confidence losing decisions."""
|
||||||
|
# Profitable decision
|
||||||
|
id1 = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Correct prediction",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id1, pnl=3000.0, accuracy=1)
|
||||||
|
|
||||||
|
# High-confidence loss
|
||||||
|
id2 = logger.log_decision(
|
||||||
|
stock_code="000660",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="SELL",
|
||||||
|
confidence=90,
|
||||||
|
rationale="Wrong prediction",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id2, pnl=-2000.0, accuracy=0)
|
||||||
|
|
||||||
|
# Low-confidence loss (should be ignored)
|
||||||
|
id3 = logger.log_decision(
|
||||||
|
stock_code="035420",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=70,
|
||||||
|
rationale="Low confidence, wrong",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id3, pnl=-1500.0, accuracy=0)
|
||||||
|
|
||||||
|
# Get high-confidence losing decisions
|
||||||
|
losers = logger.get_losing_decisions(min_confidence=80, min_loss=-1000.0)
|
||||||
|
assert len(losers) == 1
|
||||||
|
assert losers[0].decision_id == id2
|
||||||
|
assert losers[0].outcome_pnl == -2000.0
|
||||||
|
assert losers[0].confidence == 90
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_decision_by_id_not_found(logger: DecisionLogger) -> None:
|
||||||
|
"""Test that get_decision_by_id returns None for non-existent ID."""
|
||||||
|
decision = logger.get_decision_by_id("non-existent-uuid")
|
||||||
|
assert decision is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_unreviewed_limit(logger: DecisionLogger) -> None:
|
||||||
|
"""Test that get_unreviewed_decisions respects limit parameter."""
|
||||||
|
# Create 5 unreviewed decisions
|
||||||
|
for i in range(5):
|
||||||
|
logger.log_decision(
|
||||||
|
stock_code=f"00{i}",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="HOLD",
|
||||||
|
confidence=85,
|
||||||
|
rationale=f"Decision {i}",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get only 3
|
||||||
|
unreviewed = logger.get_unreviewed_decisions(limit=3)
|
||||||
|
assert len(unreviewed) == 3
|
||||||
|
|
||||||
|
|
||||||
|
def test_decision_log_dataclass() -> None:
|
||||||
|
"""Test DecisionLog dataclass creation."""
|
||||||
|
now = datetime.now(UTC).isoformat()
|
||||||
|
log = DecisionLog(
|
||||||
|
decision_id="test-uuid",
|
||||||
|
timestamp=now,
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Test",
|
||||||
|
context_snapshot={"L1": "data"},
|
||||||
|
input_data={"price": 100.0},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert log.decision_id == "test-uuid"
|
||||||
|
assert log.action == "BUY"
|
||||||
|
assert log.confidence == 85
|
||||||
|
assert log.reviewed is False
|
||||||
|
assert log.outcome_pnl is None
|
||||||
686
tests/test_evolution.py
Normal file
686
tests/test_evolution.py
Normal file
@@ -0,0 +1,686 @@
|
|||||||
|
"""Tests for the Evolution Engine components.
|
||||||
|
|
||||||
|
Tests cover:
|
||||||
|
- EvolutionOptimizer: failure analysis and strategy generation
|
||||||
|
- ABTester: A/B testing and statistical comparison
|
||||||
|
- PerformanceTracker: metrics tracking and dashboard
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sqlite3
|
||||||
|
import tempfile
|
||||||
|
from datetime import UTC, datetime, timedelta
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest.mock import AsyncMock, MagicMock, Mock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from src.config import Settings
|
||||||
|
from src.db import init_db, log_trade
|
||||||
|
from src.evolution.ab_test import ABTester, ABTestResult, StrategyPerformance
|
||||||
|
from src.evolution.optimizer import EvolutionOptimizer
|
||||||
|
from src.evolution.performance_tracker import (
|
||||||
|
PerformanceDashboard,
|
||||||
|
PerformanceTracker,
|
||||||
|
StrategyMetrics,
|
||||||
|
)
|
||||||
|
from src.logging.decision_logger import DecisionLogger
|
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# Fixtures
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def db_conn() -> sqlite3.Connection:
|
||||||
|
"""Provide an in-memory database with initialized schema."""
|
||||||
|
return init_db(":memory:")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def settings() -> Settings:
|
||||||
|
"""Provide test settings."""
|
||||||
|
return Settings(
|
||||||
|
KIS_APP_KEY="test_key",
|
||||||
|
KIS_APP_SECRET="test_secret",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="test_gemini_key",
|
||||||
|
GEMINI_MODEL="gemini-pro",
|
||||||
|
DB_PATH=":memory:",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def optimizer(settings: Settings) -> EvolutionOptimizer:
|
||||||
|
"""Provide an EvolutionOptimizer instance."""
|
||||||
|
return EvolutionOptimizer(settings)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def decision_logger(db_conn: sqlite3.Connection) -> DecisionLogger:
|
||||||
|
"""Provide a DecisionLogger instance."""
|
||||||
|
return DecisionLogger(db_conn)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def ab_tester() -> ABTester:
|
||||||
|
"""Provide an ABTester instance."""
|
||||||
|
return ABTester(significance_level=0.05)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def performance_tracker(settings: Settings) -> PerformanceTracker:
|
||||||
|
"""Provide a PerformanceTracker instance."""
|
||||||
|
return PerformanceTracker(db_path=":memory:")
|
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# EvolutionOptimizer Tests
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_analyze_failures_uses_decision_logger(optimizer: EvolutionOptimizer) -> None:
|
||||||
|
"""Test that analyze_failures uses DecisionLogger.get_losing_decisions()."""
|
||||||
|
# Add some losing decisions to the database
|
||||||
|
logger = optimizer._decision_logger
|
||||||
|
|
||||||
|
# High-confidence loss
|
||||||
|
id1 = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Expected growth",
|
||||||
|
context_snapshot={"L1": {"price": 70000}},
|
||||||
|
input_data={"price": 70000, "volume": 1000},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id1, pnl=-2000.0, accuracy=0)
|
||||||
|
|
||||||
|
# Another high-confidence loss
|
||||||
|
id2 = logger.log_decision(
|
||||||
|
stock_code="000660",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="SELL",
|
||||||
|
confidence=90,
|
||||||
|
rationale="Expected drop",
|
||||||
|
context_snapshot={"L1": {"price": 100000}},
|
||||||
|
input_data={"price": 100000, "volume": 500},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id2, pnl=-1500.0, accuracy=0)
|
||||||
|
|
||||||
|
# Low-confidence loss (should be ignored)
|
||||||
|
id3 = logger.log_decision(
|
||||||
|
stock_code="035420",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="HOLD",
|
||||||
|
confidence=70,
|
||||||
|
rationale="Uncertain",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id3, pnl=-500.0, accuracy=0)
|
||||||
|
|
||||||
|
# Analyze failures
|
||||||
|
failures = optimizer.analyze_failures(limit=10)
|
||||||
|
|
||||||
|
# Should get 2 failures (confidence >= 80)
|
||||||
|
assert len(failures) == 2
|
||||||
|
assert all(f["confidence"] >= 80 for f in failures)
|
||||||
|
assert all(f["outcome_pnl"] <= -100.0 for f in failures)
|
||||||
|
|
||||||
|
|
||||||
|
def test_analyze_failures_empty_database(optimizer: EvolutionOptimizer) -> None:
|
||||||
|
"""Test analyze_failures with no losing decisions."""
|
||||||
|
failures = optimizer.analyze_failures()
|
||||||
|
assert failures == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_identify_failure_patterns(optimizer: EvolutionOptimizer) -> None:
|
||||||
|
"""Test identification of failure patterns."""
|
||||||
|
failures = [
|
||||||
|
{
|
||||||
|
"decision_id": "1",
|
||||||
|
"timestamp": "2024-01-15T09:30:00+00:00",
|
||||||
|
"stock_code": "005930",
|
||||||
|
"market": "KR",
|
||||||
|
"exchange_code": "KRX",
|
||||||
|
"action": "BUY",
|
||||||
|
"confidence": 85,
|
||||||
|
"rationale": "Test",
|
||||||
|
"outcome_pnl": -1000.0,
|
||||||
|
"outcome_accuracy": 0,
|
||||||
|
"context_snapshot": {},
|
||||||
|
"input_data": {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"decision_id": "2",
|
||||||
|
"timestamp": "2024-01-15T14:30:00+00:00",
|
||||||
|
"stock_code": "000660",
|
||||||
|
"market": "KR",
|
||||||
|
"exchange_code": "KRX",
|
||||||
|
"action": "SELL",
|
||||||
|
"confidence": 90,
|
||||||
|
"rationale": "Test",
|
||||||
|
"outcome_pnl": -2000.0,
|
||||||
|
"outcome_accuracy": 0,
|
||||||
|
"context_snapshot": {},
|
||||||
|
"input_data": {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"decision_id": "3",
|
||||||
|
"timestamp": "2024-01-15T09:45:00+00:00",
|
||||||
|
"stock_code": "035420",
|
||||||
|
"market": "US_NASDAQ",
|
||||||
|
"exchange_code": "NASDAQ",
|
||||||
|
"action": "BUY",
|
||||||
|
"confidence": 80,
|
||||||
|
"rationale": "Test",
|
||||||
|
"outcome_pnl": -500.0,
|
||||||
|
"outcome_accuracy": 0,
|
||||||
|
"context_snapshot": {},
|
||||||
|
"input_data": {},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
patterns = optimizer.identify_failure_patterns(failures)
|
||||||
|
|
||||||
|
assert patterns["total_failures"] == 3
|
||||||
|
assert patterns["markets"]["KR"] == 2
|
||||||
|
assert patterns["markets"]["US_NASDAQ"] == 1
|
||||||
|
assert patterns["actions"]["BUY"] == 2
|
||||||
|
assert patterns["actions"]["SELL"] == 1
|
||||||
|
assert 9 in patterns["hours"] # 09:30 and 09:45
|
||||||
|
assert 14 in patterns["hours"] # 14:30
|
||||||
|
assert patterns["avg_confidence"] == 85.0
|
||||||
|
assert patterns["avg_loss"] == -1166.67
|
||||||
|
|
||||||
|
|
||||||
|
def test_identify_failure_patterns_empty(optimizer: EvolutionOptimizer) -> None:
|
||||||
|
"""Test pattern identification with no failures."""
|
||||||
|
patterns = optimizer.identify_failure_patterns([])
|
||||||
|
assert patterns["pattern_count"] == 0
|
||||||
|
assert patterns["patterns"] == {}
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_generate_strategy_creates_file(optimizer: EvolutionOptimizer, tmp_path: Path) -> None:
|
||||||
|
"""Test that generate_strategy creates a strategy file."""
|
||||||
|
failures = [
|
||||||
|
{
|
||||||
|
"decision_id": "1",
|
||||||
|
"timestamp": "2024-01-15T09:30:00+00:00",
|
||||||
|
"stock_code": "005930",
|
||||||
|
"market": "KR",
|
||||||
|
"action": "BUY",
|
||||||
|
"confidence": 85,
|
||||||
|
"outcome_pnl": -1000.0,
|
||||||
|
"context_snapshot": {},
|
||||||
|
"input_data": {},
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
# Mock Gemini response
|
||||||
|
mock_response = Mock()
|
||||||
|
mock_response.text = """
|
||||||
|
# Simple strategy
|
||||||
|
price = market_data.get("current_price", 0)
|
||||||
|
if price > 50000:
|
||||||
|
return {"action": "BUY", "confidence": 70, "rationale": "Price above threshold"}
|
||||||
|
return {"action": "HOLD", "confidence": 50, "rationale": "Waiting"}
|
||||||
|
"""
|
||||||
|
|
||||||
|
with patch.object(optimizer._client.aio.models, "generate_content", new=AsyncMock(return_value=mock_response)):
|
||||||
|
with patch("src.evolution.optimizer.STRATEGIES_DIR", tmp_path):
|
||||||
|
strategy_path = await optimizer.generate_strategy(failures)
|
||||||
|
|
||||||
|
assert strategy_path is not None
|
||||||
|
assert strategy_path.exists()
|
||||||
|
assert strategy_path.suffix == ".py"
|
||||||
|
assert "class Strategy_" in strategy_path.read_text()
|
||||||
|
assert "def evaluate" in strategy_path.read_text()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_generate_strategy_handles_api_error(optimizer: EvolutionOptimizer) -> None:
|
||||||
|
"""Test that generate_strategy handles Gemini API errors gracefully."""
|
||||||
|
failures = [{"decision_id": "1", "timestamp": "2024-01-15T09:30:00+00:00"}]
|
||||||
|
|
||||||
|
with patch.object(
|
||||||
|
optimizer._client.aio.models,
|
||||||
|
"generate_content",
|
||||||
|
side_effect=Exception("API Error"),
|
||||||
|
):
|
||||||
|
strategy_path = await optimizer.generate_strategy(failures)
|
||||||
|
|
||||||
|
assert strategy_path is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_performance_summary() -> None:
|
||||||
|
"""Test getting performance summary from trades table."""
|
||||||
|
# Create a temporary database with trades
|
||||||
|
import tempfile
|
||||||
|
with tempfile.NamedTemporaryFile(suffix=".db", delete=False) as tmp:
|
||||||
|
tmp_path = tmp.name
|
||||||
|
|
||||||
|
conn = init_db(tmp_path)
|
||||||
|
log_trade(conn, "005930", "BUY", 85, "Test win", quantity=10, price=70000, pnl=1000.0)
|
||||||
|
log_trade(conn, "000660", "SELL", 90, "Test loss", quantity=5, price=100000, pnl=-500.0)
|
||||||
|
log_trade(conn, "035420", "BUY", 80, "Test win", quantity=8, price=50000, pnl=800.0)
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
# Create settings with temp database path
|
||||||
|
settings = Settings(
|
||||||
|
KIS_APP_KEY="test_key",
|
||||||
|
KIS_APP_SECRET="test_secret",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="test_gemini_key",
|
||||||
|
GEMINI_MODEL="gemini-pro",
|
||||||
|
DB_PATH=tmp_path,
|
||||||
|
)
|
||||||
|
|
||||||
|
optimizer = EvolutionOptimizer(settings)
|
||||||
|
summary = optimizer.get_performance_summary()
|
||||||
|
|
||||||
|
assert summary["total_trades"] == 3
|
||||||
|
assert summary["wins"] == 2
|
||||||
|
assert summary["losses"] == 1
|
||||||
|
assert summary["total_pnl"] == 1300.0
|
||||||
|
assert summary["avg_pnl"] == 433.33
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
Path(tmp_path).unlink()
|
||||||
|
|
||||||
|
|
||||||
|
def test_validate_strategy_success(optimizer: EvolutionOptimizer, tmp_path: Path) -> None:
|
||||||
|
"""Test strategy validation when tests pass."""
|
||||||
|
strategy_file = tmp_path / "test_strategy.py"
|
||||||
|
strategy_file.write_text("# Valid strategy file")
|
||||||
|
|
||||||
|
with patch("subprocess.run") as mock_run:
|
||||||
|
mock_run.return_value = Mock(returncode=0, stdout="", stderr="")
|
||||||
|
result = optimizer.validate_strategy(strategy_file)
|
||||||
|
|
||||||
|
assert result is True
|
||||||
|
assert strategy_file.exists()
|
||||||
|
|
||||||
|
|
||||||
|
def test_validate_strategy_failure(optimizer: EvolutionOptimizer, tmp_path: Path) -> None:
|
||||||
|
"""Test strategy validation when tests fail."""
|
||||||
|
strategy_file = tmp_path / "test_strategy.py"
|
||||||
|
strategy_file.write_text("# Invalid strategy file")
|
||||||
|
|
||||||
|
with patch("subprocess.run") as mock_run:
|
||||||
|
mock_run.return_value = Mock(returncode=1, stdout="FAILED", stderr="")
|
||||||
|
result = optimizer.validate_strategy(strategy_file)
|
||||||
|
|
||||||
|
assert result is False
|
||||||
|
# File should be deleted on failure
|
||||||
|
assert not strategy_file.exists()
|
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# ABTester Tests
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_calculate_performance_basic(ab_tester: ABTester) -> None:
|
||||||
|
"""Test basic performance calculation."""
|
||||||
|
trades = [
|
||||||
|
{"pnl": 1000.0},
|
||||||
|
{"pnl": -500.0},
|
||||||
|
{"pnl": 800.0},
|
||||||
|
{"pnl": 200.0},
|
||||||
|
]
|
||||||
|
|
||||||
|
perf = ab_tester.calculate_performance(trades, "TestStrategy")
|
||||||
|
|
||||||
|
assert perf.strategy_name == "TestStrategy"
|
||||||
|
assert perf.total_trades == 4
|
||||||
|
assert perf.wins == 3
|
||||||
|
assert perf.losses == 1
|
||||||
|
assert perf.total_pnl == 1500.0
|
||||||
|
assert perf.avg_pnl == 375.0
|
||||||
|
assert perf.win_rate == 75.0
|
||||||
|
assert perf.sharpe_ratio is not None
|
||||||
|
|
||||||
|
|
||||||
|
def test_calculate_performance_empty(ab_tester: ABTester) -> None:
|
||||||
|
"""Test performance calculation with no trades."""
|
||||||
|
perf = ab_tester.calculate_performance([], "EmptyStrategy")
|
||||||
|
|
||||||
|
assert perf.total_trades == 0
|
||||||
|
assert perf.wins == 0
|
||||||
|
assert perf.losses == 0
|
||||||
|
assert perf.total_pnl == 0.0
|
||||||
|
assert perf.avg_pnl == 0.0
|
||||||
|
assert perf.win_rate == 0.0
|
||||||
|
assert perf.sharpe_ratio is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_compare_strategies_significant_difference(ab_tester: ABTester) -> None:
|
||||||
|
"""Test strategy comparison with significant performance difference."""
|
||||||
|
# Strategy A: consistently profitable
|
||||||
|
trades_a = [{"pnl": 1000.0} for _ in range(30)]
|
||||||
|
|
||||||
|
# Strategy B: consistently losing
|
||||||
|
trades_b = [{"pnl": -500.0} for _ in range(30)]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "Strategy A", "Strategy B")
|
||||||
|
|
||||||
|
# scipy returns np.True_ instead of Python bool
|
||||||
|
assert bool(result.is_significant) is True
|
||||||
|
assert result.winner == "Strategy A"
|
||||||
|
assert result.p_value < 0.05
|
||||||
|
assert result.performance_a.avg_pnl > result.performance_b.avg_pnl
|
||||||
|
|
||||||
|
|
||||||
|
def test_compare_strategies_no_difference(ab_tester: ABTester) -> None:
|
||||||
|
"""Test strategy comparison with no significant difference."""
|
||||||
|
# Both strategies have similar performance
|
||||||
|
trades_a = [{"pnl": 100.0}, {"pnl": -50.0}, {"pnl": 80.0}]
|
||||||
|
trades_b = [{"pnl": 90.0}, {"pnl": -60.0}, {"pnl": 85.0}]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "Strategy A", "Strategy B")
|
||||||
|
|
||||||
|
# With small samples and similar performance, likely not significant
|
||||||
|
assert result.winner is None or not result.is_significant
|
||||||
|
|
||||||
|
|
||||||
|
def test_should_deploy_meets_criteria(ab_tester: ABTester) -> None:
|
||||||
|
"""Test deployment decision when criteria are met."""
|
||||||
|
# Create a winning result that meets criteria
|
||||||
|
trades_a = [{"pnl": 1000.0} for _ in range(25)] # 100% win rate
|
||||||
|
trades_b = [{"pnl": -500.0} for _ in range(25)]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "Winner", "Loser")
|
||||||
|
|
||||||
|
should_deploy = ab_tester.should_deploy(result, min_win_rate=60.0, min_trades=20)
|
||||||
|
|
||||||
|
assert should_deploy is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_should_deploy_insufficient_trades(ab_tester: ABTester) -> None:
|
||||||
|
"""Test deployment decision with insufficient trades."""
|
||||||
|
trades_a = [{"pnl": 1000.0} for _ in range(10)] # Only 10 trades
|
||||||
|
trades_b = [{"pnl": -500.0} for _ in range(10)]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "Winner", "Loser")
|
||||||
|
|
||||||
|
should_deploy = ab_tester.should_deploy(result, min_win_rate=60.0, min_trades=20)
|
||||||
|
|
||||||
|
assert should_deploy is False
|
||||||
|
|
||||||
|
|
||||||
|
def test_should_deploy_low_win_rate(ab_tester: ABTester) -> None:
|
||||||
|
"""Test deployment decision with low win rate."""
|
||||||
|
# Mix of wins and losses, below 60% win rate
|
||||||
|
trades_a = [{"pnl": 100.0}] * 10 + [{"pnl": -100.0}] * 15 # 40% win rate
|
||||||
|
trades_b = [{"pnl": -500.0} for _ in range(25)]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "LowWinner", "Loser")
|
||||||
|
|
||||||
|
should_deploy = ab_tester.should_deploy(result, min_win_rate=60.0, min_trades=20)
|
||||||
|
|
||||||
|
assert should_deploy is False
|
||||||
|
|
||||||
|
|
||||||
|
def test_should_deploy_not_significant(ab_tester: ABTester) -> None:
|
||||||
|
"""Test deployment decision when difference is not significant."""
|
||||||
|
# Use more varied data to ensure statistical insignificance
|
||||||
|
trades_a = [{"pnl": 100.0}, {"pnl": -50.0}] * 12 + [{"pnl": 100.0}]
|
||||||
|
trades_b = [{"pnl": 95.0}, {"pnl": -45.0}] * 12 + [{"pnl": 95.0}]
|
||||||
|
|
||||||
|
result = ab_tester.compare_strategies(trades_a, trades_b, "A", "B")
|
||||||
|
|
||||||
|
should_deploy = ab_tester.should_deploy(result, min_win_rate=60.0, min_trades=20)
|
||||||
|
|
||||||
|
# Not significant or not profitable enough
|
||||||
|
# Even if significant, win rate is 50% which is below 60% threshold
|
||||||
|
assert should_deploy is False
|
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# PerformanceTracker Tests
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_strategy_metrics(db_conn: sqlite3.Connection) -> None:
|
||||||
|
"""Test getting strategy metrics."""
|
||||||
|
# Add some trades
|
||||||
|
log_trade(db_conn, "005930", "BUY", 85, "Win 1", quantity=10, price=70000, pnl=1000.0)
|
||||||
|
log_trade(db_conn, "000660", "SELL", 90, "Loss 1", quantity=5, price=100000, pnl=-500.0)
|
||||||
|
log_trade(db_conn, "035420", "BUY", 80, "Win 2", quantity=8, price=50000, pnl=800.0)
|
||||||
|
log_trade(db_conn, "005930", "HOLD", 75, "Hold", quantity=0, price=70000, pnl=0.0)
|
||||||
|
|
||||||
|
tracker = PerformanceTracker(db_path=":memory:")
|
||||||
|
# Manually set connection for testing
|
||||||
|
tracker._db_path = db_conn
|
||||||
|
|
||||||
|
# Need to use the same connection
|
||||||
|
with patch("sqlite3.connect", return_value=db_conn):
|
||||||
|
metrics = tracker.get_strategy_metrics()
|
||||||
|
|
||||||
|
assert metrics.total_trades == 4
|
||||||
|
assert metrics.wins == 2
|
||||||
|
assert metrics.losses == 1
|
||||||
|
assert metrics.holds == 1
|
||||||
|
assert metrics.win_rate == 50.0
|
||||||
|
assert metrics.total_pnl == 1300.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_calculate_improvement_trend_improving(performance_tracker: PerformanceTracker) -> None:
|
||||||
|
"""Test improvement trend calculation for improving strategy."""
|
||||||
|
metrics = [
|
||||||
|
StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-01",
|
||||||
|
period_end="2024-01-07",
|
||||||
|
total_trades=10,
|
||||||
|
wins=5,
|
||||||
|
losses=5,
|
||||||
|
holds=0,
|
||||||
|
win_rate=50.0,
|
||||||
|
avg_pnl=100.0,
|
||||||
|
total_pnl=1000.0,
|
||||||
|
best_trade=500.0,
|
||||||
|
worst_trade=-300.0,
|
||||||
|
avg_confidence=75.0,
|
||||||
|
),
|
||||||
|
StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-08",
|
||||||
|
period_end="2024-01-14",
|
||||||
|
total_trades=10,
|
||||||
|
wins=7,
|
||||||
|
losses=3,
|
||||||
|
holds=0,
|
||||||
|
win_rate=70.0,
|
||||||
|
avg_pnl=200.0,
|
||||||
|
total_pnl=2000.0,
|
||||||
|
best_trade=600.0,
|
||||||
|
worst_trade=-200.0,
|
||||||
|
avg_confidence=80.0,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
trend = performance_tracker.calculate_improvement_trend(metrics)
|
||||||
|
|
||||||
|
assert trend["trend"] == "improving"
|
||||||
|
assert trend["win_rate_change"] == 20.0
|
||||||
|
assert trend["pnl_change"] == 100.0
|
||||||
|
assert trend["confidence_change"] == 5.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_calculate_improvement_trend_declining(performance_tracker: PerformanceTracker) -> None:
|
||||||
|
"""Test improvement trend calculation for declining strategy."""
|
||||||
|
metrics = [
|
||||||
|
StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-01",
|
||||||
|
period_end="2024-01-07",
|
||||||
|
total_trades=10,
|
||||||
|
wins=7,
|
||||||
|
losses=3,
|
||||||
|
holds=0,
|
||||||
|
win_rate=70.0,
|
||||||
|
avg_pnl=200.0,
|
||||||
|
total_pnl=2000.0,
|
||||||
|
best_trade=600.0,
|
||||||
|
worst_trade=-200.0,
|
||||||
|
avg_confidence=80.0,
|
||||||
|
),
|
||||||
|
StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-08",
|
||||||
|
period_end="2024-01-14",
|
||||||
|
total_trades=10,
|
||||||
|
wins=4,
|
||||||
|
losses=6,
|
||||||
|
holds=0,
|
||||||
|
win_rate=40.0,
|
||||||
|
avg_pnl=-50.0,
|
||||||
|
total_pnl=-500.0,
|
||||||
|
best_trade=300.0,
|
||||||
|
worst_trade=-400.0,
|
||||||
|
avg_confidence=70.0,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
trend = performance_tracker.calculate_improvement_trend(metrics)
|
||||||
|
|
||||||
|
assert trend["trend"] == "declining"
|
||||||
|
assert trend["win_rate_change"] == -30.0
|
||||||
|
assert trend["pnl_change"] == -250.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_calculate_improvement_trend_insufficient_data(performance_tracker: PerformanceTracker) -> None:
|
||||||
|
"""Test improvement trend with insufficient data."""
|
||||||
|
metrics = [
|
||||||
|
StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-01",
|
||||||
|
period_end="2024-01-07",
|
||||||
|
total_trades=10,
|
||||||
|
wins=5,
|
||||||
|
losses=5,
|
||||||
|
holds=0,
|
||||||
|
win_rate=50.0,
|
||||||
|
avg_pnl=100.0,
|
||||||
|
total_pnl=1000.0,
|
||||||
|
best_trade=500.0,
|
||||||
|
worst_trade=-300.0,
|
||||||
|
avg_confidence=75.0,
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
trend = performance_tracker.calculate_improvement_trend(metrics)
|
||||||
|
|
||||||
|
assert trend["trend"] == "insufficient_data"
|
||||||
|
assert trend["win_rate_change"] == 0.0
|
||||||
|
assert trend["pnl_change"] == 0.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_export_dashboard_json(performance_tracker: PerformanceTracker) -> None:
|
||||||
|
"""Test exporting dashboard as JSON."""
|
||||||
|
overall_metrics = StrategyMetrics(
|
||||||
|
strategy_name="test",
|
||||||
|
period_start="2024-01-01",
|
||||||
|
period_end="2024-01-31",
|
||||||
|
total_trades=100,
|
||||||
|
wins=60,
|
||||||
|
losses=40,
|
||||||
|
holds=10,
|
||||||
|
win_rate=60.0,
|
||||||
|
avg_pnl=150.0,
|
||||||
|
total_pnl=15000.0,
|
||||||
|
best_trade=1000.0,
|
||||||
|
worst_trade=-500.0,
|
||||||
|
avg_confidence=80.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
dashboard = PerformanceDashboard(
|
||||||
|
generated_at=datetime.now(UTC).isoformat(),
|
||||||
|
overall_metrics=overall_metrics,
|
||||||
|
daily_metrics=[],
|
||||||
|
weekly_metrics=[],
|
||||||
|
improvement_trend={"trend": "improving", "win_rate_change": 10.0},
|
||||||
|
)
|
||||||
|
|
||||||
|
json_output = performance_tracker.export_dashboard_json(dashboard)
|
||||||
|
|
||||||
|
# Verify it's valid JSON
|
||||||
|
data = json.loads(json_output)
|
||||||
|
assert "generated_at" in data
|
||||||
|
assert "overall_metrics" in data
|
||||||
|
assert data["overall_metrics"]["total_trades"] == 100
|
||||||
|
assert data["overall_metrics"]["win_rate"] == 60.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_generate_dashboard() -> None:
|
||||||
|
"""Test generating a complete dashboard."""
|
||||||
|
# Create tracker with temp database
|
||||||
|
with tempfile.NamedTemporaryFile(suffix=".db", delete=False) as tmp:
|
||||||
|
tmp_path = tmp.name
|
||||||
|
|
||||||
|
# Initialize with data
|
||||||
|
conn = init_db(tmp_path)
|
||||||
|
log_trade(conn, "005930", "BUY", 85, "Win", quantity=10, price=70000, pnl=1000.0)
|
||||||
|
log_trade(conn, "000660", "SELL", 90, "Loss", quantity=5, price=100000, pnl=-500.0)
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
tracker = PerformanceTracker(db_path=tmp_path)
|
||||||
|
dashboard = tracker.generate_dashboard()
|
||||||
|
|
||||||
|
assert isinstance(dashboard, PerformanceDashboard)
|
||||||
|
assert dashboard.overall_metrics.total_trades == 2
|
||||||
|
assert len(dashboard.daily_metrics) == 7
|
||||||
|
assert len(dashboard.weekly_metrics) == 4
|
||||||
|
assert "trend" in dashboard.improvement_trend
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
Path(tmp_path).unlink()
|
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# Integration Tests
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_full_evolution_pipeline(optimizer: EvolutionOptimizer, tmp_path: Path) -> None:
|
||||||
|
"""Test the complete evolution pipeline."""
|
||||||
|
# Add losing decisions
|
||||||
|
logger = optimizer._decision_logger
|
||||||
|
id1 = logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=85,
|
||||||
|
rationale="Expected growth",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
logger.update_outcome(id1, pnl=-2000.0, accuracy=0)
|
||||||
|
|
||||||
|
# Mock Gemini and subprocess
|
||||||
|
mock_response = Mock()
|
||||||
|
mock_response.text = 'return {"action": "HOLD", "confidence": 50, "rationale": "Test"}'
|
||||||
|
|
||||||
|
with patch.object(optimizer._client.aio.models, "generate_content", new=AsyncMock(return_value=mock_response)):
|
||||||
|
with patch("src.evolution.optimizer.STRATEGIES_DIR", tmp_path):
|
||||||
|
with patch("subprocess.run") as mock_run:
|
||||||
|
mock_run.return_value = Mock(returncode=0, stdout="", stderr="")
|
||||||
|
|
||||||
|
result = await optimizer.evolve()
|
||||||
|
|
||||||
|
assert result is not None
|
||||||
|
assert "title" in result
|
||||||
|
assert "branch" in result
|
||||||
|
assert "status" in result
|
||||||
Reference in New Issue
Block a user