trade_history should paginate through results
this avoids huge results
This commit is contained in:
parent
b230558294
commit
bd92ce938c
@ -199,6 +199,7 @@ class OpenTradeSchema(TradeSchema):
|
|||||||
class TradeResponse(BaseModel):
|
class TradeResponse(BaseModel):
|
||||||
trades: List[TradeSchema]
|
trades: List[TradeSchema]
|
||||||
trades_count: int
|
trades_count: int
|
||||||
|
total_trades: int
|
||||||
|
|
||||||
|
|
||||||
class ForceBuyResponse(BaseModel):
|
class ForceBuyResponse(BaseModel):
|
||||||
|
@ -85,8 +85,8 @@ def status(rpc: RPC = Depends(get_rpc)):
|
|||||||
# Using the responsemodel here will cause a ~100% increase in response time (from 1s to 2s)
|
# Using the responsemodel here will cause a ~100% increase in response time (from 1s to 2s)
|
||||||
# on big databases. Correct response model: response_model=TradeResponse,
|
# on big databases. Correct response model: response_model=TradeResponse,
|
||||||
@router.get('/trades', tags=['info', 'trading'])
|
@router.get('/trades', tags=['info', 'trading'])
|
||||||
def trades(limit: int = 0, rpc: RPC = Depends(get_rpc)):
|
def trades(limit: int = 500, offset: int = 0, rpc: RPC = Depends(get_rpc)):
|
||||||
return rpc._rpc_trade_history(limit)
|
return rpc._rpc_trade_history(min(limit, 500), offset=offset, order_by_id=True)
|
||||||
|
|
||||||
|
|
||||||
@router.get('/trade/{tradeid}', response_model=OpenTradeSchema, tags=['info', 'trading'])
|
@router.get('/trade/{tradeid}', response_model=OpenTradeSchema, tags=['info', 'trading'])
|
||||||
|
@ -300,11 +300,12 @@ class RPC:
|
|||||||
'data': data
|
'data': data
|
||||||
}
|
}
|
||||||
|
|
||||||
def _rpc_trade_history(self, limit: int) -> Dict:
|
def _rpc_trade_history(self, limit: int, offset: int = 0, order_by_id: bool = False) -> Dict:
|
||||||
""" Returns the X last trades """
|
""" Returns the X last trades """
|
||||||
if limit > 0:
|
order_by = Trade.id if order_by_id else Trade.close_date.desc()
|
||||||
|
if limit:
|
||||||
trades = Trade.get_trades([Trade.is_open.is_(False)]).order_by(
|
trades = Trade.get_trades([Trade.is_open.is_(False)]).order_by(
|
||||||
Trade.close_date.desc()).limit(limit)
|
order_by).limit(limit).offset(offset)
|
||||||
else:
|
else:
|
||||||
trades = Trade.get_trades([Trade.is_open.is_(False)]).order_by(
|
trades = Trade.get_trades([Trade.is_open.is_(False)]).order_by(
|
||||||
Trade.close_date.desc()).all()
|
Trade.close_date.desc()).all()
|
||||||
@ -313,7 +314,8 @@ class RPC:
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
"trades": output,
|
"trades": output,
|
||||||
"trades_count": len(output)
|
"trades_count": len(output),
|
||||||
|
"total_trades": Trade.get_trades([Trade.is_open.is_(False)]).count(),
|
||||||
}
|
}
|
||||||
|
|
||||||
def _rpc_stats(self) -> Dict[str, Any]:
|
def _rpc_stats(self) -> Dict[str, Any]:
|
||||||
|
@ -200,13 +200,19 @@ class FtRestClient():
|
|||||||
"""
|
"""
|
||||||
return self._get("logs", params={"limit": limit} if limit else 0)
|
return self._get("logs", params={"limit": limit} if limit else 0)
|
||||||
|
|
||||||
def trades(self, limit=None):
|
def trades(self, limit=None, offset=None):
|
||||||
"""Return trades history.
|
"""Return trades history, sorted by id
|
||||||
|
|
||||||
:param limit: Limits trades to the X last trades. No limit to get all the trades.
|
:param limit: Limits trades to the X last trades. Max 500 trades.
|
||||||
|
:param offset: Offset by this amount of trades.
|
||||||
:return: json object
|
:return: json object
|
||||||
"""
|
"""
|
||||||
return self._get("trades", params={"limit": limit} if limit else 0)
|
params = {}
|
||||||
|
if limit:
|
||||||
|
params['limit'] = limit
|
||||||
|
if offset:
|
||||||
|
params['offset'] = offset
|
||||||
|
return self._get("trades", params)
|
||||||
|
|
||||||
def trade(self, trade_id):
|
def trade(self, trade_id):
|
||||||
"""Return specific trade
|
"""Return specific trade
|
||||||
|
@ -506,7 +506,7 @@ def test_api_trades(botclient, mocker, fee, markets):
|
|||||||
)
|
)
|
||||||
rc = client_get(client, f"{BASE_URI}/trades")
|
rc = client_get(client, f"{BASE_URI}/trades")
|
||||||
assert_response(rc)
|
assert_response(rc)
|
||||||
assert len(rc.json()) == 2
|
assert len(rc.json()) == 3
|
||||||
assert rc.json()['trades_count'] == 0
|
assert rc.json()['trades_count'] == 0
|
||||||
|
|
||||||
create_mock_trades(fee)
|
create_mock_trades(fee)
|
||||||
|
Loading…
Reference in New Issue
Block a user