Compare commits

..

3 Commits

Author SHA1 Message Date
aa16480158 fix: query previous day's holdings instead of current day
**Problem:**
Subsequent trading days were not retrieving starting holdings correctly.
The API showed empty starting_position and final_position even after
executing multiple buy trades.

**Root Cause:**
get_current_position_from_db() used `date <= ?` which returned the
CURRENT day's trading_day record instead of the PREVIOUS day's ending.
Since holdings are written at END of trading day, querying the current
day's record would return incomplete/empty holdings.

**Timeline on Day 1 (2025-10-02):**
1. Start: Create trading_day with empty holdings
2. Trade: Execute 8 buy trades (recorded in actions table)
3. End: Call get_current_position_from_db(date='2025-10-02')
   - Query: `date <= 2025-10-02` returns TODAY's record
   - Holdings: EMPTY (not written yet)
   - Saves: Empty holdings to database 

**Solution:**
Changed query to use `date < ?` to retrieve PREVIOUS day's ending
position, which becomes the current day's starting position.

**Impact:**
- Day 1: Correctly saves ending holdings after trades
- Day 2+: Correctly retrieves previous day's ending as starting position
- Holdings now persist between trading days as expected

**Tests Added:**
- test_get_position_retrieves_previous_day_not_current: Verifies query
  returns previous day when multiple days exist
- Updated existing tests to align with new behavior

Fixes holdings persistence bug identified in API response showing
empty starting_position/final_position despite successful trades.
2025-11-04 23:29:30 -05:00
05620facc2 fix: update context_injector with trading_day_id after creation
Changes:
- Update context_injector.trading_day_id after trading_day record is created

Root Cause:
- ContextInjector was created before trading_day record existed
- trading_day_id was None when context_injector was initialized
- Even though trading_day_id was written to runtime config, the
  context_injector's attribute was never updated
- MCP tools use the injected trading_day_id parameter, not runtime config

Flow:
1. ModelDayExecutor creates ContextInjector (trading_day_id=None)
2. Agent.run_trading_session() creates trading_day record
3. NEW: Update context_injector.trading_day_id = trading_day_id
4. MCP tools receive trading_day_id via context injection

Impact:
- Fixes: "Trade failed: trading_day_id not found in runtime config"
- Trading tools (buy/sell) can now record actions properly
- Actions are linked to correct trading_day record

Related: agent/base_agent/base_agent.py:541-543
2025-11-04 23:04:47 -05:00
7c71a047bc fix: update position queries to use new trading_days schema
Changes:
- Update get_today_init_position_from_db to query trading_days table
- Remove obsolete add_no_trade_record_to_db calls from BaseAgent
- Simplify _handle_trading_result (trading_day record handles both scenarios)

Root Cause:
- Code was still querying old positions table after schema migration
- The add_no_trade_record_to_db function is obsolete in new schema

New Schema Behavior:
- trading_day record created at session start (regardless of trading)
- trading_day record updated at session end with final results
- No separate "no-trade" record needed

Impact:
- Fixes: "no such table: positions" error in get_today_init_position_from_db
- Removes unnecessary database writes for no-trade scenarios
- Simplifies codebase by removing obsolete function calls

Related: tools/price_tools.py:340-364, agent/base_agent/base_agent.py:661-673
2025-11-04 22:49:01 -05:00
4 changed files with 132 additions and 45 deletions

View File

@@ -538,6 +538,10 @@ Summary:"""
from tools.general_tools import write_config_value
write_config_value('TRADING_DAY_ID', trading_day_id)
# Update context_injector with trading_day_id for MCP tools
if self.context_injector:
self.context_injector.trading_day_id = trading_day_id
# 6. Run AI trading session
action_count = 0
@@ -660,8 +664,6 @@ Summary:"""
async def _handle_trading_result(self, today_date: str) -> None:
"""Handle trading results with database writes."""
from tools.price_tools import add_no_trade_record_to_db
if_trade = get_config_value("IF_TRADE")
if if_trade:
@@ -669,23 +671,10 @@ Summary:"""
print("✅ Trading completed")
else:
print("📊 No trading, maintaining positions")
# Get context from runtime config
job_id = get_config_value("JOB_ID")
session_id = self.context_injector.session_id if self.context_injector else None
if not job_id or not session_id:
raise ValueError("Missing JOB_ID or session_id for no-trade record")
# Write no-trade record to database
add_no_trade_record_to_db(
today_date,
self.signature,
job_id,
session_id
)
write_config_value("IF_TRADE", False)
# Note: In new schema, trading_day record is created at session start
# and updated at session end, so no separate no-trade record needed
def register_agent(self) -> None:
"""Register new agent, create initial positions"""

View File

@@ -28,16 +28,17 @@ def get_current_position_from_db(
initial_cash: float = 10000.0
) -> Tuple[Dict[str, float], int]:
"""
Get current position from database (new schema).
Get starting position for current trading day from database (new schema).
Queries most recent trading_day record for this job+model up to date.
Returns ending holdings and cash from that day.
Queries most recent trading_day record BEFORE the given date (previous day's ending).
Returns ending holdings and cash from that previous day, which becomes the
starting position for the current day.
Args:
job_id: Job UUID
model: Model signature
date: Current trading date
initial_cash: Initial cash if no prior data
date: Current trading date (will query for date < this)
initial_cash: Initial cash if no prior data (first trading day)
Returns:
(position_dict, action_count) where:
@@ -49,11 +50,11 @@ def get_current_position_from_db(
cursor = conn.cursor()
try:
# Query most recent trading_day up to date
# Query most recent trading_day BEFORE current date (previous day's ending position)
cursor.execute("""
SELECT id, ending_cash
FROM trading_days
WHERE job_id = ? AND model = ? AND date <= ?
WHERE job_id = ? AND model = ? AND date < ?
ORDER BY date DESC
LIMIT 1
""", (job_id, model, date))

View File

@@ -6,7 +6,7 @@ from api.database import Database
def test_get_position_from_new_schema():
"""Test position retrieval from trading_days + holdings."""
"""Test position retrieval from trading_days + holdings (previous day)."""
# Create test database
db = Database(":memory:")
@@ -14,11 +14,11 @@ def test_get_position_from_new_schema():
# Create prerequisite: jobs record
db.connection.execute("""
INSERT INTO jobs (job_id, config_path, status, date_range, models, created_at)
VALUES ('test-job-123', 'test_config.json', 'running', '2025-01-15 to 2025-01-15', 'test-model', '2025-01-15T10:00:00Z')
VALUES ('test-job-123', 'test_config.json', 'running', '2025-01-14 to 2025-01-16', 'test-model', '2025-01-14T10:00:00Z')
""")
db.connection.commit()
# Create trading_day with holdings
# Create trading_day with holdings for 2025-01-15
trading_day_id = db.create_trading_day(
job_id='test-job-123',
model='test-model',
@@ -32,7 +32,7 @@ def test_get_position_from_new_schema():
days_since_last_trading=0
)
# Add ending holdings
# Add ending holdings for 2025-01-15
db.create_holding(trading_day_id, 'AAPL', 10)
db.create_holding(trading_day_id, 'MSFT', 5)
@@ -48,18 +48,19 @@ def test_get_position_from_new_schema():
trade_module.get_db_connection = mock_get_db_connection
try:
# Query position
# Query position for NEXT day (2025-01-16)
# Should retrieve previous day's (2025-01-15) ending position
position, action_id = get_current_position_from_db(
job_id='test-job-123',
model='test-model',
date='2025-01-15'
date='2025-01-16' # Query for day AFTER the trading_day record
)
# Verify
assert position['AAPL'] == 10
assert position['MSFT'] == 5
assert position['CASH'] == 8000.0
assert action_id == 2 # 2 holdings = 2 actions
# Verify we got the previous day's ending position
assert position['AAPL'] == 10, f"Expected 10 AAPL but got {position.get('AAPL', 0)}"
assert position['MSFT'] == 5, f"Expected 5 MSFT but got {position.get('MSFT', 0)}"
assert position['CASH'] == 8000.0, f"Expected cash $8000 but got ${position['CASH']}"
assert action_id == 2, f"Expected 2 holdings but got {action_id}"
finally:
# Restore original function
trade_module.get_db_connection = original_get_db_connection
@@ -95,3 +96,99 @@ def test_get_position_first_day():
# Restore original function
trade_module.get_db_connection = original_get_db_connection
db.connection.close()
def test_get_position_retrieves_previous_day_not_current():
"""Test that get_current_position_from_db queries PREVIOUS day's ending, not current day.
This is the critical fix: when querying for day 2's starting position,
it should return day 1's ending position, NOT day 2's (incomplete) position.
"""
db = Database(":memory:")
# Create prerequisite: jobs record
db.connection.execute("""
INSERT INTO jobs (job_id, config_path, status, date_range, models, created_at)
VALUES ('test-job-123', 'test_config.json', 'running', '2025-10-01 to 2025-10-03', 'gpt-5', '2025-10-01T10:00:00Z')
""")
db.connection.commit()
# Day 1: Create complete trading day with holdings
day1_id = db.create_trading_day(
job_id='test-job-123',
model='gpt-5',
date='2025-10-02',
starting_cash=10000.0,
starting_portfolio_value=10000.0,
daily_profit=0.0,
daily_return_pct=0.0,
ending_cash=2500.0, # After buying stocks
ending_portfolio_value=10000.0,
days_since_last_trading=1
)
# Day 1 ending holdings (7 AMZN, 5 GOOGL, 6 MU, 3 QCOM, 4 MSFT, 1 CRWD, 10 NVDA, 3 AVGO)
db.create_holding(day1_id, 'AMZN', 7)
db.create_holding(day1_id, 'GOOGL', 5)
db.create_holding(day1_id, 'MU', 6)
db.create_holding(day1_id, 'QCOM', 3)
db.create_holding(day1_id, 'MSFT', 4)
db.create_holding(day1_id, 'CRWD', 1)
db.create_holding(day1_id, 'NVDA', 10)
db.create_holding(day1_id, 'AVGO', 3)
# Day 2: Create incomplete trading day (just started, no holdings yet)
day2_id = db.create_trading_day(
job_id='test-job-123',
model='gpt-5',
date='2025-10-03',
starting_cash=2500.0, # From day 1 ending
starting_portfolio_value=10000.0,
daily_profit=0.0,
daily_return_pct=0.0,
ending_cash=2500.0, # Not finalized yet
ending_portfolio_value=10000.0, # Not finalized yet
days_since_last_trading=1
)
# NOTE: No holdings created for day 2 yet (trading in progress)
db.connection.commit()
# Mock get_db_connection to return our test db
import agent_tools.tool_trade as trade_module
original_get_db_connection = trade_module.get_db_connection
def mock_get_db_connection(path):
return db.connection
trade_module.get_db_connection = mock_get_db_connection
try:
# Query starting position for day 2 (2025-10-03)
# This should return day 1's ending position, NOT day 2's incomplete position
position, action_id = get_current_position_from_db(
job_id='test-job-123',
model='gpt-5',
date='2025-10-03'
)
# Verify we got day 1's ending position (8 holdings)
assert position['CASH'] == 2500.0, f"Expected cash $2500 but got ${position['CASH']}"
assert position['AMZN'] == 7, f"Expected 7 AMZN but got {position.get('AMZN', 0)}"
assert position['GOOGL'] == 5, f"Expected 5 GOOGL but got {position.get('GOOGL', 0)}"
assert position['MU'] == 6, f"Expected 6 MU but got {position.get('MU', 0)}"
assert position['QCOM'] == 3, f"Expected 3 QCOM but got {position.get('QCOM', 0)}"
assert position['MSFT'] == 4, f"Expected 4 MSFT but got {position.get('MSFT', 0)}"
assert position['CRWD'] == 1, f"Expected 1 CRWD but got {position.get('CRWD', 0)}"
assert position['NVDA'] == 10, f"Expected 10 NVDA but got {position.get('NVDA', 0)}"
assert position['AVGO'] == 3, f"Expected 3 AVGO but got {position.get('AVGO', 0)}"
assert action_id == 8, f"Expected 8 holdings but got {action_id}"
# Verify total holdings count (should NOT include day 2's empty holdings)
assert len(position) == 9, f"Expected 9 items (8 stocks + CASH) but got {len(position)}"
finally:
# Restore original function
trade_module.get_db_connection = original_get_db_connection
db.connection.close()

View File

@@ -337,12 +337,12 @@ def get_today_init_position_from_db(
cursor = conn.cursor()
try:
# Get most recent position before today
# Get most recent trading day before today
cursor.execute("""
SELECT p.id, p.cash
FROM positions p
WHERE p.job_id = ? AND p.model = ? AND p.date < ?
ORDER BY p.date DESC, p.action_id DESC
SELECT id, ending_cash
FROM trading_days
WHERE job_id = ? AND model = ? AND date < ?
ORDER BY date DESC
LIMIT 1
""", (job_id, modelname, today_date))
@@ -353,15 +353,15 @@ def get_today_init_position_from_db(
logger.info(f"No previous position found for {modelname}, returning initial cash")
return {"CASH": 10000.0}
position_id, cash = row
trading_day_id, cash = row
position_dict = {"CASH": cash}
# Get holdings for this position
# Get holdings for this trading day
cursor.execute("""
SELECT symbol, quantity
FROM holdings
WHERE position_id = ?
""", (position_id,))
WHERE trading_day_id = ?
""", (trading_day_id,))
for symbol, quantity in cursor.fetchall():
position_dict[symbol] = quantity