Commit Graph

1002 Commits

Author SHA1 Message Date
nanoric
f6d0cda6ce [Mod] WebSocketClient: remove useless lock. 2019-03-15 03:00:28 -04:00
nanoric
ee307d6323 [Fix] OesGateway: ensure all on_order on_tick response will receive a new python object. 2019-03-15 02:58:37 -04:00
nanoric
fed48e1a06 [Add] BitmexGateway: Added some comment to make logic more clear. 2019-03-15 02:51:49 -04:00
nanoric
88f661615c [Add] BitmexGateway: make send_order thread-safe 2019-03-15 02:43:05 -04:00
nanoric
39effc29b4 [Mod] BtimexGateway: renaeme setting.session into session_number 2019-03-15 02:28:54 -04:00
nanoric
49e721844e [Mod] change typing and docs for RestClient and WebSocketClient 2019-03-15 02:26:05 -04:00
nanoric
51c8ed3b03 [Add] some docs for BaseGateway 2019-03-15 02:24:58 -04:00
nanoric
2ee257bed1 [Fix] OesGateway.TdApi: Optimized reconnect for rpt channel & ord channel
[Fix] OesGateway.TdApi: Multiple reconnect request will not blocked now.
2019-03-15 00:20:39 -04:00
nanoric
a2c91c99cd [Fix] OesGateway.MdApi: Optimized reconnect for tcp channel 2019-03-15 00:18:19 -04:00
nanoric
9410775fb3 [Add] OesGateway: TD API: Reconnect: Reduce CPU usage. 2019-03-15 00:02:03 -04:00
nanoric
459fc4770f [Fix] OesGateway:Optimized connect status detection 2019-03-14 23:21:00 -04:00
nanoric
71d34d5854 [Add] OesGateway: 成功连接到行情服务器的提示 2019-03-14 23:10:14 -04:00
nanoric
5f5bf06e53 [Add] OesGateway: User can supply a hdd serial number.
[Fix] OesGateway: Optimized reconnection of td api: reconnect if connection of ord_channel is lost.
2019-03-14 23:05:33 -04:00
1122455801
d73be6d77c Update tiger_gateway.py 2019-03-15 10:12:55 +08:00
vn.py
5a6f496cb1 [Fix]Close #1481 2019-03-15 08:58:44 +08:00
nanoric
9b4f360bef [Fix] OesGateway:修复一个BUG:多个打开多个vnpy实例时重连会导致重连的服务器混乱的问题
[Fix] OesGateway:修复成交委托号为0的BUG

Windows version fix only. Linux not supported yet.
2019-03-14 07:37:23 -04:00
vn.py
b105b08c9f [Mod]change ibapi to use relative import 2019-03-14 09:52:01 +08:00
vn.py
3758d13cd2 [Mod]change talib import 2019-03-14 09:45:21 +08:00
vn.py
51166282d6 [Add]embed talib into project 2019-03-14 09:44:59 +08:00
vn.py
adb884e19f [Add]ib api source code into vnpy.api 2019-03-14 09:28:12 +08:00
vn.py
da53a5fc0b [Mod]Add support for spread product class, close #1479 2019-03-14 09:22:03 +08:00
vn.py
7711825486 [Fix]Close #1474 2019-03-14 09:10:57 +08:00
1122455801
d0073ea6c6 Update tiger_gateway.py 2019-03-12 17:39:28 +08:00
1122455801
918191e06d Merge branch 'v2.0.1-DEV' into tiger_gateway_version_05 2019-03-11 17:06:29 +08:00
1122455801
f009c33f57 Update tiger_gateway.py 2019-03-11 16:33:11 +08:00
1122455801
4cfab5b9d9 Update tiger_gateway.py 2019-03-11 16:16:08 +08:00
vn.py
cc129b3e2c
Merge pull request #1459 from nanoric/oes_fix
Oes fix
2019-03-08 22:32:52 +08:00
vn.py
3a982534a7
Merge pull request #1458 from 1122455801/tiger_gateway_version_03
[Mod] futu_gateway.py
2019-03-08 22:32:30 +08:00
nanoric
d1306dd237 [Fix] 修正成交发生时订单成交量错误的BUG 2019-03-08 08:56:47 -04:00
nanoric
212b864c69 [Add] Add lock to make public methods of gateway thread-safe 2019-03-08 08:56:05 -04:00
nanoric
0daffb3e5f [Mod] OesTdApi: uniform naming. 2019-03-08 08:50:45 -04:00
nanoric
34bce32dc0 [Fix] 修复stop()之后还重连一次的bug 2019-03-08 07:41:11 -04:00
nanoric
9b694fce07 [Mod] md, td并行连接,加快td响应速度。 2019-03-08 07:38:00 -04:00
nanoric
7eaa0c19f6 [Del] remove useless code 2019-03-08 07:35:19 -04:00
nanoric
eb5aac2595 [Mod] 统一格式,隐藏内部变量 2019-03-08 07:35:18 -04:00
nanoric
637dabd406 [Mod] remove OrderManager 2019-03-08 07:35:18 -04:00
nanoric
897e7f0372 [Fix] OesTdApi:修复退出时还在重连的Bug
[Fix] 修复无法撤销非本会话订单的BUG
[Fix] 填充order&trade中的time字段
[Fix] 冻结资金不再是计算得出,而是使用精确的挂单冻结资金。
2019-03-08 07:35:17 -04:00
nanoric
e2e93cef3b [Fix] oes.MdApi: 修复退出时还在重连的BUG 2019-03-08 07:35:17 -04:00
nanoric
ee3731f21c [Mod] 去除不必要的订阅 2019-03-08 07:35:16 -04:00
nanoric
cad96b95fc [Add] gateway.oes: reconnect 2019-03-08 07:35:16 -04:00
nanoric
a280758809 dev 2019-03-08 07:35:09 -04:00
1122455801
5e753f5003 Update futu_gateway.py 2019-03-08 17:25:52 +08:00
vn.py
67a8e5bdd2 [Mod]Use thread pool for changing sync call to async in tiger_gateway 2019-03-08 16:42:21 +08:00
vn.py
a30766bc72
Merge pull request #1457 from 1122455801/tiger_gateway_version_03
[Mod] tiger_gateway.py
2019-03-08 15:51:15 +08:00
1122455801
63d88de2b3 Update tiger_gateway.py 2019-03-08 15:46:56 +08:00
vn.py
a54699b11d [Fix]Close #1454 2019-03-08 10:12:21 +08:00
vn.py
0ac6034fd7 [Fix]Close #1451 2019-03-08 09:44:38 +08:00
vn.py
08a82f3dd2 [Fix]Close #1450 2019-03-08 09:43:45 +08:00
vn.py
bd43538a31
Merge pull request #1449 from 1122455801/tiger_gateway_version_02
[Add] Tiger gateway
2019-03-07 15:03:50 +08:00
1122455801
30a65dfd43 Update tiger_gateway.py 2019-03-07 14:58:44 +08:00
vn.py
acf14b7f19 [Fix]Close #1340 2019-03-07 14:11:26 +08:00
vn.py
c282ab13f9 [Fix]Close #1427 2019-03-07 13:51:51 +08:00
vn.py
bfb5e1ea42 [Fix]Close #1439 2019-03-07 13:47:29 +08:00
vn.py
b10726fa40 [Fix]Close #1442 2019-03-07 13:46:02 +08:00
vn.py
f4d34bae13 [Fix]Close #1443 2019-03-07 13:32:45 +08:00
vn.py
c5accfc44b [Fix]Close #1446 2019-03-07 13:28:19 +08:00
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