autopep8
This commit is contained in:
parent
7cdbd550c8
commit
1b6b0ad9d2
@ -197,11 +197,11 @@ def execute_sell(trade: Trade, limit: float) -> None:
|
||||
profit_trade = trade.calc_profit(rate=limit)
|
||||
|
||||
message = '*{exchange}:* Selling [{pair}]({pair_url}) with limit `{limit:.8f}`'.format(
|
||||
exchange=trade.exchange,
|
||||
pair=trade.pair.replace('_', '/'),
|
||||
pair_url=exchange.get_pair_detail_url(trade.pair),
|
||||
limit=limit
|
||||
)
|
||||
exchange=trade.exchange,
|
||||
pair=trade.pair.replace('_', '/'),
|
||||
pair_url=exchange.get_pair_detail_url(trade.pair),
|
||||
limit=limit
|
||||
)
|
||||
|
||||
# For regular case, when the configuration exists
|
||||
if 'stake_currency' in _CONF and 'fiat_display_currency' in _CONF:
|
||||
@ -213,12 +213,12 @@ def execute_sell(trade: Trade, limit: float) -> None:
|
||||
)
|
||||
message += '` ({gain}: {profit_percent:.2f}%, {profit_coin:.8f} {coin}`' \
|
||||
'` / {profit_fiat:.3f} {fiat})`'.format(
|
||||
gain="profit" if fmt_exp_profit > 0 else "loss",
|
||||
profit_percent=fmt_exp_profit,
|
||||
profit_coin=profit_trade,
|
||||
coin=_CONF['stake_currency'],
|
||||
profit_fiat=profit_fiat,
|
||||
fiat=_CONF['fiat_display_currency'],
|
||||
gain="profit" if fmt_exp_profit > 0 else "loss",
|
||||
profit_percent=fmt_exp_profit,
|
||||
profit_coin=profit_trade,
|
||||
coin=_CONF['stake_currency'],
|
||||
profit_fiat=profit_fiat,
|
||||
fiat=_CONF['fiat_display_currency'],
|
||||
)
|
||||
# Because telegram._forcesell does not have the configuration
|
||||
# Ignore the FIAT value and does not show the stake_currency as well
|
||||
|
@ -122,20 +122,20 @@ def backtest(stake_amount: float, processed: Dict[str, DataFrame],
|
||||
if min_roi_reached(trade, row2.close, row2.date) or \
|
||||
(row2.sell == 1 and use_sell_signal) or \
|
||||
current_profit_percent <= stoploss:
|
||||
current_profit_btc = trade.calc_profit(rate=row2.close)
|
||||
lock_pair_until = row2.Index
|
||||
current_profit_btc = trade.calc_profit(rate=row2.close)
|
||||
lock_pair_until = row2.Index
|
||||
|
||||
trades.append(
|
||||
(
|
||||
pair,
|
||||
current_profit_percent,
|
||||
current_profit_btc,
|
||||
row2.Index - row.Index,
|
||||
current_profit_btc > 0,
|
||||
current_profit_btc < 0
|
||||
)
|
||||
trades.append(
|
||||
(
|
||||
pair,
|
||||
current_profit_percent,
|
||||
current_profit_btc,
|
||||
row2.Index - row.Index,
|
||||
current_profit_btc > 0,
|
||||
current_profit_btc < 0
|
||||
)
|
||||
break
|
||||
)
|
||||
break
|
||||
labels = ['currency', 'profit_percent', 'profit_BTC', 'duration', 'profit', 'loss']
|
||||
return DataFrame.from_records(trades, columns=labels)
|
||||
|
||||
@ -193,6 +193,6 @@ def start(args):
|
||||
use_sell_signal=config.get('experimental', {}).get('use_sell_signal', False)
|
||||
)
|
||||
logger.info(
|
||||
'\n==================================== BACKTESTING REPORT ====================================\n%s', # noqa
|
||||
'\n==================================== BACKTESTING REPORT ====================================\n%s', # noqa
|
||||
generate_text_table(data, results, config['stake_currency'], args.ticker_interval)
|
||||
)
|
||||
|
@ -194,7 +194,7 @@ def format_results(results: DataFrame):
|
||||
results.profit_percent.mean() * 100.0,
|
||||
results.profit_BTC.sum(),
|
||||
results.duration.mean() * 5,
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def buy_strategy_generator(params):
|
||||
|
@ -255,7 +255,7 @@ def _daily(bot: Bot, update: Update) -> None:
|
||||
),
|
||||
symbol=_CONF['fiat_display_currency']
|
||||
)
|
||||
]
|
||||
]
|
||||
for key, value in profit_days.items()
|
||||
]
|
||||
stats = tabulate(stats,
|
||||
|
@ -6,7 +6,7 @@ from shutil import copyfile
|
||||
from freqtrade import exchange, optimize
|
||||
from freqtrade.exchange import Bittrex
|
||||
from freqtrade.optimize.__init__ import make_testdata_path, download_pairs,\
|
||||
download_backtesting_testdata, load_tickerdata_file
|
||||
download_backtesting_testdata, load_tickerdata_file
|
||||
|
||||
# Change this if modifying BTC_UNITEST testdatafile
|
||||
_btc_unittest_length = 13681
|
||||
|
@ -25,51 +25,51 @@ def whitelist_conf():
|
||||
|
||||
def get_market_summaries():
|
||||
return [{
|
||||
"MarketName": "BTC-TKN",
|
||||
"High": 0.00000919,
|
||||
"Low": 0.00000820,
|
||||
"Volume": 74339.61396015,
|
||||
"Last": 0.00000820,
|
||||
"BaseVolume": 1664,
|
||||
"TimeStamp": "2014-07-09T07:19:30.15",
|
||||
"Bid": 0.00000820,
|
||||
"Ask": 0.00000831,
|
||||
"OpenBuyOrders": 15,
|
||||
"OpenSellOrders": 15,
|
||||
"PrevDay": 0.00000821,
|
||||
"Created": "2014-03-20T06:00:00",
|
||||
"DisplayMarketName": ""
|
||||
}, {
|
||||
"MarketName": "BTC-ETH",
|
||||
"High": 0.00000072,
|
||||
"Low": 0.00000001,
|
||||
"Volume": 166340678.42280999,
|
||||
"Last": 0.00000005,
|
||||
"BaseVolume": 42,
|
||||
"TimeStamp": "2014-07-09T07:21:40.51",
|
||||
"Bid": 0.00000004,
|
||||
"Ask": 0.00000005,
|
||||
"OpenBuyOrders": 18,
|
||||
"OpenSellOrders": 18,
|
||||
"PrevDay": 0.00000002,
|
||||
"Created": "2014-05-30T07:57:49.637",
|
||||
"DisplayMarketName": ""
|
||||
}, {
|
||||
"MarketName": "BTC-BLK",
|
||||
"High": 0.00000072,
|
||||
"Low": 0.00000001,
|
||||
"Volume": 166340678.42280999,
|
||||
"Last": 0.00000005,
|
||||
"BaseVolume": 3,
|
||||
"TimeStamp": "2014-07-09T07:21:40.51",
|
||||
"Bid": 0.00000004,
|
||||
"Ask": 0.00000005,
|
||||
"OpenBuyOrders": 18,
|
||||
"OpenSellOrders": 18,
|
||||
"PrevDay": 0.00000002,
|
||||
"Created": "2014-05-30T07:57:49.637",
|
||||
"DisplayMarketName": ""
|
||||
}
|
||||
"MarketName": "BTC-TKN",
|
||||
"High": 0.00000919,
|
||||
"Low": 0.00000820,
|
||||
"Volume": 74339.61396015,
|
||||
"Last": 0.00000820,
|
||||
"BaseVolume": 1664,
|
||||
"TimeStamp": "2014-07-09T07:19:30.15",
|
||||
"Bid": 0.00000820,
|
||||
"Ask": 0.00000831,
|
||||
"OpenBuyOrders": 15,
|
||||
"OpenSellOrders": 15,
|
||||
"PrevDay": 0.00000821,
|
||||
"Created": "2014-03-20T06:00:00",
|
||||
"DisplayMarketName": ""
|
||||
}, {
|
||||
"MarketName": "BTC-ETH",
|
||||
"High": 0.00000072,
|
||||
"Low": 0.00000001,
|
||||
"Volume": 166340678.42280999,
|
||||
"Last": 0.00000005,
|
||||
"BaseVolume": 42,
|
||||
"TimeStamp": "2014-07-09T07:21:40.51",
|
||||
"Bid": 0.00000004,
|
||||
"Ask": 0.00000005,
|
||||
"OpenBuyOrders": 18,
|
||||
"OpenSellOrders": 18,
|
||||
"PrevDay": 0.00000002,
|
||||
"Created": "2014-05-30T07:57:49.637",
|
||||
"DisplayMarketName": ""
|
||||
}, {
|
||||
"MarketName": "BTC-BLK",
|
||||
"High": 0.00000072,
|
||||
"Low": 0.00000001,
|
||||
"Volume": 166340678.42280999,
|
||||
"Last": 0.00000005,
|
||||
"BaseVolume": 3,
|
||||
"TimeStamp": "2014-07-09T07:21:40.51",
|
||||
"Bid": 0.00000004,
|
||||
"Ask": 0.00000005,
|
||||
"OpenBuyOrders": 18,
|
||||
"OpenSellOrders": 18,
|
||||
"PrevDay": 0.00000002,
|
||||
"Created": "2014-05-30T07:57:49.637",
|
||||
"DisplayMarketName": ""
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
|
@ -624,54 +624,54 @@ def test_sell_profit_only_disable_profit(default_conf, limit_buy_order, mocker):
|
||||
|
||||
|
||||
def test_sell_profit_only_enable_loss(default_conf, limit_buy_order, mocker):
|
||||
default_conf['experimental'] = {
|
||||
'use_sell_signal': True,
|
||||
'sell_profit_only': True,
|
||||
}
|
||||
default_conf['experimental'] = {
|
||||
'use_sell_signal': True,
|
||||
'sell_profit_only': True,
|
||||
}
|
||||
|
||||
mocker.patch.dict('freqtrade.main._CONF', default_conf)
|
||||
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
|
||||
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True)
|
||||
mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
|
||||
mocker.patch.multiple('freqtrade.main.exchange',
|
||||
validate_pairs=MagicMock(),
|
||||
get_ticker=MagicMock(return_value={
|
||||
'bid': 0.00000172,
|
||||
'ask': 0.00000173,
|
||||
'last': 0.00000172
|
||||
}),
|
||||
buy=MagicMock(return_value='mocked_limit_buy'))
|
||||
mocker.patch.dict('freqtrade.main._CONF', default_conf)
|
||||
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
|
||||
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True)
|
||||
mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
|
||||
mocker.patch.multiple('freqtrade.main.exchange',
|
||||
validate_pairs=MagicMock(),
|
||||
get_ticker=MagicMock(return_value={
|
||||
'bid': 0.00000172,
|
||||
'ask': 0.00000173,
|
||||
'last': 0.00000172
|
||||
}),
|
||||
buy=MagicMock(return_value='mocked_limit_buy'))
|
||||
|
||||
init(default_conf, create_engine('sqlite://'))
|
||||
create_trade(0.001)
|
||||
init(default_conf, create_engine('sqlite://'))
|
||||
create_trade(0.001)
|
||||
|
||||
trade = Trade.query.first()
|
||||
trade.update(limit_buy_order)
|
||||
assert handle_trade(trade) is False
|
||||
trade = Trade.query.first()
|
||||
trade.update(limit_buy_order)
|
||||
assert handle_trade(trade) is False
|
||||
|
||||
|
||||
def test_sell_profit_only_disable_loss(default_conf, limit_buy_order, mocker):
|
||||
default_conf['experimental'] = {
|
||||
'use_sell_signal': True,
|
||||
'sell_profit_only': False,
|
||||
}
|
||||
default_conf['experimental'] = {
|
||||
'use_sell_signal': True,
|
||||
'sell_profit_only': False,
|
||||
}
|
||||
|
||||
mocker.patch.dict('freqtrade.main._CONF', default_conf)
|
||||
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
|
||||
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True)
|
||||
mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
|
||||
mocker.patch.multiple('freqtrade.main.exchange',
|
||||
validate_pairs=MagicMock(),
|
||||
get_ticker=MagicMock(return_value={
|
||||
'bid': 0.00000172,
|
||||
'ask': 0.00000173,
|
||||
'last': 0.00000172
|
||||
}),
|
||||
buy=MagicMock(return_value='mocked_limit_buy'))
|
||||
mocker.patch.dict('freqtrade.main._CONF', default_conf)
|
||||
mocker.patch('freqtrade.main.min_roi_reached', return_value=False)
|
||||
mocker.patch('freqtrade.main.get_signal', side_effect=lambda s, t: True)
|
||||
mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
|
||||
mocker.patch.multiple('freqtrade.main.exchange',
|
||||
validate_pairs=MagicMock(),
|
||||
get_ticker=MagicMock(return_value={
|
||||
'bid': 0.00000172,
|
||||
'ask': 0.00000173,
|
||||
'last': 0.00000172
|
||||
}),
|
||||
buy=MagicMock(return_value='mocked_limit_buy'))
|
||||
|
||||
init(default_conf, create_engine('sqlite://'))
|
||||
create_trade(0.001)
|
||||
init(default_conf, create_engine('sqlite://'))
|
||||
create_trade(0.001)
|
||||
|
||||
trade = Trade.query.first()
|
||||
trade.update(limit_buy_order)
|
||||
assert handle_trade(trade) is True
|
||||
trade = Trade.query.first()
|
||||
trade.update(limit_buy_order)
|
||||
assert handle_trade(trade) is True
|
||||
|
@ -8,7 +8,7 @@ import pytest
|
||||
from jsonschema import ValidationError
|
||||
|
||||
from freqtrade.misc import throttle, parse_args, load_config,\
|
||||
parse_args_common
|
||||
parse_args_common
|
||||
|
||||
|
||||
def test_throttle():
|
||||
|
Loading…
Reference in New Issue
Block a user