Spaces:
Paused
Paused
zt p commited on
Commit ·
5c306b6
1
Parent(s): 52e290c
Tune notification defaults and spread settings
Browse files- coinpush.py +96 -36
coinpush.py
CHANGED
|
@@ -244,6 +244,8 @@ def _alpha_defaults():
|
|
| 244 |
})
|
| 245 |
return d
|
| 246 |
|
|
|
|
|
|
|
| 247 |
|
| 248 |
DEFAULT_CONFIG = {
|
| 249 |
"coins": {
|
|
@@ -253,12 +255,12 @@ DEFAULT_CONFIG = {
|
|
| 253 |
},
|
| 254 |
"global": {
|
| 255 |
"poll_interval_sec": 30,
|
| 256 |
-
"daily_report_hour":
|
| 257 |
"down_priority": True,
|
| 258 |
"alert_sensitivity": 1.0,
|
| 259 |
# 阈值模式:auto=定时历史自动校准;manual=使用自定义阈值不自动覆盖
|
| 260 |
"calibration_mode": "auto",
|
| 261 |
-
"auto_calibrate_hours":
|
| 262 |
"last_calibrate_ts": 0,
|
| 263 |
},
|
| 264 |
# 多交易所扩展:主行情走 Binance,Bitget/OKX 仅作为跨所差价提醒
|
|
@@ -268,12 +270,16 @@ DEFAULT_CONFIG = {
|
|
| 268 |
# 跨交易所差价提醒(同一资产在不同所的价差)
|
| 269 |
"spread": {
|
| 270 |
"enable": True,
|
| 271 |
-
"threshold_pct":
|
| 272 |
"pairs": [
|
| 273 |
-
{"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT",
|
| 274 |
-
|
|
|
|
|
|
|
| 275 |
# futures: 前缀表示 Binance U 本位合约价格
|
| 276 |
-
{"name": "STRC", "binance": "futures:STRCUSDT",
|
|
|
|
|
|
|
| 277 |
],
|
| 278 |
},
|
| 279 |
# 附加 OKX 合约监控保留给手工自定义;默认不再推送 OKX GRAM/STRC 主线提醒
|
|
@@ -360,16 +366,23 @@ def _normalize_primary_coin(name, coin_cfg):
|
|
| 360 |
|
| 361 |
def _default_spread_pairs():
|
| 362 |
return {
|
| 363 |
-
"BTC": {"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT",
|
| 364 |
-
|
|
|
|
|
|
|
| 365 |
"STRC": {"name": "STRC", "binance": "futures:STRCUSDT",
|
| 366 |
-
"bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP"
|
|
|
|
| 367 |
}
|
| 368 |
|
| 369 |
|
| 370 |
-
def _normalize_spread_pairs(pairs):
|
| 371 |
defaults = _default_spread_pairs()
|
| 372 |
normalized, seen = [], set()
|
|
|
|
|
|
|
|
|
|
|
|
|
| 373 |
|
| 374 |
for pair in pairs or []:
|
| 375 |
p = copy.deepcopy(pair)
|
|
@@ -406,12 +419,18 @@ def _normalize_spread_pairs(pairs):
|
|
| 406 |
pair_key = pair_name.upper()
|
| 407 |
if not pair_name or pair_key in seen:
|
| 408 |
continue
|
|
|
|
|
|
|
|
|
|
|
|
|
| 409 |
seen.add(pair_key)
|
| 410 |
normalized.append(p)
|
| 411 |
|
| 412 |
for name in ("BTC", "GRAM", "STRC"):
|
| 413 |
if name not in seen:
|
| 414 |
-
|
|
|
|
|
|
|
| 415 |
return normalized
|
| 416 |
|
| 417 |
|
|
@@ -421,7 +440,12 @@ def _normalize_exchanges(ex):
|
|
| 421 |
|
| 422 |
# 1) spread 对照表确保含 BTC/GRAM/STRC,并迁移旧 TONUSDT / OKX STRC 主线
|
| 423 |
sp = ex.setdefault("spread", {})
|
| 424 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 425 |
|
| 426 |
# 2) 默认不再保留 OKX GRAM/STRC 独立合约提醒,避免和 Binance 主行情重复
|
| 427 |
contracts = ex.get("okx_contracts")
|
|
@@ -1978,12 +2002,19 @@ class CrossExchangeMonitor:
|
|
| 1978 |
spread_cfg = ex_cfg.get("spread", {})
|
| 1979 |
if not spread_cfg.get("enable", True):
|
| 1980 |
return alerts
|
| 1981 |
-
|
|
|
|
|
|
|
|
|
|
| 1982 |
use_bitget = ex_cfg.get("enable_bitget", True)
|
| 1983 |
use_okx = ex_cfg.get("enable_okx", True)
|
| 1984 |
|
| 1985 |
for pair in spread_cfg.get("pairs", []):
|
| 1986 |
name = pair.get("name", "?")
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1987 |
prices = {}
|
| 1988 |
if pair.get("binance"):
|
| 1989 |
p = self._binance_price(pair["binance"])
|
|
@@ -2231,7 +2262,7 @@ class CryptoMonitor:
|
|
| 2231 |
return
|
| 2232 |
if getattr(self, "_calibrating", False):
|
| 2233 |
return
|
| 2234 |
-
hours = float(g.get("auto_calibrate_hours",
|
| 2235 |
if hours <= 0:
|
| 2236 |
return
|
| 2237 |
last = float(g.get("last_calibrate_ts", 0) or 0)
|
|
@@ -2255,7 +2286,7 @@ class CryptoMonitor:
|
|
| 2255 |
def _maybe_daily_report(self):
|
| 2256 |
now = get_beijing_now()
|
| 2257 |
today = now.strftime("%Y-%m-%d")
|
| 2258 |
-
hour = int(self.config["global"].get("daily_report_hour",
|
| 2259 |
if now.time() >= dt_time(hour, 0) and self.last_daily_report_date != today:
|
| 2260 |
if self.last_daily_report_date is None:
|
| 2261 |
# 首次启动当天不发,避免重启刷屏
|
|
@@ -2426,7 +2457,7 @@ def render_config_editor(monitor):
|
|
| 2426 |
value=int(g.get("poll_interval_sec", 30)), step=5)
|
| 2427 |
g["daily_report_hour"] = st.number_input(
|
| 2428 |
"每日报告时间(小时)", min_value=0, max_value=23,
|
| 2429 |
-
value=int(g.get("daily_report_hour",
|
| 2430 |
g["alert_sensitivity"] = st.number_input(
|
| 2431 |
"通知灵敏度(越大通知越多,建议 0.5~2.0)", min_value=0.2, max_value=5.0,
|
| 2432 |
value=float(g.get("alert_sensitivity", 1.0)), step=0.1, format="%.1f",
|
|
@@ -2443,7 +2474,7 @@ def render_config_editor(monitor):
|
|
| 2443 |
if g["calibration_mode"] == "auto":
|
| 2444 |
g["auto_calibrate_hours"] = st.number_input(
|
| 2445 |
"自动校准间隔(小时)", min_value=1, max_value=168,
|
| 2446 |
-
value=int(g.get("auto_calibrate_hours",
|
| 2447 |
help="到期后后台自动对所有币种重新历史校准并保存")
|
| 2448 |
last = float(g.get("last_calibrate_ts", 0) or 0)
|
| 2449 |
if last > 0:
|
|
@@ -2471,25 +2502,54 @@ def render_config_editor(monitor):
|
|
| 2471 |
st.markdown("**跨交易所差价提醒**")
|
| 2472 |
sp = ex.setdefault("spread", {})
|
| 2473 |
sp["enable"] = st.checkbox("启用跨所差价提醒", value=sp.get("enable", True))
|
| 2474 |
-
|
| 2475 |
-
|
| 2476 |
-
|
| 2477 |
-
|
| 2478 |
-
|
| 2479 |
-
|
| 2480 |
-
|
| 2481 |
-
|
| 2482 |
-
|
| 2483 |
-
|
| 2484 |
-
|
| 2485 |
-
|
| 2486 |
-
|
| 2487 |
-
|
| 2488 |
-
|
| 2489 |
-
|
| 2490 |
-
|
| 2491 |
-
|
| 2492 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2493 |
|
| 2494 |
contracts = ex.setdefault("okx_contracts", [])
|
| 2495 |
if contracts:
|
|
|
|
| 244 |
})
|
| 245 |
return d
|
| 246 |
|
| 247 |
+
DEFAULT_SPREAD_THRESHOLD_PCT = 3.0
|
| 248 |
+
|
| 249 |
|
| 250 |
DEFAULT_CONFIG = {
|
| 251 |
"coins": {
|
|
|
|
| 255 |
},
|
| 256 |
"global": {
|
| 257 |
"poll_interval_sec": 30,
|
| 258 |
+
"daily_report_hour": 8,
|
| 259 |
"down_priority": True,
|
| 260 |
"alert_sensitivity": 1.0,
|
| 261 |
# 阈值模式:auto=定时历史自动校准;manual=使用自定义阈值不自动覆盖
|
| 262 |
"calibration_mode": "auto",
|
| 263 |
+
"auto_calibrate_hours": 1,
|
| 264 |
"last_calibrate_ts": 0,
|
| 265 |
},
|
| 266 |
# 多交易所扩展:主行情走 Binance,Bitget/OKX 仅作为跨所差价提醒
|
|
|
|
| 270 |
# 跨交易所差价提醒(同一资产在不同所的价差)
|
| 271 |
"spread": {
|
| 272 |
"enable": True,
|
| 273 |
+
"threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT,
|
| 274 |
"pairs": [
|
| 275 |
+
{"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT",
|
| 276 |
+
"okx": "BTC-USDT", "threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 277 |
+
{"name": "GRAM", "binance": "GRAMUSDT", "bitget": "GRAMUSDT",
|
| 278 |
+
"okx": "GRAM-USDT", "threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 279 |
# futures: 前缀表示 Binance U 本位合约价格
|
| 280 |
+
{"name": "STRC", "binance": "futures:STRCUSDT",
|
| 281 |
+
"bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP",
|
| 282 |
+
"threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 283 |
],
|
| 284 |
},
|
| 285 |
# 附加 OKX 合约监控保留给手工自定义;默认不再推送 OKX GRAM/STRC 主线提醒
|
|
|
|
| 366 |
|
| 367 |
def _default_spread_pairs():
|
| 368 |
return {
|
| 369 |
+
"BTC": {"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT",
|
| 370 |
+
"okx": "BTC-USDT", "threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 371 |
+
"GRAM": {"name": "GRAM", "binance": "GRAMUSDT", "bitget": "GRAMUSDT",
|
| 372 |
+
"okx": "GRAM-USDT", "threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 373 |
"STRC": {"name": "STRC", "binance": "futures:STRCUSDT",
|
| 374 |
+
"bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP",
|
| 375 |
+
"threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT},
|
| 376 |
}
|
| 377 |
|
| 378 |
|
| 379 |
+
def _normalize_spread_pairs(pairs, default_threshold_pct=DEFAULT_SPREAD_THRESHOLD_PCT):
|
| 380 |
defaults = _default_spread_pairs()
|
| 381 |
normalized, seen = [], set()
|
| 382 |
+
try:
|
| 383 |
+
default_threshold_pct = float(default_threshold_pct)
|
| 384 |
+
except (TypeError, ValueError):
|
| 385 |
+
default_threshold_pct = DEFAULT_SPREAD_THRESHOLD_PCT
|
| 386 |
|
| 387 |
for pair in pairs or []:
|
| 388 |
p = copy.deepcopy(pair)
|
|
|
|
| 419 |
pair_key = pair_name.upper()
|
| 420 |
if not pair_name or pair_key in seen:
|
| 421 |
continue
|
| 422 |
+
try:
|
| 423 |
+
p["threshold_pct"] = float(p.get("threshold_pct", default_threshold_pct))
|
| 424 |
+
except (TypeError, ValueError):
|
| 425 |
+
p["threshold_pct"] = default_threshold_pct
|
| 426 |
seen.add(pair_key)
|
| 427 |
normalized.append(p)
|
| 428 |
|
| 429 |
for name in ("BTC", "GRAM", "STRC"):
|
| 430 |
if name not in seen:
|
| 431 |
+
p = copy.deepcopy(defaults[name])
|
| 432 |
+
p["threshold_pct"] = default_threshold_pct
|
| 433 |
+
normalized.append(p)
|
| 434 |
return normalized
|
| 435 |
|
| 436 |
|
|
|
|
| 440 |
|
| 441 |
# 1) spread 对照表确保含 BTC/GRAM/STRC,并迁移旧 TONUSDT / OKX STRC 主线
|
| 442 |
sp = ex.setdefault("spread", {})
|
| 443 |
+
try:
|
| 444 |
+
threshold = float(sp.get("threshold_pct", DEFAULT_SPREAD_THRESHOLD_PCT))
|
| 445 |
+
except (TypeError, ValueError):
|
| 446 |
+
threshold = DEFAULT_SPREAD_THRESHOLD_PCT
|
| 447 |
+
sp["threshold_pct"] = threshold
|
| 448 |
+
sp["pairs"] = _normalize_spread_pairs(sp.get("pairs") or [], threshold)
|
| 449 |
|
| 450 |
# 2) 默认不再保留 OKX GRAM/STRC 独立合约提醒,避免和 Binance 主行情重复
|
| 451 |
contracts = ex.get("okx_contracts")
|
|
|
|
| 2002 |
spread_cfg = ex_cfg.get("spread", {})
|
| 2003 |
if not spread_cfg.get("enable", True):
|
| 2004 |
return alerts
|
| 2005 |
+
try:
|
| 2006 |
+
default_thr = float(spread_cfg.get("threshold_pct", DEFAULT_SPREAD_THRESHOLD_PCT))
|
| 2007 |
+
except (TypeError, ValueError):
|
| 2008 |
+
default_thr = DEFAULT_SPREAD_THRESHOLD_PCT
|
| 2009 |
use_bitget = ex_cfg.get("enable_bitget", True)
|
| 2010 |
use_okx = ex_cfg.get("enable_okx", True)
|
| 2011 |
|
| 2012 |
for pair in spread_cfg.get("pairs", []):
|
| 2013 |
name = pair.get("name", "?")
|
| 2014 |
+
try:
|
| 2015 |
+
thr = float(pair.get("threshold_pct", default_thr))
|
| 2016 |
+
except (TypeError, ValueError):
|
| 2017 |
+
thr = default_thr
|
| 2018 |
prices = {}
|
| 2019 |
if pair.get("binance"):
|
| 2020 |
p = self._binance_price(pair["binance"])
|
|
|
|
| 2262 |
return
|
| 2263 |
if getattr(self, "_calibrating", False):
|
| 2264 |
return
|
| 2265 |
+
hours = float(g.get("auto_calibrate_hours", 1))
|
| 2266 |
if hours <= 0:
|
| 2267 |
return
|
| 2268 |
last = float(g.get("last_calibrate_ts", 0) or 0)
|
|
|
|
| 2286 |
def _maybe_daily_report(self):
|
| 2287 |
now = get_beijing_now()
|
| 2288 |
today = now.strftime("%Y-%m-%d")
|
| 2289 |
+
hour = int(self.config["global"].get("daily_report_hour", 8))
|
| 2290 |
if now.time() >= dt_time(hour, 0) and self.last_daily_report_date != today:
|
| 2291 |
if self.last_daily_report_date is None:
|
| 2292 |
# 首次启动当天不发,避免重启刷屏
|
|
|
|
| 2457 |
value=int(g.get("poll_interval_sec", 30)), step=5)
|
| 2458 |
g["daily_report_hour"] = st.number_input(
|
| 2459 |
"每日报告时间(小时)", min_value=0, max_value=23,
|
| 2460 |
+
value=int(g.get("daily_report_hour", 8)))
|
| 2461 |
g["alert_sensitivity"] = st.number_input(
|
| 2462 |
"通知灵敏度(越大通知越多,建议 0.5~2.0)", min_value=0.2, max_value=5.0,
|
| 2463 |
value=float(g.get("alert_sensitivity", 1.0)), step=0.1, format="%.1f",
|
|
|
|
| 2474 |
if g["calibration_mode"] == "auto":
|
| 2475 |
g["auto_calibrate_hours"] = st.number_input(
|
| 2476 |
"自动校准间隔(小时)", min_value=1, max_value=168,
|
| 2477 |
+
value=int(g.get("auto_calibrate_hours", 1)), step=1,
|
| 2478 |
help="到期后后台自动对所有币种重新历史校准并保存")
|
| 2479 |
last = float(g.get("last_calibrate_ts", 0) or 0)
|
| 2480 |
if last > 0:
|
|
|
|
| 2502 |
st.markdown("**跨交易所差价提醒**")
|
| 2503 |
sp = ex.setdefault("spread", {})
|
| 2504 |
sp["enable"] = st.checkbox("启用跨所差价提醒", value=sp.get("enable", True))
|
| 2505 |
+
try:
|
| 2506 |
+
fallback_threshold = float(sp.get("threshold_pct", DEFAULT_SPREAD_THRESHOLD_PCT))
|
| 2507 |
+
except (TypeError, ValueError):
|
| 2508 |
+
fallback_threshold = DEFAULT_SPREAD_THRESHOLD_PCT
|
| 2509 |
+
sp["threshold_pct"] = fallback_threshold
|
| 2510 |
+
sp["pairs"] = _normalize_spread_pairs(sp.get("pairs") or [], fallback_threshold)
|
| 2511 |
+
st.caption("每个币种单独设置交易所映射和差价阈值;任意两所价差超过该币种阈值时提醒。")
|
| 2512 |
+
|
| 2513 |
+
if st.button("➕ 添加跨所差价币种", key="add_spread_pair"):
|
| 2514 |
+
sp["pairs"].append({
|
| 2515 |
+
"name": "", "binance": "", "bitget": "", "okx": "",
|
| 2516 |
+
"threshold_pct": DEFAULT_SPREAD_THRESHOLD_PCT,
|
| 2517 |
+
})
|
| 2518 |
+
|
| 2519 |
+
edited_pairs = []
|
| 2520 |
+
for idx, pair in enumerate(sp.get("pairs", [])):
|
| 2521 |
+
row = st.columns([0.9, 1.5, 1.5, 1.6, 1.0])
|
| 2522 |
+
with row[0]:
|
| 2523 |
+
name_val = st.text_input(
|
| 2524 |
+
"币种", value=str(pair.get("name", "")),
|
| 2525 |
+
key=f"spread_pair_{idx}_name")
|
| 2526 |
+
with row[1]:
|
| 2527 |
+
binance_val = st.text_input(
|
| 2528 |
+
"Binance", value=str(pair.get("binance", "")),
|
| 2529 |
+
key=f"spread_pair_{idx}_binance",
|
| 2530 |
+
help="合约价可用 futures:STRCUSDT")
|
| 2531 |
+
with row[2]:
|
| 2532 |
+
bitget_val = st.text_input(
|
| 2533 |
+
"Bitget", value=str(pair.get("bitget", "")),
|
| 2534 |
+
key=f"spread_pair_{idx}_bitget")
|
| 2535 |
+
with row[3]:
|
| 2536 |
+
okx_val = st.text_input(
|
| 2537 |
+
"OKX", value=str(pair.get("okx", "")),
|
| 2538 |
+
key=f"spread_pair_{idx}_okx")
|
| 2539 |
+
with row[4]:
|
| 2540 |
+
threshold_val = st.number_input(
|
| 2541 |
+
"阈值 %", min_value=0.05, max_value=20.0,
|
| 2542 |
+
value=float(pair.get("threshold_pct", fallback_threshold)),
|
| 2543 |
+
step=0.05, format="%.2f", key=f"spread_pair_{idx}_threshold")
|
| 2544 |
+
if str(name_val).strip():
|
| 2545 |
+
edited_pairs.append({
|
| 2546 |
+
"name": str(name_val).strip().upper(),
|
| 2547 |
+
"binance": str(binance_val).strip().upper(),
|
| 2548 |
+
"bitget": str(bitget_val).strip().upper(),
|
| 2549 |
+
"okx": str(okx_val).strip().upper(),
|
| 2550 |
+
"threshold_pct": float(threshold_val),
|
| 2551 |
+
})
|
| 2552 |
+
sp["pairs"] = edited_pairs
|
| 2553 |
|
| 2554 |
contracts = ex.setdefault("okx_contracts", [])
|
| 2555 |
if contracts:
|