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

improve data aggregation

Browse Source
This commit is contained in:
Gert Wohlgemuth 2018-06-05 13:59:45 -07:00
parent 7e8461b8fe
commit 19a525265f
3 changed files with 118 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
freqtrade/aws/backtesting_lambda.py
View File

@ -5,9 +5,9 @@ import tempfile
from base64 import urlsafe_b64encode
import simplejson as json
from requests import post
from freqtrade.optimize.backtesting import Backtesting
from requests import post
def backtest(event, context):
@ -38,7 +38,6 @@ def backtest(event, context):
"""
from boto3.dynamodb.conditions import Key
from freqtrade.aws.tables import get_strategy_table
import boto3
if 'Records' in event:
for x in event['Records']:
@ -59,11 +58,24 @@ def backtest(event, context):
till = datetime.datetime.today()
fromDate = till - datetime.timedelta(days=90)
if 'days' in event['body']:
fromDate = till - datetime.timedelta(days=event['body']['days'])
else:
if 'from' in event['body']:
fromDate = datetime.datetime.strptime(event['body']['from'], '%Y%m%d')
if 'till' in event['body']:
till = datetime.datetime.strptime(event['body']['till'], '%Y%m%d')
timerange = (till - fromDate).days
# by default we refresh data
refresh = True
if 'refresh' in event['body']:
refresh = event['body']
print("time range between dates is: {} days".format(timerange))
try:
if "Items" in response and len(response['Items']) > 0:
@ -72,12 +84,26 @@ def backtest(event, context):
'stake_currency'],
event['body'][
'assets']))
configuration = _generate_configuration(event, fromDate, name, response, till)
response = _submit_job(configuration, user)
configuration = _generate_configuration(event, fromDate, name, response, till, refresh)
ticker = response['Items'][0]['ticker']
if "ticker" in event['body']:
ticker = event['body']['ticker']
print("using ticker of {}".format(ticker))
if "local" in event['body'] and event['body']['local']:
print("running in local mode")
run_backtest(configuration, name, user, ticker, timerange)
return {
"statusCode": 200
}
else:
print("running in remote mode")
return {
"statusCode": 200,
"body": json.dumps(response)
"body": json.dumps(_submit_job(configuration, user, ticker, timerange))
}
else:
return {
@ -96,7 +122,7 @@ def backtest(event, context):
raise Exception("not a valid event: {}".format(event))
def _submit_job(configuration, user):
def _submit_job(configuration, user, interval, timerange):
"""
submits a new task to the cluster
@ -137,6 +163,14 @@ def _submit_job(configuration, user):
{
"name": "FREQ_CONFIG",
"value": "{}".format(configuration)
},
{
"name": "FREQ_TICKER",
"value": "{}".format(interval)
},
{
"name": "FREQ_TIMERANGE",
"value": "{}".format(timerange)
}
]
@ -145,12 +179,60 @@ def _submit_job(configuration, user):
return response
def run_backtest(configuration, name, user):
def run_backtest(configuration, name, user, interval, timerange):
"""
this backtests the specified evaluation
:param configuration:
:param name:
:param user:
:param interval:
:param timerange:
:return:
"""
configuration['ticker_interval'] = interval
backtesting = Backtesting(configuration)
result = backtesting.start()
for index, row in result.iterrows():
# store individual trades
_store_trade_data(interval, name, result, timerange, user)
# store aggregated values
_store_aggregated_data(interval, name, result, timerange, user)
return result
def _store_aggregated_data(interval, name, result, timerange, user):
for row in result[1][2]:
if row[1] > 0:
data = {
"id": "{}.{}:{}:test".format(user, name, row['currency'].upper()),
"id": "{}.{}:{}:{}:test".format(user, name, interval, timerange),
"trade": "aggregate:{}".format(row[0].upper()),
"pair": row[0],
"trades": row[1],
"losses": row[6],
"wins": row[5],
"duration": row[4],
"profit_percent": row[2],
}
print(data)
try:
print(
post("{}/trade".format(os.environ.get('BASE_URL', 'https://freq.isaac.international/dev')),
json=data))
except Exception as e:
print("submission ignored: {}".format(e))
def _store_trade_data(interval, name, result, timerange, user):
for index, row in result[0].iterrows():
data = {
"id": "{}.{}:{}:{}:{}:test".format(user, name, interval, timerange, row['currency'].upper()),
"trade": "{} to {}".format(row['entry'].strftime('%Y-%m-%d %H:%M:%S'),
row['exit'].strftime('%Y-%m-%d %H:%M:%S')),
"pair": row['currency'],
@ -161,15 +243,6 @@ def run_backtest(configuration, name, user):
"exit_date": row['exit'].strftime('%Y-%m-%d %H:%M:%S')
}
_submit_result_to_backend(data)
def _submit_result_to_backend(data):
"""
submits the given result to the backend system for further processing and analysis
:param data:
:return:
"""
print(data)
try:
print(
@ -177,9 +250,10 @@ def _submit_result_to_backend(data):
json=data))
except Exception as e:
print("submission ignored: {}".format(e))
return data
def _generate_configuration(event, fromDate, name, response, till):
def _generate_configuration(event, fromDate, name, response, till, refresh):
"""
generates the configuration for us on the fly
:param event:
@ -228,7 +302,7 @@ def _generate_configuration(event, fromDate, name, response, till):
"loglevel": logging.INFO,
"strategy": "{}:{}".format(name, content),
"timerange": "{}-{}".format(fromDate.strftime('%Y%m%d'), till.strftime('%Y%m%d')),
"refresh_pairs": False # no longer required, we will maintain static files for the future
"refresh_pairs": refresh
}
return configuration

4
freqtrade/optimize/backtesting.py
View File

@ -291,8 +291,8 @@ class Backtesting(object):
)
# return date for data storage
self.aggregate(data, results)
return results
table = self.aggregate(data, results)
return (results, table)
def setup_configuration(args: Namespace) -> Dict[str, Any]:

9
freqtrade/tests/aws/test_backtest.py
View File

@ -60,7 +60,10 @@ class MyFancyTestStrategy(IStrategy):
"description": "simple test strategy",
"name": "MyFancyTestStrategy",
"content": urlsafe_b64encode(content.encode('utf-8')),
"public": False
"public": False,
"days": 1,
"local": True
}
# now we add an entry
@ -154,7 +157,9 @@ class MyFancyTestStrategy(IStrategy):
"user": "GCU4LW2XXZW3A3FM2XZJTEJHNWHTWDKY2DIJLCZJ5ULVZ4K7LZ7D23TG",
"name": "MyFancyTestStrategy",
"stake_currency": "usdt",
"assets": ["ltc"]
"assets": ["ltc"],
"days": 2,
"local": True
}
assert backtest({