From 830b9f93d3dd5ee3c158b99fc3d91d527164f007 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Thu, 19 Sep 2024 14:29:07 +0800 Subject: [PATCH] no message --- datasource/crypto.py | 2 +- main.py | 30 +++++++++++++++++------------- monitors/vegas.py | 18 +++++++++--------- setting.py | 4 ++++ test.py | 22 +++++++++++++++------- 5 files changed, 46 insertions(+), 30 deletions(-) diff --git a/datasource/crypto.py b/datasource/crypto.py index bf3ebde..12cf4ba 100644 --- a/datasource/crypto.py +++ b/datasource/crypto.py @@ -66,7 +66,7 @@ def get_symbols(): return df_in_USDT['symbol'] ## 根据交易对和周期获取数据集 -def get_klines(symbol,interval , limit=500): +def get_klines(symbol,interval , limit=1000): # 获取 k 线数据 data = client.klines(symbol, interval,limit=limit) diff --git a/main.py b/main.py index ff2cb74..f90a805 100644 --- a/main.py +++ b/main.py @@ -1,28 +1,32 @@ import schedule import time -import monitors.vegas as vegas import monitors.large_transfer as lt import telegram_sender,setting import dingding import monitors.move as move -#move -schedule.every().hour.at(":00").do(move.run_crypto, interval = '30m') -schedule.every().hour.at(":30").do(move.run_crypto, interval = '30m') +from monitors import vegas, vegas_cross -schedule.every().hour.at(":00").do(move.run_crypto, interval = '1h') -schedule.every().hour.at(":00").do(move.run_crypto, interval = '4h') +#move +# schedule.every().hour.at(":00").do(move.run_crypto, interval = '30m') +# schedule.every().hour.at(":30").do(move.run_crypto, interval = '30m') + +# schedule.every().hour.at(":00").do(move.run_crypto, interval = '1h') +# schedule.every().hour.at(":00").do(move.run_crypto, interval = '4h') #vegas -# schedule.every().hour.at(":00").do(vegas.run_crypto, interval = '30m') -# schedule.every().hour.at(":30").do(vegas.run_crypto, interval = '30m') +schedule.every().hour.at(":00").do(vegas.run_crypto, interval = '1h') +times = ["00:00", "04:00", "08:00", "12:00", "16:00", "20:00"] +for t in times: + schedule.every().day.at(t).do(vegas.run_crypto, interval = '4h') -# schedule.every().hour.at(":00").do(vegas.run_crypto, interval = '1h') -# times = ["00:00", "04:00", "08:00", "12:00", "16:00", "20:00"] -# for t in times: -# schedule.every().day.at(t).do(vegas.run_crypto, interval = '4h') +#vegas_cross +schedule.every().hour.at(":00").do(vegas_cross.run_crypto, interval = '1h') +times = ["00:00", "04:00", "08:00", "12:00", "16:00", "20:00"] +for t in times: + schedule.every().day.at(t).do(vegas_cross.run_crypto, interval = '4h') -version = 'V1.10' +version = 'V1.12' print(f'Running... {version}') while True: schedule.run_pending() diff --git a/monitors/vegas.py b/monitors/vegas.py index 6157796..b6aae35 100644 --- a/monitors/vegas.py +++ b/monitors/vegas.py @@ -4,6 +4,7 @@ import time,setting import telegram_sender from datasource import crypto import dingding +import discord_sender # crossover 函数：检测上穿信号 @@ -43,12 +44,11 @@ def stratergy_run(symbol, interval, df, debug): direction = "" if latest['shortResut']==True: - direction = '做空' + direction = '空' if latest['longResut']==True: - direction = '做多' - - message = f"🌟 信 号 提 醒 🌟\r\n\r\n" - message += f"策略:【Vegas反转策略】\r\n" + direction = '多' + + message = f"策略:【Vegas反转策略】\r\n" message += f"品种: {symbol}\r\n" message += f"周期: {interval}\r\n" message += f"信号: 【{direction}】\r\n" @@ -57,8 +57,9 @@ def stratergy_run(symbol, interval, df, debug): print(f"【{symbol} - {interval}】 is checked!") if direction != "": if debug == False: - telegram_sender.send_message(setting.chat_id, message) - dingding.send_message(message) + url = 'https://discordapp.com/api/webhooks/1285867836454998077/JNAFUyur_ygOJIh6C4beUAVYMpm1TZf4IEeMn8Q1p0TglO1Hjyiu2LQqiU5AxVovWyiO' + discord_sender.send_message(url,'🦄信号提醒🦄',message) + print(f"【{symbol} - {interval}】 is singal fired!") else: print(message) @@ -69,8 +70,7 @@ def run_crypto(interval, debug=False): # symbols = crypto.get_symbols() # symbols = crypto.get_top_binance_usdt_pairs(10) - symbols = ['BTCUSDT',"ETHUSDT",'LTCUSDT','DOGEUSDT','FTMUSDT','FILUSDT','OPUSDT','SOLUSDT','BNBUSDT','BCHUSDT','ETCUSDT','ARUSDT'] - for s in symbols: + for s in setting.symbols: df = crypto.get_klines(s, interval) stratergy_run(s,interval, df, debug) diff --git a/setting.py b/setting.py index 596fc3b..7eb78c1 100644 --- a/setting.py +++ b/setting.py @@ -5,3 +5,7 @@ telegram_bot_key='5863718864:AAFijN65_SbbGQ0WDBggzKJw2SIcZVTVrPw' # chat_id = os.getenv("TQ_CHAT_ID", "@cyber4trading") + + +# +symbols = ['BTCUSDT',"ETHUSDT",'LTCUSDT','DOGEUSDT','FTMUSDT','FILUSDT','OPUSDT','SOLUSDT','BNBUSDT','BCHUSDT','ETCUSDT','ARUSDT'] diff --git a/test.py b/test.py index a8bbd86..6af3aab 100644 --- a/test.py +++ b/test.py @@ -4,17 +4,25 @@ from datasource import crypto import talib import discord_sender from binance.cm_futures import CMFutures +from monitors import vegas_cross +from datasource import crypto -client = CMFutures() -data = client.funding_rate('BTCUSD_PERP', limit=1) -fundingRate = float(data[0]['fundingRate']) * 100 - -text = f"币种: {data[0]['symbol']}\r\n资金费率: {fundingRate} %" +print(crypto._get_top_coins_by_market_cap(20)) +# vegas_cross.run_crypto('1h') -mUrl = "https://discordapp.com/api/webhooks/1285898004641091605/DwIh9yZvrU6TwelVmJr96XBdpFTEEpeFD8GsZpH7rBdwT4UwVyZTrtdmBzS4ae0Ta7PH" -discord_sender.send_message(mUrl, '消息内容',text) +# client = CMFutures() +# data = client.funding_rate('BTCUSD_PERP', limit=1) + +# fundingRate = float(data[0]['fundingRate']) * 100 + +# text = f"币种: {data[0]['symbol']}\r\n资金费率: {fundingRate} %" + + +# mUrl = "https://discordapp.com/api/webhooks/1285898004641091605/DwIh9yZvrU6TwelVmJr96XBdpFTEEpeFD8GsZpH7rBdwT4UwVyZTrtdmBzS4ae0Ta7PH" + +# discord_sender.send_message(mUrl, '消息内容',text)