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:
@@ -0,0 +1,120 @@
|
||||
"""Slot occupancy_seq bump + close-delete hook (dcy-028 / REQ-081, BAT-042).
|
||||
|
||||
S-3: every close path (→INACTIVE) deletes the slot's strategy_state and a reused
|
||||
slot starts with a new occupancy_seq + empty state. occupancy_seq is stable
|
||||
across one holding episode and bumps on inactive→pending_buy.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from trex_core.application.strategy_state import InMemoryStrategyStateStore
|
||||
from trex_core.domain.slot import SlotService, SlotState
|
||||
from trex_core.domain.slot.in_memory_repository import InMemorySlotRepository
|
||||
|
||||
INST = "default"
|
||||
|
||||
|
||||
def _seed(repo):
|
||||
repo.reconcile_universe(INST, {"pf-0": "SYM"})
|
||||
return repo.list_slots(INST)[0]
|
||||
|
||||
|
||||
def _service(repo, store=None):
|
||||
return SlotService(repo, instance_key=INST, strategy_state_store=store)
|
||||
|
||||
|
||||
def _activate_to_holding(service, slot_id):
|
||||
service.transit_slot(slot_id, SlotState.INACTIVE, SlotState.PENDING_BUY,
|
||||
reason="buy", actor="t")
|
||||
return service.transit_slot(slot_id, SlotState.PENDING_BUY, SlotState.HOLDING,
|
||||
reason="filled", actor="t", qty=10, avg_price=100)
|
||||
|
||||
|
||||
class TestOccupancySeq:
|
||||
def test_bumps_on_inactive_to_pending_buy(self):
|
||||
repo = InMemorySlotRepository()
|
||||
service = _service(repo)
|
||||
slot = _seed(repo)
|
||||
assert slot.occupancy_seq == 0
|
||||
updated = service.transit_slot(
|
||||
slot.slot_id, SlotState.INACTIVE, SlotState.PENDING_BUY,
|
||||
reason="buy", actor="t")
|
||||
assert updated.occupancy_seq == 1
|
||||
|
||||
def test_stable_across_holding_episode(self):
|
||||
repo = InMemorySlotRepository()
|
||||
service = _service(repo)
|
||||
slot = _seed(repo)
|
||||
held = _activate_to_holding(service, slot.slot_id)
|
||||
assert held.occupancy_seq == 1
|
||||
sold = service.transit_slot(slot.slot_id, SlotState.HOLDING,
|
||||
SlotState.PENDING_SELL, reason="sell", actor="t")
|
||||
assert sold.occupancy_seq == 1 # unchanged within the episode
|
||||
|
||||
def test_increments_on_reuse(self):
|
||||
repo = InMemorySlotRepository()
|
||||
service = _service(repo)
|
||||
slot = _seed(repo)
|
||||
_activate_to_holding(service, slot.slot_id)
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.PENDING_SELL,
|
||||
reason="sell", actor="t")
|
||||
service.transit_slot(slot.slot_id, SlotState.PENDING_SELL, SlotState.INACTIVE,
|
||||
reason="sold", actor="t")
|
||||
# reuse: occupancy_seq bumps from 1 to 2
|
||||
reused = service.transit_slot(slot.slot_id, SlotState.INACTIVE,
|
||||
SlotState.PENDING_BUY, reason="buy", actor="t")
|
||||
assert reused.occupancy_seq == 2
|
||||
|
||||
|
||||
class TestCloseDelete:
|
||||
def _setup(self):
|
||||
repo = InMemorySlotRepository()
|
||||
store = InMemoryStrategyStateStore()
|
||||
service = _service(repo, store)
|
||||
slot = _seed(repo)
|
||||
_activate_to_holding(service, slot.slot_id)
|
||||
# daemon writes state during holding (occupancy_seq=1)
|
||||
store.set(slot.slot_id, "tsl_v1", expected_version=0,
|
||||
expected_occupancy_seq=1, data="peak", current_occupancy_seq=1,
|
||||
slot_active=True)
|
||||
assert store.get_for_slots([slot.slot_id], {slot.slot_id: 1})
|
||||
return repo, store, service, slot
|
||||
|
||||
def test_sell_fill_close_deletes_state(self):
|
||||
repo, store, service, slot = self._setup()
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.PENDING_SELL,
|
||||
reason="sell", actor="t")
|
||||
service.transit_slot(slot.slot_id, SlotState.PENDING_SELL, SlotState.INACTIVE,
|
||||
reason="sold", actor="t")
|
||||
assert store.get_for_slots([slot.slot_id], {slot.slot_id: 1}) == {}
|
||||
|
||||
def test_reused_slot_starts_empty_with_new_occupancy(self):
|
||||
repo, store, service, slot = self._setup()
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.PENDING_SELL,
|
||||
reason="sell", actor="t")
|
||||
service.transit_slot(slot.slot_id, SlotState.PENDING_SELL, SlotState.INACTIVE,
|
||||
reason="sold", actor="t")
|
||||
reused = service.transit_slot(slot.slot_id, SlotState.INACTIVE,
|
||||
SlotState.PENDING_BUY, reason="buy", actor="t")
|
||||
assert reused.occupancy_seq == 2
|
||||
assert store.get_for_slots([slot.slot_id], {slot.slot_id: 2}) == {}
|
||||
|
||||
def test_error_close_path_also_deletes(self):
|
||||
repo, store, service, slot = self._setup()
|
||||
# holding → error → inactive (operator resolve) also clears state
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.ERROR,
|
||||
reason="err", actor="t")
|
||||
service.transit_slot(slot.slot_id, SlotState.ERROR, SlotState.INACTIVE,
|
||||
reason="resolve", actor="t")
|
||||
assert store.get_for_slots([slot.slot_id], {slot.slot_id: 1}) == {}
|
||||
|
||||
def test_no_store_injected_is_noop(self):
|
||||
# backward-compat: service without store does not raise on close
|
||||
repo = InMemorySlotRepository()
|
||||
service = _service(repo, store=None)
|
||||
slot = _seed(repo)
|
||||
_activate_to_holding(service, slot.slot_id)
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.PENDING_SELL,
|
||||
reason="sell", actor="t")
|
||||
out = service.transit_slot(slot.slot_id, SlotState.PENDING_SELL,
|
||||
SlotState.INACTIVE, reason="sold", actor="t")
|
||||
assert out.status is SlotState.INACTIVE
|
||||
Reference in New Issue
Block a user