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

Convert to % as part of RPC to allow users to use unrounded ratio

Browse Source
This commit is contained in:
Matthias 2019-10-30 09:59:54 +01:00
parent 5ed7771148
commit b7b1e66c6e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/strategy-customization.md
View File

@ -415,7 +415,7 @@ At the top of the file, import Trade.
from freqtrade.persistence import Trade from freqtrade.persistence import Trade
``` ```
The following example queries for the current pair and trades from today, however other filters easily be added. The following example queries for the current pair and trades from today, however other filters can easily be added.
``` python ``` python
if self.config['runmode'] in ('live', 'dry_run'): if self.config['runmode'] in ('live', 'dry_run'):
@ -442,10 +442,10 @@ if self.config['runmode'] in ('live', 'dry_run'):
performance = Trade.get_overall_performance() performance = Trade.get_overall_performance()
``` ```
Sample return value: ETH/BTC had 5 trades, with a total profit of 1.5%. Sample return value: ETH/BTC had 5 trades, with a total profit of 1.5% (ratio of 0.015).
``` json ``` json
{'pair': "ETH/BTC", 'profit': 1.5, 'count': 5} {'pair': "ETH/BTC", 'profit': 0.015, 'count': 5}
``` ```
!!! Warning !!! Warning

4
freqtrade/persistence.py
View File

@ -437,7 +437,7 @@ class Trade(_DECL_BASE):
return total_open_stake_amount or 0 return total_open_stake_amount or 0
@staticmethod @staticmethod
def get_overall_performance() -> List[Dict]: def get_overall_performance() -> List[Dict[str, Any]]:
""" """
Returns List of dicts containing all Trades, including profit and trade count Returns List of dicts containing all Trades, including profit and trade count
""" """
@ -452,7 +452,7 @@ class Trade(_DECL_BASE):
return [ return [
{ {
'pair': pair, 'pair': pair,
'profit': round(rate * 100, 2), 'profit': rate,
'count': count 'count': count
} }
for pair, rate, count in pair_rates for pair, rate, count in pair_rates

7
freqtrade/rpc/rpc.py
View File

@ -428,12 +428,15 @@ class RPC:
else: else:
return None return None
def _rpc_performance(self) -> List[Dict]: def _rpc_performance(self) -> List[Dict[str, Any]]:
""" """
Handler for performance. Handler for performance.
Shows a performance statistic from finished trades Shows a performance statistic from finished trades
""" """
return Trade.get_overall_performance() pair_rates = Trade.get_overall_performance()
# Round and convert to %
[x.update({'profit': round(x['profit'] * 100, 2)}) for x in pair_rates]
return pair_rates
def _rpc_count(self) -> Dict[str, float]: def _rpc_count(self) -> Dict[str, float]:
""" Returns the number of trades running """ """ Returns the number of trades running """