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

Rename persistant storage infrastructure.

Browse Source
This commit is contained in:
eSeR1805
2022-06-19 15:56:50 +03:00
parent 0009b987e4
commit 9fdb8b07ac
10 changed files with 123 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
freqtrade/rpc/rpc.py
View File

@@ -805,24 +805,24 @@ class RPC:
'cancel_order_count': c_count,
}
def _rpc_list_kvals(self, trade_id: int, key: Optional[str]) -> List[Dict[str, Any]]:
def _rpc_list_custom_data(self, trade_id: int, key: Optional[str]) -> List[Dict[str, Any]]:
# Query for trade
trade = Trade.get_trades(trade_filter=[Trade.id == trade_id]).first()
if trade is None:
return []
# Query keyvals
keyvals = trade.get_kvals(key=key)
# Query custom_data
custom_data = trade.get_custom_data(key=key)
return [
{
'id': kval.id,
'ft_trade_id': kval.ft_trade_id,
'kv_key': kval.kv_key,
'kv_type': kval.kv_type,
'kv_value': kval.kv_value,
'created_at': kval.created_at,
'updated_at': kval.updated_at
'id': data_entry.id,
'ft_trade_id': data_entry.ft_trade_id,
'cd_key': data_entry.cd_key,
'cd_type': data_entry.cd_type,
'cd_value': data_entry.cd_value,
'created_at': data_entry.created_at,
'updated_at': data_entry.updated_at
}
for kval in keyvals
for data_entry in custom_data
]
def _rpc_performance(self) -> List[Dict[str, Any]]:

18
freqtrade/rpc/telegram.py
View File

@@ -192,7 +192,7 @@ class Telegram(RPCHandler):
CommandHandler('health', self._health),
CommandHandler('help', self._help),
CommandHandler('version', self._version),
CommandHandler('list_kvals', self._list_kvals),
CommandHandler('list_custom_data', self._list_custom_data),
]
callbacks = [
CallbackQueryHandler(self._status_table, pattern='update_status_table'),
@@ -1453,7 +1453,7 @@ class Telegram(RPCHandler):
"Avg. holding durationsfor buys and sells.`\n"
"*/help:* `This help message`\n"
"*/version:* `Show version`\n"
"*/list_kvals <trade_id> <key>:* `List key-value for Trade ID and Key combo.`\n"
"*/list_custom_data <trade_id> <key>:* `List custom_data for Trade ID & Key combo.`\n"
"`If no Key is supplied it will list all key-value pairs found for that Trade ID.`"
)
@@ -1535,10 +1535,10 @@ class Telegram(RPCHandler):
)
@authorized_only
def _list_kvals(self, update: Update, context: CallbackContext) -> None:
def _list_custom_data(self, update: Update, context: CallbackContext) -> None:
"""
Handler for /list_kvals <id> <key>.
List keyvalues for specified trade (and key if supplied).
Handler for /list_custom_data <id> <key>.
List custom_data for specified trade (and key if supplied).
:param bot: telegram bot
:param update: message update
:return: None
@@ -1549,17 +1549,17 @@ class Telegram(RPCHandler):
trade_id = int(context.args[0])
key = None if len(context.args) < 2 else str(context.args[1])
results = self._rpc._rpc_list_kvals(trade_id, key)
results = self._rpc._rpc_list_custom_data(trade_id, key)
messages = []
if len(results) > 0:
messages = ['Found key-value pair' + 's: \n' if key is None else ': \n']
for result in results:
lines = [
f"*Key:* `{result['kv_key']}`",
f"*Key:* `{result['cd_key']}`",
f"*ID:* `{result['id']}`",
f"*Trade ID:* `{result['ft_trade_id']}`",
f"*Type:* `{result['kv_type']}`",
f"*Value:* `{result['kv_value']}`",
f"*Type:* `{result['cd_type']}`",
f"*Value:* `{result['cd_value']}`",
f"*Create Date:* `{result['created_at']}`",
f"*Update Date:* `{result['updated_at']}`"
]