Spaces:
Paused
Paused
zt p commited on
Commit ·
9be7428
1
Parent(s): 7463ed8
Limit OKX fallback to configured futures symbols
Browse files- app/monitors/crypto_price.py +1 -0
- coinpush.py +10 -3
app/monitors/crypto_price.py
CHANGED
|
@@ -61,6 +61,7 @@ class CryptoPriceMonitor(BaseMonitor):
|
|
| 61 |
fallback_symbols={"STRCUSDT": "STRC-USDT-SWAP", "GRAMUSDT": "GRAM-USDT-SWAP"},
|
| 62 |
primary_label="Binance合约主源",
|
| 63 |
fallback_label="OKX",
|
|
|
|
| 64 |
)
|
| 65 |
self.alpha_with_futures = legacy.AlphaWithFuturesAdapter(
|
| 66 |
self.alpha_api,
|
|
|
|
| 61 |
fallback_symbols={"STRCUSDT": "STRC-USDT-SWAP", "GRAMUSDT": "GRAM-USDT-SWAP"},
|
| 62 |
primary_label="Binance合约主源",
|
| 63 |
fallback_label="OKX",
|
| 64 |
+
allow_symbol_guess=False,
|
| 65 |
)
|
| 66 |
self.alpha_with_futures = legacy.AlphaWithFuturesAdapter(
|
| 67 |
self.alpha_api,
|
coinpush.py
CHANGED
|
@@ -1265,21 +1265,25 @@ class FallbackMarketAdapter:
|
|
| 1265 |
"""主行情源不可用时透明切到备用行情源,返回格式保持 BinanceAPI 兼容。"""
|
| 1266 |
|
| 1267 |
def __init__(self, primary, fallback, logger, fallback_symbols=None,
|
| 1268 |
-
primary_label="主源", fallback_label="备用源"
|
|
|
|
| 1269 |
self.primary = primary
|
| 1270 |
self.fallback = fallback
|
| 1271 |
self.logger = logger
|
| 1272 |
self.fallback_symbols = fallback_symbols or {}
|
| 1273 |
self.primary_label = primary_label
|
| 1274 |
self.fallback_label = fallback_label
|
|
|
|
| 1275 |
self._fallback_logged = set()
|
| 1276 |
|
| 1277 |
def _fallback_symbol(self, symbol):
|
| 1278 |
if symbol in self.fallback_symbols:
|
| 1279 |
return self.fallback_symbols[symbol]
|
| 1280 |
-
if symbol.endswith("USDT") and len(symbol) > 4:
|
| 1281 |
return f"{symbol[:-4]}-USDT-SWAP"
|
| 1282 |
-
|
|
|
|
|
|
|
| 1283 |
|
| 1284 |
def _call(self, method, symbol, *args):
|
| 1285 |
primary_fn = getattr(self.primary, method)
|
|
@@ -1288,6 +1292,8 @@ class FallbackMarketAdapter:
|
|
| 1288 |
return result
|
| 1289 |
|
| 1290 |
fb_symbol = self._fallback_symbol(symbol)
|
|
|
|
|
|
|
| 1291 |
fallback_fn = getattr(self.fallback, method, None)
|
| 1292 |
if fallback_fn is None:
|
| 1293 |
return None
|
|
@@ -2330,6 +2336,7 @@ class CryptoMonitor:
|
|
| 2330 |
fallback_symbols={"STRCUSDT": "STRC-USDT-SWAP", "GRAMUSDT": "GRAM-USDT-SWAP"},
|
| 2331 |
primary_label="Binance合约主源",
|
| 2332 |
fallback_label="OKX",
|
|
|
|
| 2333 |
)
|
| 2334 |
self.alpha_with_futures = AlphaWithFuturesAdapter(
|
| 2335 |
self.alpha_api,
|
|
|
|
| 1265 |
"""主行情源不可用时透明切到备用行情源,返回格式保持 BinanceAPI 兼容。"""
|
| 1266 |
|
| 1267 |
def __init__(self, primary, fallback, logger, fallback_symbols=None,
|
| 1268 |
+
primary_label="主源", fallback_label="备用源",
|
| 1269 |
+
allow_symbol_guess=True):
|
| 1270 |
self.primary = primary
|
| 1271 |
self.fallback = fallback
|
| 1272 |
self.logger = logger
|
| 1273 |
self.fallback_symbols = fallback_symbols or {}
|
| 1274 |
self.primary_label = primary_label
|
| 1275 |
self.fallback_label = fallback_label
|
| 1276 |
+
self.allow_symbol_guess = allow_symbol_guess
|
| 1277 |
self._fallback_logged = set()
|
| 1278 |
|
| 1279 |
def _fallback_symbol(self, symbol):
|
| 1280 |
if symbol in self.fallback_symbols:
|
| 1281 |
return self.fallback_symbols[symbol]
|
| 1282 |
+
if self.allow_symbol_guess and symbol.endswith("USDT") and len(symbol) > 4:
|
| 1283 |
return f"{symbol[:-4]}-USDT-SWAP"
|
| 1284 |
+
if self.allow_symbol_guess:
|
| 1285 |
+
return symbol
|
| 1286 |
+
return None
|
| 1287 |
|
| 1288 |
def _call(self, method, symbol, *args):
|
| 1289 |
primary_fn = getattr(self.primary, method)
|
|
|
|
| 1292 |
return result
|
| 1293 |
|
| 1294 |
fb_symbol = self._fallback_symbol(symbol)
|
| 1295 |
+
if not fb_symbol:
|
| 1296 |
+
return None
|
| 1297 |
fallback_fn = getattr(self.fallback, method, None)
|
| 1298 |
if fallback_fn is None:
|
| 1299 |
return None
|
|
|
|
| 2336 |
fallback_symbols={"STRCUSDT": "STRC-USDT-SWAP", "GRAMUSDT": "GRAM-USDT-SWAP"},
|
| 2337 |
primary_label="Binance合约主源",
|
| 2338 |
fallback_label="OKX",
|
| 2339 |
+
allow_symbol_guess=False,
|
| 2340 |
)
|
| 2341 |
self.alpha_with_futures = AlphaWithFuturesAdapter(
|
| 2342 |
self.alpha_api,
|