feat(strategy-state): persist instance-scoped slot maps
This commit is contained in:
@@ -1,120 +1,23 @@
|
||||
"""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.
|
||||
"""
|
||||
"""Slot occupancy remains intact while strategy state survives close/reopen."""
|
||||
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
|
||||
def test_close_preserves_state_and_reopen_continues_version():
|
||||
repo, store = InMemorySlotRepository(), InMemoryStrategyStateStore()
|
||||
service = SlotService(repo, strategy_state_store=store)
|
||||
repo.reconcile_universe("default", {"pf": "SYM"})
|
||||
slot = repo.list_slots("default")[0]
|
||||
service.transit_slot(slot.slot_id, SlotState.INACTIVE, SlotState.PENDING_BUY, reason="buy", actor="t")
|
||||
service.transit_slot(slot.slot_id, SlotState.PENDING_BUY, SlotState.HOLDING, reason="fill", actor="t", qty=1, avg_price=1)
|
||||
assert store.set(slot.slot_id, "instance", expected_version=0, data="old", slot_active=True).version == 1
|
||||
service.transit_slot(slot.slot_id, SlotState.HOLDING, SlotState.PENDING_SELL, reason="sell", actor="t")
|
||||
inactive = service.transit_slot(slot.slot_id, SlotState.PENDING_SELL, SlotState.INACTIVE, reason="sold", actor="t")
|
||||
assert inactive.occupancy_seq == 1
|
||||
assert store.get_for_slots([slot.slot_id])[slot.slot_id]["instance"].data == "old"
|
||||
reopened = service.transit_slot(slot.slot_id, SlotState.INACTIVE, SlotState.PENDING_BUY, reason="buy", actor="t")
|
||||
assert reopened.occupancy_seq == 2
|
||||
assert store.set(slot.slot_id, "instance", expected_version=1, data="new", slot_active=True).version == 2
|
||||
|
||||
Reference in New Issue
Block a user