senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mod] make flake8 happy

Browse Source
This commit is contained in:
nanoric 2019-09-09 10:59:34 +08:00
parent 0258a9b331
commit 29a39a258a
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vnpy/gateway/bybit/bybit_gateway.py
View File

@ -1,19 +1,19 @@
"""""" """"""
from dataclasses import dataclass from dataclasses import dataclass
from datetime import datetime from datetime import datetime
from typing import Dict, List, Any, Tuple from typing import Any, Dict, List, Tuple
from vnpy.event import Event from vnpy.event import Event
from vnpy.gateway.bybit.rest_api import BybitRestApi, HistoryDataNextInfo from vnpy.gateway.bybit.rest_api import BybitRestApi, HistoryDataNextInfo
from vnpy.gateway.bybit.websocket_api import BybitWebsocketApi from vnpy.gateway.bybit.websocket_api import BybitWebsocketApi
from vnpy.trader.constant import (Exchange, OrderType, Interval) from vnpy.trader.constant import (Exchange, Interval, OrderType)
from vnpy.trader.event import EVENT_TIMER from vnpy.trader.event import EVENT_TIMER
from vnpy.trader.gateway import BaseGateway from vnpy.trader.gateway import BaseGateway
from vnpy.trader.object import (CancelRequest, HistoryRequest, OrderData, OrderRequest, from vnpy.trader.object import (BarData, CancelRequest, HistoryRequest, OrderData, OrderRequest,
PositionData, SubscribeRequest, TickData, BarData) PositionData, SubscribeRequest, TickData)
from .common import DIRECTION_BYBIT2VT, OPPOSITE_DIRECTION, ORDER_TYPE_BYBIT2VT, \ from .common import (DIRECTION_BYBIT2VT, INTERVAL_VT2BYBIT_INT, OPPOSITE_DIRECTION,
STOP_ORDER_STATUS_BYBIT2VT, parse_datetime, STATUS_BYBIT2VT, INTERVAL_VT2BYBIT, local_tz, \ ORDER_TYPE_BYBIT2VT, STATUS_BYBIT2VT, STOP_ORDER_STATUS_BYBIT2VT, local_tz,
utc_tz, INTERVAL_VT2BYBIT_INT parse_datetime, utc_tz)
@dataclass() @dataclass()
@ -97,10 +97,10 @@ class BybitGateway(BaseGateway):
self.rest_api.query_position() self.rest_api.query_position()
def query_first_history(self, def query_first_history(self,
symbol: str, symbol: str,
interval: Interval, interval: Interval,
start: datetime, start: datetime,
) -> Tuple[List[BarData], "HistoryDataNextInfo"]: ) -> Tuple[List[BarData], "HistoryDataNextInfo"]:
# datetime for a bar is close_time # datetime for a bar is close_time
# we got open_time from API. # we got open_time from API.

4
vnpy/gateway/bybit/common.py
View File

@ -49,8 +49,8 @@ INTERVAL_VT2BYBIT = {
INTERVAL_VT2BYBIT_INT = { INTERVAL_VT2BYBIT_INT = {
Interval.MINUTE: 1, Interval.MINUTE: 1,
Interval.HOUR: 60, Interval.HOUR: 60,
Interval.DAILY: 60*24, Interval.DAILY: 60 * 24,
Interval.WEEKLY: 60*24*7, Interval.WEEKLY: 60 * 24 * 7,
} }
TIMEDELTA_MAP = { TIMEDELTA_MAP = {
Interval.MINUTE: timedelta(minutes=1), Interval.MINUTE: timedelta(minutes=1),

10
vnpy/gateway/bybit/websocket_api.py
View File

@ -10,11 +10,9 @@ from typing import Any, Callable, Dict, TYPE_CHECKING
from sortedcontainers import SortedSet from sortedcontainers import SortedSet
from vnpy.api.websocket import WebsocketClient from vnpy.api.websocket import WebsocketClient
from vnpy.trader.constant import Direction, Exchange, Product, OrderType from vnpy.trader.constant import (Exchange, Product)
from vnpy.trader.object import AccountData, ContractData, PositionData, SubscribeRequest, \ from vnpy.trader.object import (AccountData, ContractData, SubscribeRequest, TickData, TradeData)
TickData, TradeData from .common import (DIRECTION_BYBIT2VT, generate_timestamp, local_tz, parse_datetime, sign, utc_tz)
from .common import (DIRECTION_BYBIT2VT, generate_timestamp,
sign, local_tz, utc_tz, parse_datetime)
if TYPE_CHECKING: if TYPE_CHECKING:
from vnpy.gateway.bybit import BybitGateway from vnpy.gateway.bybit import BybitGateway
@ -115,7 +113,6 @@ class BybitWebsocketApi(WebsocketClient):
def on_packet(self, packet: dict): def on_packet(self, packet: dict):
"""""" """"""
processed = False
success = packet.get('success', None) success = packet.get('success', None)
topic = packet.get('topic', None) topic = packet.get('topic', None)
if success is not None: if success is not None:
@ -338,7 +335,6 @@ class BybitWebsocketApi(WebsocketClient):
def _ping(self): def _ping(self):
super()._ping() super()._ping()
ws = self._ws
self.send_packet({'op': 'ping'}) self.send_packet({'op': 'ping'})

1
vnpy/trader/constant.py
View File

@ -118,6 +118,7 @@ class Exchange(Enum):
BYBIT = "BYBIT" # bybit.com BYBIT = "BYBIT" # bybit.com
COINBASE = "COINBASE" COINBASE = "COINBASE"
class Currency(Enum): class Currency(Enum):
""" """
Currency. Currency.