[Add] query history data function

This commit is contained in:
vn.py 2019-05-10 14:29:04 +08:00
parent 3b279c68eb
commit 04906bf277
2 changed files with 86 additions and 8 deletions

View File

@ -521,6 +521,9 @@ class BacktesterChart(pg.GraphicsWindow):
def set_data(self, df): def set_data(self, df):
"""""" """"""
if df is None:
return
count = len(df) count = len(df)
self.dates.clear() self.dates.clear()

View File

@ -23,19 +23,22 @@ from vnpy.trader.constant import (
Exchange, Exchange,
Product, Product,
Status, Status,
OrderType OrderType,
Interval
) )
from vnpy.trader.gateway import BaseGateway from vnpy.trader.gateway import BaseGateway
from vnpy.trader.object import ( from vnpy.trader.object import (
TickData, TickData,
OrderData, OrderData,
TradeData, TradeData,
BarData,
AccountData, AccountData,
PositionData, PositionData,
ContractData, ContractData,
OrderRequest, OrderRequest,
CancelRequest, CancelRequest,
SubscribeRequest SubscribeRequest,
HistoryRequest
) )
from vnpy.trader.event import EVENT_TIMER from vnpy.trader.event import EVENT_TIMER
@ -72,6 +75,18 @@ OFFSET_VT2HBDM = {
} }
OFFSET_HBDM2VT = {v: k for k, v in OFFSET_VT2HBDM.items()} OFFSET_HBDM2VT = {v: k for k, v in OFFSET_VT2HBDM.items()}
INTERVAL_VT2HBDM = {
Interval.MINUTE: "1min",
Interval.HOUR: "60min",
Interval.DAILY: "1day"
}
CONTRACT_TYPE_MAP = {
"this_week": "CW",
"next_week": "NW",
"this_quarter": "CQ"
}
symbol_type_map = {} symbol_type_map = {}
@ -143,6 +158,10 @@ class HbdmGateway(BaseGateway):
"""""" """"""
self.rest_api.query_position() self.rest_api.query_position()
def query_history(self, req: HistoryRequest):
""""""
return self.rest_api.query_history(req)
def close(self): def close(self):
"""""" """"""
self.rest_api.stop() self.rest_api.stop()
@ -308,6 +327,66 @@ class HbdmRestApi(RestClient):
callback=self.on_query_contract callback=self.on_query_contract
) )
def query_history(self, req: HistoryRequest):
""""""
# Convert symbol
contract_type = symbol_type_map.get(req.symbol, "")
buf = [i for i in req.symbol if not i.isdigit()]
symbol = "".join(buf)
ws_contract_type = CONTRACT_TYPE_MAP[contract_type]
ws_symbol = f"{symbol}_{ws_contract_type}"
# Create query params
params = {
"symbol": ws_symbol,
"period": INTERVAL_VT2HBDM[req.interval],
"size": 2000
}
# Get response from server
resp = self.request(
"GET",
"/market/history/kline",
params=params
)
# Break if request failed with other status code
history = []
if resp.status_code // 100 != 2:
msg = f"获取历史数据失败,状态码:{resp.status_code},信息:{resp.text}"
self.gateway.write_log(msg)
else:
data = resp.json()
if not data:
msg = f"获取历史数据为空"
self.gateway.write_log(msg)
else:
for d in data["data"]:
dt = datetime.fromtimestamp(d["id"])
bar = BarData(
symbol=req.symbol,
exchange=req.exchange,
datetime=dt,
interval=req.interval,
volume=d["vol"],
open_price=d["open"],
high_price=d["high"],
low_price=d["low"],
close_price=d["close"],
gateway_name=self.gateway_name
)
history.append(bar)
begin = history[0].datetime
end = history[-1].datetime
msg = f"获取历史数据成功,{req.symbol} - {req.interval.value}{begin} - {end}"
self.gateway.write_log(msg)
return history
def new_local_orderid(self): def new_local_orderid(self):
"""""" """"""
with self.order_count_lock: with self.order_count_lock:
@ -570,6 +649,7 @@ class HbdmRestApi(RestClient):
size=int(d["contract_size"]), size=int(d["contract_size"]),
min_volume=1, min_volume=1,
product=Product.FUTURES, product=Product.FUTURES,
history_data=True,
gateway_name=self.gateway_name, gateway_name=self.gateway_name,
) )
self.gateway.on_contract(contract) self.gateway.on_contract(contract)
@ -863,11 +943,6 @@ class HbdmTradeWebsocketApi(HbdmWebsocketApiBase):
class HbdmDataWebsocketApi(HbdmWebsocketApiBase): class HbdmDataWebsocketApi(HbdmWebsocketApiBase):
"""""" """"""
CONTRACT_TYPE_MAP = {
"this_week": "CW",
"next_week": "NW",
"this_quarter": "CQ"
}
def __init__(self, gateway): def __init__(self, gateway):
"""""" """"""
@ -892,7 +967,7 @@ class HbdmDataWebsocketApi(HbdmWebsocketApiBase):
buf = [i for i in req.symbol if not i.isdigit()] buf = [i for i in req.symbol if not i.isdigit()]
symbol = "".join(buf) symbol = "".join(buf)
ws_contract_type = self.CONTRACT_TYPE_MAP[contract_type] ws_contract_type = CONTRACT_TYPE_MAP[contract_type]
ws_symbol = f"{symbol}_{ws_contract_type}" ws_symbol = f"{symbol}_{ws_contract_type}"
# Create tick data buffer # Create tick data buffer