Stage 07.4.3.2 — price polling, event bus and UI throttling
This commit is contained in:
@@ -10,6 +10,7 @@ from src.trading.auto.state import AutoTradeState
|
||||
from src.trading.journal.service import JournalService
|
||||
from src.trading.strategies.base import BaseStrategy, StrategyContext
|
||||
from src.trading.strategies.registry import StrategyRegistry
|
||||
from src.core.event_bus import EventBus
|
||||
|
||||
|
||||
class AutoTradeService:
|
||||
@@ -69,18 +70,30 @@ class AutoTradeService:
|
||||
# запустить активную торговлю
|
||||
def start(self) -> tuple[AutoTradeState, str]:
|
||||
state = self.get_state()
|
||||
previous_status = state.status
|
||||
|
||||
if state.status == "RUNNING":
|
||||
self.start_loop()
|
||||
return state, "Автоторговля уже активна."
|
||||
|
||||
if state.status == "OBSERVING":
|
||||
state.status = "RUNNING"
|
||||
self.start_loop()
|
||||
EventBus.emit(
|
||||
"auto_status_changed",
|
||||
{
|
||||
"previous_status": previous_status,
|
||||
"status": state.status,
|
||||
},
|
||||
)
|
||||
return state, "Автоторговля активирована."
|
||||
|
||||
state.status = "RUNNING"
|
||||
self.start_loop()
|
||||
EventBus.emit(
|
||||
"auto_status_changed",
|
||||
{
|
||||
"previous_status": previous_status,
|
||||
"status": state.status,
|
||||
},
|
||||
)
|
||||
return state, "Автоторговля запущена."
|
||||
|
||||
# включить режим наблюдения
|
||||
@@ -89,11 +102,17 @@ class AutoTradeService:
|
||||
previous_status = state.status
|
||||
|
||||
if previous_status == "OBSERVING":
|
||||
self.start_loop()
|
||||
return state, "Режим наблюдения уже включён."
|
||||
|
||||
state.status = "OBSERVING"
|
||||
self.start_loop()
|
||||
|
||||
EventBus.emit(
|
||||
"auto_status_changed",
|
||||
{
|
||||
"previous_status": previous_status,
|
||||
"status": state.status,
|
||||
},
|
||||
)
|
||||
|
||||
if previous_status == "OFF":
|
||||
return state, "Включён режим наблюдения."
|
||||
@@ -103,6 +122,7 @@ class AutoTradeService:
|
||||
# полностью выключить автоторговлю
|
||||
def stop(self) -> tuple[AutoTradeState, str]:
|
||||
state = self.get_state()
|
||||
previous_status = state.status
|
||||
|
||||
if state.status == "OFF":
|
||||
self.stop_loop()
|
||||
@@ -110,6 +130,15 @@ class AutoTradeService:
|
||||
|
||||
state.status = "OFF"
|
||||
self.stop_loop()
|
||||
|
||||
EventBus.emit(
|
||||
"auto_status_changed",
|
||||
{
|
||||
"previous_status": previous_status,
|
||||
"status": state.status,
|
||||
},
|
||||
)
|
||||
|
||||
return state, "Автоторговля выключена."
|
||||
|
||||
# установить инструмент
|
||||
@@ -132,7 +161,7 @@ class AutoTradeService:
|
||||
state.risk_percent = risk_percent
|
||||
return state
|
||||
|
||||
# установить плечо
|
||||
# установить плечо
|
||||
def set_leverage(self, leverage: float) -> AutoTradeState:
|
||||
state = self.get_state()
|
||||
state.leverage = leverage
|
||||
@@ -285,6 +314,9 @@ class AutoTradeService:
|
||||
reason: str,
|
||||
confidence: float,
|
||||
) -> None:
|
||||
previous_signal = state.last_signal
|
||||
previous_decision_status = state.decision_status
|
||||
|
||||
state.last_signal = signal
|
||||
state.last_signal_repeat_count = self._same_signal_count
|
||||
state.last_signal_confidence = confidence
|
||||
@@ -296,6 +328,29 @@ class AutoTradeService:
|
||||
confidence=confidence,
|
||||
)
|
||||
|
||||
if previous_signal != state.last_signal:
|
||||
EventBus.emit(
|
||||
"auto_signal_changed",
|
||||
{
|
||||
"previous_signal": previous_signal,
|
||||
"signal": state.last_signal,
|
||||
"repeat_count": state.last_signal_repeat_count,
|
||||
"confidence": state.last_signal_confidence,
|
||||
},
|
||||
)
|
||||
|
||||
if previous_decision_status != state.decision_status:
|
||||
EventBus.emit(
|
||||
"auto_decision_changed",
|
||||
{
|
||||
"previous_decision_status": previous_decision_status,
|
||||
"decision_status": state.decision_status,
|
||||
"signal": state.last_signal,
|
||||
"repeat_count": state.last_signal_repeat_count,
|
||||
"confidence": state.last_signal_confidence,
|
||||
},
|
||||
)
|
||||
|
||||
# записать одиночный сигнал в журнал
|
||||
def _log_signal_event(
|
||||
self,
|
||||
|
||||
Reference in New Issue
Block a user