Allow conditional notifications

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: ''
+assignees: w1ld3r
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. git clone '...'
+2. docker build -t dev/crypto-signals:latest .
+3. docker run '....'
+4. Error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**config.yml**
+```yml
+settings:
+log_level: INFO
+[...]
+```
+
+**Machine**
+ - OS name and version
+ - crypto-signal branch
+ - Docker version
+
+**Additional context**
+Add any other context about the problem here.
+For example if any modification of the code as been made
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE] ..."
+labels: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:latest
 
 # 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
@@ -10,13 +10,11 @@ RUN cd /tmp && \
   make && \
   make install
 
-ADD app/requirements-step-1.txt /app/requirements-step-1.txt
-ADD app/requirements-step-2.txt /app/requirements-step-2.txt
+COPY ./app /app
+
 WORKDIR /app
 
-# Pip doesn't install requirements sequentially.
-# To ensure pre-reqs are installed in the correct
-# order they have been split into two files
+RUN pip install --upgrade pip
 RUN pip install -r requirements-step-1.txt
 RUN pip install -r requirements-step-2.txt
 

README.md

@@ -19,23 +19,19 @@ Development branch to testing new features. This develop version has a lot of im
 
 
 ## Installing And Running
-Because this is a development branch you need to build your custom Docker image. The commands listed below are intended to be run in a terminal.
+The commands listed below are intended to be run in a terminal.
 
 Be sure you have git installed in your system.
 
-1. Clone this repo `git clone https://github.com/CryptoSignal/crypto-signal.git`
+1. Clone this repo `git clone https://github.com/w1ld3r/crypto-signal.git`
 
 1. Enter to cripto-signal folder `cd crypto-signal`
 
 1. Switch to develop branch `git checkout develop`
 
 1. Create a config.yml file and put it into "app" folder.
 
-1. Build your own Docker image, for example, `docker build -t dev/crypto-signals:latest .`
-
-1. For testing and debugging run docker with "-t" option `docker run --rm -ti -v  $PWD/app:/app dev/crypto-signals:latest`
-
-1. For production run in daemon mode using "-d" option `docker run --rm -di -v  $PWD/app:/app dev/crypto-signals:latest`
+1. Build and run the docker container: `docker-compose up --build`
 
 
 ### Configuring config.yml
@@ -125,7 +121,7 @@ exchanges:
 
 #### Show me the price!
 
-If you want prices in your notification messages, you can use the "prices" variable.
+If you want prices in your notification messages, you can use the "prices" variable or "price_value".
 
 ```
 notifiers:
@@ -138,6 +134,17 @@ notifiers:
             template: "[{{analysis.config.candle_period}}] {{market}} {{values}} Prices: [{{prices}}]"
 ```
 
+```
+notifiers:
+    telegram:
+        required:
+            token: 791615820:AAGFgGSumWUrb-CyXtGxzAuYaabababababababa
+            chat_id: 687950000
+        optional:
+            parse_mode: html
+            template: "[{{analysis.config.candle_period}}] {{market}} {{values}} Price 15m low: [{{price_value['15m'].low}}]"
+```
+
 By the way, to have this feature you need to configure "ohlcv" informant for each candle period of your indicators.
 
 ```
@@ -723,8 +730,7 @@ informants:
             - low
             - close
           candle_period: 4h
-          period_count: 14
-
+          period_count: 14  
 ```
 
 Then you can use the "price_value" variable to have the values of prices and be able to do some operations on them.
@@ -738,9 +744,9 @@ notifiers:
         optional:
             parse_mode: html
             template: "{{ market }} 
-            BUY {{ price_value.close }} 
-            SL: {{ decimal_format|format(price_value.low * 0.9) }} 
-            TP: {{ decimal_format|format(price_value.close * 1.02) }} {{ decimal_format|format(price_value.close * 1.04) }} "
+            BUY {{ price_value['1h'].close }} 
+            SL: {{ decimal_format|format(price_value['4h'].low * 0.9) }} 
+            TP: {{ decimal_format|format(price_value['1h'].close * 1.02) }} {{ decimal_format|format(price_value['4h'].close * 1.04) }} "
 ```
 
 The code for "decimal_format" and "format" is necessary to obtain the prices formatted with the corresponding zeros.

app/analyzers/indicators/ichimoku.py

@@ -76,8 +76,8 @@ def analyze(self, historical_data, tenkansen_period, kijunsen_period, senkou_spa
             last_time = dataframe.index[-1]
             timedelta = dataframe.index[1] - dataframe.index[0]
             newindex = pandas.date_range(last_time + timedelta,
-                                            freq=timedelta,
-                                            periods=cloud_displacement)
+                                         freq=timedelta,
+                                         periods=cloud_displacement)
             ichimoku_values = ichimoku_values.append(
                 pandas.DataFrame(index=newindex))
             # cloud offset
@@ -133,4 +133,4 @@ def analyze(self, historical_data, tenkansen_period, kijunsen_period, senkou_spa
         except Exception as e:
             print('Error running ichimoku analysis: {}'.format(e))
 
-        return ichimoku_values
+        return ichimoku_values

app/app.py

@@ -50,7 +50,7 @@ def main():
                 key: market_data[exchange][key] for key in chunk}
 
             notifier = Notifier(
-                config.notifiers, config.indicators, market_data_chunk)
+                config.notifiers, config.indicators, config.conditionals, market_data_chunk)
             behaviour = Behaviour(config, exchange_interface, notifier)
 
             workerName = "Worker-{}".format(num)

app/behaviour.py

@@ -347,23 +347,25 @@ def _get_crossover_results(self, new_result):
                 if not crossover_conf['enabled']:
                     self.logger.debug("%s is disabled, skipping.", crossover)
                     continue
-
-                key_indicator = new_result[crossover_conf['key_indicator_type']
-                                           ][crossover_conf['key_indicator']][crossover_conf['key_indicator_index']]
-                crossed_indicator = new_result[crossover_conf['crossed_indicator_type']
-                                               ][crossover_conf['crossed_indicator']][crossover_conf['crossed_indicator_index']]
-
-                crossover_conf['candle_period'] = crossover_conf['key_indicator'] + \
-                    str(crossover_conf['key_indicator_index'])
-
-                dispatcher_args = {
-                    'key_indicator': key_indicator['result'],
-                    'key_signal': crossover_conf['key_signal'],
-                    'key_indicator_index': crossover_conf['key_indicator_index'],
-                    'crossed_indicator': crossed_indicator['result'],
-                    'crossed_signal': crossover_conf['crossed_signal'],
-                    'crossed_indicator_index': crossover_conf['crossed_indicator_index']
-                }
+                try:
+                    key_indicator = new_result[crossover_conf['key_indicator_type']][crossover_conf['key_indicator']][crossover_conf['key_indicator_index']]
+                    crossed_indicator = new_result[crossover_conf['crossed_indicator_type']][crossover_conf['crossed_indicator']][crossover_conf['crossed_indicator_index']]
+
+                    crossover_conf['candle_period'] = crossover_conf['key_indicator'] + \
+                        str(crossover_conf['key_indicator_index'])
+
+                    dispatcher_args = {
+                        'key_indicator': key_indicator['result'],
+                        'key_signal': crossover_conf['key_signal'],
+                        'key_indicator_index': crossover_conf['key_indicator_index'],
+                        'crossed_indicator': crossed_indicator['result'],
+                        'crossed_signal': crossover_conf['crossed_signal'],
+                        'crossed_indicator_index': crossover_conf['crossed_indicator_index']
+                    }
+                except Exception as e:
+                    self.logger.warning(e)
+                    self.logger.warning(traceback.format_exc())
+                    continue
 
                 results[crossover].append({
                     'result': crossover_dispatcher[crossover](**dispatcher_args),

app/conf.py

@@ -58,6 +58,11 @@ def __init__(self):
             self.exchanges = user_config['exchanges']
         else:
             self.exchanges = dict()
+
+        if 'conditionals' in user_config:
+            self.conditionals = user_config['conditionals']
+        else:
+            self.conditionals = None
 
         for exchange in ccxt.exchanges:
             if exchange not in self.exchanges:

app/defaults.yml

@@ -36,8 +36,9 @@ notifiers:
       webhook: null
     optional:
       template: "{{exchange}}-{{market}}-{{indicator}}-{{indicator_number}} is {{status}}!{{ '\n' -}}"
-  gmail:
+  email:
     required:
+      smtp_server: null
       username: null
       password: null
       destination_emails: null

app/exchange.py

@@ -32,9 +32,11 @@ def __init__(self, exchange_config):
         # Loads the exchanges using ccxt.
         for exchange in exchange_config:
             if exchange_config[exchange]['required']['enabled']:
-                new_exchange = getattr(ccxt, exchange)({
-                    "enableRateLimit": True
-                })
+                parameters = {'enableRateLimit': True}
+                if 'future' in exchange_config[exchange].keys():
+                    if exchange_config[exchange]['future'] == True:
+                        parameters['options'] = {'defaultType': 'future'}
+                new_exchange = getattr(ccxt, exchange)(parameters)
 
                 # sets up api permissions for user if given
                 if new_exchange: