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

fixed some format issues and added better logging

Browse Source
This commit is contained in:
Gert Wohlgemuth 2018-05-24 16:58:09 -07:00
parent beb45bc58f
commit 86de538d9e
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
freqtrade/aws/backtesting_lambda.py
View File

@ -69,13 +69,13 @@ def backtest(event, context):
if "Items" in response and len(response['Items']) > 0:
print("backtesting from {} till {} for {} with {} vs {}".format(yesterday, today, name,
response['Items'][0][
event['body'][
'stake_currency'],
response['Items'][0]['assets']))
event['body']['asset']))
content = response['Items'][0]['content']
configuration = {
"max_open_trades": 1,
"stake_currency": response['Items'][0]['stake_currency'],
"stake_currency": event['body']['stake_currency'].upper(),
"stake_amount": 1,
"fiat_display_currency": "USD",
"unfilledtimeout": 600,
@ -88,9 +88,11 @@ def backtest(event, context):
"enabled": True,
"key": "key",
"secret": "secret",
"pair_whitelist": list(
map(lambda x: "{}/{}".format(x, response['Items'][0]['stake_currency']).upper(),
response['Items'][0]['assets']))
"pair_whitelist": [
"{}/{}".format(event['body']['asset'].upper(),
event['body']['stake_currency']).upper(),
]
},
"telegram": {
"enabled": False,
@ -191,29 +193,32 @@ def cron(event, context):
for i in response['Items']:
# fire a message to our queue
print(i)
message = {
"user": i['user'],
"name": i['name']
}
for x in i['assets']:
# triggered over html, let's provide
# a date range for the backtesting
if 'pathParameters' in event:
if 'from' in event['pathParameters']:
message['from'] = event['pathParameters']['from']
if 'till' in event['pathParameters']:
message['till'] = event['pathParameters']['till']
message = {
"user": i['user'],
"name": i['name'],
"asset": x,
"stake_currency": i['stake_currency']
}
serialized = json.dumps(message, use_decimal=True)
# submit item to queue for routing to the correct persistence
# triggered over html, let's provide
# a date range for the backtesting
if 'pathParameters' in event:
if 'from' in event['pathParameters']:
message['from'] = event['pathParameters']['from']
if 'till' in event['pathParameters']:
message['till'] = event['pathParameters']['till']
result = client.publish(
TopicArn=topic_arn,
Message=json.dumps({'default': serialized}),
Subject="schedule backtesting",
MessageStructure='json'
)
serialized = json.dumps(message, use_decimal=True)
# submit item to queue for routing to the correct persistence
result = client.publish(
TopicArn=topic_arn,
Message=json.dumps({'default': serialized}),
Subject="schedule backtesting",
MessageStructure='json'
)
if 'LastEvaluatedKey' in response:
return table.scan(

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

@ -71,7 +71,9 @@ class MyFancyTestStrategy(IStrategy):
"user": "GCU4LW2XXZW3A3FM2XZJTEJHNWHTWDKY2DIJLCZJ5ULVZ4K7LZ7D23TG",
"name": "MyFancyTestStrategy",
"from": "20180401",
"till": "20180501"
"till": "20180501",
"stake_currency": "usdt",
"asset": "ltc"
}
@ -163,7 +165,9 @@ class MyFancyTestStrategy(IStrategy):
# build sns request
request = {
"user": "GCU4LW2XXZW3A3FM2XZJTEJHNWHTWDKY2DIJLCZJ5ULVZ4K7LZ7D23TG",
"name": "MyFancyTestStrategy"
"name": "MyFancyTestStrategy",
"stake_currency": "usdt",
"asset": "ltc"
}
data = json.loads(backtest({
@ -184,9 +188,7 @@ class MyFancyTestStrategy(IStrategy):
data = get_trades({
'pathParameters': {
'user': "GCU4LW2XXZW3A3FM2XZJTEJHNWHTWDKY2DIJLCZJ5ULVZ4K7LZ7D23TG",
"name": "MyFancyTestStrategy",
'stake': "USDT",
'asset': "{}".format(data[0]['pair'].split("/")[0])
"name": "MyFancyTestStrategy"
}
}, {})['body']
print(data)