[Add] query history bars from gateway if available for initing cta strategy
This commit is contained in:
parent
81c36ef11c
commit
85f4fe9a3a
@ -521,8 +521,23 @@ class CtaEngine(BaseEngine):
|
|||||||
end = datetime.now()
|
end = datetime.now()
|
||||||
start = end - timedelta(days)
|
start = end - timedelta(days)
|
||||||
|
|
||||||
# Query bars from RQData by default, if not found, load from database.
|
# Query bars from gateway if available
|
||||||
bars = self.query_bar_from_rq(symbol, exchange, interval, start, end)
|
contract = self.main_engine.get_contract(vt_symbol)
|
||||||
|
|
||||||
|
if contract and contract.history_data:
|
||||||
|
req = HistoryRequest(
|
||||||
|
symbol=symbol,
|
||||||
|
exchange=exchange,
|
||||||
|
interval=interval,
|
||||||
|
start=start,
|
||||||
|
end=end
|
||||||
|
)
|
||||||
|
bars = self.main_engine.query_history(req, contract.gateway_name)
|
||||||
|
|
||||||
|
# Try to query bars from RQData, if not found, load from database.
|
||||||
|
else:
|
||||||
|
bars = self.query_bar_from_rq(symbol, exchange, interval, start, end)
|
||||||
|
|
||||||
if not bars:
|
if not bars:
|
||||||
bars = database_manager.load_bar_data(
|
bars = database_manager.load_bar_data(
|
||||||
symbol=symbol,
|
symbol=symbol,
|
||||||
|
Loading…
Reference in New Issue
Block a user