From 58c07a7ce57b428617d9cb045513551aa77c9842 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Tue, 1 Feb 2022 22:50:33 +0300 Subject: [PATCH 1/6] send_backtest_start_deliminator_message --- user_data/strategies/Strategy002.py | 2 ++ user_data/strategies/Strategy003.py | 2 ++ user_data/strategies/Strategy004.py | 3 +++ user_data/strategies/config.py | 3 +++ user_data/strategies/notifier.py | 11 +++++++++++ 5 files changed, 21 insertions(+) create mode 100644 user_data/strategies/notifier.py diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index 493011581..b1d89bc3c 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -15,9 +15,11 @@ from datetime import datetime from user_data.strategies.util import execute, back_test from user_data.strategies.config import Config +from user_data.strategies.notifier import send_backtest_start_deliminator_message class Strategy002(IStrategy): + send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 002 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 3687c0717..2c0bf7995 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -15,9 +15,11 @@ from datetime import datetime from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config +from user_data.strategies.notifier import send_backtest_start_deliminator_message class Strategy003(IStrategy): + send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 003 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index 81402d49e..5a440f43f 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -12,8 +12,11 @@ import talib.abstract as ta from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config +from user_data.strategies.notifier import send_backtest_start_deliminator_message + class Strategy004(IStrategy): + send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 004 author@: Gerald Lonlas diff --git a/user_data/strategies/config.py b/user_data/strategies/config.py index 62a4735ae..58ccd7a83 100644 --- a/user_data/strategies/config.py +++ b/user_data/strategies/config.py @@ -1,4 +1,7 @@ class Config: + NOTIFIER_TELEGRAM_CHANNEL_ID_BACKTEST = "-1001569603630" + NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST = "914726826:AAEHl2IH3tjXvAwe_hnTcxKjHmRismua0VE" + BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH = "" BACKTEST_DATA_CLEANER_YEAR = 2020 BACKTEST_DATA_CLEANER_MONTH_INDEX = 9 diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py new file mode 100644 index 000000000..5474fc71f --- /dev/null +++ b/user_data/strategies/notifier.py @@ -0,0 +1,11 @@ +import requests +from user_data.strategies.config import Config + + +def send_backtest_start_deliminator_message(action, coin, month, year): + print("Notifier: send_backtest_start_deliminator_message: action= " + str(action)) + text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" + + result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST + + '/sendMessage?chat_id=' + Config.NOTIFIER_TELEGRAM_CHANNEL_ID_BACKTEST + '&text=' + text + '&parse_mode=Markdown') + print(str(result)) \ No newline at end of file From f349a4abc6cab12a968f163b695db42143ff2c77 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Tue, 1 Feb 2022 22:51:23 +0300 Subject: [PATCH 2/6] capiitalization fix --- user_data/strategies/notifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 5474fc71f..4f9afcdd1 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -3,7 +3,7 @@ from user_data.strategies.config import Config def send_backtest_start_deliminator_message(action, coin, month, year): - print("Notifier: send_backtest_start_deliminator_message: action= " + str(action)) + print("notifier: send_backtest_start_deliminator_message: action= " + str(action)) text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST + From c674467ee40da85f69e3c14fc694cc7ad4c42ba5 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Tue, 1 Feb 2022 23:04:38 +0300 Subject: [PATCH 3/6] Hidding the bot token and channel id --- user_data/strategies/config.py | 4 +--- user_data/strategies/notifier.py | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_data/strategies/config.py b/user_data/strategies/config.py index 58ccd7a83..d452cb844 100644 --- a/user_data/strategies/config.py +++ b/user_data/strategies/config.py @@ -1,7 +1,5 @@ class Config: - NOTIFIER_TELEGRAM_CHANNEL_ID_BACKTEST = "-1001569603630" - NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST = "914726826:AAEHl2IH3tjXvAwe_hnTcxKjHmRismua0VE" - + BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH = "" BACKTEST_DATA_CLEANER_YEAR = 2020 BACKTEST_DATA_CLEANER_MONTH_INDEX = 9 diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 4f9afcdd1..87cab1ec3 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -1,5 +1,7 @@ import requests -from user_data.strategies.config import Config +import sys +sys.path.append('/root/workspace2/execution/') +from config import Config def send_backtest_start_deliminator_message(action, coin, month, year): From cdee253fdaf461113c1a4555206688d30c6ad520 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 2 Feb 2022 10:54:53 +0300 Subject: [PATCH 4/6] fixes implemented --- user_data/strategies/Strategy002.py | 5 +++-- user_data/strategies/Strategy003.py | 5 +++-- user_data/strategies/Strategy004.py | 5 +++-- user_data/strategies/notifier.py | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index b1d89bc3c..17c16e333 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -15,11 +15,12 @@ from datetime import datetime from user_data.strategies.util import execute, back_test from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy002(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 002 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 2c0bf7995..1a916589a 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -15,11 +15,12 @@ from datetime import datetime from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy003(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 003 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index 5a440f43f..a875e5f50 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -12,11 +12,12 @@ import talib.abstract as ta from user_data.strategies.util import back_test, execute from user_data.strategies.config import Config -from user_data.strategies.notifier import send_backtest_start_deliminator_message +from user_data.strategies.notifier import send_start_deliminator_message class Strategy004(IStrategy): - send_backtest_start_deliminator_message('send_backtest_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + if Config.IS_BACKTEST: + send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 004 author@: Gerald Lonlas diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 87cab1ec3..57df3cc57 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -4,8 +4,8 @@ sys.path.append('/root/workspace2/execution/') from config import Config -def send_backtest_start_deliminator_message(action, coin, month, year): - print("notifier: send_backtest_start_deliminator_message: action= " + str(action)) +def send_start_deliminator_message(action, coin, month, year): + print("notifier: send_start_deliminator_message: action= " + str(action)) text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST + From 7375ae1b11255c37404d449ef90acf416eb2a21a Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 2 Feb 2022 14:30:06 +0300 Subject: [PATCH 5/6] fix 2 --- user_data/strategies/Strategy002.py | 2 +- user_data/strategies/Strategy003.py | 2 +- user_data/strategies/Strategy004.py | 2 +- user_data/strategies/notifier.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index 17c16e333..d806b62dc 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -20,7 +20,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy002(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 002 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 1a916589a..810f23761 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -20,7 +20,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy003(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 003 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index a875e5f50..1b8e68deb 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -17,7 +17,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy004(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message('send_start_deliminator_message',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 004 author@: Gerald Lonlas diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 57df3cc57..4200c2e12 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -1,11 +1,11 @@ import requests import sys -sys.path.append('/root/workspace2/execution/') +sys.path.append(Config.EXECUTION_PATH) from config import Config -def send_start_deliminator_message(action, coin, month, year): - print("notifier: send_start_deliminator_message: action= " + str(action)) +def send_start_deliminator_message(coin, month, year): + print("notifier: send_start_deliminator_message: action= ") text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST + From d1734590cc4fe0aca7e698da78957d6c52e04c79 Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 2 Feb 2022 15:13:35 +0300 Subject: [PATCH 6/6] fix3 --- user_data/strategies/Strategy002.py | 2 +- user_data/strategies/Strategy003.py | 2 +- user_data/strategies/Strategy004.py | 2 +- user_data/strategies/notifier.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index d806b62dc..4f2c5fce7 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -20,7 +20,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy002(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message('Freq Strategy002 ',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 002 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 810f23761..e0f179348 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -20,7 +20,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy003(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message('Freq Strategy003 ',Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 003 author@: Gerald Lonlas diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index 1b8e68deb..421bfce6b 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -17,7 +17,7 @@ from user_data.strategies.notifier import send_start_deliminator_message class Strategy004(IStrategy): if Config.IS_BACKTEST: - send_start_deliminator_message(Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) + send_start_deliminator_message('Freq Strategy004 ', Config.BACKTEST_COIN ,Config.BACKTEST_MONTH_LIST[Config.BACKTEST_DATA_CLEANER_MONTH_INDEX], Config.BACKTEST_DATA_CLEANER_YEAR) """ Strategy 004 author@: Gerald Lonlas diff --git a/user_data/strategies/notifier.py b/user_data/strategies/notifier.py index 4200c2e12..96e304114 100644 --- a/user_data/strategies/notifier.py +++ b/user_data/strategies/notifier.py @@ -4,9 +4,9 @@ sys.path.append(Config.EXECUTION_PATH) from config import Config -def send_start_deliminator_message(coin, month, year): - print("notifier: send_start_deliminator_message: action= ") - text = "=========" + str(coin) + " " + str(month) + " " + str(year) + "=========>" +def send_start_deliminator_message(brain, coin, month, year): + print("notifier: send_start_deliminator_message: ") + text = "========" + str(brain) + str(coin) + " " + str(month) + " " + str(year) + "=======>" result = requests.post('https://api.telegram.org/bot' + Config.NOTIFIER_TELEGRAM_BOT_API_TOKEN_BACKTEST + '/sendMessage?chat_id=' + Config.NOTIFIER_TELEGRAM_CHANNEL_ID_BACKTEST + '&text=' + text + '&parse_mode=Markdown')