Stage 07.4.3.2 — price polling, event bus and UI throttling
This commit is contained in:
@@ -168,7 +168,7 @@ async def open_system_management(callback: CallbackQuery) -> None:
|
||||
@router.callback_query(F.data == "settings:auto")
|
||||
async def open_auto_settings(callback: CallbackQuery) -> None:
|
||||
AutoTradeRunner.set_current_screen("settings_auto")
|
||||
|
||||
|
||||
if callback.message is None:
|
||||
await callback.answer("Сообщение не найдено", show_alert=True)
|
||||
return
|
||||
@@ -177,7 +177,7 @@ async def open_auto_settings(callback: CallbackQuery) -> None:
|
||||
chat_id=callback.message.chat.id,
|
||||
message_id=callback.message.message_id,
|
||||
)
|
||||
|
||||
|
||||
state = AutoTradeService().get_state()
|
||||
|
||||
strategy_map = {
|
||||
@@ -185,20 +185,43 @@ async def open_auto_settings(callback: CallbackQuery) -> None:
|
||||
"GRID": "🧩 Grid Trading",
|
||||
"SCALP": "⚡ Scalping",
|
||||
}
|
||||
|
||||
strategy_ready = state.strategy is not None
|
||||
symbol_ready = bool(state.symbol)
|
||||
risk_ready = state.risk_percent is not None
|
||||
leverage_ready = state.leverage is not None
|
||||
|
||||
is_configured = strategy_ready and symbol_ready and risk_ready and leverage_ready
|
||||
|
||||
strategy = strategy_map.get(state.strategy or "", "—")
|
||||
symbol = state.symbol or "—"
|
||||
risk = f"{state.risk_percent:.1f}%" if state.risk_percent is not None else "—"
|
||||
leverage = f"x{state.leverage:g}" if state.leverage is not None else "—"
|
||||
|
||||
strategy_icon = "✅" if strategy_ready else "👉"
|
||||
symbol_icon = "✅" if symbol_ready else "👉"
|
||||
risk_icon = "✅" if risk_ready else "👉"
|
||||
leverage_icon = "✅" if leverage_ready else "👉"
|
||||
|
||||
config_status = (
|
||||
"✅ Все параметры настроены"
|
||||
if is_configured
|
||||
else "⛔️ Настрой все параметры"
|
||||
)
|
||||
|
||||
text = (
|
||||
"<b>🤖 Автоторговля</b>\n\n"
|
||||
"<b>СИСТЕМА</b> · Настройки\n\n"
|
||||
f"Стратегия: {strategy}\n"
|
||||
f"Инструмент: {state.symbol}\n"
|
||||
f"Риск: {risk}\n"
|
||||
f"Плечо: {leverage}\n\n"
|
||||
"Выберите настройку:"
|
||||
f"{strategy_icon} Стратегия: {strategy}\n"
|
||||
f"{symbol_icon} Инструмент: {symbol}\n"
|
||||
f"{risk_icon} Риск: {risk}\n"
|
||||
f"{leverage_icon} Плечо: {leverage}\n\n"
|
||||
f"{config_status}"
|
||||
)
|
||||
|
||||
if not is_configured:
|
||||
text += "\n\nВыберите настройку:"
|
||||
|
||||
builder = InlineKeyboardBuilder()
|
||||
builder.button(text="🧠 Стратегия", callback_data="settings:auto_strategy")
|
||||
builder.button(text="📈 Инструмент", callback_data="settings:auto_symbol")
|
||||
@@ -361,7 +384,7 @@ async def set_auto_leverage(callback: CallbackQuery) -> None:
|
||||
AutoTradeRunner.set_current_screen("settings_auto")
|
||||
await callback.answer("Плечо обновлено")
|
||||
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:trade")
|
||||
async def open_trade_settings(callback: CallbackQuery) -> None:
|
||||
if callback.message is None:
|
||||
|
||||
Reference in New Issue
Block a user