Add 永期半自动: human arm, machine open/close, then stop.
Settings toggle, Plan panel, Fleet monitor, exit locks and armed TOCTOU gates; docs and dual audits. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -45,6 +45,13 @@ KEYS = (
|
||||
"max_atm_open_offset",
|
||||
"fixed_direction_enabled",
|
||||
"fixed_perp_side",
|
||||
"semi_auto_enabled",
|
||||
"semi_armed",
|
||||
"semi_view_side",
|
||||
"semi_option_move_points",
|
||||
"semi_perp_exit_unit",
|
||||
"semi_min_option_hours",
|
||||
"semi_min_option_leverage",
|
||||
"close_bid_mark_max_pct",
|
||||
"residual_min_premium_pct",
|
||||
"residual_close_check_sec",
|
||||
@@ -95,6 +102,13 @@ class StrategySettingsBody(BaseModel):
|
||||
max_atm_open_offset: float | None = Field(default=None, ge=0, le=100)
|
||||
fixed_direction_enabled: bool | None = None
|
||||
fixed_perp_side: str | None = Field(default=None, pattern="^(long|short)$")
|
||||
semi_auto_enabled: bool | None = None
|
||||
# semi_armed 仅允许经 /api/plan/semi/arm,不接受设置接口写入
|
||||
semi_view_side: str | None = Field(default=None, pattern="^(long|short)$")
|
||||
semi_option_move_points: float | None = Field(default=None, ge=1, le=5000)
|
||||
semi_perp_exit_unit: float | None = Field(default=None, ge=0.1, le=1_000_000)
|
||||
semi_min_option_hours: float | None = Field(default=None, ge=1, le=720)
|
||||
semi_min_option_leverage: float | None = Field(default=None, ge=1, le=10000)
|
||||
close_bid_mark_max_pct: float | None = Field(default=None, ge=1, le=100)
|
||||
residual_min_premium_pct: float | None = Field(default=None, ge=1, le=100)
|
||||
residual_close_check_sec: int | None = Field(default=None, ge=30, le=86400)
|
||||
@@ -239,6 +253,49 @@ def _read_settings() -> dict:
|
||||
in ("long", "short")
|
||||
else "long"
|
||||
),
|
||||
"semi_auto_enabled": _as_bool(
|
||||
db.get_setting("semi_auto_enabled", str(s.semi_auto_enabled)),
|
||||
s.semi_auto_enabled,
|
||||
),
|
||||
"semi_armed": _as_bool(
|
||||
db.get_setting("semi_armed", str(s.semi_armed)),
|
||||
s.semi_armed,
|
||||
),
|
||||
"semi_view_side": (
|
||||
sv
|
||||
if (
|
||||
sv := str(
|
||||
db.get_setting("semi_view_side", s.semi_view_side)
|
||||
or s.semi_view_side
|
||||
)
|
||||
.strip()
|
||||
.lower()
|
||||
)
|
||||
in ("long", "short")
|
||||
else "long"
|
||||
),
|
||||
"semi_option_move_points": float(
|
||||
db.get_setting(
|
||||
"semi_option_move_points", str(s.semi_option_move_points)
|
||||
)
|
||||
or s.semi_option_move_points
|
||||
),
|
||||
"semi_perp_exit_unit": float(
|
||||
db.get_setting("semi_perp_exit_unit", str(s.semi_perp_exit_unit))
|
||||
or s.semi_perp_exit_unit
|
||||
),
|
||||
"semi_min_option_hours": float(
|
||||
db.get_setting(
|
||||
"semi_min_option_hours", str(s.semi_min_option_hours)
|
||||
)
|
||||
or s.semi_min_option_hours
|
||||
),
|
||||
"semi_min_option_leverage": float(
|
||||
db.get_setting(
|
||||
"semi_min_option_leverage", str(s.semi_min_option_leverage)
|
||||
)
|
||||
or s.semi_min_option_leverage
|
||||
),
|
||||
"close_bid_mark_max_pct": float(
|
||||
db.get_setting("close_bid_mark_max_pct", str(s.close_bid_mark_max_pct))
|
||||
or s.close_bid_mark_max_pct
|
||||
@@ -418,6 +475,8 @@ async def put_strategy_settings(
|
||||
db = get_db()
|
||||
s = get_settings()
|
||||
data = body.model_dump(exclude_none=True)
|
||||
# 授权态只经 /api/plan/semi/arm;设置接口不可伪造 armed=true
|
||||
data.pop("semi_armed", None)
|
||||
equity_to_apply: float | None = None
|
||||
switch_to: str | None = None
|
||||
old_hedge = str(
|
||||
@@ -491,6 +550,12 @@ async def put_strategy_settings(
|
||||
"oo_reward_ratio",
|
||||
"oo_budget_cushion",
|
||||
"oo_strike_max_dev_pct",
|
||||
"semi_view_side",
|
||||
"semi_option_move_points",
|
||||
"semi_perp_exit_unit",
|
||||
"semi_min_option_hours",
|
||||
"semi_min_option_leverage",
|
||||
"semi_auto_enabled",
|
||||
)
|
||||
hit = [k for k in locked_keys if k in data]
|
||||
if hit:
|
||||
@@ -516,6 +581,12 @@ async def put_strategy_settings(
|
||||
data["exit_mode"] = "fixed_usdt"
|
||||
data.pop("perp_qty_eth", None)
|
||||
data["fixed_direction_enabled"] = False
|
||||
data["semi_auto_enabled"] = False
|
||||
data["semi_armed"] = False
|
||||
|
||||
# 开关半自动时强制清授权,避免陈旧 armed 或关半自动后落入全自动误开
|
||||
if "semi_auto_enabled" in data:
|
||||
data["semi_armed"] = False
|
||||
|
||||
sizing_mode = str(
|
||||
data.get(
|
||||
|
||||
Reference in New Issue
Block a user