Compare commits
1 Commits
62cd8a81a4
...
e0513d85d0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0513d85d0 |
@@ -64,9 +64,6 @@ class Settings(BaseSettings):
|
|||||||
STAGED_EXIT_BE_ARM_PCT: float = Field(default=1.2, gt=0.0, le=30.0)
|
STAGED_EXIT_BE_ARM_PCT: float = Field(default=1.2, gt=0.0, le=30.0)
|
||||||
STAGED_EXIT_ARM_PCT: float = Field(default=3.0, gt=0.0, le=100.0)
|
STAGED_EXIT_ARM_PCT: float = Field(default=3.0, gt=0.0, le=100.0)
|
||||||
STOPLOSS_REENTRY_COOLDOWN_MINUTES: int = Field(default=120, ge=1, le=1440)
|
STOPLOSS_REENTRY_COOLDOWN_MINUTES: int = Field(default=120, ge=1, le=1440)
|
||||||
KR_ATR_STOP_MULTIPLIER_K: float = Field(default=2.0, ge=0.1, le=10.0)
|
|
||||||
KR_ATR_STOP_MIN_PCT: float = Field(default=-2.0, le=0.0)
|
|
||||||
KR_ATR_STOP_MAX_PCT: float = Field(default=-7.0, le=0.0)
|
|
||||||
OVERNIGHT_EXCEPTION_ENABLED: bool = True
|
OVERNIGHT_EXCEPTION_ENABLED: bool = True
|
||||||
|
|
||||||
# Trading frequency mode (daily = batch API calls, realtime = per-stock calls)
|
# Trading frequency mode (daily = batch API calls, realtime = per-stock calls)
|
||||||
|
|||||||
31
src/main.py
31
src/main.py
@@ -120,27 +120,6 @@ def _resolve_sell_qty_for_pnl(*, sell_qty: int | None, buy_qty: int | None) -> i
|
|||||||
return max(0, int(buy_qty or 0))
|
return max(0, int(buy_qty or 0))
|
||||||
|
|
||||||
|
|
||||||
def _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
*,
|
|
||||||
entry_price: float,
|
|
||||||
atr_value: float,
|
|
||||||
fallback_stop_loss_pct: float,
|
|
||||||
settings: Settings | None,
|
|
||||||
) -> float:
|
|
||||||
"""Compute KR dynamic hard-stop threshold in percent."""
|
|
||||||
if entry_price <= 0 or atr_value <= 0:
|
|
||||||
return fallback_stop_loss_pct
|
|
||||||
|
|
||||||
k = float(getattr(settings, "KR_ATR_STOP_MULTIPLIER_K", 2.0) if settings else 2.0)
|
|
||||||
min_pct = float(getattr(settings, "KR_ATR_STOP_MIN_PCT", -2.0) if settings else -2.0)
|
|
||||||
max_pct = float(getattr(settings, "KR_ATR_STOP_MAX_PCT", -7.0) if settings else -7.0)
|
|
||||||
if max_pct > min_pct:
|
|
||||||
min_pct, max_pct = max_pct, min_pct
|
|
||||||
|
|
||||||
dynamic_stop_pct = -((k * atr_value) / entry_price) * 100.0
|
|
||||||
return max(max_pct, min(min_pct, dynamic_stop_pct))
|
|
||||||
|
|
||||||
|
|
||||||
def _stoploss_cooldown_key(*, market: MarketInfo, stock_code: str) -> str:
|
def _stoploss_cooldown_key(*, market: MarketInfo, stock_code: str) -> str:
|
||||||
return f"{market.code}:{stock_code}"
|
return f"{market.code}:{stock_code}"
|
||||||
|
|
||||||
@@ -640,14 +619,6 @@ def _apply_staged_exit_override_for_hold(
|
|||||||
if stock_playbook and stock_playbook.scenarios:
|
if stock_playbook and stock_playbook.scenarios:
|
||||||
stop_loss_threshold = stock_playbook.scenarios[0].stop_loss_pct
|
stop_loss_threshold = stock_playbook.scenarios[0].stop_loss_pct
|
||||||
take_profit_threshold = stock_playbook.scenarios[0].take_profit_pct
|
take_profit_threshold = stock_playbook.scenarios[0].take_profit_pct
|
||||||
atr_value = safe_float(market_data.get("atr_value"), 0.0)
|
|
||||||
if market.code == "KR":
|
|
||||||
stop_loss_threshold = _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
entry_price=entry_price,
|
|
||||||
atr_value=atr_value,
|
|
||||||
fallback_stop_loss_pct=stop_loss_threshold,
|
|
||||||
settings=settings,
|
|
||||||
)
|
|
||||||
if settings is None:
|
if settings is None:
|
||||||
be_arm_pct = max(0.5, take_profit_threshold * 0.4)
|
be_arm_pct = max(0.5, take_profit_threshold * 0.4)
|
||||||
arm_pct = take_profit_threshold
|
arm_pct = take_profit_threshold
|
||||||
@@ -682,7 +653,7 @@ def _apply_staged_exit_override_for_hold(
|
|||||||
current_price=current_price,
|
current_price=current_price,
|
||||||
entry_price=entry_price,
|
entry_price=entry_price,
|
||||||
peak_price=peak_price,
|
peak_price=peak_price,
|
||||||
atr_value=atr_value,
|
atr_value=safe_float(market_data.get("atr_value"), 0.0),
|
||||||
pred_down_prob=safe_float(market_data.get("pred_down_prob"), 0.0),
|
pred_down_prob=safe_float(market_data.get("pred_down_prob"), 0.0),
|
||||||
liquidity_weak=safe_float(market_data.get("volume_ratio"), 1.0) < 1.0,
|
liquidity_weak=safe_float(market_data.get("volume_ratio"), 1.0) < 1.0,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ from src.main import (
|
|||||||
_run_context_scheduler,
|
_run_context_scheduler,
|
||||||
_run_evolution_loop,
|
_run_evolution_loop,
|
||||||
_start_dashboard_server,
|
_start_dashboard_server,
|
||||||
_compute_kr_dynamic_stop_loss_pct,
|
|
||||||
handle_domestic_pending_orders,
|
handle_domestic_pending_orders,
|
||||||
handle_overseas_pending_orders,
|
handle_overseas_pending_orders,
|
||||||
process_blackout_recovery_orders,
|
process_blackout_recovery_orders,
|
||||||
@@ -141,51 +140,6 @@ def test_resolve_sell_qty_for_pnl_returns_zero_when_both_missing() -> None:
|
|||||||
assert _resolve_sell_qty_for_pnl(sell_qty=None, buy_qty=None) == 0
|
assert _resolve_sell_qty_for_pnl(sell_qty=None, buy_qty=None) == 0
|
||||||
|
|
||||||
|
|
||||||
def test_compute_kr_dynamic_stop_loss_pct_falls_back_without_atr() -> None:
|
|
||||||
out = _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
entry_price=100.0,
|
|
||||||
atr_value=0.0,
|
|
||||||
fallback_stop_loss_pct=-2.0,
|
|
||||||
settings=None,
|
|
||||||
)
|
|
||||||
assert out == -2.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_compute_kr_dynamic_stop_loss_pct_clamps_to_min_and_max() -> None:
|
|
||||||
# Small ATR -> clamp to min (-2%)
|
|
||||||
out_small = _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
entry_price=100.0,
|
|
||||||
atr_value=0.2,
|
|
||||||
fallback_stop_loss_pct=-2.0,
|
|
||||||
settings=None,
|
|
||||||
)
|
|
||||||
assert out_small == -2.0
|
|
||||||
|
|
||||||
# Large ATR -> clamp to max (-7%)
|
|
||||||
out_large = _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
entry_price=100.0,
|
|
||||||
atr_value=10.0,
|
|
||||||
fallback_stop_loss_pct=-2.0,
|
|
||||||
settings=None,
|
|
||||||
)
|
|
||||||
assert out_large == -7.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_compute_kr_dynamic_stop_loss_pct_uses_settings_values() -> None:
|
|
||||||
settings = MagicMock(
|
|
||||||
KR_ATR_STOP_MULTIPLIER_K=3.0,
|
|
||||||
KR_ATR_STOP_MIN_PCT=-1.5,
|
|
||||||
KR_ATR_STOP_MAX_PCT=-6.0,
|
|
||||||
)
|
|
||||||
out = _compute_kr_dynamic_stop_loss_pct(
|
|
||||||
entry_price=100.0,
|
|
||||||
atr_value=1.0,
|
|
||||||
fallback_stop_loss_pct=-2.0,
|
|
||||||
settings=settings,
|
|
||||||
)
|
|
||||||
assert out == -3.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_estimate_pred_down_prob_from_rsi_uses_linear_mapping() -> None:
|
def test_estimate_pred_down_prob_from_rsi_uses_linear_mapping() -> None:
|
||||||
assert _estimate_pred_down_prob_from_rsi(None) == 0.5
|
assert _estimate_pred_down_prob_from_rsi(None) == 0.5
|
||||||
assert _estimate_pred_down_prob_from_rsi(0.0) == 0.0
|
assert _estimate_pred_down_prob_from_rsi(0.0) == 0.0
|
||||||
|
|||||||
Reference in New Issue
Block a user