Stage 07.4.3.1 — trend strategy stabilization
This commit is contained in:
@@ -3,9 +3,11 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import time
|
||||
from typing import Callable
|
||||
|
||||
from aiogram import Bot
|
||||
from aiogram.exceptions import TelegramBadRequest, TelegramRetryAfter
|
||||
|
||||
from src.trading.auto.service import AutoTradeService
|
||||
|
||||
@@ -18,9 +20,11 @@ class AutoTradeRunner:
|
||||
_render_text: Callable[[], str] | None = None
|
||||
_render_markup: Callable[[], object] | None = None
|
||||
_current_screen: str | None = None
|
||||
_interval_seconds = 5
|
||||
_interval_seconds = 15
|
||||
|
||||
_last_text: str | None = None
|
||||
_retry_after_until: float = 0.0
|
||||
|
||||
# зарегистрировать live-экран для автообновления
|
||||
@classmethod
|
||||
def register_screen(
|
||||
cls,
|
||||
@@ -36,8 +40,8 @@ class AutoTradeRunner:
|
||||
cls._message_id = message_id
|
||||
cls._render_text = render_text
|
||||
cls._render_markup = render_markup
|
||||
cls._last_text = None
|
||||
|
||||
# удалить ранее зарегистрированный live-экран
|
||||
@classmethod
|
||||
async def delete_registered_screen(
|
||||
cls,
|
||||
@@ -62,13 +66,27 @@ class AutoTradeRunner:
|
||||
cls._message_id = None
|
||||
cls._render_text = None
|
||||
cls._render_markup = None
|
||||
cls._last_text = None
|
||||
|
||||
@classmethod
|
||||
def unregister_screen(
|
||||
cls,
|
||||
*,
|
||||
chat_id: int,
|
||||
message_id: int,
|
||||
) -> None:
|
||||
if cls._chat_id != chat_id or cls._message_id != message_id:
|
||||
return
|
||||
|
||||
cls._message_id = None
|
||||
cls._render_text = None
|
||||
cls._render_markup = None
|
||||
cls._last_text = 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():
|
||||
@@ -76,7 +94,6 @@ class AutoTradeRunner:
|
||||
|
||||
cls._task = asyncio.create_task(cls._worker())
|
||||
|
||||
# остановить background runner
|
||||
@classmethod
|
||||
def stop(cls) -> None:
|
||||
if cls._task is None:
|
||||
@@ -85,7 +102,6 @@ class AutoTradeRunner:
|
||||
cls._task.cancel()
|
||||
cls._task = None
|
||||
|
||||
# background loop автоторговли
|
||||
@classmethod
|
||||
async def _worker(cls) -> None:
|
||||
service = AutoTradeService()
|
||||
@@ -102,9 +118,11 @@ class AutoTradeRunner:
|
||||
await cls._refresh_screen()
|
||||
await asyncio.sleep(cls._interval_seconds)
|
||||
|
||||
# обновить live-экран Telegram
|
||||
@classmethod
|
||||
async def _refresh_screen(cls) -> None:
|
||||
if time.monotonic() < cls._retry_after_until:
|
||||
return
|
||||
|
||||
if not all(
|
||||
[
|
||||
cls._bot,
|
||||
@@ -116,12 +134,36 @@ class AutoTradeRunner:
|
||||
):
|
||||
return
|
||||
|
||||
text = cls._render_text()
|
||||
|
||||
if text == cls._last_text:
|
||||
return
|
||||
|
||||
try:
|
||||
await cls._bot.edit_message_text(
|
||||
chat_id=cls._chat_id,
|
||||
message_id=cls._message_id,
|
||||
text=cls._render_text(),
|
||||
text=text,
|
||||
reply_markup=cls._render_markup(),
|
||||
)
|
||||
cls._last_text = text
|
||||
|
||||
except TelegramRetryAfter as exc:
|
||||
cls._retry_after_until = time.monotonic() + exc.retry_after + 5
|
||||
|
||||
except TelegramBadRequest as exc:
|
||||
error_text = str(exc).lower()
|
||||
|
||||
if "message is not modified" in error_text:
|
||||
cls._last_text = text
|
||||
return
|
||||
|
||||
if "message to edit not found" in error_text:
|
||||
cls._message_id = None
|
||||
cls._render_text = None
|
||||
cls._render_markup = None
|
||||
cls._last_text = None
|
||||
return
|
||||
|
||||
except Exception:
|
||||
pass
|
||||
Reference in New Issue
Block a user