feat(frontend): 添加交易看板，统一时区为CST
refactor(db): 移除所有SQLite相关代码，迁移至MySQL
This commit is contained in:
crypto_predictor committed
1 parent
5e0d6b18ef
commit
55453d3739
12 files changed
+2116
-501
No files matched your search
+46
-115
@@ -1,4 +1,3 @@
|
||||
import sqlite3
|
||||
import pymysql
|
||||
from datetime import datetime
|
||||
import json
|
||||
@@ -8,43 +7,26 @@ from dotenv import load_dotenv
|
||||
|
||||
load_dotenv()
|
||||
|
||||
|
||||
class TradingDatabase:
|
||||
"""交易数据库管理类 - 用于记录交易历史和预测结果
|
||||
"""交易数据库管理类 - 用于记录交易历史和预测结果 (MySQL)"""
|
||||
|
||||
支持 SQLite (本地) 和 MySQL (远程)。
|
||||
如果 .env 中配置了 MYSQL_HOST，则优先使用 MySQL。
|
||||
"""
|
||||
|
||||
def __init__(self, db_path="trading_history.db"):
|
||||
self.db_path = db_path
|
||||
self.use_mysql = bool(os.getenv('MYSQL_HOST'))
|
||||
def __init__(self, db_path=None):
|
||||
"""初始化 (db_path 参数已废弃，仅为兼容性保留)"""
|
||||
self._init_db()
|
||||
|
||||
@contextmanager
|
||||
def get_connection(self):
|
||||
"""数据库连接上下文管理器"""
|
||||
if self.use_mysql:
|
||||
conn = pymysql.connect(
|
||||
host=os.getenv('MYSQL_HOST'),
|
||||
port=int(os.getenv('MYSQL_PORT', 3306)),
|
||||
user=os.getenv('MYSQL_USER'),
|
||||
password=os.getenv('MYSQL_PASSWORD'),
|
||||
database=os.getenv('MYSQL_DB'),
|
||||
charset='utf8mb4',
|
||||
cursorclass=pymysql.cursors.DictCursor
|
||||
)
|
||||
else:
|
||||
conn = sqlite3.connect(self.db_path)
|
||||
# Make sqlite behave like dict cursor for consistency if needed,
|
||||
# but existing code might expect tuple.
|
||||
# Actually existing code uses cursor.execute directly.
|
||||
# SQLite cursor returns tuples by default.
|
||||
# PyMySQL DictCursor returns dicts.
|
||||
# We need to be careful about compatibility.
|
||||
# The existing log_trade uses INSERT which is fine.
|
||||
# check_existing_trade uses SELECT count(*), fetchone()[0], which works for both if we don't use DictCursor for MySQL or handle it.
|
||||
# Let's use standard cursor for MySQL for compatibility with existing fetchone()[0] usage.
|
||||
|
||||
"""获取 MySQL 数据库连接"""
|
||||
conn = pymysql.connect(
|
||||
host=os.getenv('MYSQL_HOST'),
|
||||
port=int(os.getenv('MYSQL_PORT', 3306)),
|
||||
user=os.getenv('MYSQL_USER'),
|
||||
password=os.getenv('MYSQL_PASSWORD'),
|
||||
database=os.getenv('MYSQL_DB'),
|
||||
charset='utf8mb4',
|
||||
cursorclass=pymysql.cursors.DictCursor
|
||||
)
|
||||
try:
|
||||
yield conn
|
||||
finally:
|
||||
@@ -54,81 +36,45 @@ class TradingDatabase:
|
||||
"""初始化数据库表结构"""
|
||||
with self.get_connection() as conn:
|
||||
cursor = conn.cursor()
|
||||
|
||||
if self.use_mysql:
|
||||
# MySQL Schema
|
||||
cursor.execute('''
|
||||
CREATE TABLE IF NOT EXISTS trades (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
timestamp DATETIME,
|
||||
market_title VARCHAR(255),
|
||||
market_slug VARCHAR(255),
|
||||
model_name VARCHAR(50),
|
||||
prediction VARCHAR(10),
|
||||
probability DOUBLE,
|
||||
action VARCHAR(10),
|
||||
price DOUBLE,
|
||||
amount DOUBLE,
|
||||
size DOUBLE,
|
||||
status VARCHAR(20),
|
||||
error_message TEXT,
|
||||
raw_data JSON,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
INDEX idx_market_slug (market_slug),
|
||||
INDEX idx_status (status)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
''')
|
||||
else:
|
||||
# SQLite Schema
|
||||
cursor.execute('''
|
||||
CREATE TABLE IF NOT EXISTS trades (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
timestamp TEXT,
|
||||
market_title TEXT,
|
||||
market_slug TEXT,
|
||||
model_name TEXT,
|
||||
prediction TEXT,
|
||||
probability REAL,
|
||||
action TEXT,
|
||||
price REAL,
|
||||
amount REAL,
|
||||
size REAL,
|
||||
status TEXT,
|
||||
error_message TEXT,
|
||||
raw_data TEXT,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
|
||||
)
|
||||
''')
|
||||
cursor.execute('''
|
||||
CREATE TABLE IF NOT EXISTS trades (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
timestamp DATETIME,
|
||||
market_title VARCHAR(255),
|
||||
market_slug VARCHAR(255),
|
||||
model_name VARCHAR(50),
|
||||
prediction VARCHAR(10),
|
||||
probability DOUBLE,
|
||||
action VARCHAR(10),
|
||||
price DOUBLE,
|
||||
amount DOUBLE,
|
||||
size DOUBLE,
|
||||
status VARCHAR(20),
|
||||
error_message TEXT,
|
||||
raw_data JSON,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
INDEX idx_market_slug (market_slug),
|
||||
INDEX idx_status (status)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
''')
|
||||
conn.commit()
|
||||
|
||||
def log_trade(self, trade_data: dict):
|
||||
"""
|
||||
记录交易信息
|
||||
"""
|
||||
"""记录交易信息"""
|
||||
try:
|
||||
with self.get_connection() as conn:
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Prepare data
|
||||
timestamp = trade_data.get('timestamp', datetime.now().isoformat())
|
||||
raw_data_json = json.dumps(trade_data.get('raw_data', {}), ensure_ascii=False)
|
||||
|
||||
if self.use_mysql:
|
||||
sql = '''
|
||||
INSERT INTO trades (
|
||||
timestamp, market_title, market_slug, model_name,
|
||||
prediction, probability, action, price, amount, size,
|
||||
status, error_message, raw_data
|
||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
'''
|
||||
else:
|
||||
sql = '''
|
||||
INSERT INTO trades (
|
||||
timestamp, market_title, market_slug, model_name,
|
||||
prediction, probability, action, price, amount, size,
|
||||
status, error_message, raw_data
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
'''
|
||||
sql = '''
|
||||
INSERT INTO trades (
|
||||
timestamp, market_title, market_slug, model_name,
|
||||
prediction, probability, action, price, amount, size,
|
||||
status, error_message, raw_data
|
||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
'''
|
||||
|
||||
cursor.execute(sql, (
|
||||
timestamp,
|
||||
@@ -150,29 +96,14 @@ class TradingDatabase:
|
||||
print(f"写入数据库失败: {e}")
|
||||
|
||||
def check_existing_trade(self, market_slug: str, status: str = 'success') -> bool:
|
||||
"""
|
||||
检查指定市场是否已有成功交易记录
|
||||
"""
|
||||
"""检查指定市场是否已有成功交易记录"""
|
||||
try:
|
||||
with self.get_connection() as conn:
|
||||
cursor = conn.cursor()
|
||||
|
||||
if self.use_mysql:
|
||||
sql = 'SELECT COUNT(*) FROM trades WHERE market_slug = %s AND status = %s'
|
||||
else:
|
||||
sql = 'SELECT COUNT(*) FROM trades WHERE market_slug = ? AND status = ?'
|
||||
|
||||
sql = 'SELECT COUNT(*) as cnt FROM trades WHERE market_slug = %s AND status = %s'
|
||||
cursor.execute(sql, (market_slug, status))
|
||||
|
||||
# Fetch result compatible with both
|
||||
result = cursor.fetchone()
|
||||
if isinstance(result, dict): # If DictCursor was used (not used here but for safety)
|
||||
count = list(result.values())[0]
|
||||
elif isinstance(result, (list, tuple)):
|
||||
count = result[0]
|
||||
else:
|
||||
count = 0
|
||||
|
||||
count = result['cnt'] if result else 0
|
||||
return count > 0
|
||||
except Exception as e:
|
||||
print(f"检查已存在交易失败: {e}")
|
||||
|
||||
Reference in new issue
Block a user