From 49bd92296ebd1aa442577d4d2db75b45fa38a2ae Mon Sep 17 00:00:00 2001 From: zhiyong Date: Fri, 16 May 2025 14:12:20 +0800 Subject: [PATCH] fix: module path --- src/__init__.py | 1 - src/config.py | 2 +- src/core/app_state.py | 12 ++++++------ src/core/scheduler_tasks.py | 6 +++--- src/routes/account_routes.py | 2 +- src/routes/health_routes.py | 2 +- src/routes/strategy_routes.py | 2 +- src/routes/trading_routes.py | 6 +++--- src/trade_server.py | 16 ++++++++-------- 9 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 src/__init__.py diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index 0519ecb..0000000 --- a/src/__init__.py +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/config.py b/src/config.py index f36d4fe..5543c56 100644 --- a/src/config.py +++ b/src/config.py @@ -9,7 +9,7 @@ class Config: # Trading settings TRADE_TIMEOUT = 5 # 交易超时时间（秒） - SIMULATION_MODE = False + SIMULATION_MODE = True # Trading hours MARKET_OPEN_TIME = "09:20" diff --git a/src/core/app_state.py b/src/core/app_state.py index b450394..47852f8 100644 --- a/src/core/app_state.py +++ b/src/core/app_state.py @@ -6,12 +6,12 @@ import time from typing import Optional -from ..config import Config # 使用相对导入 -from ..logger_config import get_logger -from ..real.xt_trader import XtTrader -from ..simulation.simulation_trader import SimulationTrader -from ..base_trader import BaseTrader -from ..real.real_trader_manager import RealTraderManager # 确保导入 +from config import Config # 使用相对导入 +from logger_config import get_logger +from real.xt_trader import XtTrader +from simulation.simulation_trader import SimulationTrader +from base_trader import BaseTrader +from real.real_trader_manager import RealTraderManager # 确保导入 # 获取日志记录器 logger = get_logger("app_state") # 可以考虑是否需要区分 logger 名称 diff --git a/src/core/scheduler_tasks.py b/src/core/scheduler_tasks.py index bd8c69e..42013e0 100644 --- a/src/core/scheduler_tasks.py +++ b/src/core/scheduler_tasks.py @@ -10,9 +10,9 @@ import time import subprocess import os -from ..config import Config -from ..logger_config import get_logger -from ..base_trader import BaseTrader +from config import Config +from logger_config import get_logger +from base_trader import BaseTrader from .app_state import login, logout, is_real_mode, _trader_instance, logger as app_logger # 使用 app_state中的logger # 如果需要独立的 logger，可以取消下面这行的注释 diff --git a/src/routes/account_routes.py b/src/routes/account_routes.py index 509b8ef..6330a58 100644 --- a/src/routes/account_routes.py +++ b/src/routes/account_routes.py @@ -5,7 +5,7 @@ """ from flask import Blueprint, jsonify, abort -from ..core.app_state import get_trader, is_real_mode, logger +from core.app_state import get_trader, is_real_mode, logger account_bp = Blueprint('account_routes', __name__, url_prefix='/yu') diff --git a/src/routes/health_routes.py b/src/routes/health_routes.py index aac11c1..4c65081 100644 --- a/src/routes/health_routes.py +++ b/src/routes/health_routes.py @@ -3,7 +3,7 @@ """ from flask import Blueprint, jsonify -from ..core.app_state import is_real_mode, get_trader, logger +from core.app_state import is_real_mode, get_trader, logger health_bp = Blueprint('health_routes', __name__, url_prefix='/yu') diff --git a/src/routes/strategy_routes.py b/src/routes/strategy_routes.py index b1f54f3..adb8fb1 100644 --- a/src/routes/strategy_routes.py +++ b/src/routes/strategy_routes.py @@ -3,7 +3,7 @@ """ from flask import Blueprint, jsonify, abort -from ..core.app_state import get_trader, logger +from core.app_state import get_trader, logger strategy_bp = Blueprint('strategy_routes', __name__, url_prefix='/yu') diff --git a/src/routes/trading_routes.py b/src/routes/trading_routes.py index f1bcbce..05702d0 100644 --- a/src/routes/trading_routes.py +++ b/src/routes/trading_routes.py @@ -3,9 +3,9 @@ """ from flask import Blueprint, request, jsonify, abort -from ..core.app_state import get_trader, get_real_trader_manager, is_real_mode, logger -from ..base_trader import BaseTrader -from ..trade_constants import ORDER_TYPE_LIMIT, ORDER_DIRECTION_BUY, ORDER_DIRECTION_SELL +from core.app_state import get_trader, get_real_trader_manager, is_real_mode, logger +from base_trader import BaseTrader +from trade_constants import ORDER_TYPE_LIMIT, ORDER_DIRECTION_BUY, ORDER_DIRECTION_SELL trading_bp = Blueprint('trading_routes', __name__, url_prefix='/yu') diff --git a/src/trade_server.py b/src/trade_server.py index d5d6cbe..34c3034 100644 --- a/src/trade_server.py +++ b/src/trade_server.py @@ -5,18 +5,18 @@ Flask应用主入口文件。 """ from flask import Flask, request, abort -from .config import Config -from .logger_config import get_logger # 主应用的logger +from config import Config +from logger_config import get_logger # 主应用的logger # 核心服务和状态初始化 -from .core.app_state import login as initialize_trader_login, logger as app_state_logger, is_real_mode -from .core.scheduler_tasks import setup_scheduler, logger as scheduler_logger +from core.app_state import login as initialize_trader_login, logger as app_state_logger, is_real_mode +from core.scheduler_tasks import setup_scheduler, logger as scheduler_logger # API 路由蓝图 -from .routes.health_routes import health_bp -from .routes.trading_routes import trading_bp -from .routes.account_routes import account_bp -from .routes.strategy_routes import strategy_bp +from routes.health_routes import health_bp +from routes.trading_routes import trading_bp +from routes.account_routes import account_bp +from routes.strategy_routes import strategy_bp # 主日志记录器 (可以根据需要选择使用 app_state_logger 或 scheduler_logger, 或者独立的) logger = get_logger("trade_server_main")