From 00400d906df7f85ee573094319a0c02e1363ffe0 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 12:26:33 +0300 Subject: [PATCH 1/7] separate calling ticker api from parsing the result --- analyze.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/analyze.py b/analyze.py index 6ac798757..23095cc6b 100644 --- a/analyze.py +++ b/analyze.py @@ -13,13 +13,10 @@ logging.basicConfig(level=logging.DEBUG, logger = logging.getLogger(__name__) -def get_ticker_dataframe(pair: str) -> DataFrame: +def get_ticker(pair: str, minimum_date: arrow.Arrow) -> dict: """ - Analyses the trend for the given pair - :param pair: pair as str in format BTC_ETH or BTC-ETH - :return: DataFrame + Request ticker data from Bittrex for a given currency pair """ - minimum_date = arrow.now() - timedelta(hours=6) url = 'https://bittrex.com/Api/v2.0/pub/market/GetTicks' headers = { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36', @@ -32,6 +29,15 @@ def get_ticker_dataframe(pair: str) -> DataFrame: data = requests.get(url, params=params, headers=headers).json() if not data['success']: raise RuntimeError('BITTREX: {}'.format(data['message'])) + return data + + +def parse_ticker_dataframe(ticker: list, minimum_date: arrow.Arrow) -> DataFrame: + """ + Analyses the trend for the given pair + :param pair: pair as str in format BTC_ETH or BTC-ETH + :return: DataFrame + """ data = [{ 'close': t['C'], @@ -40,7 +46,7 @@ def get_ticker_dataframe(pair: str) -> DataFrame: 'high': t['H'], 'low': t['L'], 'date': t['T'], - } for t in sorted(data['result'], key=lambda k: k['T']) if arrow.get(t['T']) > minimum_date] + } for t in sorted(ticker, key=lambda k: k['T']) if arrow.get(t['T']) > minimum_date] dataframe = DataFrame(json_normalize(data)) dataframe['close_30_ema'] = ta.EMA(dataframe, timeperiod=30) @@ -89,7 +95,9 @@ def get_buy_signal(pair: str) -> bool: :param pair: pair in format BTC_ANT or BTC-ANT :return: True if pair is underpriced, False otherwise """ - dataframe = get_ticker_dataframe(pair) + minimum_date = arrow.now() - timedelta(hours=6) + data = get_ticker(pair, minimum_date) + dataframe = parse_ticker_dataframe(data['result'], minimum_date) dataframe = populate_trends(dataframe) latest = dataframe.iloc[-1] @@ -150,7 +158,9 @@ if __name__ == '__main__': pair = 'BTC_ANT' #for pair in ['BTC_ANT', 'BTC_ETH', 'BTC_GNT', 'BTC_ETC']: # get_buy_signal(pair) - dataframe = get_ticker_dataframe(pair) + minimum_date = arrow.now() - timedelta(hours=6) + data = get_ticker(pair, minimum_date) + dataframe = parse_ticker_dataframe(data['result'], minimum_date) dataframe = populate_trends(dataframe) plot_dataframe(dataframe, pair) time.sleep(60) From 8a736ba38dcf89eab8b7cd5b450a7955a1f30982 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 13:02:47 +0300 Subject: [PATCH 2/7] separate calculating indicators from parsing the data --- analyze.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/analyze.py b/analyze.py index 23095cc6b..e4c1903af 100644 --- a/analyze.py +++ b/analyze.py @@ -38,7 +38,6 @@ def parse_ticker_dataframe(ticker: list, minimum_date: arrow.Arrow) -> DataFrame :param pair: pair as str in format BTC_ETH or BTC-ETH :return: DataFrame """ - data = [{ 'close': t['C'], 'volume': t['V'], @@ -47,8 +46,14 @@ def parse_ticker_dataframe(ticker: list, minimum_date: arrow.Arrow) -> DataFrame 'low': t['L'], 'date': t['T'], } for t in sorted(ticker, key=lambda k: k['T']) if arrow.get(t['T']) > minimum_date] - dataframe = DataFrame(json_normalize(data)) + return DataFrame(json_normalize(data)) + + +def populate_indicators(dataframe: DataFrame) -> DataFrame: + """ + Adds several different TA indicators to the given DataFrame + """ dataframe['close_30_ema'] = ta.EMA(dataframe, timeperiod=30) dataframe['close_90_ema'] = ta.EMA(dataframe, timeperiod=90) @@ -81,7 +86,7 @@ def populate_trends(dataframe: DataFrame) -> DataFrame: """ dataframe.loc[ (dataframe['stochrsi'] < 20) - & (dataframe['macd'] > dataframe['macds']) + & (dataframe['macd'] > dataframe['macds']) & (dataframe['close'] > dataframe['sar']), 'underpriced' ] = 1 @@ -98,6 +103,7 @@ def get_buy_signal(pair: str) -> bool: minimum_date = arrow.now() - timedelta(hours=6) data = get_ticker(pair, minimum_date) dataframe = parse_ticker_dataframe(data['result'], minimum_date) + dataframe = populate_indicators(dataframe) dataframe = populate_trends(dataframe) latest = dataframe.iloc[-1] @@ -161,6 +167,7 @@ if __name__ == '__main__': minimum_date = arrow.now() - timedelta(hours=6) data = get_ticker(pair, minimum_date) dataframe = parse_ticker_dataframe(data['result'], minimum_date) + dataframe = populate_indicators(dataframe) dataframe = populate_trends(dataframe) plot_dataframe(dataframe, pair) time.sleep(60) From 507f12e92a1871c07fa8fe65e49c5d800b7fe945 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 13:16:14 +0300 Subject: [PATCH 3/7] combine analyzation steps to one method --- analyze.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/analyze.py b/analyze.py index e4c1903af..348a20e8a 100644 --- a/analyze.py +++ b/analyze.py @@ -94,17 +94,21 @@ def populate_trends(dataframe: DataFrame) -> DataFrame: return dataframe +def analyze_ticker(pair: str) -> DataFrame: + minimum_date = arrow.now() - timedelta(hours=6) + data = get_ticker(pair, minimum_date) + dataframe = parse_ticker_dataframe(data['result'], minimum_date) + dataframe = populate_indicators(dataframe) + dataframe = populate_trends(dataframe) + return dataframe + def get_buy_signal(pair: str) -> bool: """ Calculates a buy signal based on StochRSI indicator :param pair: pair in format BTC_ANT or BTC-ANT :return: True if pair is underpriced, False otherwise """ - minimum_date = arrow.now() - timedelta(hours=6) - data = get_ticker(pair, minimum_date) - dataframe = parse_ticker_dataframe(data['result'], minimum_date) - dataframe = populate_indicators(dataframe) - dataframe = populate_trends(dataframe) + dataframe = analyze_ticker(pair) latest = dataframe.iloc[-1] # Check if dataframe is out of date @@ -164,10 +168,5 @@ if __name__ == '__main__': pair = 'BTC_ANT' #for pair in ['BTC_ANT', 'BTC_ETH', 'BTC_GNT', 'BTC_ETC']: # get_buy_signal(pair) - minimum_date = arrow.now() - timedelta(hours=6) - data = get_ticker(pair, minimum_date) - dataframe = parse_ticker_dataframe(data['result'], minimum_date) - dataframe = populate_indicators(dataframe) - dataframe = populate_trends(dataframe) - plot_dataframe(dataframe, pair) + plot_dataframe(analyze_ticker(pair), pair) time.sleep(60) From 1bcd51d6e064061d1aeb1a212c6d76242eeaa99f Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 14:48:49 +0300 Subject: [PATCH 4/7] first unit tests for analyze.py --- test/test_analyze.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 test/test_analyze.py diff --git a/test/test_analyze.py b/test/test_analyze.py new file mode 100644 index 000000000..7ba3345ab --- /dev/null +++ b/test/test_analyze.py @@ -0,0 +1,34 @@ +# pragma pylint: disable=missing-docstring +import unittest +import arrow +from analyze import parse_ticker_dataframe + +RESULT_BITTREX = { + 'success': True, + 'message': '', + 'result': [ + {'O': 0.00065311, 'H': 0.00065311, 'L': 0.00065311, 'C': 0.00065311, 'V': 22.17210568, 'T': '2017-08-30T10:40:00', 'BV': 0.01448082}, + {'O': 0.00066194, 'H': 0.00066195, 'L': 0.00066194, 'C': 0.00066195, 'V': 33.4727437, 'T': '2017-08-30T10:34:00', 'BV': 0.02215696}, + {'O': 0.00065311, 'H': 0.00065311, 'L': 0.00065311, 'C': 0.00065311, 'V': 53.85127609, 'T': '2017-08-30T10:37:00', 'BV': 0.0351708}, + {'O': 0.00066194, 'H': 0.00066194, 'L': 0.00065311, 'C': 0.00065311, 'V': 46.29210665, 'T': '2017-08-30T10:42:00', 'BV': 0.03063118}, + ] +} + +class TestAnalyze(unittest.TestCase): + def setUp(self): + self.result = parse_ticker_dataframe(RESULT_BITTREX['result'], arrow.get('2017-08-30T10:00:00')) + + def test_1_dataframe_has_correct_columns(self): + self.assertEqual(self.result.columns.tolist(), + ['close', 'date', 'high', 'low', 'open', 'volume']) + + def test_2_orders_by_date(self): + self.assertEqual(self.result['date'].tolist(), + ['2017-08-30T10:34:00', + '2017-08-30T10:37:00', + '2017-08-30T10:40:00', + '2017-08-30T10:42:00']) + + +if __name__ == '__main__': + unittest.main() From 2f3fd1de8aa0a39e3fe495c9137fa87094dcbdb9 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 16:32:53 +0300 Subject: [PATCH 5/7] rename populate_trends to populate_buy_trend. make it produce buy and buy_price columns --- analyze.py | 32 +++++++++++++++----------------- test/test_analyze.py | 6 +++++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/analyze.py b/analyze.py index 348a20e8a..8d62aac5d 100644 --- a/analyze.py +++ b/analyze.py @@ -71,42 +71,40 @@ def populate_indicators(dataframe: DataFrame) -> DataFrame: return dataframe -def populate_trends(dataframe: DataFrame) -> DataFrame: +def populate_buy_trend(dataframe: DataFrame) -> DataFrame: """ - Populates the trends for the given dataframe + Based on TA indicators, populates the buy trend for the given dataframe :param dataframe: DataFrame - :return: DataFrame with populated trends - """ - """ - dataframe.loc[ - (dataframe['stochrsi'] < 20) - & (dataframe['close_30_ema'] > (1 + 0.0025) * dataframe['close_60_ema']), - 'underpriced' - ] = 1 + :return: DataFrame with buy column """ dataframe.loc[ (dataframe['stochrsi'] < 20) & (dataframe['macd'] > dataframe['macds']) & (dataframe['close'] > dataframe['sar']), - 'underpriced' + 'buy' ] = 1 - dataframe.loc[dataframe['underpriced'] == 1, 'buy'] = dataframe['close'] + dataframe.loc[dataframe['buy'] == 1, 'buy_price'] = dataframe['close'] return dataframe def analyze_ticker(pair: str) -> DataFrame: + """ + Get ticker data for given currency pair, push it to a DataFrame and + add several TA indicators and buy signal to it + :return DataFrame with ticker data and indicator data + """ minimum_date = arrow.now() - timedelta(hours=6) data = get_ticker(pair, minimum_date) dataframe = parse_ticker_dataframe(data['result'], minimum_date) dataframe = populate_indicators(dataframe) - dataframe = populate_trends(dataframe) + dataframe = populate_buy_trend(dataframe) return dataframe def get_buy_signal(pair: str) -> bool: """ - Calculates a buy signal based on StochRSI indicator + Calculates a buy signal based several technical analysis indicators :param pair: pair in format BTC_ANT or BTC-ANT - :return: True if pair is underpriced, False otherwise + :return: True if pair is good for buying, False otherwise """ dataframe = analyze_ticker(pair) latest = dataframe.iloc[-1] @@ -116,7 +114,7 @@ def get_buy_signal(pair: str) -> bool: if signal_date < arrow.now() - timedelta(minutes=10): return False - signal = latest['underpriced'] == 1 + signal = latest['buy'] == 1 logger.debug('buy_trigger: %s (pair=%s, signal=%s)', latest['date'], pair, signal) return signal @@ -141,7 +139,7 @@ def plot_dataframe(dataframe: DataFrame, pair: str) -> None: ax1.plot(dataframe.index.values, dataframe['close_30_ema'], label='EMA(30)') ax1.plot(dataframe.index.values, dataframe['close_90_ema'], label='EMA(90)') # ax1.plot(dataframe.index.values, dataframe['sell'], 'ro', label='sell') - ax1.plot(dataframe.index.values, dataframe['buy'], 'bo', label='buy') + ax1.plot(dataframe.index.values, dataframe['buy_price'], 'bo', label='buy') ax1.legend() ax2.plot(dataframe.index.values, dataframe['macd'], label='MACD') diff --git a/test/test_analyze.py b/test/test_analyze.py index 7ba3345ab..48cca6fd5 100644 --- a/test/test_analyze.py +++ b/test/test_analyze.py @@ -1,7 +1,7 @@ # pragma pylint: disable=missing-docstring import unittest import arrow -from analyze import parse_ticker_dataframe +from analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators RESULT_BITTREX = { 'success': True, @@ -29,6 +29,10 @@ class TestAnalyze(unittest.TestCase): '2017-08-30T10:40:00', '2017-08-30T10:42:00']) + def test_3_populates_buy_trend(self): + dataframe = populate_buy_trend(populate_indicators(self.result)) + self.assertTrue('buy' in dataframe.columns) + self.assertTrue('buy_price' in dataframe.columns) if __name__ == '__main__': unittest.main() From 4069e730395c9c88899b788d504a0194f1c03fa0 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 9 Sep 2017 19:18:53 +0300 Subject: [PATCH 6/7] test for buy signal --- test/test_analyze.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/test_analyze.py b/test/test_analyze.py index 48cca6fd5..d57f0b108 100644 --- a/test/test_analyze.py +++ b/test/test_analyze.py @@ -1,7 +1,9 @@ # pragma pylint: disable=missing-docstring import unittest +from unittest.mock import patch +from pandas import DataFrame import arrow -from analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators +from analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators, analyze_ticker, get_buy_signal RESULT_BITTREX = { 'success': True, @@ -34,5 +36,14 @@ class TestAnalyze(unittest.TestCase): self.assertTrue('buy' in dataframe.columns) self.assertTrue('buy_price' in dataframe.columns) + def test_4_returns_latest_buy_signal(self): + buydf = DataFrame([{'buy': 1, 'date': arrow.utcnow()}]) + with patch('analyze.analyze_ticker', return_value=buydf): + self.assertEqual(get_buy_signal('BTC-ETH'), True) + buydf = DataFrame([{'buy': 0, 'date': arrow.utcnow()}]) + with patch('analyze.analyze_ticker', return_value=buydf): + self.assertEqual(get_buy_signal('BTC-ETH'), False) + + if __name__ == '__main__': unittest.main() From 8bf5f15125e657df082ff0ae861cec7c2e5fc6d8 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sun, 10 Sep 2017 09:51:56 +0300 Subject: [PATCH 7/7] use DataFrames own functions to manipulate the Bittrex JSON --- analyze.py | 17 ++++++----------- test/test_analyze.py | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/analyze.py b/analyze.py index 8d62aac5d..4878333b6 100644 --- a/analyze.py +++ b/analyze.py @@ -38,16 +38,11 @@ def parse_ticker_dataframe(ticker: list, minimum_date: arrow.Arrow) -> DataFrame :param pair: pair as str in format BTC_ETH or BTC-ETH :return: DataFrame """ - data = [{ - 'close': t['C'], - 'volume': t['V'], - 'open': t['O'], - 'high': t['H'], - 'low': t['L'], - 'date': t['T'], - } for t in sorted(ticker, key=lambda k: k['T']) if arrow.get(t['T']) > minimum_date] - - return DataFrame(json_normalize(data)) + df = DataFrame(ticker) \ + .drop('BV', 1) \ + .rename(columns={'C':'close', 'V':'volume', 'O':'open', 'H':'high', 'L':'low', 'T':'date'}) \ + .sort_values('date') + return df[df['date'].map(arrow.get) > minimum_date] def populate_indicators(dataframe: DataFrame) -> DataFrame: @@ -93,7 +88,7 @@ def analyze_ticker(pair: str) -> DataFrame: add several TA indicators and buy signal to it :return DataFrame with ticker data and indicator data """ - minimum_date = arrow.now() - timedelta(hours=6) + minimum_date = arrow.utcnow().shift(hours=-6) data = get_ticker(pair, minimum_date) dataframe = parse_ticker_dataframe(data['result'], minimum_date) dataframe = populate_indicators(dataframe) diff --git a/test/test_analyze.py b/test/test_analyze.py index d57f0b108..9fdc16d7a 100644 --- a/test/test_analyze.py +++ b/test/test_analyze.py @@ -22,7 +22,7 @@ class TestAnalyze(unittest.TestCase): def test_1_dataframe_has_correct_columns(self): self.assertEqual(self.result.columns.tolist(), - ['close', 'date', 'high', 'low', 'open', 'volume']) + ['close', 'high', 'low', 'open', 'date', 'volume']) def test_2_orders_by_date(self): self.assertEqual(self.result['date'].tolist(),