mirror of
https://github.com/Xe138/AI-Trader.git
synced 2026-04-02 01:27:24 -04:00
Compare commits
11 Commits
v0.3.0-alp
...
v0.3.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
| 396a2747d3 | |||
| 71ec53db45 | |||
| b6bd949d23 | |||
| b5f18ac0f3 | |||
| 90b6ad400d | |||
| 6e4b2a4cc5 | |||
| 18bd4d169d | |||
| 8b91c75b32 | |||
| bdb3f6a6a2 | |||
| 3502a7ffa8 | |||
| 68d9f241e1 |
41
api/main.py
41
api/main.py
@@ -116,7 +116,7 @@ class HealthResponse(BaseModel):
|
||||
|
||||
def create_app(
|
||||
db_path: str = "data/jobs.db",
|
||||
config_path: str = "configs/default_config.json"
|
||||
config_path: str = "/tmp/runtime_config.json" if Path("/tmp/runtime_config.json").exists() else "configs/default_config.json"
|
||||
) -> FastAPI:
|
||||
"""
|
||||
Create FastAPI application instance.
|
||||
@@ -134,20 +134,28 @@ def create_app(
|
||||
from tools.deployment_config import is_dev_mode, get_db_path
|
||||
from api.database import initialize_dev_database, initialize_database
|
||||
|
||||
# Startup
|
||||
# Startup - use closure to access db_path from create_app scope
|
||||
logger.info("🚀 FastAPI application starting...")
|
||||
logger.info("📊 Initializing database...")
|
||||
|
||||
if is_dev_mode():
|
||||
# Initialize dev database (reset unless PRESERVE_DEV_DATA=true)
|
||||
dev_db_path = get_db_path(app.state.db_path)
|
||||
logger.info(" 🔧 DEV mode detected - initializing dev database")
|
||||
dev_db_path = get_db_path(db_path)
|
||||
initialize_dev_database(dev_db_path)
|
||||
log_dev_mode_startup_warning()
|
||||
else:
|
||||
# Ensure production database schema exists
|
||||
initialize_database(app.state.db_path)
|
||||
logger.info(" 🏭 PROD mode - ensuring database schema exists")
|
||||
initialize_database(db_path)
|
||||
|
||||
logger.info("✅ Database initialized")
|
||||
logger.info("🌐 API server ready to accept requests")
|
||||
|
||||
yield
|
||||
|
||||
# Shutdown (if needed in future)
|
||||
pass
|
||||
logger.info("🛑 FastAPI application shutting down...")
|
||||
|
||||
app = FastAPI(
|
||||
title="AI-Trader Simulation API",
|
||||
@@ -514,11 +522,30 @@ def create_app(
|
||||
# Create default app instance
|
||||
app = create_app()
|
||||
|
||||
# Ensure database is initialized when module is loaded
|
||||
# This handles cases where lifespan might not be triggered properly
|
||||
logger.info("🔧 Module-level database initialization check...")
|
||||
|
||||
from tools.deployment_config import is_dev_mode, get_db_path
|
||||
from api.database import initialize_dev_database, initialize_database
|
||||
|
||||
_db_path = app.state.db_path
|
||||
|
||||
if is_dev_mode():
|
||||
logger.info(" 🔧 DEV mode - initializing dev database at module load")
|
||||
_dev_db_path = get_db_path(_db_path)
|
||||
initialize_dev_database(_dev_db_path)
|
||||
else:
|
||||
logger.info(" 🏭 PROD mode - ensuring database exists at module load")
|
||||
initialize_database(_db_path)
|
||||
|
||||
logger.info("✅ Module-level database initialization complete")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import uvicorn
|
||||
|
||||
# Note: Database initialization happens in startup_event()
|
||||
# DEV mode warning will be displayed there as well
|
||||
# Note: Database initialization happens in lifespan AND at module load
|
||||
# for maximum reliability
|
||||
|
||||
uvicorn.run(app, host="0.0.0.0", port=8080)
|
||||
|
||||
@@ -11,6 +11,7 @@ This module provides:
|
||||
|
||||
import logging
|
||||
import os
|
||||
import asyncio
|
||||
from typing import Dict, Any, Optional, List, TYPE_CHECKING
|
||||
from pathlib import Path
|
||||
|
||||
@@ -118,7 +119,7 @@ class ModelDayExecutor:
|
||||
|
||||
# Run trading session
|
||||
logger.info(f"Running trading session for {self.model_sig} on {self.date}")
|
||||
session_result = agent.run_trading_session(self.date)
|
||||
session_result = asyncio.run(agent.run_trading_session(self.date))
|
||||
|
||||
# Persist results to SQLite
|
||||
self._write_results_to_db(agent, session_result)
|
||||
@@ -211,8 +212,10 @@ class ModelDayExecutor:
|
||||
init_date=config.get("date_range", {}).get("init_date", "2025-10-13")
|
||||
)
|
||||
|
||||
# Register agent (creates initial position if needed)
|
||||
agent.register_agent()
|
||||
# Note: In API mode, we don't call register_agent() because:
|
||||
# - Position data is stored in SQLite database, not files
|
||||
# - Database initialization is handled by JobManager
|
||||
# - File-based position tracking is only for standalone/CLI mode
|
||||
|
||||
return agent
|
||||
|
||||
|
||||
@@ -6,30 +6,28 @@
|
||||
},
|
||||
"models": [
|
||||
{
|
||||
"name": "claude-3.7-sonnet",
|
||||
"basemodel": "anthropic/claude-3.7-sonnet",
|
||||
"signature": "claude-3.7-sonnet",
|
||||
"enabled": false,
|
||||
"openai_base_url": "Optional: YOUR_OPENAI_BASE_URL,you can write them in .env file",
|
||||
"openai_api_key": "Optional: YOUR_OPENAI_API_KEY,you can write them in .env file"
|
||||
"name": "claude-sonnet-4-5",
|
||||
"basemodel": "anthropic/claude-sonnet-4.5",
|
||||
"signature": "claude-sonnet-4.5",
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"name": "deepseek-chat-v3.1",
|
||||
"basemodel": "deepseek/deepseek-chat-v3.1",
|
||||
"signature": "deepseek-chat-v3.1",
|
||||
"enabled": false
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"name": "qwen3-max",
|
||||
"basemodel": "qwen/qwen3-max",
|
||||
"signature": "qwen3-max",
|
||||
"enabled": false
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"name": "gemini-2.5-flash",
|
||||
"basemodel": "google/gemini-2.5-flash",
|
||||
"signature": "gemini-2.5-flash",
|
||||
"enabled": false
|
||||
"enabled": true
|
||||
},
|
||||
{
|
||||
"name": "gpt-5",
|
||||
|
||||
@@ -36,12 +36,7 @@ fi
|
||||
|
||||
echo "✅ Environment variables validated"
|
||||
|
||||
# Step 1: Initialize database
|
||||
echo "📊 Initializing database..."
|
||||
python -c "from api.database import initialize_database; initialize_database('data/jobs.db')"
|
||||
echo "✅ Database initialized"
|
||||
|
||||
# Step 2: Merge and validate configuration
|
||||
# Step 1: Merge and validate configuration
|
||||
echo "🔧 Merging and validating configuration..."
|
||||
python -c "from tools.config_merger import merge_and_validate; merge_and_validate()" || {
|
||||
echo "❌ Configuration validation failed"
|
||||
@@ -50,7 +45,7 @@ python -c "from tools.config_merger import merge_and_validate; merge_and_validat
|
||||
export CONFIG_PATH=/tmp/runtime_config.json
|
||||
echo "✅ Configuration validated and merged"
|
||||
|
||||
# Step 3: Start MCP services in background
|
||||
# Step 2: Start MCP services in background
|
||||
echo "🔧 Starting MCP services..."
|
||||
cd /app
|
||||
python agent_tools/start_mcp_services.py &
|
||||
@@ -59,11 +54,11 @@ MCP_PID=$!
|
||||
# Setup cleanup trap before starting uvicorn
|
||||
trap "echo '🛑 Stopping services...'; kill $MCP_PID 2>/dev/null; exit 0" EXIT SIGTERM SIGINT
|
||||
|
||||
# Step 4: Wait for services to initialize
|
||||
# Step 3: Wait for services to initialize
|
||||
echo "⏳ Waiting for MCP services to start..."
|
||||
sleep 3
|
||||
|
||||
# Step 5: Start FastAPI server with uvicorn (this blocks)
|
||||
# Step 4: Start FastAPI server with uvicorn (this blocks)
|
||||
# Note: Container always uses port 8080 internally
|
||||
# The API_PORT env var only affects the host port mapping in docker-compose.yml
|
||||
echo "🌐 Starting FastAPI server on port 8080..."
|
||||
|
||||
@@ -14,7 +14,7 @@ Tests verify:
|
||||
|
||||
import pytest
|
||||
import json
|
||||
from unittest.mock import Mock, patch, MagicMock
|
||||
from unittest.mock import Mock, patch, MagicMock, AsyncMock
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
@@ -29,7 +29,8 @@ def create_mock_agent(positions=None, last_trade=None, current_prices=None,
|
||||
mock_agent.get_current_prices.return_value = current_prices or {}
|
||||
mock_agent.get_reasoning_steps.return_value = reasoning_steps or []
|
||||
mock_agent.get_tool_usage.return_value = tool_usage or {}
|
||||
mock_agent.run_trading_session.return_value = session_result or {"success": True}
|
||||
# run_trading_session is async, so use AsyncMock
|
||||
mock_agent.run_trading_session = AsyncMock(return_value=session_result or {"success": True})
|
||||
|
||||
return mock_agent
|
||||
|
||||
|
||||
@@ -69,8 +69,16 @@ def get_db_path(base_db_path: str) -> str:
|
||||
Example:
|
||||
PROD: "data/trading.db" -> "data/trading.db"
|
||||
DEV: "data/trading.db" -> "data/trading_dev.db"
|
||||
|
||||
Note:
|
||||
This function is idempotent - calling it multiple times on the same
|
||||
path will not add multiple _dev suffixes.
|
||||
"""
|
||||
if is_dev_mode():
|
||||
# Check if already has _dev suffix (idempotent)
|
||||
if "_dev.db" in base_db_path:
|
||||
return base_db_path
|
||||
|
||||
# Insert _dev before .db extension
|
||||
if base_db_path.endswith(".db"):
|
||||
return base_db_path[:-3] + "_dev.db"
|
||||
|
||||
Reference in New Issue
Block a user