Stage 07.4.3.2 — price polling, event bus and UI throttling
This commit is contained in:
@@ -11,6 +11,9 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
|
||||
from src.telegram.ui.common import mode_line
|
||||
from src.trading.auto.runner import AutoTradeRunner
|
||||
from src.trading.auto.service import AutoTradeService
|
||||
from src.telegram.handlers.system import open_auto_settings
|
||||
from src.integrations.exchange.service import ExchangeService
|
||||
from src.telegram.ui.currency_ui import format_usd_amount
|
||||
|
||||
|
||||
router = Router(name="auto")
|
||||
@@ -71,6 +74,18 @@ def _price_or_dash(value: float | None) -> str:
|
||||
return f"{value:.2f}"
|
||||
|
||||
|
||||
# текущая цена инструмента
|
||||
def _market_price_or_dash(symbol: str | None) -> str:
|
||||
if not symbol:
|
||||
return "—"
|
||||
|
||||
try:
|
||||
ticker = ExchangeService().get_price(symbol)
|
||||
return f"$ {format_usd_amount(ticker.price)}"
|
||||
except Exception:
|
||||
return "—"
|
||||
|
||||
|
||||
# формат USD
|
||||
def _usd_or_dash(value: float | None) -> str:
|
||||
if value is None:
|
||||
@@ -162,9 +177,16 @@ def _build_auto_text() -> str:
|
||||
account_mode = "DEMO" if "DEMO" in mode_line().upper() else "LIVE"
|
||||
risk = f"{state.risk_percent:.1f}%" if state.risk_percent is not None else "—"
|
||||
configured = _is_auto_configured(state)
|
||||
price = _market_price_or_dash(state.symbol)
|
||||
|
||||
status_line = {
|
||||
"OFF": "⚪ Off",
|
||||
"OBSERVING": "👀 Watch",
|
||||
"RUNNING": "🟢 On",
|
||||
}.get(state.status, state.status)
|
||||
|
||||
header = (
|
||||
"<b>🤖 Автоторговля</b>\n"
|
||||
f"<b>🤖 Автоторговля · {status_line}</b>\n"
|
||||
f"🔸 {account_mode} аккаунт\n\n"
|
||||
)
|
||||
|
||||
@@ -172,32 +194,36 @@ def _build_auto_text() -> str:
|
||||
if not configured:
|
||||
return (
|
||||
f"{header}"
|
||||
"⚪ Выключена\n\n"
|
||||
"⚠️ Не настроена\n"
|
||||
"Настрой параметры"
|
||||
)
|
||||
|
||||
return (
|
||||
f"{header}"
|
||||
"⚪ Выключена\n\n"
|
||||
f"{_context_line(state)}\n"
|
||||
f"Price: {price}\n"
|
||||
f"Risk: {risk}"
|
||||
)
|
||||
|
||||
status_line = (
|
||||
"🟢 Активна"
|
||||
if state.status == "RUNNING"
|
||||
else "👀 Наблюдение"
|
||||
position_line = (
|
||||
f"Pos: {_value_or_dash(state.position_side)} | "
|
||||
f"PnL: {_usd_or_dash(state.unrealized_pnl_usd)}"
|
||||
)
|
||||
|
||||
if state.position_side != "NONE" and state.entry_price is not None:
|
||||
position_line = (
|
||||
f"Pos: {_value_or_dash(state.position_side)} | "
|
||||
f"Entry: $ {_price_or_dash(state.entry_price)} | "
|
||||
f"PnL: {_usd_or_dash(state.unrealized_pnl_usd)}"
|
||||
)
|
||||
|
||||
return (
|
||||
f"{header}"
|
||||
f"{status_line}\n\n"
|
||||
f"{_context_line(state)}\n\n"
|
||||
f"{_context_line(state)}\n"
|
||||
f"Price: {price}\n\n"
|
||||
f"{_signal_label(state.last_signal)} ×{state.last_signal_repeat_count} "
|
||||
f"· {state.decision_status}\n\n"
|
||||
f"Pos: {_value_or_dash(state.position_side)} | "
|
||||
f"PnL: {_usd_or_dash(state.unrealized_pnl_usd)}\n"
|
||||
f"{position_line}\n"
|
||||
f"Risk: {risk}"
|
||||
)
|
||||
|
||||
@@ -272,6 +298,19 @@ async def open_auto_from_callback(callback: CallbackQuery, state: FSMContext) ->
|
||||
@router.callback_query(F.data == "auto:start")
|
||||
async def auto_start(callback: CallbackQuery) -> None:
|
||||
service = AutoTradeService()
|
||||
state = service.get_state()
|
||||
|
||||
if not _is_auto_configured(state):
|
||||
await callback.answer(
|
||||
"Сначала настрой параметры автоторговли",
|
||||
show_alert=True,
|
||||
)
|
||||
|
||||
if callback.message is not None:
|
||||
await open_auto_settings(callback)
|
||||
|
||||
return
|
||||
|
||||
_, message = service.start()
|
||||
|
||||
AutoTradeRunner.set_current_screen("auto")
|
||||
@@ -287,6 +326,19 @@ async def auto_start(callback: CallbackQuery) -> None:
|
||||
@router.callback_query(F.data == "auto:observe")
|
||||
async def auto_observe(callback: CallbackQuery) -> None:
|
||||
service = AutoTradeService()
|
||||
state = service.get_state()
|
||||
|
||||
if not _is_auto_configured(state):
|
||||
await callback.answer(
|
||||
"Сначала настрой параметры автоторговли",
|
||||
show_alert=True,
|
||||
)
|
||||
|
||||
if callback.message is not None:
|
||||
await open_auto_settings(callback)
|
||||
|
||||
return
|
||||
|
||||
_, message = service.observe()
|
||||
|
||||
AutoTradeRunner.set_current_screen("auto")
|
||||
|
||||
@@ -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