KIS 계좌에서 직접 매도 주문을 취소하면 poll_fill 이 cncl_yn 을 파싱하지 않아 슬롯이 pending_sell 에 영구히 갇히고 죽은 주문을 무한 폴링하던 버그(issue #9) 정정. 거버넌스: 전부 change-req (신규 REQ 없음, dcy-013 OQ-3). - REQ-012: KIS poll_fill cncl_yn 파싱 → 외부 취소 감지. FillStatus.cancelled /is_partial_cancel 추가. 체결 0 취소→cancelled, 부분 체결 후 취소→partial+cancelled - REQ-013: 집행 _on_partial_cancel — 체결분 원장 1회 + qty 차감(매도 잔여/매수 체결분) + holding 복귀 (OQ-1 A안). 전량 취소는 기존 롤백 경로 재사용 - REQ-018: 부분 체결분 원장 1회 기록 (_record_ledger 재사용) - REQ-031: 잔여 포지션 정합 연계 (slot.qty ↔ 실 잔고, 과매도 방지) - REQ-014: pending stale 워치독 Alert-only (TREX_PENDING_STALE_THRESHOLD, WARN+카운터, 상태 미변경) — 취소 감지 누락 backstop - REQ-015: interface-contract/runtime-flows 정합 전량 취소는 holding 자동 복구(limit_price clear→재매도 시장가, dcy-012 연계). KIS cncl_yn 실 규약은 운영 검증(미지 값 보수 처리 + 워치독 backstop). 검증: 단위 294 passed/32 skipped, 인프라 게이트(PG+RabbitMQ) 326 passed, ruff clean. 신규 test_kis_cancel(httpx stub) + test_execution_cancel(programmable broker). BAT-017 release-candidate. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
285 lines
13 KiB
Python
285 lines
13 KiB
Python
"""Order execution service (REQ-013, REQ-014, REQ-018, dcy-003, dcy-004).
|
|
|
|
A single background execution loop (invariant A single writer, invariant B
|
|
single broker session) that, per tick:
|
|
dispatch: claim pending slots with broker_order_id IS NULL (option A queue),
|
|
submit the order, record broker_order_id (idempotency guard).
|
|
poll: observe fills on dispatched pending slots and transition the slot
|
|
(pending_buy->holding / pending_sell->closed), or roll back on reject.
|
|
On a successful fill, enqueue a LedgerWorkItem (slot transition is
|
|
kept ON the critical path; the ledger write is eventually-consistent
|
|
via a separate writer — REQ-019).
|
|
reconcile() re-polls dispatched slots on restart so a crash after dispatch
|
|
converges without duplicate orders (REQ-014).
|
|
|
|
All slot writes go through SlotService (advisory lock). The broker is touched
|
|
only here, never by the domain or the HTTP API. The ledger outbox is the
|
|
single producer for ledger work items (NFR-3, single record subject).
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from dataclasses import dataclass
|
|
from datetime import datetime, timezone
|
|
from typing import Callable, Optional
|
|
|
|
from trex_core.application.broker_port import BrokerPort, OrderRequest
|
|
from trex_core.application.ledger_outbox import LedgerOutbox
|
|
from trex_core.application.ledger_port import LedgerTrade
|
|
from trex_core.domain.slot import SlotService, SlotState, SlotStateMismatchError
|
|
|
|
_log = logging.getLogger(__name__)
|
|
|
|
# REQ-021/023: event emission hook. Runtime wires a callable that publishes
|
|
# slot transition events through MessagingTransport. Application layer stays
|
|
# transport-agnostic (NFR-1). Slot type is duck-typed to keep the application
|
|
# layer free of domain re-imports (the slot is just used for attribute access).
|
|
SlotEventEmitter = Callable[[str, object], None] # (event_type, slot) -> None
|
|
|
|
_MAX_DISPATCH_PER_TICK = 64
|
|
|
|
|
|
@dataclass
|
|
class ExecutionResult:
|
|
dispatched: int = 0
|
|
filled: int = 0
|
|
rolled_back: int = 0
|
|
ledger_enqueued: int = 0 # REQ-019: ledger work items appended this tick
|
|
ledger_skipped: int = 0 # REQ-018 AC-4: fills without portfolio_id
|
|
stale_pending: int = 0 # dcy-013 / REQ-014 FR-3: pending orders over threshold
|
|
|
|
|
|
class ExecutionService:
|
|
def __init__(
|
|
self,
|
|
slot_service: SlotService,
|
|
repo,
|
|
broker: BrokerPort,
|
|
ledger_outbox: Optional[LedgerOutbox] = None,
|
|
event_emitter: Optional[SlotEventEmitter] = None,
|
|
stale_pending_threshold_sec: Optional[int] = None,
|
|
) -> None:
|
|
self._svc = slot_service
|
|
self._repo = repo
|
|
self._broker = broker
|
|
self._ledger_outbox = ledger_outbox
|
|
self._event_emitter = event_emitter
|
|
# dcy-013 / REQ-014 (issue #9): Alert-only pending-order stale watchdog.
|
|
# <=0 or None disables it. When set, a dispatched-pending slot whose
|
|
# last update is older than the threshold is surfaced (WARN + counter)
|
|
# without changing its state — the backstop for a cancel-detection miss.
|
|
self._stale_threshold_sec = (
|
|
stale_pending_threshold_sec
|
|
if stale_pending_threshold_sec and stale_pending_threshold_sec > 0
|
|
else None
|
|
)
|
|
|
|
# ------------------------------------------------------------
|
|
def run_once(self) -> ExecutionResult:
|
|
r = ExecutionResult()
|
|
self._dispatch(r)
|
|
self._poll(r)
|
|
return r
|
|
|
|
def reconcile(self) -> ExecutionResult:
|
|
"""Restart recovery: re-poll dispatched-but-pending slots (REQ-014).
|
|
|
|
Undispatched pending slots (broker_order_id IS NULL) are simply picked
|
|
up by the next dispatch, so a crash before dispatch causes no duplicate.
|
|
"""
|
|
r = ExecutionResult()
|
|
self._poll(r)
|
|
return r
|
|
|
|
# ------------------------------------------------------------
|
|
def _dispatch(self, r: ExecutionResult) -> None:
|
|
for _ in range(_MAX_DISPATCH_PER_TICK):
|
|
slot = self._repo.find_pending_for_dispatch()
|
|
if slot is None:
|
|
return
|
|
side = "buy" if slot.status is SlotState.PENDING_BUY else "sell"
|
|
qty = int(slot.qty or 0)
|
|
# dcy-012 / REQ-013: side-agnostic — use the slot's pending-order
|
|
# limit_price only. A sell never reuses a buy limit (issue #10):
|
|
# limit_price is cleared on entering HOLDING, so a market sell
|
|
# carries None -> order_type "01".
|
|
limit = int(slot.limit_price) if slot.limit_price else None
|
|
ack = self._broker.submit_order(
|
|
OrderRequest(
|
|
slot_id=str(slot.slot_id),
|
|
side=side,
|
|
symbol=slot.symbol or "",
|
|
qty=qty,
|
|
limit_price=limit,
|
|
order_type="00" if limit is not None else "01",
|
|
)
|
|
)
|
|
if ack.accepted and ack.broker_order_id:
|
|
self._repo.mark_dispatched(slot.slot_id, ack.broker_order_id)
|
|
r.dispatched += 1
|
|
else:
|
|
self._rollback(slot, reason=ack.reason or "order_rejected")
|
|
r.rolled_back += 1
|
|
|
|
def _poll(self, r: ExecutionResult) -> None:
|
|
now = datetime.now(tz=timezone.utc)
|
|
for slot in self._repo.list_dispatched_pending():
|
|
side = "buy" if slot.status is SlotState.PENDING_BUY else "sell"
|
|
fs = self._broker.poll_fill(slot.broker_order_id, side=side, symbol=slot.symbol or "")
|
|
if fs.is_filled:
|
|
self._on_filled(slot, fs, side, r)
|
|
r.filled += 1
|
|
elif fs.is_partial_cancel:
|
|
# dcy-013 / REQ-013 FR-2: partial fill then external cancel.
|
|
self._on_partial_cancel(slot, fs, side, r)
|
|
r.filled += 1
|
|
elif fs.is_terminal_reject:
|
|
# rejected or full external cancel (dcy-013 FR-1) -> rollback.
|
|
self._rollback(slot, reason=f"order_{fs.state}")
|
|
r.rolled_back += 1
|
|
else:
|
|
# accepted / partially_filled (not cancelled) -> leave for next
|
|
# tick, but surface if it has been stuck too long (FR-3).
|
|
self._check_stale_pending(slot, now, r)
|
|
|
|
# ------------------------------------------------------------
|
|
def _on_filled(self, slot, fs, side: str, r: ExecutionResult) -> None:
|
|
broker_order_id = slot.broker_order_id # captured BEFORE clear_dispatch
|
|
try:
|
|
if slot.status is SlotState.PENDING_BUY:
|
|
updated = self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_BUY, SlotState.HOLDING,
|
|
reason="buy_filled", actor="execution_loop",
|
|
avg_price=fs.avg_price, qty=float(fs.filled_qty) or slot.qty,
|
|
)
|
|
event_type = "slot_filled_buy"
|
|
else: # PENDING_SELL
|
|
updated = self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_SELL, SlotState.CLOSED,
|
|
reason="sell_filled", actor="execution_loop",
|
|
)
|
|
event_type = "slot_filled_sell"
|
|
except SlotStateMismatchError:
|
|
return # slot moved concurrently; next tick reconciles
|
|
# REQ-018: enqueue ledger work item AFTER the slot transition is durable.
|
|
# Slot transition is the critical path; ledger write is async (REQ-019).
|
|
self._record_ledger(slot, fs, side, broker_order_id, r)
|
|
# REQ-021/023: emit event AFTER transition + ledger enqueue (single
|
|
# record subject). Best-effort: a publish failure must not roll back.
|
|
self._emit_event(event_type, updated)
|
|
self._repo.clear_dispatch(slot.slot_id) # done with this order
|
|
|
|
def _on_partial_cancel(self, slot, fs, side: str, r: ExecutionResult) -> None:
|
|
"""Partial fill then external cancel (dcy-013 / REQ-013 FR-2, OQ-1 A).
|
|
|
|
Record the filled portion to the ledger ONCE, decrement the held qty,
|
|
and return the slot to holding with the remainder — so the remaining
|
|
position can be re-sold and no over-sell / double-record occurs (NFR-3).
|
|
avg_price (cost basis) is preserved on a sell; a buy keeps only the
|
|
portion that actually filled.
|
|
"""
|
|
broker_order_id = slot.broker_order_id # captured BEFORE clear_dispatch
|
|
filled = float(fs.filled_qty)
|
|
try:
|
|
if slot.status is SlotState.PENDING_BUY:
|
|
# Only the filled portion is held; avg_price = fill price.
|
|
updated = self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_BUY, SlotState.HOLDING,
|
|
reason="buy_partial_cancel", actor="execution_loop",
|
|
avg_price=fs.avg_price, qty=filled,
|
|
)
|
|
event_type = "slot_filled_buy"
|
|
else: # PENDING_SELL: remainder stays held, cost basis unchanged.
|
|
remaining = max(0.0, float(slot.qty or 0) - filled)
|
|
updated = self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_SELL, SlotState.HOLDING,
|
|
reason="sell_partial_cancel", actor="execution_loop",
|
|
qty=remaining,
|
|
)
|
|
event_type = "slot_filled_sell"
|
|
except SlotStateMismatchError:
|
|
return # slot moved concurrently; next tick reconciles
|
|
self._record_ledger(slot, fs, side, broker_order_id, r)
|
|
self._emit_event(event_type, updated)
|
|
self._repo.clear_dispatch(slot.slot_id)
|
|
|
|
def _check_stale_pending(self, slot, now: datetime, r: ExecutionResult) -> None:
|
|
"""Alert-only: surface a dispatched-pending slot stuck past the threshold.
|
|
|
|
dcy-013 / REQ-014 FR-3 — state is NOT changed (auto-remediation is a
|
|
follow-up). This is the backstop for a cancel-detection miss (R-1).
|
|
"""
|
|
if self._stale_threshold_sec is None or slot.updated_at is None:
|
|
return
|
|
age = (now - slot.updated_at).total_seconds()
|
|
if age >= self._stale_threshold_sec:
|
|
r.stale_pending += 1
|
|
_log.warning(
|
|
"pending order stale: slot=%s status=%s broker_order_id=%s "
|
|
"age_sec=%.0f threshold_sec=%d (no state change — ops attention)",
|
|
slot.slot_id, slot.status.value, slot.broker_order_id,
|
|
age, self._stale_threshold_sec,
|
|
)
|
|
|
|
def _emit_event(self, event_type: str, slot) -> None:
|
|
if self._event_emitter is None:
|
|
return
|
|
try:
|
|
self._event_emitter(event_type, slot)
|
|
except Exception: # noqa: BLE001 - event publish failure is non-critical
|
|
return
|
|
|
|
def _record_ledger(self, slot, fs, side: str, broker_order_id: str, r: ExecutionResult) -> None:
|
|
"""Append a LedgerWorkItem for the just-filled trade (REQ-018 + REQ-019)."""
|
|
if self._ledger_outbox is None:
|
|
return
|
|
if not slot.portfolio_id:
|
|
# dcy-011 / REQ-018 (issue #11): ledger skip must NOT be silent.
|
|
# Slot transition still proceeded; surface for ops (FR-4).
|
|
r.ledger_skipped += 1
|
|
_log.warning(
|
|
"ledger skip: slot=%s symbol=%s side=%s reason=missing_portfolio_id "
|
|
"(trade NOT recorded to portfolio-hub)",
|
|
slot.slot_id, slot.symbol, side,
|
|
)
|
|
return
|
|
if fs.execution_id is None:
|
|
# Broker contract regression — slot already transitioned; surface for ops.
|
|
r.ledger_skipped += 1
|
|
_log.warning(
|
|
"ledger skip: slot=%s portfolio_id=%s side=%s reason=missing_execution_id "
|
|
"(trade NOT recorded to portfolio-hub)",
|
|
slot.slot_id, slot.portfolio_id, side,
|
|
)
|
|
return
|
|
price = float(fs.avg_price) if fs.avg_price is not None else 0.0
|
|
trade = LedgerTrade(
|
|
asset_id=str(slot.portfolio_id),
|
|
order_id=str(broker_order_id),
|
|
execution_id=str(fs.execution_id),
|
|
side=side,
|
|
qty=float(fs.filled_qty),
|
|
price=price,
|
|
fee=float(fs.fee),
|
|
tax=float(fs.tax),
|
|
executed_at=datetime.now(tz=timezone.utc),
|
|
)
|
|
self._ledger_outbox.enqueue(trade)
|
|
r.ledger_enqueued += 1
|
|
|
|
def _rollback(self, slot, *, reason: str) -> None:
|
|
try:
|
|
if slot.status is SlotState.PENDING_BUY:
|
|
self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_BUY, SlotState.IDLE,
|
|
reason=reason, actor="execution_loop",
|
|
) # idle reset clears broker_order_id in the domain
|
|
else: # PENDING_SELL rejected -> back to holding, clear order for re-dispatch
|
|
self._svc.transit_slot(
|
|
slot.slot_id, SlotState.PENDING_SELL, SlotState.HOLDING,
|
|
reason=reason, actor="execution_loop",
|
|
)
|
|
self._repo.clear_dispatch(slot.slot_id)
|
|
except SlotStateMismatchError:
|
|
return
|