Stage 07.3.1 - auto trading background runner and live screen

This commit is contained in:
2026-04-28 22:29:26 +03:00
parent d639137855
commit b2801d8a19
11 changed files with 368 additions and 19 deletions

View File

@@ -0,0 +1,130 @@
# app/src/trading/auto/runner.py
from __future__ import annotations
import asyncio
from typing import Callable
from aiogram import Bot
from src.trading.auto.service import AutoTradeService
class AutoTradeRunner:
_task: asyncio.Task | None = None
_bot: Bot | None = None
_chat_id: int | None = None
_message_id: int | None = None
_render_text: Callable[[], str] | None = None
_render_markup: Callable[[], object] | None = None
_current_screen: str | None = None
_interval_seconds = 5
# зарегистрировать live-экран для автообновления
@classmethod
def register_screen(
cls,
*,
bot: Bot,
chat_id: int,
message_id: int,
render_text: Callable[[], str],
render_markup: Callable[[], object],
) -> None:
cls._bot = bot
cls._chat_id = chat_id
cls._message_id = message_id
cls._render_text = render_text
cls._render_markup = render_markup
# удалить ранее зарегистрированный live-экран
@classmethod
async def delete_registered_screen(
cls,
*,
bot: Bot,
chat_id: int,
) -> None:
if cls._chat_id is None or cls._message_id is None:
return
if cls._chat_id != chat_id:
return
try:
await bot.delete_message(
chat_id=cls._chat_id,
message_id=cls._message_id,
)
except Exception:
pass
cls._message_id = None
cls._render_text = None
cls._render_markup = None
# переключить активный экран
@classmethod
def set_current_screen(cls, screen: str) -> None:
cls._current_screen = screen
# запустить background runner
@classmethod
def start(cls) -> None:
if cls._task is not None and not cls._task.done():
return
cls._task = asyncio.create_task(cls._worker())
# остановить background runner
@classmethod
def stop(cls) -> None:
if cls._task is None:
return
cls._task.cancel()
cls._task = None
# background loop автоторговли
@classmethod
async def _worker(cls) -> None:
service = AutoTradeService()
while True:
state = service.get_state()
if state.status == "OFF":
cls._task = None
break
service.run_cycle()
await cls._refresh_screen()
await asyncio.sleep(cls._interval_seconds)
# обновить live-экран Telegram
@classmethod
async def _refresh_screen(cls) -> None:
if cls._current_screen != "auto":
return
if not all(
[
cls._bot,
cls._chat_id,
cls._message_id,
cls._render_text,
cls._render_markup,
]
):
return
try:
await cls._bot.edit_message_text(
chat_id=cls._chat_id,
message_id=cls._message_id,
text=cls._render_text(),
reply_markup=cls._render_markup(),
)
except Exception:
pass

View File

@@ -2,6 +2,7 @@
from __future__ import annotations
import asyncio
import random
from datetime import datetime
@@ -11,6 +12,8 @@ from src.trading.auto.state import AutoTradeState
class AutoTradeService:
_state = AutoTradeState()
_loop_task: asyncio.Task | None = None
_loop_interval_seconds = 5
# получить текущее состояние автоторговли
def get_state(self) -> AutoTradeState:
@@ -18,18 +21,51 @@ class AutoTradeService:
self._state.symbol = load_settings().default_symbol
return self._state
# проверить, запущен ли background loop
def is_loop_running(self) -> bool:
return self._loop_task is not None and not self._loop_task.done()
# запустить background loop, если он ещё не запущен
def start_loop(self) -> None:
if self.is_loop_running():
return
self._loop_task = asyncio.create_task(self._loop_worker())
# остановить background loop
def stop_loop(self) -> None:
if self._loop_task is None:
return
self._loop_task.cancel()
self._loop_task = None
# рабочий цикл автоторговли
async def _loop_worker(self) -> None:
while True:
state = self.get_state()
if state.status == "OFF":
break
self.run_cycle()
await asyncio.sleep(self._loop_interval_seconds)
# запустить активную торговлю
def start(self) -> tuple[AutoTradeState, str]:
state = self.get_state()
if state.status == "RUNNING":
self.start_loop()
return state, "Автоторговля уже активна."
if state.status == "OBSERVING":
state.status = "RUNNING"
self.start_loop()
return state, "Автоторговля активирована."
state.status = "RUNNING"
self.start_loop()
return state, "Автоторговля запущена."
# включить режим наблюдения
@@ -38,9 +74,11 @@ class AutoTradeService:
previous_status = state.status
if previous_status == "OBSERVING":
self.start_loop()
return state, "Режим наблюдения уже включён."
state.status = "OBSERVING"
self.start_loop()
if previous_status == "OFF":
return state, "Включён режим наблюдения."
@@ -52,9 +90,11 @@ class AutoTradeService:
state = self.get_state()
if state.status == "OFF":
self.stop_loop()
return state, "Автоторговля уже выключена."
state.status = "OFF"
self.stop_loop()
return state, "Автоторговля выключена."
# установить инструмент