Merge pull request #387 from x1n5h3n/develop

Correct Erros && Remove Unnecessary comparaisons && Allow usage of newer versions of python and requirements modules && Allow to define more settings

Author: laliux

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-jessie
+FROM python:3
 
 # TA-lib is required by the python TA-lib wrapper. This provides analysis.
 COPY lib/ta-lib-0.4.0-src.tar.gz /tmp/ta-lib-0.4.0-src.tar.gz
@@ -20,4 +20,4 @@ WORKDIR /app
 RUN pip install -r requirements-step-1.txt
 RUN pip install -r requirements-step-2.txt
 
-CMD ["/usr/local/bin/python","app.py"]
+CMD ["python","app.py"]

app/analyzers/crossover.py

@@ -33,8 +33,9 @@ def analyze(self, key_indicator, key_signal, key_indicator_index,
             column_indexed_name = '{}_{}'.format(column, key_indicator_index)
             new_key_indicator.rename(columns={column: column_indexed_name}, inplace=True)
 
+        length = new_key_indicator.shape()
         crossed_indicator_name = '{}_{}'.format(crossed_signal, crossed_indicator_index)
-        new_crossed_indicator = crossed_indicator.copy(deep=True)
+        new_crossed_indicator = crossed_indicator[:length[1]].copy(deep=True)
         for column in new_crossed_indicator:
             column_indexed_name = '{}_{}'.format(column, crossed_indicator_index)
             new_crossed_indicator.rename(columns={column: column_indexed_name}, inplace=True)

app/analyzers/indicators/ichimoku.py

@@ -88,12 +88,12 @@ def analyze(self, historical_data, tenkansen_period, kijunsen_period, senkou_spa
                     close_hot = dataframe['close'][date] > ichimoku_values['leading_span_a'][date]
                     if hot_thresh:
                         ichimoku_values.at[date,
-                                           'is_hot'] = span_hot and close_hot
+                                           'is_hot'] = span_hot & close_hot
                     span_cold = ichimoku_values['leading_span_a'][date] < ichimoku_values['leading_span_b'][date]
                     close_cold = dataframe['close'][date] < ichimoku_values['leading_span_a'][date]
                     if cold_thresh:
                         ichimoku_values.at[date,
-                                           'is_cold'] = span_cold and close_cold
+                                           'is_cold'] = span_cold & close_cold
                 else:
                     pass
 

app/app.py

@@ -44,7 +44,7 @@ def main():
 
     for exchange in market_data:
         num = 1
-        for chunk in split_market_data(market_data[exchange]):
+        for chunk in split_market_data(market_data[exchange], settings['market_data_chunk_size']):
             market_data_chunk = dict()
             market_data_chunk[exchange] = {
                 key: market_data[exchange][key] for key in chunk}
@@ -60,7 +60,7 @@ def main():
             worker.daemon = True
             worker.start()
 
-            time.sleep(60)
+            time.sleep(settings['start_worker_interval'])
             num += 1
 
     logger.info('All workers are running!')
@@ -69,9 +69,9 @@ def main():
         worker.join()
 
 
-def split_market_data(market_data):
-    if len(market_data.keys()) > 20:
-        return list(chunks(list(market_data.keys()), 20))
+def split_market_data(market_data, chunk_size):
+    if len(market_data.keys()) > chunk_size:
+        return list(chunks(list(market_data.keys()), chunk_size))
     else:
         return [list(market_data.keys())]
 

app/conf.py

@@ -16,11 +16,11 @@ def __init__(self):
         """
 
         with open('defaults.yml', 'r') as config_file:
-            default_config = yaml.load(config_file)
+            default_config = yaml.load(config_file, Loader=yaml.FullLoader)
 
         if os.path.isfile('config.yml'):
             with open('config.yml', 'r') as config_file:
-                user_config = yaml.load(config_file)
+                user_config = yaml.load(config_file, Loader=yaml.FullLoader)
         else:
             user_config = dict()
 

app/defaults.yml

@@ -8,6 +8,8 @@ settings:
   enable_charts: false
   output_mode: cli
   update_interval: 300
+  start_worker_interval: 60
+  market_data_chunk_size: 20
   market_pairs: null
   timezone: UTC
 

app/notification.py

@@ -138,7 +138,7 @@ def notify_all(self, new_analysis):
 
         messages = self.get_indicator_messages(new_analysis)
 
-        if self.enable_charts == True:
+        if self.enable_charts:
             if not os.path.exists(charts_dir):
                 os.mkdir(charts_dir)
 
@@ -158,7 +158,7 @@ def notify_all(self, new_analysis):
     def notify_all_messages(self, exchange, market_pair, candle_period, messages):
         chart_file = None
 
-        if self.enable_charts == True:
+        if self.enable_charts:
             try:
                 candles_data = self.all_historical_data[exchange][market_pair][candle_period]
                 chart_file = self.create_chart(
@@ -258,8 +258,8 @@ def notify_telegram(self, messages, chart_file):
         for message in messages:
             formatted_messages.append(message_template.render(message))
 
-        if self.enable_charts == True:
-            if chart_file != None and os.path.exists(chart_file):
+        if self.enable_charts:
+            if chart_file and os.path.exists(chart_file):
                 try:
                     self.telegram_client.send_chart_messages(
                         open(chart_file, 'rb'), formatted_messages)
@@ -644,7 +644,7 @@ def get_indicator_messages(self, new_analysis):
         # Merge changes from new analysis into last analysis
         self.last_analysis = {**self.last_analysis, **new_analysis}
 
-        if self.first_run == True:
+        if self.first_run:
             self.first_run = False
 
         return new_messages

app/notifiers/webhook_client.py

@@ -32,7 +32,7 @@ def notify(self, messages, chart_file):
 
         data = {'messages': json.dumps(messages)}
 
-        if chart_file != None and os.path.exists(chart_file):
+        if chart_file and os.path.exists(chart_file):
             files = {'chart': open(chart_file, 'rb')}
 
             if self.username and self.password:

app/requirements-step-1.txt

@@ -1,2 +1,2 @@
-numpy==1.14.0
-Cython==0.28.2
+numpy>=1.14.0
+Cython>=0.28.2

app/requirements-step-2.txt

@@ -1,18 +1,18 @@
-twilio==6.6.3
-ccxt==1.25.40
-structlog==17.2.0
-python-json-logger==0.1.8
-pandas==0.22.0
-stockstats==0.2.0
-TA-lib==0.4.17
-tabulate==0.8.2
-slackweb==1.0.5
-tenacity==4.8.0
-python-telegram-bot==10.0.1
-webcord==0.2
-jinja2==2.10
-requests==2.20.0
-PyYAML==3.12
-tulipy==0.2.1
-matplotlib==3.0.1
-scipy==1.1.0
+twilio>=6.6.3
+ccxt>=1.25.40
+structlog>=17.2.0
+python-json-logger>=0.1.8
+pandas>=0.22.0
+stockstats>=0.2.0
+TA-lib>=0.4.17
+tabulate>=0.8.2
+slackweb>=1.0.5
+tenacity>=4.8.0
+python-telegram-bot>=10.0.1
+webcord>=0.2
+jinja2>=2.10
+requests>=2.20.0
+PyYAML>=3.12
+tulipy>=0.2.1
+matplotlib>=3.0.1
+scipy>=1.1.0