mirror of
https://github.com/Xe138/AI-Trader.git
synced 2026-04-01 17:17:24 -04:00
This commit implements Task 1 from the schema migration plan: - Trade tools (buy/sell) now write to actions table instead of old positions table - Added trading_day_id parameter to buy/sell functions - Updated ContextInjector to inject trading_day_id - Updated RuntimeConfigManager to include TRADING_DAY_ID in config - Removed P&L calculation from trade functions (now done at trading_days level) - Added tests verifying correct behavior with new schema Changes: - agent_tools/tool_trade.py: Modified _buy_impl and _sell_impl to write to actions table - agent/context_injector.py: Added trading_day_id parameter and injection logic - api/model_day_executor.py: Updated to read trading_day_id from runtime config - api/runtime_manager.py: Added trading_day_id to config initialization - tests/unit/test_trade_tools_new_schema.py: New tests for new schema compliance All tests passing.
323 lines
11 KiB
Python
323 lines
11 KiB
Python
"""
|
|
Trade execution tool for MCP interface.
|
|
|
|
NOTE: This module uses the OLD positions table schema.
|
|
It is being replaced by the new trading_days schema.
|
|
Trade operations will be migrated to use the new schema in a future update.
|
|
"""
|
|
|
|
from fastmcp import FastMCP
|
|
import sys
|
|
import os
|
|
from typing import Dict, List, Optional, Any, Tuple
|
|
# Add project root directory to Python path
|
|
project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
sys.path.insert(0, project_root)
|
|
from tools.price_tools import get_open_prices
|
|
import json
|
|
from api.database import get_db_connection
|
|
from datetime import datetime
|
|
mcp = FastMCP("TradeTools")
|
|
|
|
|
|
def get_current_position_from_db(job_id: str, model: str, date: str) -> Tuple[Dict[str, float], int]:
|
|
"""
|
|
Query current position from SQLite database.
|
|
|
|
Args:
|
|
job_id: Job UUID
|
|
model: Model signature
|
|
date: Trading date (YYYY-MM-DD)
|
|
|
|
Returns:
|
|
Tuple of (position_dict, next_action_id)
|
|
- position_dict: {symbol: quantity, "CASH": amount}
|
|
- next_action_id: Next available action_id for this job+model
|
|
|
|
Raises:
|
|
Exception: If database query fails
|
|
"""
|
|
db_path = "data/jobs.db"
|
|
conn = get_db_connection(db_path)
|
|
cursor = conn.cursor()
|
|
|
|
try:
|
|
# Get most recent position on or before this date
|
|
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
|
|
LIMIT 1
|
|
""", (job_id, model, date))
|
|
|
|
position_row = cursor.fetchone()
|
|
|
|
if not position_row:
|
|
# No position found - this shouldn't happen if ModelDayExecutor initializes properly
|
|
raise Exception(f"No position found for job_id={job_id}, model={model}, date={date}")
|
|
|
|
position_id = position_row[0]
|
|
cash = position_row[1]
|
|
|
|
# Build position dict starting with CASH
|
|
position_dict = {"CASH": cash}
|
|
|
|
# Get holdings for this position
|
|
cursor.execute("""
|
|
SELECT symbol, quantity
|
|
FROM holdings
|
|
WHERE position_id = ?
|
|
""", (position_id,))
|
|
|
|
for row in cursor.fetchall():
|
|
symbol = row[0]
|
|
quantity = row[1]
|
|
position_dict[symbol] = quantity
|
|
|
|
# Get next action_id
|
|
cursor.execute("""
|
|
SELECT COALESCE(MAX(action_id), -1) + 1 as next_action_id
|
|
FROM positions
|
|
WHERE job_id = ? AND model = ?
|
|
""", (job_id, model))
|
|
|
|
next_action_id = cursor.fetchone()[0]
|
|
|
|
return position_dict, next_action_id
|
|
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def _buy_impl(symbol: str, amount: int, signature: str = None, today_date: str = None,
|
|
job_id: str = None, session_id: int = None, trading_day_id: int = None) -> Dict[str, Any]:
|
|
"""
|
|
Internal buy implementation - accepts injected context parameters.
|
|
|
|
Args:
|
|
symbol: Stock symbol
|
|
amount: Number of shares
|
|
signature: Model signature (injected)
|
|
today_date: Trading date (injected)
|
|
job_id: Job ID (injected)
|
|
session_id: Session ID (injected, DEPRECATED)
|
|
trading_day_id: Trading day ID (injected)
|
|
|
|
This function is not exposed to the AI model. It receives runtime context
|
|
(signature, today_date, job_id, session_id, trading_day_id) from the ContextInjector.
|
|
"""
|
|
# Validate required parameters
|
|
if not job_id:
|
|
return {"error": "Missing required parameter: job_id"}
|
|
if not signature:
|
|
return {"error": "Missing required parameter: signature"}
|
|
if not today_date:
|
|
return {"error": "Missing required parameter: today_date"}
|
|
|
|
db_path = "data/jobs.db"
|
|
conn = get_db_connection(db_path)
|
|
cursor = conn.cursor()
|
|
|
|
try:
|
|
# Step 1: Get current position
|
|
current_position, next_action_id = get_current_position_from_db(job_id, signature, today_date)
|
|
|
|
# Step 2: Get stock price
|
|
try:
|
|
this_symbol_price = get_open_prices(today_date, [symbol])[f'{symbol}_price']
|
|
except KeyError:
|
|
return {"error": f"Symbol {symbol} not found on {today_date}", "symbol": symbol, "date": today_date}
|
|
|
|
# Step 3: Validate sufficient cash
|
|
cash_required = this_symbol_price * amount
|
|
cash_available = current_position.get("CASH", 0)
|
|
cash_left = cash_available - cash_required
|
|
|
|
if cash_left < 0:
|
|
return {
|
|
"error": "Insufficient cash",
|
|
"required_cash": cash_required,
|
|
"cash_available": cash_available,
|
|
"symbol": symbol,
|
|
"date": today_date
|
|
}
|
|
|
|
# Step 4: Calculate new position
|
|
new_position = current_position.copy()
|
|
new_position["CASH"] = cash_left
|
|
new_position[symbol] = new_position.get(symbol, 0) + amount
|
|
|
|
# Step 5: Write to actions table (NEW SCHEMA)
|
|
# NOTE: P&L is now calculated at the trading_days level, not per-trade
|
|
if trading_day_id is None:
|
|
# Get trading_day_id from runtime config if not provided
|
|
from tools.general_tools import get_config_value
|
|
trading_day_id = get_config_value('TRADING_DAY_ID')
|
|
|
|
if trading_day_id is None:
|
|
raise ValueError("trading_day_id not found in runtime config")
|
|
|
|
created_at = datetime.utcnow().isoformat() + "Z"
|
|
|
|
cursor.execute("""
|
|
INSERT INTO actions (
|
|
trading_day_id, action_type, symbol, quantity, price, created_at
|
|
)
|
|
VALUES (?, ?, ?, ?, ?, ?)
|
|
""", (
|
|
trading_day_id, "buy", symbol, amount, this_symbol_price, created_at
|
|
))
|
|
|
|
# NOTE: Holdings are written by BaseAgent at end of day, not per-trade
|
|
# This keeps the data model clean (one holdings snapshot per day)
|
|
|
|
conn.commit()
|
|
print(f"[buy] {signature} bought {amount} shares of {symbol} at ${this_symbol_price}")
|
|
return new_position
|
|
|
|
except Exception as e:
|
|
conn.rollback()
|
|
return {"error": f"Trade failed: {str(e)}", "symbol": symbol, "date": today_date}
|
|
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
@mcp.tool()
|
|
def buy(symbol: str, amount: int, signature: str = None, today_date: str = None,
|
|
job_id: str = None, session_id: int = None, trading_day_id: int = None) -> Dict[str, Any]:
|
|
"""
|
|
Buy stock shares.
|
|
|
|
Args:
|
|
symbol: Stock symbol (e.g., "AAPL", "MSFT", "GOOGL")
|
|
amount: Number of shares to buy (positive integer)
|
|
|
|
Returns:
|
|
Dict[str, Any]:
|
|
- Success: {"CASH": remaining_cash, "SYMBOL": shares, ...}
|
|
- Failure: {"error": error_message, ...}
|
|
|
|
Note: signature, today_date, job_id, session_id, trading_day_id are
|
|
automatically injected by the system. Do not provide these parameters.
|
|
"""
|
|
return _buy_impl(symbol, amount, signature, today_date, job_id, session_id, trading_day_id)
|
|
|
|
|
|
def _sell_impl(symbol: str, amount: int, signature: str = None, today_date: str = None,
|
|
job_id: str = None, session_id: int = None, trading_day_id: int = None) -> Dict[str, Any]:
|
|
"""
|
|
Sell stock function - writes to SQLite database.
|
|
|
|
Args:
|
|
symbol: Stock symbol (e.g., "AAPL", "MSFT")
|
|
amount: Number of shares to sell (positive integer)
|
|
signature: Model signature (injected by ContextInjector)
|
|
today_date: Trading date YYYY-MM-DD (injected by ContextInjector)
|
|
job_id: Job UUID (injected by ContextInjector)
|
|
session_id: Trading session ID (injected by ContextInjector, DEPRECATED)
|
|
trading_day_id: Trading day ID (injected by ContextInjector)
|
|
|
|
Returns:
|
|
Dict[str, Any]:
|
|
- Success: {"CASH": amount, symbol: quantity, ...}
|
|
- Failure: {"error": message, ...}
|
|
"""
|
|
# Validate required parameters
|
|
if not job_id:
|
|
return {"error": "Missing required parameter: job_id"}
|
|
if not signature:
|
|
return {"error": "Missing required parameter: signature"}
|
|
if not today_date:
|
|
return {"error": "Missing required parameter: today_date"}
|
|
|
|
db_path = "data/jobs.db"
|
|
conn = get_db_connection(db_path)
|
|
cursor = conn.cursor()
|
|
|
|
try:
|
|
# Step 1: Get current position
|
|
current_position, next_action_id = get_current_position_from_db(job_id, signature, today_date)
|
|
|
|
# Step 2: Validate position exists
|
|
if symbol not in current_position:
|
|
return {"error": f"No position for {symbol}", "symbol": symbol, "date": today_date}
|
|
|
|
if current_position[symbol] < amount:
|
|
return {
|
|
"error": "Insufficient shares",
|
|
"have": current_position[symbol],
|
|
"want_to_sell": amount,
|
|
"symbol": symbol,
|
|
"date": today_date
|
|
}
|
|
|
|
# Step 3: Get stock price
|
|
try:
|
|
this_symbol_price = get_open_prices(today_date, [symbol])[f'{symbol}_price']
|
|
except KeyError:
|
|
return {"error": f"Symbol {symbol} not found on {today_date}", "symbol": symbol, "date": today_date}
|
|
|
|
# Step 4: Calculate new position
|
|
new_position = current_position.copy()
|
|
new_position[symbol] -= amount
|
|
new_position["CASH"] = new_position.get("CASH", 0) + (this_symbol_price * amount)
|
|
|
|
# Step 5: Write to actions table (NEW SCHEMA)
|
|
# NOTE: P&L is now calculated at the trading_days level, not per-trade
|
|
if trading_day_id is None:
|
|
from tools.general_tools import get_config_value
|
|
trading_day_id = get_config_value('TRADING_DAY_ID')
|
|
|
|
if trading_day_id is None:
|
|
raise ValueError("trading_day_id not found in runtime config")
|
|
|
|
created_at = datetime.utcnow().isoformat() + "Z"
|
|
|
|
cursor.execute("""
|
|
INSERT INTO actions (
|
|
trading_day_id, action_type, symbol, quantity, price, created_at
|
|
)
|
|
VALUES (?, ?, ?, ?, ?, ?)
|
|
""", (
|
|
trading_day_id, "sell", symbol, amount, this_symbol_price, created_at
|
|
))
|
|
|
|
conn.commit()
|
|
print(f"[sell] {signature} sold {amount} shares of {symbol} at ${this_symbol_price}")
|
|
return new_position
|
|
|
|
except Exception as e:
|
|
conn.rollback()
|
|
return {"error": f"Trade failed: {str(e)}", "symbol": symbol, "date": today_date}
|
|
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
@mcp.tool()
|
|
def sell(symbol: str, amount: int, signature: str = None, today_date: str = None,
|
|
job_id: str = None, session_id: int = None, trading_day_id: int = None) -> Dict[str, Any]:
|
|
"""
|
|
Sell stock shares.
|
|
|
|
Args:
|
|
symbol: Stock symbol (e.g., "AAPL", "MSFT", "GOOGL")
|
|
amount: Number of shares to sell (positive integer)
|
|
|
|
Returns:
|
|
Dict[str, Any]:
|
|
- Success: {"CASH": remaining_cash, "SYMBOL": shares, ...}
|
|
- Failure: {"error": error_message, ...}
|
|
|
|
Note: signature, today_date, job_id, session_id, trading_day_id are
|
|
automatically injected by the system. Do not provide these parameters.
|
|
"""
|
|
return _sell_impl(symbol, amount, signature, today_date, job_id, session_id, trading_day_id)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
port = int(os.getenv("TRADE_HTTP_PORT", "8002"))
|
|
mcp.run(transport="streamable-http", port=port)
|