fix: api url and rm key

This commit is contained in:
David Arena
2024-12-17 19:22:02 +01:00
parent 47613b1cf9
commit 83e56a09c2
2 changed files with 10 additions and 18 deletions

View File

@@ -1097,13 +1097,13 @@ class RPC:
"cancel_order_count": c_count, "cancel_order_count": c_count,
} }
def _rpc_list_custom_data(self, trade_id: int | None = None, key: str | None = None) -> list[dict[str, Any]]: def _rpc_list_custom_data(self, trade_id: int) -> list[dict[str, Any]]:
# Query trades based on trade_id # Query trades based on trade_id
if trade_id: if trade_id == -1:
trades = Trade.get_trades(trade_filter=[Trade.id == trade_id]).all() #get all open trades
else:
# If no trade_id, get all open trades
trades = Trade.get_open_trades() trades = Trade.get_open_trades()
else:
trades = Trade.get_trades(trade_filter=[Trade.id == trade_id]).all()
if not trades: if not trades:
return [] return []
@@ -1111,12 +1111,7 @@ class RPC:
# Collect custom data # Collect custom data
custom_data = [] custom_data = []
for trade in trades: for trade in trades:
if key: custom_data.extend(trade.get_all_custom_data())
data = trade.get_custom_data(key=key)
if data:
custom_data.append(data)
else:
custom_data.extend(trade.get_all_custom_data())
# Format the results # Format the results
return [ return [

View File

@@ -477,17 +477,14 @@ class FtRestClient:
def list_custom_data(self, trade_id=None, key=None): def list_custom_data(self, trade_id=None, key=None):
"""Lists custom_data of the running bot. """Lists custom_data of the running bot.
Without a tradeid, returns all custom_data from open trades.
:param tradeid: Optional keyword argument - Id of the trade (can be received via status command) :param tradeid: Optional keyword argument - Id of the trade
:param key: Optional keyword argument - Key of the custom data
:return: json object :return: json object
""" """
params = {} params = {}
trade_id = -1
if trade_id is not None: if trade_id is not None:
params["trade_id"] = trade_id params["trade_id"] = trade_id
if key is not None:
params["key"] = key
return self._get("list_custom_data", params=params) return self._get("trades/{tradeid}/custom_data", params=params)