Fix application state and add new optional config attribute: "initial_state"

* Move State handling to misc, to avoid circular imports
* Add optional config attribute "initial_state"

README.md

@@ -40,10 +40,14 @@ See the example below:
 For example value `-0.10` will cause immediate sell if the
 profit dips below -10% for a given trade. This parameter is optional.
 
+`initial_state` is an optional field that defines the initial application state.
+Possible values are `running` or `stopped`. (default=`running`)
+If the value is `stopped` the bot has to be started with `/start` first.
+
 The other values should be self-explanatory,
 if not feel free to raise a github issue.
 
-##### Prerequisites
+#### Prerequisites
 * python3.6
 * sqlite
 * [TA-lib](https://github.com/mrjbq7/ta-lib#dependencies) binaries

config.json.example

@@ -35,5 +35,6 @@
         "enabled": true,
         "token": "token",
         "chat_id": "chat_id"
-    }
+    },
+    "initial_state": "running"
 }

main.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-import enum
 import json
 import logging
 import time
@@ -8,13 +7,12 @@ from datetime import datetime
 from typing import Optional
 
 from jsonschema import validate
-from wrapt import synchronized
 
 import exchange
 import persistence
 from persistence import Trade
 from analyze import get_buy_signal
-from misc import CONF_SCHEMA
+from misc import CONF_SCHEMA, get_state, State, update_state
 from rpc import telegram
 
 logging.basicConfig(level=logging.DEBUG,
@@ -26,38 +24,8 @@ __copyright__ = "gcarq 2017"
 __license__ = "GPLv3"
 __version__ = "0.8.0"
 
-
-class State(enum.Enum):
-    RUNNING = 0
-    PAUSED = 1
-    TERMINATE = 2
-
-
 _CONF = {}
 
-# Current application state
-_STATE = State.RUNNING
-
-
-@synchronized
-def update_state(state: State) -> None:
-    """
-    Updates the application state
-    :param state: new state
-    :return: None
-    """
-    global _STATE
-    _STATE = state
-
-
-@synchronized
-def get_state() -> State:
-    """
-    Gets the current application state
-    :return:
-    """
-    return _STATE
-
 
 def _process() -> None:
     """
@@ -65,6 +33,7 @@ def _process() -> None:
     otherwise a new trade is created.
     :return: None
     """
+    try:
         # Query trades from persistence layer
         trades = Trade.query.filter(Trade.is_open.is_(True)).all()
         if len(trades) < _CONF['max_open_trades']:
@@ -84,25 +53,23 @@ def _process() -> None:
                     'No open orders found and trade is fulfilled. Marking %s as closed ...',
                     trade
                 )
+                Trade.session.flush()
 
         for trade in filter(lambda t: t.is_open, trades):
             # Check if there is already an open order for this trade
             orders = exchange.get_open_orders(trade.pair)
             orders = [o for o in orders if o['id'] == trade.open_order_id]
             if orders:
-            msg = 'There is an open order for {}: Order(total={}, remaining={}, type={}, id={})' \
+                logger.info('There is an open order for: %s', orders[0])
-                .format(
-                    trade,
-                    round(orders[0]['amount'], 8),
-                    round(orders[0]['remaining'], 8),
-                    orders[0]['type'],
-                    orders[0]['id'])
-            logger.info(msg)
             else:
                 # Update state
                 trade.open_order_id = None
                 # Check if we can sell our current pair
                 handle_trade(trade)
+                Trade.session.flush()
+    except (ConnectionError, json.JSONDecodeError) as error:
+        msg = 'Got {} in _process()'.format(error.__class__.__name__)
+        logger.exception(msg)
 
 
 def close_trade_if_fulfilled(trade: Trade) -> bool:
@@ -247,35 +214,43 @@ def init(config: dict, db_url: Optional[str] = None) -> None:
     persistence.init(config, db_url)
     exchange.init(config)
 
+    # Set initial application state
+    initial_state = config.get('initial_state')
+    if initial_state:
+        update_state(State[initial_state.upper()])
+    else:
+        update_state(State.STOPPED)
+
 
 def app(config: dict) -> None:
-
+    """
+    Main function which handles the application state
+    :param config: config as dict
+    :return: None
+    """
     logger.info('Starting freqtrade %s', __version__)
     init(config)
-
     try:
-        telegram.send_msg('*Status:* `trader started`')
+        old_state = get_state()
-        logger.info('Trader started')
+        logger.info('Initial State: %s', old_state)
+        telegram.send_msg('*Status:* `{}`'.format(old_state.name.lower()))
         while True:
-            state = get_state()
+            new_state = get_state()
-            if state == State.TERMINATE:
+            # Log state transition
-                return
+            if new_state != old_state:
-            elif state == State.PAUSED:
+                telegram.send_msg('*Status:* `{}`'.format(new_state.name.lower()))
+                logging.info('Changing state to: %s', new_state.name)
+
+            if new_state == State.STOPPED:
                 time.sleep(1)
-            elif state == State.RUNNING:
+            elif new_state == State.RUNNING:
-                try:
                 _process()
-                    Trade.session.flush()
+                # We need to sleep here because otherwise we would run into bittrex rate limit
-                except (ConnectionError, json.JSONDecodeError, ValueError) as error:
-                    msg = 'Got {} during _process()'.format(error.__class__.__name__)
-                    logger.exception(msg)
-                finally:
                 time.sleep(25)
-    except (RuntimeError, json.JSONDecodeError):
+            old_state = new_state
-        telegram.send_msg(
+    except RuntimeError:
-            '*Status:* Got RuntimeError: ```\n{}\n```'.format(traceback.format_exc())
+        telegram.send_msg('*Status:* Got RuntimeError: ```\n{}\n```'.format(traceback.format_exc()))
-        )
+        logger.exception('RuntimeError. Trader stopped!')
-        logger.exception('RuntimeError. Stopping trader ...')
     finally:
         telegram.send_msg('*Status:* `Trader has stopped`')
 

misc.py

@@ -1,3 +1,36 @@
+import enum
+
+from wrapt import synchronized
+
+
+class State(enum.Enum):
+    RUNNING = 0
+    STOPPED = 1
+
+
+# Current application state
+_STATE = State.STOPPED
+
+
+@synchronized
+def update_state(state: State) -> None:
+    """
+    Updates the application state
+    :param state: new state
+    :return: None
+    """
+    global _STATE
+    _STATE = state
+
+
+@synchronized
+def get_state() -> State:
+    """
+    Gets the current application state
+    :return:
+    """
+    return _STATE
+
 
 # Required json-schema for user specified config
 CONF_SCHEMA = {
@@ -25,7 +58,8 @@ CONF_SCHEMA = {
                 'chat_id': {'type': 'string'},
             },
             'required': ['enabled', 'token', 'chat_id']
-        }
+        },
+        'initial_state': {'type': 'string', 'enum': ['running', 'stopped']},
     },
     'definitions': {
         'exchange': {

rpc/telegram.py

@@ -8,6 +8,7 @@ from telegram.error import NetworkError
 from telegram.ext import CommandHandler, Updater
 from telegram import ParseMode, Bot, Update
 
+from misc import get_state, State, update_state
 from persistence import Trade
 
 import exchange
@@ -89,7 +90,6 @@ def _status(bot: Bot, update: Update) -> None:
     """
     # Fetch open trade
     trades = Trade.query.filter(Trade.is_open.is_(True)).all()
-    from main import get_state, State
     if get_state() != State.RUNNING:
         send_msg('*Status:* `trader is not running`', bot=bot)
     elif not trades:
@@ -200,7 +200,6 @@ def _start(bot: Bot, update: Update) -> None:
     :param update: message update
     :return: None
     """
-    from main import get_state, State, update_state
     if get_state() == State.RUNNING:
         send_msg('*Status:* `already running`', bot=bot)
     else:
@@ -216,10 +215,9 @@ def _stop(bot: Bot, update: Update) -> None:
     :param update: message update
     :return: None
     """
-    from main import get_state, State, update_state
     if get_state() == State.RUNNING:
         send_msg('`Stopping trader ...`', bot=bot)
-        update_state(State.PAUSED)
+        update_state(State.STOPPED)
     else:
         send_msg('*Status:* `already stopped`', bot=bot)
 
@@ -233,7 +231,6 @@ def _forcesell(bot: Bot, update: Update) -> None:
     :param update: message update
     :return: None
     """
-    from main import get_state, State
     if get_state() != State.RUNNING:
         send_msg('`trader is not running`', bot=bot)
         return
@@ -281,7 +278,6 @@ def _performance(bot: Bot, update: Update) -> None:
     :param update: message update
     :return: None
     """
-    from main import get_state, State
     if get_state() != State.RUNNING:
         send_msg('`trader is not running`', bot=bot)
         return

test/test_telegram.py

@@ -6,8 +6,8 @@ from jsonschema import validate
 from telegram import Bot, Update, Message, Chat
 
 import exchange
-from main import init, create_trade, update_state, State, get_state
+from main import init, create_trade
-from misc import CONF_SCHEMA
+from misc import CONF_SCHEMA, update_state, State, get_state
 from persistence import Trade
 from rpc.telegram import _status, _profit, _forcesell, _performance, _start, _stop
 
@@ -46,7 +46,8 @@ class TestTelegram(unittest.TestCase):
             "enabled": True,
             "token": "token",
             "chat_id": "0"
-        }
+        },
+        "initial_state": "running"
     }
 
     def test_1_status_handle(self):
@@ -165,8 +166,8 @@ class TestTelegram(unittest.TestCase):
             with patch.multiple('main.telegram', _CONF=self.conf, init=MagicMock(), send_msg=msg_mock):
                 init(self.conf, 'sqlite://')
 
-                update_state(State.PAUSED)
+                update_state(State.STOPPED)
-                self.assertEqual(get_state(), State.PAUSED)
+                self.assertEqual(get_state(), State.STOPPED)
                 _start(bot=MagicBot(), update=self.update)
                 self.assertEqual(get_state(), State.RUNNING)
                 self.assertEqual(msg_mock.call_count, 0)
@@ -180,7 +181,7 @@ class TestTelegram(unittest.TestCase):
                 update_state(State.RUNNING)
                 self.assertEqual(get_state(), State.RUNNING)
                 _stop(bot=MagicBot(), update=self.update)
-                self.assertEqual(get_state(), State.PAUSED)
+                self.assertEqual(get_state(), State.STOPPED)
                 self.assertEqual(msg_mock.call_count, 1)
                 self.assertIn('Stopping trader', msg_mock.call_args_list[0][0][0])