fix(broker): enforce operator broker truth boundary
This commit is contained in:
@@ -0,0 +1,147 @@
|
||||
"""Common broker credential resolution and lifecycle boundary (REQ-119/120)."""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
from datetime import date, datetime, timedelta, timezone
|
||||
from typing import Literal, Protocol
|
||||
|
||||
from trex_core.adapters.broker.paper import PaperBroker
|
||||
from trex_core.application.broker_port import BrokerPort
|
||||
from trex_core.application.portfolio import PortfolioHubUnavailableError
|
||||
from trex_core.runtime.config import DaemonConfig
|
||||
|
||||
_KST = timezone(timedelta(hours=9))
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class BrokerSource:
|
||||
"""Non-secret credential-source metadata safe for CLI/log output."""
|
||||
mode: Literal["env", "fetched", "break_glass"]
|
||||
identity_label: str
|
||||
|
||||
|
||||
class BrokerCredentialUnavailable(RuntimeError):
|
||||
_CODES = frozenset({"portfolio_hub_unavailable", "broker_absent", "trading_disabled", "malformed_credential", "broker_initialization_failed"})
|
||||
|
||||
def __init__(self, code: str) -> None:
|
||||
if code not in self._CODES:
|
||||
raise ValueError(f"unsupported broker credential error code: {code}")
|
||||
self.code = code
|
||||
super().__init__("broker credential unavailable")
|
||||
|
||||
|
||||
class BrokerProvider(Protocol):
|
||||
def get_broker_for_read(self) -> tuple[BrokerPort, BrokerSource]: ...
|
||||
def refresh_day_start_credential(self) -> BrokerSource: ...
|
||||
|
||||
|
||||
def _break_glass_enabled() -> bool:
|
||||
return os.environ.get("TREX_KIS_BROKER_BREAK_GLASS", "").lower() in {"1", "true", "yes"}
|
||||
|
||||
|
||||
def _make_env_broker(config: DaemonConfig) -> BrokerPort:
|
||||
if config.broker != "kis":
|
||||
seq_store = None
|
||||
if config.paper.redis_url:
|
||||
from trex_core.adapters.broker.seq_store import RedisSeqStore
|
||||
seq_store = RedisSeqStore(config.paper.redis_url, key=f"trex:broker:paper:{config.instance_key}:order-seq")
|
||||
return PaperBroker(fill_after_polls=config.paper.fill_after_polls, qty_per_poll=config.paper.qty_per_poll,
|
||||
reject_symbols=set(config.paper.reject_symbols), seq_store=seq_store)
|
||||
from trex_core.adapters.broker.kis import KISBroker
|
||||
k = config.kis
|
||||
if k is None:
|
||||
raise BrokerCredentialUnavailable("broker_initialization_failed")
|
||||
token_cache = None
|
||||
if k.redis_url:
|
||||
from trex_core.adapters.broker.token_cache import RedisTokenCache
|
||||
token_cache = RedisTokenCache(k.redis_url)
|
||||
return KISBroker(k.account_ref, app_key=k.app_key, app_secret=k.app_secret, base_url=k.base_url,
|
||||
timeout=k.timeout, allow_live=k.allow_live, token_cache=token_cache)
|
||||
|
||||
|
||||
class ConfigBrokerProvider:
|
||||
"""One provider owns one process/command broker and fetched-source refresh."""
|
||||
def __init__(self, config: DaemonConfig, *, read_port=None, clock=None) -> None:
|
||||
self._config = config
|
||||
self._read = read_port
|
||||
self._clock = clock or (lambda: datetime.now(tz=timezone.utc))
|
||||
self._broker: BrokerPort | None = None
|
||||
self._source: BrokerSource | None = None
|
||||
self._credential_date: date | None = None
|
||||
|
||||
def _read_port(self):
|
||||
if self._read is None:
|
||||
if self._config.portfolio_hub is None:
|
||||
raise BrokerCredentialUnavailable("portfolio_hub_unavailable")
|
||||
from trex_core.adapters.portfolio.hub_read import PortfolioHubReadAdapter
|
||||
p = self._config.portfolio_hub
|
||||
self._read = PortfolioHubReadAdapter(p.base_url, token=p.token or None, timeout=p.timeout)
|
||||
return self._read
|
||||
|
||||
def _fetch(self) -> BrokerSource:
|
||||
try:
|
||||
ctx = self._read_port().fetch_broker_credential()
|
||||
except PortfolioHubUnavailableError:
|
||||
raise BrokerCredentialUnavailable("portfolio_hub_unavailable") from None
|
||||
except BrokerCredentialUnavailable:
|
||||
raise
|
||||
except Exception:
|
||||
raise BrokerCredentialUnavailable("portfolio_hub_unavailable") from None
|
||||
if ctx is None or getattr(ctx, "broker", None) is None:
|
||||
raise BrokerCredentialUnavailable("broker_absent")
|
||||
if not getattr(ctx, "trading_enabled", False):
|
||||
raise BrokerCredentialUnavailable("trading_disabled")
|
||||
credential = ctx.broker
|
||||
if not all(isinstance(getattr(credential, x, None), str) and getattr(credential, x).strip()
|
||||
for x in ("account_ref", "app_key", "app_secret")):
|
||||
raise BrokerCredentialUnavailable("malformed_credential")
|
||||
try:
|
||||
if self._broker is None:
|
||||
broker = _make_env_broker(self._config)
|
||||
reinitialize = getattr(broker, "reinitialize", None)
|
||||
if not callable(reinitialize):
|
||||
raise RuntimeError("KIS broker lacks credential reload")
|
||||
reinitialize(credential)
|
||||
self._broker = broker
|
||||
else:
|
||||
self._broker.reinitialize(credential) # type: ignore[attr-defined]
|
||||
except Exception:
|
||||
raise BrokerCredentialUnavailable("broker_initialization_failed") from None
|
||||
self._credential_date = self._clock().astimezone(_KST).date()
|
||||
# Version is designated non-secret by the portfolio contract; no account/key material.
|
||||
return BrokerSource("fetched", f"credential-version:{getattr(credential, 'credential_version', 'unknown')}")
|
||||
|
||||
def get_broker_for_read(self) -> tuple[BrokerPort, BrokerSource]:
|
||||
if self._config.broker != "kis":
|
||||
if self._broker is None:
|
||||
self._broker = _make_env_broker(self._config)
|
||||
self._source = BrokerSource("env", "paper-config")
|
||||
return self._broker, self._source
|
||||
if not self._config.credential_fetch_enabled:
|
||||
if self._broker is None:
|
||||
self._broker = _make_env_broker(self._config)
|
||||
self._source = BrokerSource("env", "kis-config")
|
||||
return self._broker, self._source
|
||||
if _break_glass_enabled():
|
||||
if self._broker is None:
|
||||
self._broker = _make_env_broker(self._config)
|
||||
self._source = BrokerSource("break_glass", "operator-break-glass")
|
||||
return self._broker, self._source
|
||||
source = self._fetch()
|
||||
self._source = source
|
||||
return self._broker, source # type: ignore[return-value]
|
||||
|
||||
def refresh_day_start_credential(self) -> BrokerSource:
|
||||
# Paper/env/break-glass paths deliberately do no portfolio-hub call.
|
||||
if self._config.broker != "kis" or not self._config.credential_fetch_enabled or _break_glass_enabled():
|
||||
return self.get_broker_for_read()[1]
|
||||
today = self._clock().astimezone(_KST).date()
|
||||
if self._broker is not None and self._credential_date == today and self._source is not None:
|
||||
return self._source
|
||||
_, source = self.get_broker_for_read()
|
||||
return source
|
||||
|
||||
|
||||
def build_broker_provider(config: DaemonConfig, *, read_port=None) -> ConfigBrokerProvider:
|
||||
return ConfigBrokerProvider(config, read_port=read_port)
|
||||
+54
-10
@@ -329,6 +329,29 @@ def _fail(message: str, as_json: bool) -> None:
|
||||
print(f"error: {message}", file=sys.stderr)
|
||||
|
||||
|
||||
def _broker_read_failure(exc, as_json: bool) -> int:
|
||||
"""REQ-120 command boundary: expose code only, never upstream payloads."""
|
||||
code = getattr(exc, "code", "broker_unavailable")
|
||||
payload = {"error": {"code": code, "message": "broker balance unavailable"}}
|
||||
if as_json:
|
||||
print(_json.dumps(payload), file=sys.stderr)
|
||||
else:
|
||||
print(f"broker balance unavailable ({code})", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
|
||||
class _CachedBalanceBroker:
|
||||
"""One validated balance read per operator invocation; delegates everything else."""
|
||||
def __init__(self, broker, balance) -> None:
|
||||
self._broker, self._balance = broker, balance
|
||||
|
||||
def get_balance(self):
|
||||
return self._balance
|
||||
|
||||
def __getattr__(self, name):
|
||||
return getattr(self._broker, name)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# arg parsing
|
||||
# --------------------------------------------------------------------------- #
|
||||
@@ -446,7 +469,6 @@ def _build_parser() -> argparse.ArgumentParser:
|
||||
|
||||
def _cmd_sync(args, cfg, confirm) -> int:
|
||||
"""REQ-105 (dcy-034, BAT-051): sync slot qty to broker ground truth."""
|
||||
import psycopg
|
||||
|
||||
from trex_core.adapters.portfolio.reconcile_warning_store import (
|
||||
PostgreSQLReconcileWarningStore,
|
||||
@@ -476,11 +498,18 @@ def _cmd_sync(args, cfg, confirm) -> int:
|
||||
print("aborted")
|
||||
return 1
|
||||
|
||||
warn_store = PostgreSQLReconcileWarningStore(cfg.dsn)
|
||||
# REQ-119/120: resolve and validate broker truth before opening/enumerating DB.
|
||||
from trex_core.runtime.broker_provider import (
|
||||
BrokerCredentialUnavailable, build_broker_provider,
|
||||
)
|
||||
from trex_core.application.broker_port import BrokerBalanceError
|
||||
try:
|
||||
broker_port, _source = build_broker_provider(cfg).get_broker_for_read()
|
||||
broker_port = _CachedBalanceBroker(broker_port, broker_port.get_balance())
|
||||
except (BrokerCredentialUnavailable, BrokerBalanceError) as exc:
|
||||
return _broker_read_failure(exc, args.json)
|
||||
|
||||
# Build broker port
|
||||
from trex_core.runtime.daemon import _build_broker
|
||||
broker_port = _build_broker(cfg)
|
||||
warn_store = PostgreSQLReconcileWarningStore(cfg.dsn)
|
||||
|
||||
# Build slot_repo + slot_service
|
||||
from trex_core.adapters.persistence.postgresql import PostgreSQLSlotRepository
|
||||
@@ -498,6 +527,7 @@ def _cmd_sync(args, cfg, confirm) -> int:
|
||||
)
|
||||
|
||||
# Determine target slot_ids
|
||||
import psycopg
|
||||
if args.portfolio_id:
|
||||
with psycopg.connect(cfg.dsn) as conn:
|
||||
with conn.cursor() as cur:
|
||||
@@ -564,7 +594,7 @@ def _cmd_sync(args, cfg, confirm) -> int:
|
||||
print(f" after: status={after.get('status')} "
|
||||
f"qty={after.get('qty')} avg_price={after.get('avg_price')}")
|
||||
if cleared:
|
||||
print(f" reconcile-warning CLEARED")
|
||||
print(" reconcile-warning CLEARED")
|
||||
|
||||
return exit_code
|
||||
|
||||
@@ -579,12 +609,20 @@ def _cmd_verify(args, cfg) -> int:
|
||||
from trex_core.application.reconciliation import verify_slot_reconcile
|
||||
|
||||
instance = _resolve_instance(args)
|
||||
# REQ-120 no-write/no-enumeration barrier also applies to verify.
|
||||
from trex_core.runtime.broker_provider import (
|
||||
BrokerCredentialUnavailable, build_broker_provider,
|
||||
)
|
||||
from trex_core.application.broker_port import BrokerBalanceError
|
||||
try:
|
||||
broker_port, _source = build_broker_provider(cfg).get_broker_for_read()
|
||||
broker_port = _CachedBalanceBroker(broker_port, broker_port.get_balance())
|
||||
except (BrokerCredentialUnavailable, BrokerBalanceError) as exc:
|
||||
return _broker_read_failure(exc, args.json)
|
||||
|
||||
warn_store = PostgreSQLReconcileWarningStore(cfg.dsn)
|
||||
slot_repo = PostgreSQLSlotRepository(cfg.dsn)
|
||||
|
||||
from trex_core.runtime.daemon import _build_broker
|
||||
broker_port = _build_broker(cfg)
|
||||
|
||||
# Build a minimal snapshot store (we only need asset_quantity for C-case check).
|
||||
# For verify we use a fresh SnapshotStore populated from warn_store metadata.
|
||||
# The hub_qty is read from the snapshot; if snapshot is empty we fall back to 0
|
||||
@@ -787,7 +825,13 @@ def main(argv: list[str] | None = None, *, rpc=None, confirm=None) -> int:
|
||||
else None
|
||||
)
|
||||
_load_dotenv(_toml, getattr(args, "env_file", None))
|
||||
cfg = DaemonConfig.from_env()
|
||||
cfg = (
|
||||
DaemonConfig.from_config(
|
||||
resolve_config_toml(args.config, args.config_path), env_file=args.env_file
|
||||
)
|
||||
if args.config
|
||||
else DaemonConfig.from_env()
|
||||
)
|
||||
confirm = confirm or _default_confirm
|
||||
|
||||
# REQ-088 (dcy-029): operator report — direct-DB point-in-time aggregate.
|
||||
|
||||
@@ -74,6 +74,7 @@ _log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _build_broker(config: DaemonConfig) -> BrokerPort:
|
||||
"""Backward-compatible env-only factory; new callers use broker_provider."""
|
||||
if config.broker == "kis":
|
||||
from trex_core.adapters.broker.kis import KISBroker
|
||||
|
||||
@@ -180,7 +181,7 @@ class Daemon:
|
||||
instance_key=config.instance_key,
|
||||
strategy_state_store=self.strategy_state_store,
|
||||
)
|
||||
self.broker = _build_broker(config)
|
||||
|
||||
self.outbox = PostgreSQLLedgerOutbox(config.dsn)
|
||||
# BAT-008: portfolio-hub read + snapshot store + durable pause + scheduler.
|
||||
# (Created before the ledger writer so option-D write-back can target it.)
|
||||
@@ -193,6 +194,11 @@ class Daemon:
|
||||
# BAT-012: day-scoped kill-switch exclusion store + service.
|
||||
self.killswitch_store = PostgreSQLKillSwitchStore(config.dsn)
|
||||
self.portfolio_read = _build_portfolio_read(config)
|
||||
# REQ-119: one provider owns source resolution and the long-lived broker.
|
||||
# Fetched mode never starts from an implicit env broker.
|
||||
from trex_core.runtime.broker_provider import build_broker_provider
|
||||
self.broker_provider = build_broker_provider(config, read_port=self.portfolio_read)
|
||||
self.broker, self.broker_source = self.broker_provider.get_broker_for_read()
|
||||
|
||||
# Event publisher transport — one dedicated instance for the
|
||||
# execution-loop thread (pika is not thread-safe).
|
||||
@@ -237,6 +243,7 @@ class Daemon:
|
||||
alarm_emitter=self.alarm_emitter, # dcy-033 / REQ-100
|
||||
warn_store=self.warn_store, # BAT-050 / REQ-103: durable reconcile-warning
|
||||
credential_fetch_enabled=config.credential_fetch_enabled, # dcy-036 / REQ-113
|
||||
credential_refresh=self.broker_provider.refresh_day_start_credential,
|
||||
# dcy-036 / REQ-113 AC-2 / REQ-115 AC-1: KISBroker reinit callback.
|
||||
# None when broker!=kis or credential_fetch_enabled=False (backward compat).
|
||||
kis_reinit_callback=_build_kis_reinit_callback(config, self.broker),
|
||||
|
||||
Reference in New Issue
Block a user