From 362ef845afd7e8c3cf024269dcdace5b796d69da Mon Sep 17 00:00:00 2001 From: WangJieCIFCO Date: Sun, 26 May 2024 05:42:38 +0800 Subject: [PATCH 1/2] Update api.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为API添加一个deadline参数，默认为60秒， --- tqsdk/api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tqsdk/api.py b/tqsdk/api.py index 358db660..30415d2f 100644 --- a/tqsdk/api.py +++ b/tqsdk/api.py @@ -91,7 +91,7 @@ class TqApi(TqBaseApi): """ def __init__(self, account: Optional[Union[TqMultiAccount, UnionTradeable]] = None, - auth: Union[TqAuth, str, None] = None, + auth: Union[TqAuth, str, None] = None,deadline: Optional[float] = 60, url: Optional[str] = None, backtest: Union[TqBacktest, TqReplay, None] = None, web_gui: Union[bool, str] = False, debug: Union[bool, str, None] = None, loop: Optional[asyncio.AbstractEventLoop] = None, disable_print: bool = False, _stock: bool = True, @@ -290,12 +290,12 @@ def __init__(self, account: Optional[Union[TqMultiAccount, UnionTradeable]] = No self._setup_connection() # 初始化通讯连接 # 等待初始化完成 - deadline = time.time() + 60 + _deadline = time.time() + deadline try: # 多账户时，所有账户需要初始化完成 trade_more_data = True while self._data.get("mdhis_more_data", True) or trade_more_data: - if not self.wait_update(deadline=deadline): # 等待连接成功并收取截面数据 + if not self.wait_update(_deadline=deadline): # 等待连接成功并收取截面数据 raise TqTimeoutError("接收数据超时，请检查客户端及网络是否正常") trade_more_data = self._account._get_trade_more_data(self._data) except: From f08496de65edb3e9eeaf6392d83493d928d0d4f3 Mon Sep 17 00:00:00 2001 From: WangJieCIFCO Date: Sun, 26 May 2024 05:54:04 +0800 Subject: [PATCH 2/2] Update api.py --- tqsdk/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tqsdk/api.py b/tqsdk/api.py index 30415d2f..425d1758 100644 --- a/tqsdk/api.py +++ b/tqsdk/api.py @@ -295,7 +295,7 @@ def __init__(self, account: Optional[Union[TqMultiAccount, UnionTradeable]] = No # 多账户时，所有账户需要初始化完成 trade_more_data = True while self._data.get("mdhis_more_data", True) or trade_more_data: - if not self.wait_update(_deadline=deadline): # 等待连接成功并收取截面数据 + if not self.wait_update(deadline=_deadline): # 等待连接成功并收取截面数据 raise TqTimeoutError("接收数据超时，请检查客户端及网络是否正常") trade_more_data = self._account._get_trade_more_data(self._data) except: