adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use tabulate for /count

Browse Source
This commit is contained in:
gcarq
2017-11-09 23:45:03 +01:00
parent 6ff26c561a
commit 013e13e546
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/rpc/telegram.py
View File

@@ -347,7 +347,7 @@ def _forcesell(bot: Bot, update: Update) -> None:
Trade.is_open.is_(True) Trade.is_open.is_(True)
)).first() )).first()
if not trade: if not trade:
send_msg('Invalid argument. Usage: `/forcesell <trade_id>`') send_msg('Invalid argument. See `/help` to view usage')
logger.warning('/forcesell: Invalid argument received') logger.warning('/forcesell: Invalid argument received')
return return
# Get current rate # Get current rate
@@ -400,8 +400,12 @@ def _count(bot: Bot, update: Update) -> None:
return return
trades = Trade.query.filter(Trade.is_open.is_(True)).all() trades = Trade.query.filter(Trade.is_open.is_(True)).all()
message = '<b>Count:</b>\ncurrent/max\n{}/{}\n'.format(len(trades), _CONF['max_open_trades'])
message = tabulate({
'current': [len(trades)],
'max': [_CONF['max_open_trades']]
}, headers=['current', 'max'], tablefmt='simple')
message = "<pre>{}</pre>".format(message)
logger.debug(message) logger.debug(message)
send_msg(message, parse_mode=ParseMode.HTML) send_msg(message, parse_mode=ParseMode.HTML)

42
freqtrade/tests/test_telegram.py
View File

@@ -5,6 +5,7 @@ from random import randint
from unittest.mock import MagicMock from unittest.mock import MagicMock
import pytest import pytest
from sqlalchemy import create_engine
from telegram import Update, Message, Chat from telegram import Update, Message, Chat
from telegram.error import NetworkError from telegram.error import NetworkError
@@ -86,7 +87,7 @@ def test_status_handle(default_conf, update, ticker, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker) get_ticker=ticker)
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.STOPPED) update_state(State.STOPPED)
_status(bot=MagicMock(), update=update) _status(bot=MagicMock(), update=update)
@@ -126,7 +127,7 @@ def test_status_table_handle(default_conf, update, ticker, mocker):
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker, get_ticker=ticker,
buy=MagicMock(return_value='mocked_order_id')) buy=MagicMock(return_value='mocked_order_id'))
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.STOPPED) update_state(State.STOPPED)
_status_table(bot=MagicMock(), update=update) _status_table(bot=MagicMock(), update=update)
assert msg_mock.call_count == 1 assert msg_mock.call_count == 1
@@ -167,7 +168,7 @@ def test_profit_handle(default_conf, update, ticker, limit_buy_order, limit_sell
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker) get_ticker=ticker)
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
_profit(bot=MagicMock(), update=update) _profit(bot=MagicMock(), update=update)
assert msg_mock.call_count == 1 assert msg_mock.call_count == 1
@@ -211,7 +212,7 @@ def test_forcesell_handle(default_conf, update, ticker, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker) get_ticker=ticker)
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
# Create some test data # Create some test data
trade = create_trade(15.0) trade = create_trade(15.0)
@@ -239,7 +240,7 @@ def test_forcesell_all_handle(default_conf, update, ticker, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker) get_ticker=ticker)
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
# Create some test data # Create some test data
for _ in range(4): for _ in range(4):
@@ -266,7 +267,7 @@ def test_forcesell_handle_invalid(default_conf, update, mocker):
send_msg=msg_mock) send_msg=msg_mock)
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock()) validate_pairs=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
# Trader is not running # Trader is not running
update_state(State.STOPPED) update_state(State.STOPPED)
@@ -304,7 +305,7 @@ def test_performance_handle(
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker) get_ticker=ticker)
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
# Create some test data # Create some test data
trade = create_trade(15.0) trade = create_trade(15.0)
@@ -340,7 +341,7 @@ def test_count_handle(default_conf, update, ticker, mocker):
validate_pairs=MagicMock(), validate_pairs=MagicMock(),
get_ticker=ticker, get_ticker=ticker,
buy=MagicMock(return_value='mocked_order_id')) buy=MagicMock(return_value='mocked_order_id'))
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.STOPPED) update_state(State.STOPPED)
_count(bot=MagicMock(), update=update) _count(bot=MagicMock(), update=update)
assert msg_mock.call_count == 1 assert msg_mock.call_count == 1
@@ -349,17 +350,16 @@ def test_count_handle(default_conf, update, ticker, mocker):
update_state(State.RUNNING) update_state(State.RUNNING)
# Create some test data # Create some test data
trade = create_trade(15.0) Trade.session.add(create_trade(15.0))
trade2 = create_trade(15.0)
assert trade
assert trade2
Trade.session.add(trade)
Trade.session.add(trade2)
Trade.session.flush() Trade.session.flush()
msg_mock.reset_mock()
_count(bot=MagicMock(), update=update) _count(bot=MagicMock(), update=update)
line = msg_mock.call_args_list[-1][0][0].split("\n")
assert line[2] == '{}/{}'.format(2, default_conf['max_open_trades']) msg = '<pre> current max\n--------- -----\n 1 {}</pre>'.format(
default_conf['max_open_trades']
)
assert msg in msg_mock.call_args_list[0][0][0]
def test_performance_handle_invalid(default_conf, update, mocker): def test_performance_handle_invalid(default_conf, update, mocker):
@@ -372,7 +372,7 @@ def test_performance_handle_invalid(default_conf, update, mocker):
send_msg=msg_mock) send_msg=msg_mock)
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
validate_pairs=MagicMock()) validate_pairs=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
# Trader is not running # Trader is not running
update_state(State.STOPPED) update_state(State.STOPPED)
@@ -391,7 +391,7 @@ def test_start_handle(default_conf, update, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
_CONF=default_conf, _CONF=default_conf,
init=MagicMock()) init=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.STOPPED) update_state(State.STOPPED)
assert get_state() == State.STOPPED assert get_state() == State.STOPPED
_start(bot=MagicMock(), update=update) _start(bot=MagicMock(), update=update)
@@ -409,7 +409,7 @@ def test_start_handle_already_running(default_conf, update, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
_CONF=default_conf, _CONF=default_conf,
init=MagicMock()) init=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.RUNNING) update_state(State.RUNNING)
assert get_state() == State.RUNNING assert get_state() == State.RUNNING
_start(bot=MagicMock(), update=update) _start(bot=MagicMock(), update=update)
@@ -428,7 +428,7 @@ def test_stop_handle(default_conf, update, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
_CONF=default_conf, _CONF=default_conf,
init=MagicMock()) init=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.RUNNING) update_state(State.RUNNING)
assert get_state() == State.RUNNING assert get_state() == State.RUNNING
_stop(bot=MagicMock(), update=update) _stop(bot=MagicMock(), update=update)
@@ -447,7 +447,7 @@ def test_stop_handle_already_stopped(default_conf, update, mocker):
mocker.patch.multiple('freqtrade.main.exchange', mocker.patch.multiple('freqtrade.main.exchange',
_CONF=default_conf, _CONF=default_conf,
init=MagicMock()) init=MagicMock())
init(default_conf, 'sqlite://') init(default_conf, create_engine('sqlite://'))
update_state(State.STOPPED) update_state(State.STOPPED)
assert get_state() == State.STOPPED assert get_state() == State.STOPPED
_stop(bot=MagicMock(), update=update) _stop(bot=MagicMock(), update=update)