mirror of
https://github.com/Xe138/AI-Trader.git
synced 2026-04-09 20:27:25 -04:00
Compare commits
8 Commits
v0.3.0-alp
...
v0.3.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
| 396a2747d3 | |||
| 71ec53db45 | |||
| b6bd949d23 | |||
| b5f18ac0f3 | |||
| 90b6ad400d | |||
| 6e4b2a4cc5 | |||
| 18bd4d169d | |||
| 8b91c75b32 |
25
api/main.py
25
api/main.py
@@ -116,7 +116,7 @@ class HealthResponse(BaseModel):
|
|||||||
|
|
||||||
def create_app(
|
def create_app(
|
||||||
db_path: str = "data/jobs.db",
|
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:
|
) -> FastAPI:
|
||||||
"""
|
"""
|
||||||
Create FastAPI application instance.
|
Create FastAPI application instance.
|
||||||
@@ -522,11 +522,30 @@ def create_app(
|
|||||||
# Create default app instance
|
# Create default app instance
|
||||||
app = create_app()
|
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__":
|
if __name__ == "__main__":
|
||||||
import uvicorn
|
import uvicorn
|
||||||
|
|
||||||
# Note: Database initialization happens in startup_event()
|
# Note: Database initialization happens in lifespan AND at module load
|
||||||
# DEV mode warning will be displayed there as well
|
# for maximum reliability
|
||||||
|
|
||||||
uvicorn.run(app, host="0.0.0.0", port=8080)
|
uvicorn.run(app, host="0.0.0.0", port=8080)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ This module provides:
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import asyncio
|
||||||
from typing import Dict, Any, Optional, List, TYPE_CHECKING
|
from typing import Dict, Any, Optional, List, TYPE_CHECKING
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
@@ -118,7 +119,7 @@ class ModelDayExecutor:
|
|||||||
|
|
||||||
# Run trading session
|
# Run trading session
|
||||||
logger.info(f"Running trading session for {self.model_sig} on {self.date}")
|
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
|
# Persist results to SQLite
|
||||||
self._write_results_to_db(agent, session_result)
|
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")
|
init_date=config.get("date_range", {}).get("init_date", "2025-10-13")
|
||||||
)
|
)
|
||||||
|
|
||||||
# Register agent (creates initial position if needed)
|
# Note: In API mode, we don't call register_agent() because:
|
||||||
agent.register_agent()
|
# - 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
|
return agent
|
||||||
|
|
||||||
|
|||||||
@@ -6,30 +6,28 @@
|
|||||||
},
|
},
|
||||||
"models": [
|
"models": [
|
||||||
{
|
{
|
||||||
"name": "claude-3.7-sonnet",
|
"name": "claude-sonnet-4-5",
|
||||||
"basemodel": "anthropic/claude-3.7-sonnet",
|
"basemodel": "anthropic/claude-sonnet-4.5",
|
||||||
"signature": "claude-3.7-sonnet",
|
"signature": "claude-sonnet-4.5",
|
||||||
"enabled": false,
|
"enabled": true
|
||||||
"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": "deepseek-chat-v3.1",
|
"name": "deepseek-chat-v3.1",
|
||||||
"basemodel": "deepseek/deepseek-chat-v3.1",
|
"basemodel": "deepseek/deepseek-chat-v3.1",
|
||||||
"signature": "deepseek-chat-v3.1",
|
"signature": "deepseek-chat-v3.1",
|
||||||
"enabled": false
|
"enabled": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "qwen3-max",
|
"name": "qwen3-max",
|
||||||
"basemodel": "qwen/qwen3-max",
|
"basemodel": "qwen/qwen3-max",
|
||||||
"signature": "qwen3-max",
|
"signature": "qwen3-max",
|
||||||
"enabled": false
|
"enabled": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "gemini-2.5-flash",
|
"name": "gemini-2.5-flash",
|
||||||
"basemodel": "google/gemini-2.5-flash",
|
"basemodel": "google/gemini-2.5-flash",
|
||||||
"signature": "gemini-2.5-flash",
|
"signature": "gemini-2.5-flash",
|
||||||
"enabled": false
|
"enabled": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "gpt-5",
|
"name": "gpt-5",
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ Tests verify:
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import json
|
import json
|
||||||
from unittest.mock import Mock, patch, MagicMock
|
from unittest.mock import Mock, patch, MagicMock, AsyncMock
|
||||||
from pathlib import Path
|
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_current_prices.return_value = current_prices or {}
|
||||||
mock_agent.get_reasoning_steps.return_value = reasoning_steps or []
|
mock_agent.get_reasoning_steps.return_value = reasoning_steps or []
|
||||||
mock_agent.get_tool_usage.return_value = tool_usage 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
|
return mock_agent
|
||||||
|
|
||||||
|
|||||||
@@ -69,8 +69,16 @@ def get_db_path(base_db_path: str) -> str:
|
|||||||
Example:
|
Example:
|
||||||
PROD: "data/trading.db" -> "data/trading.db"
|
PROD: "data/trading.db" -> "data/trading.db"
|
||||||
DEV: "data/trading.db" -> "data/trading_dev.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():
|
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
|
# Insert _dev before .db extension
|
||||||
if base_db_path.endswith(".db"):
|
if base_db_path.endswith(".db"):
|
||||||
return base_db_path[:-3] + "_dev.db"
|
return base_db_path[:-3] + "_dev.db"
|
||||||
|
|||||||
Reference in New Issue
Block a user