feat(safety-sell): dcy-007 core 자율 안전 매도 — BAT-010 기반 + BAT-011 트리거
dcy-007(core 자율 안전 매도) 전체 delivery. BAT-010 기반 인프라가 미커밋 상태였고 BAT-011 트리거 레이어와 공유 파일에서 섞여 있어 한 커밋으로 묶음. BAT-010 (REQ-034/035/036/041, release-candidate): - WatchdogStore(application/watchdog.py) + snapshot RPC 워치독 갱신 - Slot stop_loss_price/take_profit_price 필드 + 004_add_price_thresholds.sql - SlotService.sell() 자율 매도 내부 경로 + idempotency - SafetySellConfig env 5종 파싱 BAT-011 (REQ-037/038/039/040/042, release-candidate): - SafetySellService(application/safety_sell.py): forced_close 만기 / stop-loss· take-profit KIS polling / 장 마감 강제 청산 + trex-safety-sell 7번째 스레드 - BrokerPort.get_current_price + KIS inquire-price(TTTC8397R/VTTC8397R, stck_prpr) + paper stub - SlotService.update_thresholds() + intent RPC update_thresholds 액션 (부분 갱신/null 해제, 워치독 last_seen_at 리셋) - baseline 3문서 정합(interface-contract/runtime-flows/project-structure) 거버넌스: REQ-034~042 Implemented 동기화, BAT-010/011 release-candidate, dcy-007 discovery 포함. 검증: 신규 38 테스트 green, 단위 236 passed/23 skipped, 인프라 게이트(PG+RabbitMQ) 259 passed(마이그레이션 001~004 round-trip 포함), ruff clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -20,14 +20,25 @@ from trex_core.application.portfolio import (
|
||||
View,
|
||||
build_snapshot_envelope,
|
||||
)
|
||||
from trex_core.domain.slot import SlotRepository, SlotService
|
||||
from trex_core.application.watchdog import WatchdogStore
|
||||
from trex_core.domain.slot import (
|
||||
SlotNotFoundError,
|
||||
SlotRepository,
|
||||
SlotService,
|
||||
SlotState,
|
||||
)
|
||||
|
||||
_log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ---- intent RPC handler -----------------------------------------------------
|
||||
|
||||
def make_intent_rpc_handler(intent_service: IntentService):
|
||||
def make_intent_rpc_handler(
|
||||
intent_service: IntentService,
|
||||
*,
|
||||
slot_service: Optional[SlotService] = None,
|
||||
watchdog_store: Optional[WatchdogStore] = None,
|
||||
):
|
||||
"""Build the RPC handler for `trex.intent.req`.
|
||||
|
||||
Payload shape:
|
||||
@@ -36,9 +47,14 @@ def make_intent_rpc_handler(intent_service: IntentService):
|
||||
"intent_id": "<idempotency key, = correlation_id>",
|
||||
... fields per BuyIntent / SellIntent ...
|
||||
}
|
||||
or (REQ-040):
|
||||
{"action": "update_thresholds", "slot_id": ...,
|
||||
"stop_loss_price"?, "take_profit_price"?, "forced_close_at"?}
|
||||
|
||||
Response shape:
|
||||
{"intent_id": str, "status": "admitted"|"rejected", "slot_id": str|None, "reason": str|None}
|
||||
or for update_thresholds:
|
||||
{"status": "updated"|"ignored"|"error", "slot_id": str, "reason"?: str}
|
||||
|
||||
Dedup uses `intent_log.try_insert(intent_id, ...)` (REQ-007 gate). The
|
||||
request's `correlation_id` is reused as `intent_id` so the messaging
|
||||
@@ -48,6 +64,9 @@ def make_intent_rpc_handler(intent_service: IntentService):
|
||||
|
||||
def handler(req: RpcRequest) -> RpcResponse:
|
||||
body = req.payload or {}
|
||||
# REQ-040: update_thresholds action (separate from buy/sell intents).
|
||||
if str(body.get("action") or "").lower() == "update_thresholds":
|
||||
return _handle_update_thresholds(body, slot_service, watchdog_store)
|
||||
intent_id = str(body.get("intent_id") or req.correlation_id)
|
||||
intent_type = str(body.get("intent_type") or "").lower()
|
||||
try:
|
||||
@@ -63,6 +82,8 @@ def make_intent_rpc_handler(intent_service: IntentService):
|
||||
sell_strategy_id=_opt_str(body.get("sell_strategy_id")),
|
||||
portfolio_id=_opt_str(body.get("portfolio_id")),
|
||||
forced_close_at=_opt_dt(body.get("forced_close_at")),
|
||||
stop_loss_price=_opt_decimal(body.get("stop_loss_price")),
|
||||
take_profit_price=_opt_decimal(body.get("take_profit_price")),
|
||||
)
|
||||
d = intent_service.submit_buy(buy)
|
||||
elif intent_type == "sell":
|
||||
@@ -93,6 +114,46 @@ def make_intent_rpc_handler(intent_service: IntentService):
|
||||
return handler
|
||||
|
||||
|
||||
def _handle_update_thresholds(
|
||||
body: dict,
|
||||
slot_service: Optional[SlotService],
|
||||
watchdog_store: Optional[WatchdogStore],
|
||||
) -> RpcResponse:
|
||||
"""REQ-040: update stop_loss/take_profit/forced_close_at on a holding slot.
|
||||
|
||||
Only the keys actually present in the payload are forwarded, so an absent
|
||||
field keeps its value while an explicit ``null`` clears it (AC-4 vs AC-5).
|
||||
On success the slot's watchdog last_seen_at is reset (AC-3) — receiving an
|
||||
update_thresholds is itself a strategy-module liveness signal.
|
||||
"""
|
||||
if slot_service is None:
|
||||
return RpcResponse(payload={"status": "error", "reason": "update_thresholds_unsupported"})
|
||||
try:
|
||||
slot_id = UUID(str(body["slot_id"]))
|
||||
except (KeyError, ValueError) as exc:
|
||||
return RpcResponse(payload={"status": "error", "reason": f"bad_request:{exc}"})
|
||||
kwargs: dict = {}
|
||||
if "stop_loss_price" in body:
|
||||
kwargs["stop_loss_price"] = _opt_decimal(body["stop_loss_price"])
|
||||
if "take_profit_price" in body:
|
||||
kwargs["take_profit_price"] = _opt_decimal(body["take_profit_price"])
|
||||
if "forced_close_at" in body:
|
||||
kwargs["forced_close_at"] = _opt_dt(body["forced_close_at"])
|
||||
actor = str(body.get("actor") or "strategy")
|
||||
try:
|
||||
status = slot_service.update_thresholds(slot_id, actor=actor, **kwargs)
|
||||
except SlotNotFoundError:
|
||||
return RpcResponse(payload={
|
||||
"status": "ignored", "slot_id": str(slot_id), "reason": "slot_not_found",
|
||||
})
|
||||
if status == "updated" and watchdog_store is not None:
|
||||
watchdog_store.update(str(slot_id)) # AC-3: liveness signal
|
||||
payload = {"status": status, "slot_id": str(slot_id)}
|
||||
if status == "ignored":
|
||||
payload["reason"] = "not_holding" # AC-6
|
||||
return RpcResponse(payload=payload)
|
||||
|
||||
|
||||
# ---- snapshot RPC handler ---------------------------------------------------
|
||||
|
||||
def make_snapshot_rpc_handler(
|
||||
@@ -102,6 +163,7 @@ def make_snapshot_rpc_handler(
|
||||
snapshot_store: Optional[SnapshotStore] = None,
|
||||
pause_store: Optional[PauseStore] = None,
|
||||
default_total_slots: int = 10,
|
||||
watchdog_store: Optional[WatchdogStore] = None,
|
||||
):
|
||||
"""Build the RPC handler for `trex.snapshot.req` (REQ-028).
|
||||
|
||||
@@ -126,6 +188,12 @@ def make_snapshot_rpc_handler(
|
||||
body = req.payload or {}
|
||||
day = _parse_date(body.get("trading_date")) if body.get("trading_date") else _today()
|
||||
|
||||
# REQ-034: update watchdog for all holding slots visible in this RPC.
|
||||
if watchdog_store is not None:
|
||||
for s in slot_repo.list_slots(day):
|
||||
if s.status is SlotState.HOLDING:
|
||||
watchdog_store.update(str(s.slot_id))
|
||||
|
||||
# --- BAT-008 envelope path (snapshot store wired) ---
|
||||
if snapshot_store is not None and pause_store is not None:
|
||||
requested_view = str(body.get("view") or "all").lower()
|
||||
@@ -244,6 +312,13 @@ def _opt_str(v) -> Optional[str]:
|
||||
return str(v)
|
||||
|
||||
|
||||
def _opt_decimal(v):
|
||||
if v is None:
|
||||
return None
|
||||
from decimal import Decimal
|
||||
return Decimal(str(v))
|
||||
|
||||
|
||||
def _opt_float(v) -> Optional[float]:
|
||||
if v is None:
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user