feat(slot,intent): slot strategy-state 저장소 (dcy-028) + sell retryable 플래그 (issue #27)
BAT-042 (dcy-028 / issue #26 C-1/C-2/C-2b/C-3, REQ-079~082 + REQ-073/074 CHG): - slot_strategy_state 별도 테이블 + StrategyStateStore(in-memory+PG) + occupancy_seq·version CAS + opaque UTF-8 data + 2단 size cap (REQ-079) - trex.slots.strategy_state.set write RPC — reject reason 집합, 멱등 (REQ-080) - Slot.occupancy_seq 필드 + inactive→pending_buy bump + →INACTIVE close 삭제 훅 → 점유 전환 ABA 구조적 차단 (REQ-081) - slots.req 응답 행에 strategy_state 맵(batched 조립)·occupancy_seq additive (REQ-073 AC-7/REQ-074 AC-6) - 마이그레이션 014(occupancy_seq)/015(slot_strategy_state), baseline 문서 정합 (REQ-082) BAT-043 (issue #27 / REQ-007 CHG): - rejected SellIntent 응답에 additive retryable: bool (core 소유 reason→retryable 매핑, 미인식 기본 true, bad_request* false) — 손절매 재시도 안전 경로 decoupling 검증: 487 passed, 47 skipped (신규 41: store CAS 6+ABA, occupancy bump/close 4경로, set RPC 9, slots read 5, retryable 8, PG 게이트), ruff clean. REQ-079·080·081·082·073·074·007 → Implemented. issue #27 close. PG 경로 실 DB 검증은 release 위임. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.8
@@ -29,6 +29,33 @@ from trex_core.domain.slot import (
|
||||
_log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ---- sell-reject retryability (issue #27 / REQ-007 CHG-20260615-01) ---------
|
||||
# core-owned reason -> retryable mapping for the rejected SellIntent response.
|
||||
# Maintained with the reject vocabulary (intents.py _admit_sell/_dedup) so a new
|
||||
# reason gets a correct flag without the daemon touching a table. Unrecognized
|
||||
# reasons default to retryable=True: a stranded stop-loss (held losing position)
|
||||
# is worse than bounded, observable hammering on a terminal decision.
|
||||
_SELL_REJECT_RETRYABLE: dict[str, bool] = {
|
||||
"slot_state_changed": True,
|
||||
"slot_not_holding:pending_buy": True,
|
||||
"duplicate_in_flight": True,
|
||||
"slot_not_found": False,
|
||||
"slot_not_holding:inactive": False,
|
||||
"slot_not_holding:pending_sell": False,
|
||||
"slot_not_holding:error": False,
|
||||
}
|
||||
|
||||
|
||||
def _sell_reject_retryable(reason: Optional[str]) -> bool:
|
||||
"""Map a rejected-sell reason to retryable (issue #27). Default True (safety)."""
|
||||
if reason is None:
|
||||
return True
|
||||
# malformed payload: client defect — retrying the same bytes is pointless.
|
||||
if reason.startswith("bad_request"):
|
||||
return False
|
||||
return _SELL_REJECT_RETRYABLE.get(reason, True)
|
||||
|
||||
|
||||
# ---- intent RPC handler -----------------------------------------------------
|
||||
|
||||
def make_intent_rpc_handler(
|
||||
@@ -112,16 +139,24 @@ def make_intent_rpc_handler(
|
||||
"slot_id": None, "reason": f"unknown_intent_type:{intent_type}",
|
||||
})
|
||||
except (KeyError, ValueError) as exc:
|
||||
return RpcResponse(payload={
|
||||
payload = {
|
||||
"intent_id": intent_id, "status": "rejected",
|
||||
"slot_id": None, "reason": f"bad_request:{exc}",
|
||||
})
|
||||
return RpcResponse(payload={
|
||||
}
|
||||
# issue #27: sell-side malformed payload carries retryable=False.
|
||||
if intent_type == "sell":
|
||||
payload["retryable"] = _sell_reject_retryable(payload["reason"])
|
||||
return RpcResponse(payload=payload)
|
||||
payload = {
|
||||
"intent_id": d.intent_id,
|
||||
"status": d.status,
|
||||
"slot_id": (str(d.slot_id) if d.slot_id else None),
|
||||
"reason": d.reason,
|
||||
})
|
||||
}
|
||||
# issue #27 / REQ-007 AC-7: additive retryable on rejected sell only.
|
||||
if intent_type == "sell" and d.status == "rejected":
|
||||
payload["retryable"] = _sell_reject_retryable(d.reason)
|
||||
return RpcResponse(payload=payload)
|
||||
|
||||
return handler
|
||||
|
||||
@@ -189,6 +224,7 @@ def make_slots_rpc_handler(
|
||||
watchdog_timeout_sec: int = 120,
|
||||
ledger_outbox=None,
|
||||
max_active_slots: Optional[int] = None,
|
||||
strategy_state_store=None,
|
||||
):
|
||||
"""Build the RPC handler for `trex.slots.req` (REQ-073/074).
|
||||
|
||||
@@ -236,6 +272,25 @@ def make_slots_rpc_handler(
|
||||
for s in slots
|
||||
]
|
||||
|
||||
# dcy-028 / REQ-073/074·079 (C-1): attach opaque strategy_state map per
|
||||
# row via one batched store read (read piggyback — no extra round trip).
|
||||
# Only entries matching the slot's current occupancy_seq are surfaced.
|
||||
if strategy_state_store is not None and slots:
|
||||
slot_ids = [s.slot_id for s in slots]
|
||||
occ = {s.slot_id: getattr(s, "occupancy_seq", 0) for s in slots}
|
||||
state_map = strategy_state_store.get_for_slots(slot_ids, occ)
|
||||
for row, s in zip(slot_rows, slots):
|
||||
entries = state_map.get(s.slot_id)
|
||||
if entries:
|
||||
row["strategy_state"] = {
|
||||
strat: {
|
||||
"version": e.version,
|
||||
"data": e.data,
|
||||
"updated_at": e.updated_at.isoformat(),
|
||||
}
|
||||
for strat, e in entries.items()
|
||||
}
|
||||
|
||||
# dcy-018 / REQ-029: cash-estimated overlay (best-effort)
|
||||
if ledger_outbox is not None:
|
||||
try:
|
||||
@@ -277,6 +332,75 @@ def make_slots_rpc_handler(
|
||||
return handler
|
||||
|
||||
|
||||
# ---- strategy-state write RPC handler (dcy-028 / REQ-080) -------------------
|
||||
|
||||
def make_strategy_state_set_handler(
|
||||
slot_repo: SlotRepository,
|
||||
strategy_state_store,
|
||||
):
|
||||
"""Build the RPC handler for `trex.slots.strategy_state.set` (REQ-080).
|
||||
|
||||
Request: {slot_id, strategy_id, expected_version:int,
|
||||
expected_occupancy_seq:int, data:str}
|
||||
Response (ok): {ok:true, slot_id, strategy_id, version:int}
|
||||
Response (fail): {ok:false, slot_id, strategy_id, reason, version?|occupancy_seq?}
|
||||
|
||||
reason ∈ {occupancy_changed, version_conflict, slot_inactive,
|
||||
state_too_large, bad_request:<detail>}. The store owns the CAS
|
||||
(REQ-079); the handler supplies the slot's current occupancy_seq and
|
||||
active-ness and never interprets `data` (opaque).
|
||||
"""
|
||||
_ACTIVE_STATES = {"pending_buy", "holding", "pending_sell"}
|
||||
|
||||
def handler(req: RpcRequest) -> RpcResponse:
|
||||
body = req.payload or {}
|
||||
try:
|
||||
slot_id = UUID(str(body["slot_id"]))
|
||||
strategy_id = str(body["strategy_id"])
|
||||
expected_version = int(body["expected_version"])
|
||||
expected_occupancy_seq = int(body["expected_occupancy_seq"])
|
||||
data = body["data"]
|
||||
if not isinstance(data, str):
|
||||
raise ValueError("data must be a string")
|
||||
except (KeyError, ValueError, TypeError) as exc:
|
||||
return RpcResponse(payload={
|
||||
"ok": False,
|
||||
"slot_id": body.get("slot_id"),
|
||||
"strategy_id": body.get("strategy_id"),
|
||||
"reason": f"bad_request:{exc}",
|
||||
})
|
||||
|
||||
slot = slot_repo.fetch_slot(slot_id)
|
||||
slot_active = slot is not None and slot.status.value in _ACTIVE_STATES
|
||||
current_occupancy_seq = getattr(slot, "occupancy_seq", 0) if slot else 0
|
||||
|
||||
result = strategy_state_store.set(
|
||||
slot_id,
|
||||
strategy_id,
|
||||
expected_occupancy_seq=expected_occupancy_seq,
|
||||
expected_version=expected_version,
|
||||
data=data,
|
||||
current_occupancy_seq=current_occupancy_seq,
|
||||
slot_active=slot_active,
|
||||
)
|
||||
payload = {
|
||||
"ok": result.ok,
|
||||
"slot_id": str(slot_id),
|
||||
"strategy_id": strategy_id,
|
||||
}
|
||||
if result.ok:
|
||||
payload["version"] = result.version
|
||||
else:
|
||||
payload["reason"] = result.reason
|
||||
if result.version is not None:
|
||||
payload["version"] = result.version
|
||||
if result.occupancy_seq is not None:
|
||||
payload["occupancy_seq"] = result.occupancy_seq
|
||||
return RpcResponse(payload=payload)
|
||||
|
||||
return handler
|
||||
|
||||
|
||||
# ---- pause/resume RPC handler (REQ-032 AC-4) --------------------------------
|
||||
|
||||
def make_pause_rpc_handler(pause_store: PauseStore):
|
||||
|
||||
Reference in New Issue
Block a user