feat(rel-007): dcy-025/024 + BAT-035/036 — slots.req 즉시 교체 + safety_sell_enabled
BAT-035 (dcy-025): trex.snapshot.req → trex.slots.req 즉시 교체
- topology: SNAPSHOT_REQ_QUEUE 제거, SLOTS_REQ_QUEUE = "trex.slots.req" 추가
- portfolio.py: View/build_snapshot_envelope/SnapshotEnvelope/_asset_to_dict 제거;
slot_to_dict 시그니처 확장(snapshot_store/watchdog_store/pause_store/watchdog_timeout_sec)
— asset_quantity(hub)/cash_balance/cash_estimated/warned/watchdog{}/paused 병합 (REQ-074)
- messaging_handlers.py: make_snapshot_rpc_handler 제거, make_slots_rpc_handler 추가
— filter(all/inactive/pending/holding/error) + spy(bool) 처리; strategy 필드 제외 (REQ-073/074)
- daemon.py: _snapshot_rpc_loop → _slots_rpc_loop, make_slots_rpc_handler 연결
- cli.py: universe/slots → slots_queue + spy=True + server-side filter; buyable→inactive 매핑 (REQ-063)
- rabbitmq.py: snapshot_queue → slots_queue
- docs: interface-contract.md + runtime-flows.md slots.req 계약으로 업데이트 (REQ-075)
- REQ-028: Implemented → Deprecated (코드 삭제 완료)
- 테스트: test_snapshot_handler/selection/rpc_watchdog/messaging_snapshot_consumer 삭제;
test_slots_handler.py(신규, 13 cases), test_killswitch_masking_resume 재작성,
test_ledger_option_d._apply_cash_estimate → slots handler 경유, test_topology/cli_operator 갱신
BAT-036 (dcy-024): per-instance safety_sell_enabled 플래그
- config.py: DaemonInstanceConfig + DaemonConfig 에 safety_sell_enabled: bool = True 추가;
from_toml 파싱, from_config 전파
- daemon.py: start() workers 조건부 — safety_sell_enabled=false 시 trex-safety-sell 미기동 + WARNING
- tests: test_instance_config.py 에 safety_sell_enabled 파싱 3개 케이스 추가
REQ: 073/074/075/021/034/063/048/005 Approved → Implemented
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.8
@@ -60,15 +60,6 @@ class PortfolioHubReadPort(Protocol):
|
||||
...
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- selection enums
|
||||
|
||||
class View(str, Enum):
|
||||
"""Snapshot view modes (REQ-029, dcy-005 OQ-11/OQ-12)."""
|
||||
ALL = "all" # universe ∪ holding slots
|
||||
BUYABLE = "buyable" # universe − occupied slots
|
||||
HELD = "held" # holding slots only
|
||||
|
||||
|
||||
class DegradedReason(str, Enum):
|
||||
"""Machine-readable degraded reason codes (REQ-028 AC-2, dcy-005 OQ-5)."""
|
||||
PORTFOLIO_HUB_UNAVAILABLE = "portfolio_hub_unavailable"
|
||||
@@ -255,76 +246,74 @@ class InMemoryKillSwitchStore:
|
||||
self._excluded.discard((portfolio_id, trading_date))
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- selection
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SnapshotEnvelope:
|
||||
"""REQ-028 response envelope (transport-agnostic)."""
|
||||
assets: list[dict]
|
||||
view: str
|
||||
available_slots: int
|
||||
degraded: bool
|
||||
reason: Optional[str]
|
||||
message: Optional[str] = None
|
||||
# REQ-028 CHG-20260608-01 (BAT-022): operator-facing per-slot state list,
|
||||
# additive and independent of strategy-facing `assets[]` (universe). Lets
|
||||
# `trex-core slots` show the daemon's real slot table (idle/holding/pending)
|
||||
# instead of universe portfolios. Always a list ([] when no slots).
|
||||
slots: list[dict] = field(default_factory=list)
|
||||
def slot_to_dict(
|
||||
s,
|
||||
*,
|
||||
snapshot_store: "Optional[SnapshotStore]" = None,
|
||||
watchdog_store=None,
|
||||
pause_store: "Optional[PauseStore]" = None,
|
||||
watchdog_timeout_sec: int = 120,
|
||||
) -> dict:
|
||||
"""Merged slot row for trex.slots.req (REQ-073/074).
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"assets": list(self.assets),
|
||||
"view": self.view,
|
||||
"available_slots": self.available_slots,
|
||||
"degraded": self.degraded,
|
||||
"reason": self.reason,
|
||||
"message": self.message,
|
||||
"slots": list(self.slots),
|
||||
}
|
||||
|
||||
|
||||
def _asset_to_dict(item: PortfolioItem) -> dict:
|
||||
"""REQ-027 AC-1 / REQ-028 AC-3 — strict no-price field shape."""
|
||||
return {
|
||||
"symbol": item.symbol,
|
||||
"asset_id": item.portfolio_id,
|
||||
"cash_balance": item.cash_balance,
|
||||
"asset_quantity": item.asset_quantity,
|
||||
"active_strategy_id": item.active_strategy_id,
|
||||
"strategy_params": dict(item.strategy_params or {}),
|
||||
}
|
||||
|
||||
|
||||
def slot_to_dict(s) -> dict:
|
||||
"""Canonical operator-facing per-slot state shape (REQ-028 AC-4, BAT-022).
|
||||
|
||||
Shared by the BAT-008 envelope (`build_snapshot_envelope`) and the BAT-007
|
||||
stub-shape handler so `trex-core slots` sees an identical slot dict on either
|
||||
path. Unlike `_asset_to_dict` (strategy universe, no-price), this is
|
||||
operator-only and exposes prices. External read field name `entry_price`
|
||||
is kept for contract compatibility (dcy-012 / NFR-3 — internally backed by
|
||||
the renamed `limit_price`, the pending order limit cleared once holding).
|
||||
Carries slot/core state + hub asset data + watchdog + overlay flags.
|
||||
Field-level authority: slot/core = slot_id/status/qty/avg_price/entry_price/
|
||||
forced_close_at; hub = asset_quantity/cash_balance; watchdog = watchdog{};
|
||||
overlay = paused/warned. strategy fields excluded (REQ-074 AC-5).
|
||||
"""
|
||||
return {
|
||||
d = {
|
||||
"slot_id": str(s.slot_id),
|
||||
"status": s.status.value,
|
||||
"symbol": s.symbol,
|
||||
"qty": float(s.qty) if s.qty is not None else None,
|
||||
"avg_price": float(s.avg_price) if s.avg_price is not None else None,
|
||||
"entry_price": float(s.limit_price) if s.limit_price is not None else None,
|
||||
"strategy_id": s.strategy_id,
|
||||
"sell_strategy_id": s.sell_strategy_id,
|
||||
"portfolio_id": s.portfolio_id,
|
||||
"forced_close_at": s.forced_close_at.isoformat() if s.forced_close_at else None,
|
||||
# dcy-020 / REQ-063 (BAT-029): asset-centric single view — universe-detached
|
||||
# (soft-retired/tombstone) marker so the operator sees retired assets.
|
||||
"universe_detached": getattr(s, "retired_at", None) is not None,
|
||||
}
|
||||
|
||||
# hub authority: asset_quantity (hub primary) + cash_balance
|
||||
asset_qty: Optional[float] = None
|
||||
cash_balance: Optional[float] = None
|
||||
if snapshot_store is not None and s.portfolio_id:
|
||||
snap = snapshot_store.get(s.portfolio_id)
|
||||
if snap is not None:
|
||||
asset_qty = float(snap.item.asset_quantity)
|
||||
cash_balance = float(snap.item.cash_balance)
|
||||
|
||||
# qty (slot mirror) vs asset_quantity (hub): divergence → warned=True
|
||||
slot_qty = float(s.qty) if s.qty is not None else None
|
||||
warned = bool(slot_qty != asset_qty) if (slot_qty is not None and asset_qty is not None) else False
|
||||
|
||||
d["asset_quantity"] = asset_qty
|
||||
d["cash_balance"] = cash_balance
|
||||
d["cash_estimated"] = False # handler overlays ledger_outbox estimate if available
|
||||
d["warned"] = warned
|
||||
|
||||
# watchdog nested object (WatchdogStore)
|
||||
if watchdog_store is not None:
|
||||
sid = str(s.slot_id)
|
||||
last = watchdog_store.last_seen(sid)
|
||||
d["watchdog"] = {
|
||||
"expired": watchdog_store.is_expired(sid, watchdog_timeout_sec),
|
||||
"last_seen": last.isoformat() if last else None,
|
||||
}
|
||||
else:
|
||||
d["watchdog"] = None
|
||||
|
||||
# paused overlay (PauseStore) — orthogonal to status
|
||||
paused = False
|
||||
if pause_store is not None and s.portfolio_id:
|
||||
paused = s.portfolio_id in pause_store.list_paused()
|
||||
d["paused"] = paused
|
||||
|
||||
return d
|
||||
|
||||
|
||||
def _sanitize(message: str) -> str:
|
||||
"""Strip credentials/URLs/tokens — REQ-028 AC-2 sanitization."""
|
||||
"""Strip credentials/URLs/tokens from degraded messages."""
|
||||
if not message:
|
||||
return ""
|
||||
out = message
|
||||
@@ -333,114 +322,6 @@ def _sanitize(message: str) -> str:
|
||||
if idx >= 0:
|
||||
out = out[:idx] + "<redacted>"
|
||||
break
|
||||
# Truncate to keep response payload bounded.
|
||||
return out[:200]
|
||||
|
||||
|
||||
def build_snapshot_envelope(
|
||||
*,
|
||||
store: SnapshotStore,
|
||||
pause_store: PauseStore,
|
||||
slot_repo,
|
||||
instance_key: str = "default",
|
||||
available_slots: int,
|
||||
view: View = View.ALL,
|
||||
strategy_key: Optional[str] = None,
|
||||
trading_date=None,
|
||||
killswitch_store: "Optional[KillSwitchStore]" = None,
|
||||
) -> SnapshotEnvelope:
|
||||
"""Compose base(view) − mask(pending·warning·pause·killswitch) − strategy_key.
|
||||
|
||||
`slot_repo` is the SlotRepository used to read holding/pending state —
|
||||
instance-scoped (dcy-020/REQ-056). `trading_date` (default UTC today) is
|
||||
used only for the day-scoped kill-switch exclusion mask.
|
||||
`killswitch_store` (REQ-046) adds the day-scoped kill-switch exclusion to
|
||||
the mask: a `GLOBAL_KILLSWITCH` ("*") entry masks the whole universe.
|
||||
"""
|
||||
# Read core authoritative slot state once.
|
||||
day = trading_date or datetime.now(tz=timezone.utc).date()
|
||||
slots = slot_repo.list_slots(instance_key)
|
||||
holding_pids: set[str] = set()
|
||||
pending_pids: set[str] = set()
|
||||
holding_qty: dict[str, float] = {}
|
||||
for s in slots:
|
||||
if s.portfolio_id is None:
|
||||
continue
|
||||
if s.status.value == "holding":
|
||||
holding_pids.add(s.portfolio_id)
|
||||
holding_qty[s.portfolio_id] = float(s.qty or 0.0)
|
||||
elif s.status.value in ("pending_buy", "pending_sell"):
|
||||
pending_pids.add(s.portfolio_id)
|
||||
|
||||
assets = store.list_assets()
|
||||
paused = pause_store.list_paused()
|
||||
warned = {a.item.portfolio_id for a in assets if a.warning}
|
||||
# REQ-046: day-scoped kill-switch exclusion. '*' sentinel = whole universe.
|
||||
excluded = killswitch_store.list_excluded(day) if killswitch_store is not None else set()
|
||||
killswitch_global = GLOBAL_KILLSWITCH in excluded
|
||||
|
||||
# Build the base set (view).
|
||||
by_pid = {a.item.portfolio_id: a for a in assets}
|
||||
base_pids: list[str]
|
||||
if view is View.HELD:
|
||||
base_pids = sorted(holding_pids)
|
||||
elif view is View.BUYABLE:
|
||||
if available_slots <= 0:
|
||||
base_pids = []
|
||||
else:
|
||||
# universe − occupied slots (pending OR holding occupy)
|
||||
occupied = holding_pids | pending_pids
|
||||
base_pids = [a.item.portfolio_id for a in assets
|
||||
if a.item.portfolio_id not in occupied]
|
||||
else: # ALL
|
||||
base_pids = list({a.item.portfolio_id for a in assets} | holding_pids)
|
||||
base_pids.sort()
|
||||
|
||||
# Apply masks: pending OR warning OR pause OR kill-switch day-exclusion.
|
||||
masked = pending_pids | warned | paused | excluded
|
||||
|
||||
# Filter and shape.
|
||||
out: list[dict] = []
|
||||
for pid in base_pids:
|
||||
if killswitch_global or pid in masked:
|
||||
continue
|
||||
if pid in by_pid:
|
||||
item = by_pid[pid].item
|
||||
elif pid in holding_pids:
|
||||
# holding slot for an asset NOT in the current universe (e.g. fetch
|
||||
# gap) — synthesize a minimal item using slot data so the response
|
||||
# still carries authoritative position info (REQ-029 slot overlay
|
||||
# priority over portfolio-hub presence).
|
||||
slot = next((s for s in slots if s.portfolio_id == pid), None)
|
||||
item = PortfolioItem(
|
||||
portfolio_id=pid,
|
||||
symbol=(slot.symbol if slot else "") or "",
|
||||
cash_balance=0.0,
|
||||
asset_quantity=float((slot.qty if slot else 0.0) or 0.0),
|
||||
active_strategy_id=(slot.strategy_id if slot else None),
|
||||
strategy_params={},
|
||||
)
|
||||
else:
|
||||
continue
|
||||
if strategy_key is not None and item.active_strategy_id != strategy_key:
|
||||
continue
|
||||
d = _asset_to_dict(item)
|
||||
# holding slot quantity wins for held assets (slot-overlay priority).
|
||||
if pid in holding_qty:
|
||||
d["asset_quantity"] = holding_qty[pid]
|
||||
out.append(d)
|
||||
|
||||
# REQ-028 CHG-20260608-01 (BAT-022): operator-facing per-slot state — the
|
||||
# full daemon slot table for `day`, independent of the asset view filter.
|
||||
slot_states = [slot_to_dict(s) for s in slots]
|
||||
|
||||
reason_code, message = store.degraded_state()
|
||||
return SnapshotEnvelope(
|
||||
assets=out,
|
||||
view=view.value,
|
||||
available_slots=max(0, int(available_slots)),
|
||||
degraded=reason_code is not None,
|
||||
reason=reason_code.value if reason_code is not None else None,
|
||||
message=message,
|
||||
slots=slot_states,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user