senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,904 Commits 3 Branches 0 Tags 589 MiB
509cb7c943
Commit Graph

1046 Commits

Author SHA1 Message Date
1122455801
ae81b29f9c Update tiger_gateway.py 2019-03-06 16:17:17 +08:00
vn.py
8c07d1de4f [Add]APEX API of A stock 2019-03-06 12:10:41 +08:00
1122455801
897f898844 Update tiger_gateway.py 2019-03-06 10:54:56 +08:00
1122455801
4609854f7c Create tiger_gateway.py 2019-03-05 23:15:38 +08:00
1122455801
861bda1faf Create __init__.py 2019-03-05 23:15:35 +08:00
nanoric
8a051f1c3e [Add] Linux build for both ctp and oes. 
[Add] added cpp files for oes gateway.
[Add] added linux so files for ctp gateway.
 2019-03-04 22:35:16 -04:00
nanoric
2e0466be40 [Add] Added vnoes.pyd 2019-03-04 02:42:54 -04:00
nanoric
be6f292aca [Fix] Fix connect: change sync to async 2019-03-04 02:17:41 -04:00
nanoric
4bb5d43b6f [Fix] Remove unused imports. 2019-03-03 23:45:42 -04:00
nanoric
c06d9d066b [New] OesGateway 2019-03-03 23:45:40 -04:00
nanoric
a5f9171713 [Fix] Fixed an type annotation error: type of OrderRequest.price_type should be PriceType but not string. 2019-02-26 09:15:16 -04:00
vn.py
3be6b3d4d3 [Add]readme and other docs 2019-02-25 17:40:15 +08:00
vn.py
00da4e8bbc [Add]flake8 setting file 2019-02-23 22:22:56 +08:00
vn.py
b1c06db847 [Del]remove usage of pylint 2019-02-23 22:05:01 +08:00
vn.py
edca83c926 [Mod]remove blank lines 2019-02-23 16:33:11 +08:00
vn.py
61cbe9dc4a [Mod]reformat ctp wrap generator script 2019-02-23 16:26:14 +08:00
vn.py
e6f8060e99 [Mod]reformat code 2019-02-23 16:01:19 +08:00
vn.py
a9f652607c [Fix]close #1387 2019-02-23 09:41:46 +08:00
vn.py
f94e078a75 [Fix]bug in send_order of CtaEngine 2019-02-22 14:11:47 +08:00
vn.py
f0108ef889 [Mod]add app_name in create_qapp function 2019-02-21 22:43:55 +08:00
vn.py
a203f864c4
Merge pull request #1402 from 1122455801/Add_MultiSignalstrategy 
[Add] multi_signal_strategy
 2019-02-21 10:13:08 +08:00
1122455801
cc1db0164f Create multi_signal_strategy.py 2019-02-21 10:05:46 +08:00
vn.py
760da8e7d2 [Mod]change filename of MultiTimeframStrategy 2019-02-21 09:22:59 +08:00
vn.py
d0ff8f904d
Merge pull request #1395 from 1122455801/Mod_double_ma_strategy 
[Mod] double_ma_strategy
 2019-02-21 08:54:36 +08:00
vn.py
54fb249564
Merge pull request #1396 from 1122455801/Add_dualthrust_strategy 
Create dual_thrust_strategy.py
 2019-02-21 08:54:21 +08:00
vn.py
3a8cfe35cc
Merge pull request #1397 from 1122455801/Add_multi_time_frame_strategy 
Create multi_time_frame_strategy.py
 2019-02-21 08:54:04 +08:00
vn.py
150a41d74f
Merge pull request #1399 from 1122455801/Mod_CTATEMPLATE 
[Mod] template.py
 2019-02-21 08:52:57 +08:00
vn.py
2124c504a6
Merge pull request #1401 from 1122455801/Add_atr_rsi_strategy 
[Add] atr_rsi_strategy.py
 2019-02-21 08:50:54 +08:00
1122455801
713ecc14b6 Create atr_rsi_strategy.py 2019-02-20 14:23:38 +08:00
1122455801
ce568ae3a6 Update template.py 2019-02-20 14:07:50 +08:00
1122455801
905bccf6f6 Create multi_time_frame_strategy.py 2019-02-20 11:30:19 +08:00
1122455801
0b93038f19 Create dual_thrust_strategy.py 2019-02-20 10:17:29 +08:00
1122455801
e64cfd7223 Update double_ma_strategy.py 2019-02-20 10:01:18 +08:00
vn.py
dfb85286d1
Merge pull request #1392 from 1122455801/Add_King_Keltner_strategy 
[Add] king_keltner_strategy.py
 2019-02-19 23:27:24 +08:00
vn.py
d5eb42b7d6
Merge pull request #1388 from nanoric/setup_py 
Setup.py
 2019-02-19 23:27:03 +08:00
vn.py
04dabc725f
Merge pull request #1391 from 1122455801/Add_boll_channel_strategy 
[Add] boll_channel_strategy
 2019-02-19 23:26:20 +08:00
1122455801
b3f421af70 Create king_keltner_strategy.py 2019-02-19 16:25:26 +08:00
1122455801
950e97544d Create boll_channel_strategy.py 2019-02-19 15:36:07 +08:00
vn.py
f467afcf5e [Mod]set all statistics to 0 if no trade in backtesting 2019-02-19 15:18:20 +08:00
nanoric
6690af6f99 [Mod] api.ctp.vnctp.vnctp.h: added some include for gcc(linux) support 2019-02-18 22:46:35 -04:00
vn.py
38aabe1b09 [Mod]call exit function when destory MdApi/TdApi object 2019-02-18 22:32:34 +08:00
nanoric
b339e91289 [Mod] updated pyd: api.ctp 2019-02-18 05:11:53 -04:00
nanoric
66edd75a2b [Add] api.ctp: terminate task queue when exit() is called 2019-02-18 05:11:26 -04:00
nanoric
a62b6aba08 [Add] MT to MD 2019-02-18 05:10:15 -04:00
nanoric
3080101ba0 [Mod] Include的相对路径改为绝对路径（Python除外） 2019-02-18 03:42:06 -04:00
nanoric
4dc63db71c [Add] TaskQueue增加terminate()，可以终止pop的等待 2019-02-18 03:13:11 -04:00
vn.py
3618044b36 [Fix] bugs in cta backtesting 2019-02-18 13:42:16 +08:00
vn.py
144ca19b08 [Add] use rqdata client for query history data in cta engine 2019-02-18 13:10:00 +08:00
vn.py
d32c3100af [Add] load global setting from json file 2019-02-18 13:09:19 +08:00
vn.py
37f2a0c9b6 [Mod]simplify usage of ctp api and gateway 2019-02-18 11:15:51 +08:00
vn.py
cc236a918d
[Merge] pull request #1381 from nanoric/optimized_toUtf8 2019-02-17 23:11:38 +08:00
vn.py
f15bb91f29 [Mod] change get_path related functions 2019-02-17 22:59:41 +08:00
vn.py
6c91951e02 [Add] general functions of VN Trader 
1. use json instead of shelve for setting/data storage
2. call original sys.__excepthook__ before showing exception with QMessageBox
 2019-02-17 22:59:01 +08:00
vn.py
ae78a7f0c0 [Add] init cta strategy in thread to avoid ui block 2019-02-17 15:00:02 +08:00
vn.py
9df1cf9a74 [Add] load and sync cta strategy data function 2019-02-16 11:18:58 +08:00
vn.py
7ade45e37f [Add] load_json/save_json function 2019-02-16 10:51:32 +08:00
vn.py
95052ce822 [Add] add load history data function to cta live trading engine 2019-02-16 10:13:22 +08:00
vn.py
e29345503b [Fix] bug in calculating daily result of cta backtesting 2019-02-15 16:05:34 +08:00
nanoric
0f7a82c072 [Add] 若python中没实现对应的虚函数，则什么都不做。[1] 
[Fix] 所有对dict的使用改为const &，减少不必要的复制

[1] PYBIND11_OVERLOAD默认会调用到C++原生实现。CTP的原生实现是什么都不做。
 2019-02-14 03:21:35 -04:00
nanoric
92d488e640 [Fix] 去掉get...中的异常捕获 
异常会被上层捕获，即pybind11.
pybind11会将异常转化为python异常然后回传到python之中。
 2019-02-14 03:13:22 -04:00
nanoric
8c0d11d601 [Fix] 稍稍修改一下toUtf8 2019-02-14 00:38:04 -04:00
vn.py
cb23935ac6 [Add] new ctp gateway 2019-02-10 11:49:09 +08:00
vn.py
1bf01b2377 [Add] new python 3 ctp api 2019-02-09 12:04:56 +08:00
vn.py
a302bc93c5 [Mod] format code with autopep8 2019-01-30 13:07:23 +08:00
vn.py
d7c79327dc [Mod] reverse certain code formatting caused by black 2019-01-30 12:40:49 +08:00
vn.py
d05b558f87 [Fix] check typo bug with flake8 2019-01-30 09:54:51 +08:00
vn.py
346368cd2e [Fix] bug in calculating daily backtesting pnl result 2019-01-30 04:39:04 +08:00
vn.py
b99c5ff590 [Add]backtesting function for cta strategy 2019-01-29 15:35:37 +08:00
vn.py
2dc8057de0 [Add] TurtleSignalStrategy for cta strategy app 2019-01-26 21:43:07 +08:00
vn.py
fdf2d4cf13 [Fix] some code mistakes caused by previous merge 2019-01-26 19:45:23 +08:00
vn.py
91678e0de2 Merge branch 'v2.0-DEV' of https://github.com/vnpy/vnpy into v2.0-DEV 2019-01-26 17:41:33 +08:00
vn.py
5d4e975ff4 [Mod]change formatting tools to black 2019-01-26 17:24:38 +08:00
nanoric
8bb0bb5fbf [Mod] 再次进行一些格式修改 
[Add] 增加对binding和tests的代码质量检查
[Add] 更新README.md
 2019-01-24 09:06:31 -04:00
nanoric
ed1758a26a [Add] use flake8 
[Mod] use black instead of yapf
 2019-01-24 09:06:31 -04:00
vn.py
d45b82e110 [Add] backtesting tool of CtaStrategy app 2019-01-24 14:13:57 +08:00
vn.py
9d5866e997 [Add] vnpy/trader/database.py for database connection 2019-01-24 14:13:36 +08:00
nanoric
cda0287246 [Fix] format error of /vnpy/trader/ui/widget.py 2019-01-21 05:46:31 -04:00
vn.py
a257b18f84 [Add] LogMonitor for cta strategy and global excepthook 2019-01-20 21:34:38 +08:00
vn.py
4596f3a515 [Add] CtaManager ui widget 2019-01-19 18:57:54 +08:00
vn.py
499ffd9491 [Add] CTA engine and template for creating strategies 2019-01-19 13:12:29 +08:00
nanoric
09067dcee6 [Fix] Fixed format error and naming error 2019-01-18 01:24:15 -04:00
vn.py
f97f090a25 [Add] BaseApp for app development 2019-01-18 09:35:35 +08:00
vn.py
7f8617ff2d [Mod]Complete test of bitmex gateway 2019-01-16 20:57:30 +08:00
vn.py
d5a39a7d7f [Add] New bitmex gateway for crypto currency futures trading 2019-01-16 15:22:44 +08:00
vn.py
32867a97c2 [Mod]Change websocket client code style 2019-01-16 09:25:18 +08:00
vn.py
ab9ddbbce3 [Mod]Change rest client code style 2019-01-16 08:16:16 +08:00
vn.py
578544a3c3 [Mod]Change constant value from str to enum 2019-01-15 22:04:02 +08:00
vn.py
9c897d04af [Mod] Change futu gateway contract size to 1 2019-01-14 22:56:26 +08:00
vn.py
33aff65e60 [Add] Complete futu gateway test 2019-01-14 22:52:03 +08:00
vn.py
f912207d3f [Add] Rest and websocket client 2019-01-13 13:23:10 +08:00
vn.py
242a97a2b2 [Add] Email engine for sending email message. 2019-01-12 10:44:53 +08:00
vn.py
6e1d90b327 [Add] Mainwindow now supports geometry setting save/load/restore 2019-01-12 09:54:56 +08:00
vn.py
60a640b6d1 [Add] Show VN Trader running path in main window 2019-01-12 09:43:27 +08:00
vn.py
91cb3d103d [Add] ConnectDialog supports field value save and load 2019-01-12 09:38:22 +08:00
vn.py
f3b2f506ed [Add] New gateway for Futu Securities 2019-01-11 23:54:01 +08:00
vn.py
857b0c243c [Add] Double click order monitor cells to cancel order 2019-01-11 15:49:11 +08:00
vn.py
a89cba984d [Add] Add about dialog 2019-01-11 13:06:39 +08:00
vn.py
1eb26d6151 [Add] Add write_log function in BaseGateway 2019-01-11 12:41:50 +08:00
vn.py
9b2b0561b1 [Add] Add active order monitor and contract manager 2019-01-11 12:21:55 +08:00
vn.py
40b5a4127c [Fix] Close #1167 2019-01-11 08:35:25 +08:00
vn.py
64c1c3ccde [Add] Complete ib gateway development 2019-01-10 23:45:21 +08:00
vn.py
84eaeb8733 [Add] Add monitor into mainwindow 2019-01-09 22:36:48 +08:00
vn.py
712fad6288 [Add] Add ib gateway using official ibapi from interactive brokers 2019-01-09 22:03:33 +08:00
vn.py
be25b684a0 [Add] Start ib gateway development 2019-01-09 16:41:51 +08:00
vn.py
a899060360 [Add] Add oms engine 2019-01-08 21:53:03 +08:00
vn.py
fe5b994b0e [Add] Add mainwindow and test code of VN Trader 2019-01-08 20:45:01 +08:00
vn.py
c304c2b125 [Add] Add log engine 2019-01-08 20:43:26 +08:00
vn.py
b996285ffd [Add] Add global setting file 2019-01-08 20:42:47 +08:00
vn.py
e25787536a [Add] Add trader ui widget 2019-01-06 20:16:29 +08:00
vn.py
ca14973b9a [Add] Add trader mainengine 2019-01-06 20:16:12 +08:00
vn.py
ca8b5fa406 [Add] Add abstract gateway class 2019-01-06 20:15:05 +08:00
vn.py
dfcd0ed0ea [Add] Add trader data object structure 2019-01-06 20:14:27 +08:00
vn.py
ad40633fd8 [Add] Add trader event type definition 2019-01-06 20:14:02 +08:00
vn.py
e32b76d243 [Add] Add trader constant definition 2019-01-06 20:13:50 +08:00
vn.py
9d3ec12695 [Add] Add event engine 2019-01-05 22:34:21 +08:00
vn.py
f7d5848758 [Del]clear all old files 2019-01-04 14:46:47 +08:00
vn.py
24dbe7d014 [Mod]调整WebsocketClient的对话信息记录函数 2018-12-29 09:44:25 +08:00
vn.py
32dc3aaf7e
Merge branch 'dev' into master 2018-12-29 09:40:43 +08:00
vn.py
389a98ab1a [Mod]更新README.MD 2018-12-28 16:43:04 +08:00
vn.py
ae5151cb76
Merge pull request #1308 from nanoric/fix_app_ui_blank_after_maximiize 
[Fix] 修正一个UI错误：修复了最大化app之后关闭再打开会显示一大片空白的问题
 2018-12-28 15:41:52 +08:00
nanoric
ac9048b0ad [Fix] 修正一个UI错误：修复了最大化app之后关闭再打开会显示一大片空白的问题 
[Add] UI功能性增强：点击某个app之后，该app一定会被移到前台。

顺便去掉了try_catch KeyError，改用if
 2018-12-28 03:03:57 -04:00
vn.py
2faac219a0 [Mod]完成火币接口的测试 2018-12-27 16:44:44 +08:00
vn.py
a4614a6f27 [Mod]请求查询异常时输出错误日志 2018-12-27 15:47:44 +08:00
nanoric
6542f1ebfa [Fix] 修正了huobiGateway与GET方法相关的签名问题 2018-12-27 01:15:00 -04:00
nanoric
f0c192cbbf [Fix] 修正了huobigateway与GET相关的签名方法 2018-12-27 01:11:05 -04:00
vn.py
6b564c9f01 [Mod]调整部分火币接口逻辑 2018-12-27 13:05:24 +08:00
vn.py
d25065fdea [Mod]调整onErrorMsg函数 2018-12-26 12:31:28 +08:00
vn.py
e8bf28bd8d [Add]升级火币接口 2018-12-26 12:30:02 +08:00
vn.py
155e0004b7
Merge pull request #1258 from Gwill/dev 
fix typo
 2018-12-24 20:43:14 +08:00
vn.py
5f576cc029 [Fix]Close #1297 2018-12-24 20:39:15 +08:00
vn.py
1add685b53 [Fix]修复OKEXF接口的5档行情顺序bug #1275 2018-12-24 20:36:52 +08:00
vn.py
483b754f09 [Mod]反转SpreadTrading界面上算法显示的顺序，改为和价差一致 Close #1083 2018-12-24 20:34:09 +08:00
vn.py
bc49cde7f0 [Fix]Close #1278 2018-12-24 09:43:17 +08:00
vn.py
55ee5ea9b1 [Fix]TradeCopy模块增加拒单监控，Close #1274 2018-12-24 09:39:49 +08:00
vn.py
41d970c041 [Fix]Close #1273 2018-12-24 09:35:40 +08:00
vn.py
372a879fce [Add]更新README 2018-12-20 12:38:10 +08:00
vn.py
e3ef232557 [Mod]调整部分文字说明 2018-12-20 10:06:51 +08:00
vn.py
b779f065e4 [Del]移除vnpy/data目录下通联和天勤数据接口 2018-12-20 10:00:17 +08:00
vn.py
97fcd7f19a [Mod]更新富途接口为futu-api 2018-12-20 09:55:48 +08:00
vn.py
fa2ce167ee [Add]新增图形化的RQData数据服务下载器 2018-12-06 16:12:58 +08:00
vn.py
50f1524c12 [Add]CTA策略实盘交易引擎加入对RQData的数据支持 2018-12-06 13:00:19 +08:00
vn.py
02ac91af6f [Mod]价差交易模块的价差算法显示改为和价差数据一致，Close #1083 2018-12-02 13:44:50 +08:00
vn.py
b7a5a0bbbe [Fix]Close #1261 2018-12-02 13:34:23 +08:00
vn.py
e47899b821 [Fix]Close #1254 2018-12-02 13:33:13 +08:00
vn.py
2de657db9b [Fix]Close #1260 2018-12-02 13:30:58 +08:00
vn.py
644d14881c [Add]新增交易复制模块TradeCopy 2018-12-02 13:24:04 +08:00
nanoric
fc7eb66226 [Fix] Okex 修正了登录时无持仓时的报错 2018-11-26 04:18:40 -04:00
nanoric
268f833bdc [Add] ws:在记录最后接收到的数据时尝试解包，若解包失败则使用原来的值 2018-11-26 04:18:12 -04:00
G_will
b4afae871d fix typo 2018-11-21 16:24:02 +08:00
vn.py
31784f32b6 [Add]将日志文件改为UTF8编码，Close #1248 2018-11-17 22:21:35 +08:00
vn.py
3fee9cb48e Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-11-17 09:53:18 +08:00
vn.py
4229f6e210 [Fix]Close #1239 2018-11-17 09:53:14 +08:00
wudan
b8001cf7f5 * 修复初始化策略后界面不更新inited值 2018-11-15 10:30:39 +08:00
vn.py
272857792e [Mod]完成海龟回测引擎的统计和绘图功能 2018-11-13 23:00:38 +08:00
vn.py
270847132a [Mod]修复之前海龟策略回测中的每日盈亏计算bug 2018-11-13 16:11:35 +08:00
vn.py
7675bf8a2e [Mod]Close #1097 2018-11-13 08:58:50 +08:00
vn.py
23d6399818 [Mod]更新OKEX期货接口的持仓查询逻辑 2018-11-08 22:30:11 +08:00
vn.py
2b826154f9
Merge pull request #1216 from nanoric/fix_websocket_init_lasttext 
[Fix] 将Websocket._lastSentText移动到__init__之中
 2018-11-07 17:20:00 +08:00
nanoric
3c3369960d [Fix] 修复一个BUG：字段的初始化应该放在__init__中 2018-11-07 02:51:15 -04:00
vn.py
f02d5a7ebe
Merge pull request #1214 from nanoric/fix_websocket_ping_no_reconnect 
[Fix] 修复一个BUG：websocket在发送ping包时出错将不会重连，导致后续每ping一次报一次错。
 2018-11-07 10:52:40 +08:00
vn.py
208e962e91 [Add]新增CTA模块下的单标的海龟交易策略 2018-11-07 10:47:28 +08:00
nanoric
06eb5f094b Merge branch 'dev' of https://github.com/vnpy/vnpy into fix_websocket_ping_no_reconnect 2018-11-06 22:13:40 -04:00
vn.py
33c5f15704 [Mod]移动okexFuturesGateway到beta目录 2018-11-06 23:08:36 +08:00
vn.py
257a3c86e8 [Add]重构OKEX期货接口 2018-11-06 23:07:43 +08:00
nanoric
fe51b1aa5e [Fix] 修复一个BUG：websocket在发送ping包时出错将不会重连，导致后续每ping一次报一次错。 2018-11-05 22:56:53 -04:00
vn.py
5b2059c4de [Mod]在CryptoTrader中加入OKEX期货接口 2018-11-06 09:24:39 +08:00
vn.py
68c9c09ac3 Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-11-05 11:11:25 +08:00
vn.py
a8f289dd10 [Mod]将BarGenerator和ArrayManager移动到vtUtility.py中，Close #1084 2018-11-05 11:11:20 +08:00
vn.py
8baad896a8
Merge pull request #1207 from nanoric/fix_bitemex_onTrade_error_without_side 
[Fix] 修复了当bitmexgateway.socketapi响应onTrade时，遇到side字段为''导致异常的情况。
 2018-11-05 09:01:28 +08:00
nanoric
541c4b6f76 [Fix] 修复了当bitmexgateway.socketapi响应onTrade时，遇到side字段为''导致异常的情况。 
an example without 'size':
{
 'execID': '***', 'execType': 'Funding',
 'ordStatus': 'Filled', 'lastLiquidityInd': '', 'exDestination': 'XBME',
 'text': 'Funding',
 'lastQty': 508, 'timeInForce': 'AtTheClose', 'currency': 'USD', 'pegPriceType': '',
 'simpleLeavesQty': None, 'transactTime': '***', 'ordRejReason': '',
 'underlyingLastPx': None, 'execCost': 8051292, 'clOrdID': '', 'settlCurrency': 'XBt',
 'cumQty': 508, 'displayQty': None, 'lastPx': 6309.35, 'homeNotional': -0.08051292,
 'commission': -0.0001, 'avgPx': 6309.35, 'lastMkt': 'XBME', 'price': 6309.35,
 'trdMatchID': '***', 'simpleOrderQty': None,
 'contingencyType': '', 'triggered': '', 'timestamp': '***',
 'symbol': 'XBTUSD', 'foreignNotional': 508, 'pegOffsetValue': None, 'execInst': '',
 'simpleCumQty': None, 'execComm': -805, 'orderID': '***',
 'multiLegReportingType': 'SingleSecurity', 'account': ***, 'stopPx': None,
 'leavesQty': 0, 'tradePublishIndicator': '', 'orderQty': 508, 'workingIndicator': False,
 'ordType': 'Limit', 'clOrdLinkID': '',
 'side': ''
}
 2018-11-01 22:13:02 -04:00
vn.py
bc28feddfa
Merge pull request #1206 from nanoric/bitmex_onerror_show_more_details 
[Mod] 修改：BitmexGateway出错时将会在stderr里面打印更详细的错误信息
 2018-11-02 09:28:25 +08:00
vn.py
66d361b5e5
Merge pull request #1196 from Gwill/dev 
修改 Travis 在 py3.6 环境下无法通过的问题
 2018-11-02 09:27:59 +08:00
nanoric
d3da3c97b3 [Mod] 修改：BitmexGateway出错时将会在stderr里面打印更详细的错误信息 2018-11-01 00:30:33 -04:00
vn.py
6cf6bfb9b5
Merge pull request #1205 from nanoric/okex_compressed_websocket 
[Fix] Okex compressed websocket
 2018-11-01 10:08:20 +08:00
G_will
82ecab24a0 统一代码格式 2018-11-01 10:01:22 +08:00
nanoric
5e6f81e544 [Fix] 修复对OkexWebSocket的支持：OkexWebSocket强制启用了zlib压缩 
[Add] 增加了WebSocketClient.unpackData，用于自定义解包方法。默认解包方式为json.loads
 2018-10-31 05:09:48 -04:00
vn.py
2dfd4744a9
Merge pull request #1203 from nanoric/network_error_handle_with_detail 
[Add] 在RestClient.addRequest中增加onError参数，可以重定向onError回调。
 2018-10-31 13:49:55 +08:00
nanoric
4c39d4003e [Fix] 非当前目录下的strategyXxx.py不会被载入 2018-10-31 00:03:25 -04:00
nanoric
7ece16c914 [Fix] bitmexGateway: 当下单、撤单触发已知错误的时候不再响应默认onError或者onFailed 
[Mod] BitmexRestApi.onError:除了推送错误到时间引擎之外，还使用新的exceptionDetail在控制台打印详细的错误消息。

目前已知的错误只有网络错误。若下单时发生网络错误，该订单状态会被设置为rejected.
 2018-10-30 23:49:51 -04:00
nanoric
a4118f3364 [Add] 在RestClient.addRequest中增加onError参数，可以重定向onError回调。 
[Add] 在WebSocketClient, RestClient的错误处理函数中打印更多的详细信息
[Add] 增加RestClient.printExceptionDetail和WebSocketClient.printExceptionDetail，用于打印详细的错误信息
[Mod] 修改了对应的测试样例
 2018-10-30 23:36:50 -04:00
G_will
33714018de 优化 ctp 股票期权 tick 数据获取 2018-10-30 11:46:48 +08:00
vn.py
5b949c0124 [Mod]日志记录组件增加自动换行功能 2018-10-29 10:32:18 +08:00
vn.py
354dbb58f7 [Mod]对于没有涨跌价的市场，停止单触发使用5单价格发单 2018-10-29 10:32:05 +08:00
vn.py
a79a2019f2 [Mod]修改回调函数的参数命名 2018-10-26 15:08:57 +08:00
vn.py
7ded11666f Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-10-26 12:26:42 +08:00
vn.py
8c6b842e32
Merge pull request #1194 from nanoric/network_fix_errorhanding 
[Mod] 将websocket._connect移动到工作线程中
 2018-10-26 11:55:48 +08:00
nanoric
759489b1fd [Mod] 将websocket._connect移动到工作线程中 
[Mod] 修改错误处理方式：onError将会捕捉更多异常

onError目前比以前能够多捕获两种异常：
 * websocket首次连接时的异常
 * RestClient._createSession中产生的异常
 2018-10-25 04:25:40 -04:00
nanoric
59d82042c5 [Add] OkexGateway:增加深度信息 2018-10-25 00:33:28 -04:00
vn.py
3e479e460c [Fix]修复close函数错误 2018-10-24 16:55:45 +08:00
vn.py
8f83b6dcf2 [Mod]使用RestClient和WebsocketClient重新实现 2018-10-24 16:54:12 +08:00
nanoric
3fd5d398a8 Merge branch 'dev' of https://github.com/vnpy/vnpy into okexv3 2018-10-23 21:33:52 -04:00
nanoric
661d557bf3 [Add] okexv3 
将API层删除了，全部放到Gateway里面。
将V1RestAPI全部弃用，改为V3API。

因为V3API还不完善，目前还不支持主动的持仓查询
 2018-10-23 21:33:25 -04:00
nanoric
cab8fd1e0e [Mod] WebSocket改名为Websocket 2018-10-23 21:31:17 -04:00
nanoric
d68529dacd [Mod] 修正typehint 2018-10-23 21:26:54 -04:00
vn.py
1c4ab27d57
Merge pull request #1186 from nanoric/okex.websocket 
Okex.websocket
 2018-10-23 09:39:22 +08:00
nanoric
b702f77af9 [Mod] OkexFuture改名为OkexFutures 
[Add] 增加V3版本的OkexRestApi
 2018-10-21 22:42:20 -04:00
nanoric
f17793ed17 [Add] VtContractData.createFromGateway 2018-10-21 22:33:07 -04:00
nanoric
7c83a1e9be [Mod] RestClient、WebSocket重构 2018-10-21 22:32:34 -04:00
nanoric
35518106a2 [Mod] 重构RestClient, WebSocketClient 
主要有：
* beforeRequest改名为sign
* onFailed, onError由函数指针改为函数（利用Python的特性，可以重载，也可以仍然当函数指针用）
* sendData改名为sendBinary
* 优化了WebSocketClient的循环逻辑
 2018-10-18 05:30:30 -04:00
vn.py
4541673f58
Merge pull request #1170 from nanoric/okex.websocket 
Okex.websocket
 2018-10-17 21:01:08 +08:00
nanoric
028d344fc0 [Add] 增加订阅用户自己交易信息的接口：OkexFutureApi.OkexFutureWebSocketClient.subscribeUserTrade 2018-10-17 05:48:14 -04:00
nanoric
b90d997456 [Fix] 修复start后响应两次onConnected的错误 2018-10-17 05:46:03 -04:00
nanoric
1f37a5ebeb [Add] 增加okexFutureApi.trade 
[Add] okexFutureApi:增加自动登录
 2018-10-17 05:45:13 -04:00
nanoric
46dda98d07 [Add] 增加VtTradeData.createFromGateway 2018-10-17 05:26:28 -04:00
vn.py
9d124ed196 Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2018-10-17 14:22:18 +08:00
vn.py
72bba04d5d [Add]增加BitmexGateway的主动行情订阅功能 2018-10-17 14:22:15 +08:00
nanoric
04068256d3 Merge branch 'dev' of https://github.com/vnpy/vnpy into okex.websocket 2018-10-16 22:01:05 -04:00
nanoric
c141360847 [Add] OkexFutureGateway.subscribe 
[Add] OkexFutureApi增加WebSocket客户端实现
 2018-10-16 05:49:36 -04:00
nanoric
e8ded9edf5 [Add] 增加VtTickData的静态初始化函数 
[Fix] 修复一个潜在BUG：仅仅载入vtObject.py并初始化VtLogData时有可能提示INFO字段不存在
 2018-10-16 05:48:44 -04:00
nanoric
eb844d4b9b [Mod] 将WebSocketClient.init(host)函数提前到__init__中调用 2018-10-16 05:46:42 -04:00
nanoric
1cc5c8b16e [Fix] 修复一个BUG：WebSocketClient无法初始化：onDisconnected赋值错误 2018-10-16 05:45:45 -04:00
vn.py
663f699537
Merge pull request #1169 from nanoric/okex.websocketclient.devel 
Okex.websocketclient.devel
 2018-10-16 14:43:25 +08:00
nanoric
995d994e8e [Mod] 不用简写：req改名为request 2018-10-16 02:19:30 -04:00
nanoric
713c183a14 [Mod] 将RestClient和WebSocketClient的默认回调改为可赋值的函数 2018-10-16 01:15:43 -04:00
nanoric
a5fc1bdba0 准备写okex的websocket api 2018-10-15 05:58:30 -04:00
nanoric
4cec0f6540 [Fix] okex:修复一个BUG：在传参的时候不应传apiSecret 2018-10-15 05:42:33 -04:00
nanoric
dc340d19b6 [Add] WebSocketClient:增加setCreateConnection 
[Add] WebSocketClient:增加一些注释
 2018-10-15 04:58:27 -04:00
nanoric
788677370f [Mod] WebsocketClient改名为WebSocketClient 2018-10-15 04:45:57 -04:00
nanoric
90d25fa536 Merge branch 'refactor.network.devel' into okex.devel 2018-10-15 04:39:39 -04:00
nanoric
562fae9a25 [Mod] WebSocketClient:非纯虚函数不使用abstractmethod 2018-10-15 04:39:09 -04:00
nanoric
c50c31a6bd [Mod] sendRequest改名为sendPacket 
和onPacket对应。
 2018-10-15 04:37:55 -04:00
nanoric
b8c6c92c43 [Mod] 使用一些VtObject相关的静态函数 2018-10-15 04:36:37 -04:00
nanoric
4d7c3bf417 [Add] WebSocketClient:增加onDisconnected 2018-10-15 04:35:55 -04:00
nanoric
a55246eb77 [Mod] WebSocketClient.onMessage改名为onPacket，以免和正常WebSocket的onMessage搞混。 2018-10-15 04:30:06 -04:00
nanoric
66cb55ef26 [Add] 增加一些用于创建VtObject的静态方法 2018-10-15 03:56:20 -04:00
nanoric
f2f4669123 [Fix] 修正错误的对websocket的引用 2018-10-15 03:20:54 -04:00
nanoric
a3129a8007 [Mod] sendReq改名为sendRequest（同步），addReq改名为addRequest（异步） 2018-10-15 03:12:05 -04:00
nanoric
c8a071f38e [Mod] 整理格式 2018-10-12 03:11:10 -04:00
nanoric
7cf5825bbe [Add] OkexFutureGateway:增加持仓查询接口 2018-10-12 03:08:12 -04:00
vn.py
449c0284de
Merge pull request #1164 from nanoric/refactor.network.devel 
Refactor.network.devel 2018-10-11
 2018-10-12 14:42:44 +08:00
nanoric
e51e03f910 [Fix] 修正对齐 2018-10-12 02:21:44 -04:00
nanoric
86586a71c7 [Add] OkexFutureGateway增加了queryOrders的接口 2018-10-12 02:19:57 -04:00
nanoric
c88f5b497a [Mod] errorCode2String改名为errorCodeToString 2018-10-12 02:04:39 -04:00
nanoric
abc82ecd96 [Fix] 修改一下typeHint 2018-10-12 01:30:58 -04:00
nanoric
aad3b6c51e [Fix] 将OkexzFutureRestClient.queryOrders变为可用 
[Mod] 修改一些注释
 2018-10-12 00:02:44 -04:00
nanoric
63c8401931 [Fix] 修复OkexFutureClient缺少签名的错误 2018-10-12 00:02:36 -04:00
nanoric
4878b3291b [Mod] 将Enum改为普通的object 
[Mod] onFailed增加一个errorCode参数
 2018-10-11 23:39:01 -04:00
nanoric
8c971c7d81 [Add] 增加OkexFutureSymbol类以表示可支持的合约（无法直接从API查询） 2018-10-11 23:10:00 -04:00
nanoric
6e0e1c116b [Mod] 将RestClient和WebClient移动到api文件夹中，并修改import方式 2018-10-11 22:53:48 -04:00
nanoric
a396b55f8e [Add] 完成OkexFutureApi.queryOrders 2018-10-11 22:50:04 -04:00
nanoric
0ee13bf862 [Add] RestClient:增加了Join函数 
[Mod] 将processReq改为保护方法：改名为_processReq
 2018-10-11 22:06:30 -04:00
vn.py
051f00f051
Merge pull request #1161 from raycool/raycool-dev 
套利交易逻辑对冲函数逻辑被动腿错误
 2018-10-12 09:08:39 +08:00
vn.py
9d834b040e
Merge pull request #1159 from nanoric/refactor.network 
Refactor.network
 2018-10-12 09:04:26 +08:00
huguanghui
100700257b fix symbol error 2018-10-11 20:34:27 +08:00
huguanghui
72fef7f1ff fix symbol error 2018-10-11 20:30:59 +08:00
nanoric
d9b5de31f3 [Add] 准备增加queryOrders 2018-10-11 06:13:40 -04:00
nanoric
0749007dc7 [Add] 修改部分注释 2018-10-11 06:12:41 -04:00
nanoric
694317b663 [Mod] 修改order的字段获取顺序：按字母顺序排列 2018-10-11 05:50:28 -04:00
nanoric
cf546672fd [Add] 完成okexFutureGateway.sendOrder 2018-10-11 04:05:26 -04:00
nanoric
a4859a94eb [Fix] OkexFutureApi:将onFailed参数变为真的可选 2018-10-11 04:04:33 -04:00