ctpbee-opt-api 0.1.0__cp310-cp310-win_amd64.whl → 0.1.1__cp310-cp310-win_amd64.whl

ctpbee_api/ctp/vnctp/vnctptd/vnctptd.cpp

@@ -768,6 +768,26 @@ void TdApi::OnRspQryProduct(CThostFtdcProductField *pProduct, CThostFtdcRspInfoF
 
 void TdApi::OnRspQryInstrument(CThostFtdcInstrumentField *pInstrument, CThostFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast)
 {
+	// 批量模式：直接在 CTP 回调线程缓存，不走 Task 队列
+	if (this->instrument_batch_mode)
+	{
+		if (pInstrument)
+		{
+			this->instrument_buffer.push_back(*pInstrument);
+		}
+		if (bIsLast)
+		{
+			// 最后一条，创建一个特殊 Task 触发批量回调
+			Task task = Task();
+			task.task_name = ONRSPQRYINSTRUMENT;
+			task.task_last = true;
+			task.task_id = nRequestID;
+			this->task_queue.push(task);
+		}
+		return;
+	}
+	
+	// 非批量模式：原有逻辑
 	Task task = Task();
 	task.task_name = ONRSPQRYINSTRUMENT;
 	if (pInstrument)
@@ -4579,21 +4599,10 @@ void TdApi::processRspQryProduct(Task *task)
 
 void TdApi::processRspQryInstrument(Task *task)
 {
-	// 批量模式：缓存数据，最后一条时一次性回调
+	// 批量模式：数据已在 OnRspQryInstrument 中缓存，这里只处理最后的回调
 	if (this->instrument_batch_mode)
 	{
-		if (task->task_data)
-		{
-			CThostFtdcInstrumentField *task_data = (CThostFtdcInstrumentField*)task->task_data;
-			this->instrument_buffer.push_back(*task_data);
-			delete task_data;
-		}
-		if (task->task_error)
-		{
-			delete (CThostFtdcRspInfoField*)task->task_error;
-		}
-		
-		// 最后一条数据，一次性回调 Python
+		// 批量模式下 task_data 为空，数据已在 instrument_buffer 中
 		if (task->task_last)
 		{
 			gil_scoped_acquire acquire;

{ctpbee_opt_api-0.1.0.dist-info → ctpbee_opt_api-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctpbee_opt_api
-Version: 0.1.0
+Version: 0.1.1
 Summary: Optimized Trading API for China Future - Based on ctpbee_api with GIL optimization
 Home-page: https://github.com/fangdejia/ctpbee_api
 Author: fangdejia

{ctpbee_opt_api-0.1.0.dist-info → ctpbee_opt_api-0.1.1.dist-info}/RECORD

@@ -5,8 +5,8 @@ ctpbee_api/ctp/libthostmduserapi_se.so,sha256=L9-iCMYj39fN0pB9EZHPc0cZMFrSYhW_xq
 ctpbee_api/ctp/libthosttraderapi_se.so,sha256=ZsfsfpviJDETXY_eJixVPPAJzeDLGd7gTPvQvm3dtPE,5382769
 ctpbee_api/ctp/thostmduserapi_se.dll,sha256=2X2QBTcMnIlV5j5_2jCu2LUSF_WKtpztTjQ0X4A0GN0,2904064
 ctpbee_api/ctp/thosttraderapi_se.dll,sha256=mgjwKEfk92Y-mk-CEAuP0bG41bx1gX5A9xZLjZFOHVY,3288576
-ctpbee_api/ctp/vnctpmd.cp310-win_amd64.pyd,sha256=_ua_F0dyehW5FgkCOzkZh2m9rqeSPCRNZ_t9C8tZ8Ik,182272
-ctpbee_api/ctp/vnctptd.cp310-win_amd64.pyd,sha256=_646R-nILuHS77RSxAnhOxgNmIjsFFTYmBK3AzZ68TE,969216
+ctpbee_api/ctp/vnctpmd.cp310-win_amd64.pyd,sha256=CaDNQwa8aJzmwpbNpmDbZnhJOG90uqudj6NfNxTddwk,182272
+ctpbee_api/ctp/vnctptd.cp310-win_amd64.pyd,sha256=T6sX08nZU-1ybJNdNbdXwXDHgdFtEp4uQDUWXSkc4eE,968704
 ctpbee_api/ctp/generator/concat.py,sha256=zINvTtSlwNIIwCnjnjwk0oIVv3_-wgDnRRS_FAJ1KcY,3113
 ctpbee_api/ctp/generator/const.py,sha256=jIrdo9rVvaSj-qh4-4wUVkO5LR0K4fKj3n5-u_N0KzU,7165
 ctpbee_api/ctp/generator/ctp_constant.py,sha256=K2gn0B8E7tSV8GPM846g8lBmDGlA0y2-G5005vN3lSs,41839
@@ -153,7 +153,7 @@ ctpbee_api/ctp/vnctp/vnctptd/dllmain.cpp,sha256=RBdeSvREHArOGyNnuQQf3O_0m2Z2fL8s
 ctpbee_api/ctp/vnctp/vnctptd/stdafx.cpp,sha256=Yj6RdfxRRQpT9xirVcoV912G_q4LO3xZ1VEE-lPYRAU,21
 ctpbee_api/ctp/vnctp/vnctptd/stdafx.h,sha256=viv-zJfjxUq42Ttuf8ed8dbt4hmNcmRaRBJMDUDCDJs,374
 ctpbee_api/ctp/vnctp/vnctptd/targetver.h,sha256=SagR8Xke0x_J9FtmZwk_0UrCJfynq60u71mi6ew3jAg,296
-ctpbee_api/ctp/vnctp/vnctptd/vnctptd.cpp,sha256=dsO6X8OjuCGSErirEV4H1PewJ3jRf3Tmt9rsclgnOSY,437093
+ctpbee_api/ctp/vnctp/vnctptd/vnctptd.cpp,sha256=glZbRcbqDcOiiY4lKuehG7oQ5n0CeWuSyUL4kG5U_zU,437357
 ctpbee_api/ctp/vnctp/vnctptd/vnctptd.h,sha256=yw8xCSRn11peyetvn6TYtn_NdoOBV1ERHjJ3CfchNus,57306
 ctpbee_api/ctp/vnctp/vnctptd/vnctptd.vcxproj,sha256=PZl3S3LLPqbV6S06F6oEWgcQ8_x9uRSo5GIBbpx0ZhI,10725
 ctpbee_api/ctp/vnctp/vnctptd/vnctptd.vcxproj.filters,sha256=eWYS-vGjDlg2-VndHQ2BYxWZEoU-3GIoHNpdAN3CtEU,2000
@@ -164,8 +164,8 @@ ctpbee_api/ctp_mini/libthosttraderapi.so,sha256=zYyWfI6oNi0UyP5bX1_JWx_5plibCzom
 ctpbee_api/ctp_mini/mini_constant.py,sha256=Jjl9msUup_-8_gqxP0BtjEGdqizA4AP_CcloafFU3ws,38990
 ctpbee_api/ctp_mini/thostmduserapi.dll,sha256=55jsCD-TEjA8JtETS0uVZC3S8BJBLu7D9ShVfQc4b4M,666624
 ctpbee_api/ctp_mini/thosttraderapi.dll,sha256=vbxUVG5wZTE3B99hFIHUc3PeuZgR_QO3loCxsrJF4YY,2481152
-ctpbee_api/ctp_mini/vnctp_minimd.cp310-win_amd64.pyd,sha256=KtYMR-5OPHZ3XLXXuVEQ4IooEyarCMUQpOzk3Knajag,174080
-ctpbee_api/ctp_mini/vnctp_minitd.cp310-win_amd64.pyd,sha256=rR2aDExCrfp5cvV-ecT7zwcnQY99jNPCtHSiG6KpvDY,524800
+ctpbee_api/ctp_mini/vnctp_minimd.cp310-win_amd64.pyd,sha256=QjOQ_z3Av-WFB2VBBzRTO6AiQknBATjQqsyY6l3ao-g,174080
+ctpbee_api/ctp_mini/vnctp_minitd.cp310-win_amd64.pyd,sha256=Xr6vMUThl8yyA_b7uAYIVyvEqu4Ttx8MeR_4FTHASx4,524800
 ctpbee_api/ctp_mini/vnctp_minitd.lib,sha256=B46FT6_wU6A7jyfx_Ad4kMLNtm81DrX0p1MSPTtVSGY,1750
 ctpbee_api/ctp_mini/generator/generate_api_functions.py,sha256=rBfKQ0WuJi6mgSZefSvtzDrRpn6V1ddUWw3MkksqwYM,13363
 ctpbee_api/ctp_mini/generator/generate_data_type.py,sha256=_olRQIV7Sk4MRmp0Dz5toriKf47YjCp0HfA_SQt712Y,2039
@@ -292,8 +292,8 @@ ctpbee_api/rohon/libthosttraderapi_se.so,sha256=2T9XFAHSDAYJnry7ZxK5xmpICUwItjHM
 ctpbee_api/rohon/rohon_constant.py,sha256=DcpKFDXxJK6bnofqxinPD4V6XENmzNMComJC6FMW-tU,40901
 ctpbee_api/rohon/thostmduserapi_se.dll,sha256=b0nqdY_HDBOlDwOE3PAt1PI2qYs6L5da_4dMyJDMZpM,2809856
 ctpbee_api/rohon/thosttraderapi_se.dll,sha256=Z4tnwA97nS-UZbZwWQWo1EGzJ8FGNbX86qgQJcK53-E,206336
-ctpbee_api/rohon/vnrohonmd.cp310-win_amd64.pyd,sha256=ynPCYPZ_aURmEDgEKx3cEeh88MXv6FQ4bxQl-VXIQJI,175616
-ctpbee_api/rohon/vnrohontd.cp310-win_amd64.pyd,sha256=hs1H_CeYUUOQgmekoL3hA54UASbwwDy_FyiWqmKJH78,900608
+ctpbee_api/rohon/vnrohonmd.cp310-win_amd64.pyd,sha256=tAC3dDXLWsevz3By6AO26UVLr1XrQVimUxQxcqLB3tU,175616
+ctpbee_api/rohon/vnrohontd.cp310-win_amd64.pyd,sha256=X7wBPEJfklNIMcIgBvpQaHBzpRlLSXkuQ4f3B0Rxtns,900608
 ctpbee_api/rohon/generator/generate_api_functions.py,sha256=06o1OtNccJI2RW8V8-sQCSSwnZ-wV_KPAuRryu5G5ws,13667
 ctpbee_api/rohon/generator/generate_data_type.py,sha256=FFxk-BwGmVlRuccYFYnOEi949aGb_YT7NIcb90byNhY,2022
 ctpbee_api/rohon/generator/generate_struct.py,sha256=KDf9OAjMPNZiNuh8QXKZQdyDtezimV4JPteGFVhQSBo,2279
@@ -408,7 +408,7 @@ ctpbee_api/rohon/vnrohon/vnrohontd/vnrohontd.h,sha256=dVsI9f10_wOs29pEUtKFf_PwNI
 ctpbee_api/rohon/vnrohon/vnrohontd/vnrohontd.vcxproj,sha256=9OdQZjrguaYg7Xc4BaXEbAgD1h6yU1C0ysm3UxdsLpo,9847
 ctpbee_api/rohon/vnrohon/vnrohontd/vnrohontd.vcxproj.filters,sha256=scQg1ZHD1JICi5bfece7TRyzo4j7A4prLCx3GFSOfFU,2008
 ctpbee_api/rohon/vnrohon/vnrohontd/vnrohontd.vcxproj.user,sha256=6VOwJtDzgxiMdTSH3wpNh5-l2luoKsl5qod9uE6JoGA,165
-ctpbee_opt_api-0.1.0.dist-info/METADATA,sha256=lO8RuuGeFhPKwfrXGlVMs8E1MP5ejxCcpRAJa9HHFKI,1404
-ctpbee_opt_api-0.1.0.dist-info/WHEEL,sha256=lVtJYX4SZwMxwg8oP4kB_UdF4VQRXLlqu7hUy_2nnAE,102
-ctpbee_opt_api-0.1.0.dist-info/top_level.txt,sha256=C9UJWyrSHeURUlhNrW8Zkv2yZVVuiOfUM8-GqRhGoaA,11
-ctpbee_opt_api-0.1.0.dist-info/RECORD,,
+ctpbee_opt_api-0.1.1.dist-info/METADATA,sha256=0T_p7N-lYU7_DLnJNdcdOjGXueQIi50FxPAKozdW5AU,1404
+ctpbee_opt_api-0.1.1.dist-info/WHEEL,sha256=lVtJYX4SZwMxwg8oP4kB_UdF4VQRXLlqu7hUy_2nnAE,102
+ctpbee_opt_api-0.1.1.dist-info/top_level.txt,sha256=C9UJWyrSHeURUlhNrW8Zkv2yZVVuiOfUM8-GqRhGoaA,11
+ctpbee_opt_api-0.1.1.dist-info/RECORD,,