hikyuu 2.6.8.5__py3-none-win_amd64.whl → 2.6.9__py3-none-win_amd64.whl

hikyuu/extend.py

@@ -12,7 +12,6 @@ os.environ["NUMEXPR_MAX_THREADS"] = str(os.cpu_count())
 from datetime import datetime, timedelta, date  # NOQA: E402
 import numpy as np  # NOQA: E402
 import pandas as pd  # NOQA: E402
-import pyarrow as pa  # NOQA: E402
 
 # 解决中文对齐问题
 pd.set_option('display.unicode.ambiguous_as_wide', True)

hikyuu/extend.pyi

@@ -31,6 +31,7 @@ from hikyuu.cpp.core39 import LoanRecord
 from hikyuu.cpp.core39 import MarketInfo
 from hikyuu.cpp.core39 import MoneyManagerBase
 from hikyuu.cpp.core39 import MultiFactorBase
+from hikyuu.cpp.core39 import NormalizeBase
 from hikyuu.cpp.core39 import OrderBrokerBase
 from hikyuu.cpp.core39 import Parameter
 from hikyuu.cpp.core39 import Performance
@@ -41,6 +42,7 @@ from hikyuu.cpp.core39 import ProfitGoalBase
 from hikyuu.cpp.core39 import Query
 from hikyuu.cpp.core39 import ScoreRecord
 from hikyuu.cpp.core39 import ScoreRecordList
+from hikyuu.cpp.core39 import ScoresFilterBase
 from hikyuu.cpp.core39 import SelectorBase
 from hikyuu.cpp.core39 import SignalBase
 from hikyuu.cpp.core39 import SlippageBase
@@ -76,6 +78,7 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AF_FixedWeightList
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AF_MultiFactor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AGG_COUNT
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AGG_FUNC
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AGG_MAD
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AGG_MAX
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AGG_MEAN
@@ -138,6 +141,13 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import FILTER
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import FINANCE
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import FLOOR
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_COUNT
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_FUNC
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_MAX
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_MEAN
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_MIN
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_PROD
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import GROUP_SUM
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import HHV
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import HHVBARS
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import HOUR
@@ -200,6 +210,11 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import Milliseconds
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import Minutes
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NDAY
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NORM_MinMax
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NORM_NOTHING
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NORM_Quantile
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NORM_Quantile_Uniform
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NORM_Zscore
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import NOT
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PF_Simple
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PF_WithoutAF
@@ -209,6 +224,7 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import POS
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import POW
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import QUANTILE_TRUNC
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import RANK
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import RECOVER_BACKWARD
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import RECOVER_EQUAL_BACKWARD
@@ -228,10 +244,17 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import ROUNDUP
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import RSI
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SAFTYLOSS
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_AmountLimit
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_Group
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_IgnoreNan
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_LessOrEqualValue
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_Price
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SCFilter_TopN
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_EvaluateOptimal
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_Fixed
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_MaxFundsOptimal
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_MultiFactor
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_MultiFactor2
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_PerformanceOptimal
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SE_Signal
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SGN
@@ -471,13 +494,13 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import ZHBOND10
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import ZONGGUBEN
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import ZSCORE
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __add__ as __old_Datetime_add__
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __add__ as __old_TimeDelta_add__
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __add__ as __old_Datetime_add__
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __init__ as __old_TimeDelta_init__
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __init__ as __old_Datetime_init__
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __init__ as old_Query_init
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __init__ as __old_TimeDelta_init__
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __sub__ as __old_TimeDelta_sub__
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __sub__ as __old_Datetime_sub__
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import __sub__ as __old_TimeDelta_sub__
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import active_device
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import backtest
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import batch_calculate_inds
@@ -501,6 +524,7 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_business_name
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_data_from_buffer_server
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_date_range
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_funds_list
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_inds_view
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_inds_view_pyarrow
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import get_kdata
@@ -527,6 +551,8 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import krecords_to_pa
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import open_ostream_to_python
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import open_spend_time
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import parallel_run_pf
+from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import parallel_run_sys
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import positions_to_df
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import positions_to_np
 from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import positions_to_pa
@@ -567,9 +593,8 @@ from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 impor
 import numpy as np
 import os as os
 import pandas as pd
-import pyarrow as pa
 import sys as sys
-__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'AGG_COUNT', 'AGG_MAD', 'AGG_MAX', 'AGG_MEAN', 'AGG_MEDIAN', 'AGG_MIN', 'AGG_PROD', 'AGG_QUANTILE', 'AGG_STD', 'AGG_SUM', 'AGG_VAR', 'ALIGN', 'AMA', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSLASTCOUNT', 'BARSSINCE', 'BARSSINCEN', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CEILING', 'CN_Bool', 'CN_OPLine', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'HHV', 'HHVBARS', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA_PART', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LoanRecord', 'MA', 'MACD', 'MAX', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NOT', 'OFF', 'OrderBrokerBase', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Performance', 'Portfolio', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RANK', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REFX', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_EvaluateOptimal', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TradeCostBase', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransRecord', 'UPNDAY', 'UTCOffset', 'VAR', 'VARP', 'VIGOR', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WITHDAY', 'WITHHALFYEAR', 'WITHHOUR', 'WITHHOUR2', 'WITHHOUR4', 'WITHKTYPE', 'WITHMIN', 'WITHMIN15', 'WITHMIN30', 'WITHMIN5', 'WITHMIN60', 'WITHMONTH', 'WITHQUARTER', 'WITHWEEK', 'WITHYEAR', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'backtest', 'batch_calculate_inds', 'can_upgrade', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_index', 'constant', 'crtBrokerTM', 'crtSEOptimal', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'date', 'dates_to_np', 'dates_to_pa', 'datetime', 'df_to_krecords', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_data_from_buffer_server', 'get_date_range', 'get_inds_view', 'get_inds_view_pyarrow', 'get_kdata', 'get_last_version', 'get_log_level', 'get_market_view', 'get_market_view_pyarrow', 'get_spot_from_buffer_server', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'hikyuu_init', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'is_valid_license', 'isinf', 'isnan', 'krecords_to_df', 'krecords_to_np', 'krecords_to_pa', 'new_Query_init', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'pa', 'pd', 'positions_to_df', 'positions_to_np', 'positions_to_pa', 'register_extra_ktype', 'release_extra_ktype', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'scorerecords_to_df', 'scorerecords_to_np', 'set_log_level', 'set_python_in_interactive', 'set_python_in_jupyter', 'spot_agent_is_connected', 'spot_agent_is_running', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'systemweights_to_df', 'systemweights_to_np', 'timedelta', 'timeline_to_df', 'timeline_to_np', 'timeline_to_pa', 'toPriceList', 'trades_to_df', 'trades_to_np', 'trades_to_pa', 'translist_to_df', 'translist_to_np', 'translist_to_pa', 'view_license', 'weights_to_df', 'weights_to_np', 'weights_to_pa']
+__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'AGG_COUNT', 'AGG_FUNC', 'AGG_MAD', 'AGG_MAX', 'AGG_MEAN', 'AGG_MEDIAN', 'AGG_MIN', 'AGG_PROD', 'AGG_QUANTILE', 'AGG_STD', 'AGG_SUM', 'AGG_VAR', 'ALIGN', 'AMA', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSLASTCOUNT', 'BARSSINCE', 'BARSSINCEN', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CEILING', 'CN_Bool', 'CN_OPLine', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'GROUP_COUNT', 'GROUP_FUNC', 'GROUP_MAX', 'GROUP_MEAN', 'GROUP_MIN', 'GROUP_PROD', 'GROUP_SUM', 'HHV', 'HHVBARS', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA_PART', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LoanRecord', 'MA', 'MACD', 'MAX', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NORM_MinMax', 'NORM_NOTHING', 'NORM_Quantile', 'NORM_Quantile_Uniform', 'NORM_Zscore', 'NOT', 'NormalizeBase', 'OFF', 'OrderBrokerBase', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Performance', 'Portfolio', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'QUANTILE_TRUNC', 'Query', 'RANK', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REFX', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SCFilter_AmountLimit', 'SCFilter_Group', 'SCFilter_IgnoreNan', 'SCFilter_LessOrEqualValue', 'SCFilter_Price', 'SCFilter_TopN', 'SE_EvaluateOptimal', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_MultiFactor2', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'ScoresFilterBase', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TradeCostBase', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransRecord', 'UPNDAY', 'UTCOffset', 'VAR', 'VARP', 'VIGOR', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WITHDAY', 'WITHHALFYEAR', 'WITHHOUR', 'WITHHOUR2', 'WITHHOUR4', 'WITHKTYPE', 'WITHMIN', 'WITHMIN15', 'WITHMIN30', 'WITHMIN5', 'WITHMIN60', 'WITHMONTH', 'WITHQUARTER', 'WITHWEEK', 'WITHYEAR', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'backtest', 'batch_calculate_inds', 'can_upgrade', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_index', 'constant', 'crtBrokerTM', 'crtSEOptimal', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'date', 'dates_to_np', 'dates_to_pa', 'datetime', 'df_to_krecords', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_data_from_buffer_server', 'get_date_range', 'get_funds_list', 'get_inds_view', 'get_inds_view_pyarrow', 'get_kdata', 'get_last_version', 'get_log_level', 'get_market_view', 'get_market_view_pyarrow', 'get_spot_from_buffer_server', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'hikyuu_init', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'is_valid_license', 'isinf', 'isnan', 'krecords_to_df', 'krecords_to_np', 'krecords_to_pa', 'new_Query_init', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'parallel_run_pf', 'parallel_run_sys', 'pd', 'positions_to_df', 'positions_to_np', 'positions_to_pa', 'register_extra_ktype', 'release_extra_ktype', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'scorerecords_to_df', 'scorerecords_to_np', 'set_log_level', 'set_python_in_interactive', 'set_python_in_jupyter', 'spot_agent_is_connected', 'spot_agent_is_running', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'systemweights_to_df', 'systemweights_to_np', 'timedelta', 'timeline_to_df', 'timeline_to_np', 'timeline_to_pa', 'toPriceList', 'trades_to_df', 'trades_to_np', 'trades_to_pa', 'translist_to_df', 'translist_to_np', 'translist_to_pa', 'view_license', 'weights_to_df', 'weights_to_np', 'weights_to_pa']
 def DatetimeList_to_df(data: hikyuu.cpp.core39.DatetimeList):
     ...
 def DatetimeList_to_np(data: hikyuu.cpp.core39.DatetimeList):

hikyuu/fetcher/stock/zh_block_em.py

@@ -17,7 +17,7 @@ from hikyuu.util import *
 em_num_per_page = 100
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_hybk_names():
     """获取所有行业(板块代码,板块名称)列表"""
     url = "https://19.push2.eastmoney.com/api/qt/clist/get"
@@ -50,7 +50,7 @@ def get_hybk_names():
     return ret
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_hybk_cons_code(blk_code):
     "获取指定行业板块成分代码列表"
     url = "http://30.push2.eastmoney.com/api/qt/clist/get"
@@ -83,16 +83,19 @@ def get_hybk_cons_code(blk_code):
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_hybk_info(code_market_dict, sep=""):
     """获取所有行业板块列表"""
     blk_list = get_hybk_names()
+    time.sleep(random.uniform(1, 3))
     ret = {}
-    for blk in blk_list:
+    total = len(blk_list)
+    for i, blk in enumerate(blk_list):
         stk_codes = get_hybk_cons_code(blk[0])
-        hku_info(f"获取行业板块{blk[1]}成分: {len(stk_codes)}")
+        hku_info(f"{i}|{total} 获取行业板块{blk[1]}成分: {len(stk_codes)}")
         ret[blk[1]] = [
             f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
+        time.sleep(random.uniform(1, 3))
     return ret
 
 
@@ -431,21 +434,23 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     return temp_df
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_gnbk_info(code_market_dict, sep=""):
     """获取所有概念版本列表"""
     blk_names = stock_board_concept_name_em()['板块名称']
     ret = {}
+    total = len(blk_names)
     for i, blk_name in enumerate(blk_names):
         stk_codes = stock_board_concept_cons_em(blk_name)
         stk_codes = stk_codes['代码'].to_list()
-        hku_info(f"{i} 获取概念板块{blk_name}成分: {len(stk_codes)}")
+        hku_info(f"{i}|{total} 获取概念板块{blk_name}成分: {len(stk_codes)}")
         ret[blk_name] = [
             f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
+        time.sleep(random.uniform(1, 3))
     return ret
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_dybk_names():
     """获取所有地域板块名称列表"""
     url = "http://13.push2.eastmoney.com/api/qt/clist/get"
@@ -478,7 +483,7 @@ def get_dybk_names():
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_dybk_info(code_market_dict, sep=""):
     """获取所有地域板块列表"""
     blk_list = get_dybk_names()
@@ -499,10 +504,12 @@ def get_all_dybk_info(code_market_dict, sep=""):
     }
 
     ret = {}
-    for v in blk_list:
+    total = len(blk_list)
+    for i, v in enumerate(blk_list):
         blk_code, blk_name = v[0], v[1]
         params["fs"] = f"b:{blk_code} f:!50"
         params["pn"] = 1
+        time.sleep(random.uniform(1, 3))
         r = requests.get(url, params=params, timeout=15)
         data = r.json()
         if data["data"] is None:
@@ -522,15 +529,34 @@ def get_all_dybk_info(code_market_dict, sep=""):
             ret[blk_name].extend(
                 [f"{code_market_dict[v['f12']]}{sep}{v['f12']}" for v in stk_json if v["f12"] in code_market_dict])
             time.sleep(random.uniform(1, 3))
-        hku_info(f'获取地域板块{blk_name}成分: {len(ret[blk_name])}')
+        hku_info(f'{i}|{total} 获取地域板块{blk_name}成分: {len(ret[blk_name])}')
 
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_zsbk_info(code_market_dict, sep=""):
     """获取所有指数成分股列表"""
     blk_info = ak.index_stock_info()
+    blk_info['index_code'] = blk_info['index_code'].astype(str)  # 确保是字符串类型
+    df_000 = blk_info[blk_info['index_code'].str.startswith('000')].reset_index(drop=True)  # 000前缀
+    df_399 = blk_info[blk_info['index_code'].str.startswith('399')].reset_index(drop=True)  # 399前缀
+
+    # 2. 交替合并两个DataFrame
+    merged_rows = []
+    max_length = max(len(df_000), len(df_399))  # 取两个DataFrame的最大长度
+
+    for i in range(max_length):
+        # 先加000前缀的行（如果存在）
+        if i < len(df_000):
+            merged_rows.append(df_000.iloc[i])
+        # 再加399前缀的行（如果存在）
+        if i < len(df_399):
+            merged_rows.append(df_399.iloc[i])
+
+    # 3. 转换为DataFrame
+    blk_info = pd.DataFrame(merged_rows).reset_index(drop=True)
+
     blk_codes = blk_info["index_code"]
     blk_names = blk_info["display_name"]
     ret = {}
@@ -542,17 +568,23 @@ def get_all_zsbk_info(code_market_dict, sep=""):
         # 沪深指数有重复，避免深指覆盖
         if blk_name in ret:
             continue
+
+        time.sleep(random.uniform(1, 3))
         try:
-            stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
-            stk_codes = stk_codes['成分券代码'].to_list()
-            hku_info("{} 获取指数板块{}成分: {}", i, blk_name, len(stk_codes))
+            if blk_code[:3] == "399":
+                stk_codes = ak.index_stock_cons(symbol=blk_code)
+                stk_codes = stk_codes['品种代码'].to_list()
+            else:
+                stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
+                stk_codes = stk_codes['成分券代码'].to_list()
+            hku_info("{}|{} 获取指数板块 {}|{} 成分: {}", i, total, blk_code, blk_name, len(stk_codes))
             ret[blk_name] = [
                 f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
         except KeyboardInterrupt:
             break
-        except:
-            # print("Failed!", blk_code, blk_name)
-            pass
+        except Exception as e:
+            print(f"Failed! {i}, {blk_code}, {blk_name}")
+            # raise e
     return ret
 
 

hikyuu/gui/HikyuuTDX.py

@@ -12,11 +12,10 @@ from logging.handlers import QueueListener
 # 优先加载，处理 VS 17.10 升级后依赖 dll 不兼容问题
 import hikyuu
 
-import PyQt5
-
-from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
-from PyQt5.QtCore import pyqtSlot, QObject, pyqtSignal
-from PyQt5.QtGui import QIcon, QTextCursor, QFont, QPalette, QPixmap
+# 替换PyQt5导入为PySide6
+from PySide6.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
+from PySide6.QtCore import Slot, QObject, Signal
+from PySide6.QtGui import QIcon, QTextCursor, QFont, QPalette, QPixmap
 
 import mysql.connector
 from mysql.connector import errorcode
@@ -43,7 +42,7 @@ from hikyuu.util import *
 
 class EmittingStream(QObject):
     """输出重定向至QT"""
-    textWritten = pyqtSignal(str)
+    textWritten = Signal(str)
 
     def write(self, text):
         self.textWritten.emit(str(text))
@@ -249,7 +248,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         except:
             pass
 
-    @pyqtSlot()
+    @Slot()
     def on_save_pushButton_clicked(self):
         try:
             self.saveConfig()
@@ -333,7 +332,22 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         icon = QIcon(f"{current_dir}/images/hikyuu_small.png")
         star_img = QPixmap(f"{current_dir}/images/star.png")
         self.label_44.setPixmap(star_img)
+        # 修改 label_46 的 HTML 文本，直接在 HTML 中设置字体大小
+
+        label_46_txt = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+hr { height: 1px; border-width: 0; }
+li.unchecked::marker { content: "\2610"; }
+li.checked::marker { content: "\2612"; }
+</style></head><body style="font-weight:400; font-style:normal;">
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Hikyuu </span><span style="font-weight:700;">专注于量化交易领域的核心技术构建，涵盖交易模型开发、极速计算引擎、高效回测框架及实盘拓展能力</span><span>，定位为量化交易计算引擎，为量化交易爱好者提供高性能底层架构支持。随着社区规模扩大，分散了作者在策略研究上的精力。为保障项目的可持续性，现对捐赠用户提供部分额外功能作为回馈，感谢社区伙伴的支持！</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>捐赠功能以插件的方式提供，采用独立授权许可，完全在 hikyuu 之外，对喜欢自行编译扩展的朋友没有影响。因插件许可授权需要采集硬件信息，如有疑虑只要不申请试用许可和正式许可授权，不会触发硬件信息采集，如申请，视为同意采集。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>详情参见：</span><a href="https://hikyuu.readthedocs.io/zh-cn/latest/vip/vip-plan.html"><span style="text-decoration: underline; color:#3586ff;">捐赠权益</span></a><span style="font-weight:700;"> ，感谢大家的支持！</span></p></body></html>
+"""
+        self.label_46.setText(label_46_txt)
         self.label_46.setOpenExternalLinks(True)
+
         self.label_license.setText(view_license())
         self.fetch_trial_pushButton.setEnabled(not is_valid_license())
 
@@ -434,6 +448,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if (not is_valid_license()) or hdf5_enable or mysql_enable:
             clickhouse_enable = False
         self.enable_clickhouse_radioButton.setChecked(clickhouse_enable)
+        self.enable_clickhouse_radioButton.setEnabled(is_valid_license())
         self.clickhouse_tmpdir_lineEdit.setText(import_config.get('clickhouse', 'tmpdir', fallback='d:/stock'))
         self.clickhouse_tmpdir_pushButton.setEnabled(clickhouse_enable)
         clickhouse_ip = import_config.get('clickhouse', 'host', fallback='127.0.0.1')
@@ -618,7 +633,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             '5MIN': self.hdf5_5min_progressBar
         }
 
-    @pyqtSlot()
+    @Slot()
     def on_fetch_trial_pushButton_clicked(self):
         email = self.email_lineEdit.text()
         info = fetch_trial_license(email)
@@ -626,7 +641,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.label_license.setText(view_license())
         self.fetch_trial_pushButton.setEnabled(not is_valid_license())
 
-    @pyqtSlot()
+    @Slot()
     def on_pytdx_radioButton_clicked(self):
         if self.pytdx_radioButton.isChecked():
             self.tdx_radioButton.setChecked(False)
@@ -634,7 +649,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.use_download = 'pytdx'
         self.on_tdx_or_pytdx_toggled()
 
-    @pyqtSlot()
+    @Slot()
     def on_tdx_radioButton_clicked(self):
         if self.tdx_radioButton.isChecked():
             self.pytdx_radioButton.setChecked(False)
@@ -642,6 +657,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.use_download = 'tdx'
         self.on_tdx_or_pytdx_toggled()
 
+    @Slot()
     def on_qmt_radioButton_clicked(self):
         if self.qmt_radioButton.isChecked():
             self.tdx_radioButton.setChecked(False)
@@ -675,7 +691,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.time_start_dateEdit.setEnabled(False)
             self.use_tdx_number_spinBox.setEnabled(False)
 
-    @pyqtSlot()
+    @Slot()
     def on_select_tdx_dir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -685,7 +701,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.tdx_dir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_hdf5_dir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -695,21 +711,21 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.hdf5_dir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_hdf55_radioButton_clicked(self):
         if self.enable_hdf55_radioButton.isChecked():
             self.enable_mysql_radioButton.setChecked(False)
             self.enable_clickhouse_radioButton.setChecked(False)
         self.on_enable_database_toggled(hdf5=True, mysql=False, clickhouse=False)
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_mysql_radioButton_clicked(self):
         if self.enable_mysql_radioButton.isChecked():
             self.enable_hdf55_radioButton.setChecked(False)
             self.enable_clickhouse_radioButton.setChecked(False)
         self.on_enable_database_toggled(hdf5=False, mysql=True, clickhouse=False)
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_clickhouse_radioButton_clicked(self):
         if self.enable_clickhouse_radioButton.isChecked():
             self.enable_hdf55_radioButton.setChecked(False)
@@ -732,7 +748,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.clickhouse_test_pushButton.setEnabled(clickhouse)
         self.clickhouse_tmpdir_pushButton.setEnabled(clickhouse)
 
-    @pyqtSlot()
+    @Slot()
     def on_mysql_tmpdir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -742,7 +758,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.mysql_tmpdir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_clickhouse_tmpdir_pushButton_clicked(self):
         if not is_valid_license():
             QMessageBox.critical(self, "clickhouse引擎", "需要捐赠授权才能使用clickhouse引擎")
@@ -756,7 +772,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.clickhouse_tmpdir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_mysql_test_pushButton_clicked(self):
         """测试数据库连接"""
         db_config = {
@@ -780,7 +796,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
         QMessageBox.about(self, "测试数据库连接", " 连接成功！")
 
-    @pyqtSlot()
+    @Slot()
     def on_clickhouse_test_pushButton_clicked(self):
         """测试数据库连接"""
         db_config = {
@@ -821,7 +837,8 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if msg_name == 'ESCAPE_TIME':
             self.escape_time = msg_task_name
             self.import_status_label.setText(
-                "耗时：{:>.2f} 秒 （{:>.2f}分钟） {}".format(self.escape_time, self.escape_time / 60, datetime.datetime.now())
+                "耗时：{:>.2f} 秒 （{:>.2f}分钟） {}".format(
+                    self.escape_time, self.escape_time / 60, datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
             )
 
         elif msg_name == 'HDF5_IMPORT':
@@ -890,7 +907,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                 if msg[2] != 'FINISHED':
                     self.import_detail_textEdit.append(msg[2])
 
-    @pyqtSlot()
+    @Slot()
     def on_start_import_pushButton_clicked(self):
         try:
             self.saveConfig()
@@ -965,7 +982,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.escape_time_thread.message.connect(self.on_message_from_thread)
         self.escape_time_thread.start()
 
-    @pyqtSlot()
+    @Slot()
     def on_sched_import_pushButton_clicked(self):
         self.sched_import_pushButton.setEnabled(False)
         if self._is_sched_import_running:
@@ -993,7 +1010,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.sched_import_pushButton.setText("停止定时导入")
         self.sched_import_pushButton.setEnabled(True)
 
-    @pyqtSlot()
+    @Slot()
     def on_collect_start_pushButton_clicked(self):
         if self._is_collect_running:
             if self.collect_spot_thread is not None and self.collect_spot_thread.isRunning():
@@ -1033,6 +1050,41 @@ def start():
     sys.exit(app.exec())
 
 
+def is_font_installed(font_name):
+    """检查字体是否安装"""
+    if sys.platform == "win32":
+        try:
+            import winreg
+            # 打开注册表中的字体项
+            key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts")
+            i = 0
+            while True:
+                try:
+                    name, value, _ = winreg.EnumValue(key, i)
+                    if font_name in name:
+                        winreg.CloseKey(key)
+                        return True
+                    i += 1
+                except WindowsError:
+                    break
+            winreg.CloseKey(key)
+        except:
+            # 如果注册表检查失败，则尝试创建字体对象
+            try:
+                f = QFont(font_name)
+                return f.exactMatch()
+            except:
+                pass
+        return False
+    else:
+        # 非Windows系统简单检查
+        try:
+            f = QFont(font_name)
+            return f.exactMatch()
+        except:
+            return False
+
+
 if __name__ == "__main__":
     import requests
     import urllib
@@ -1040,14 +1092,13 @@ if __name__ == "__main__":
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("pytdx").setLevel(logging.WARNING)
 
-    # 自适应分辨率，防止字体显示不全
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-
     app = QApplication(sys.argv)
-    f = QFont('SimSun')
-    f.setPixelSize(12)
-    app.setFont(f)
+    if sys.platform == 'win32':
+        # 检查Microsoft YaHei字体是否存在
+        if is_font_installed('Microsoft YaHei'):
+            f = QFont('Microsoft YaHei')
+            f.setPixelSize(12)
+            app.setFont(f)
 
     if (len(sys.argv) > 1 and sys.argv[1] == '0'):
         FORMAT = '%(asctime)-15s [%(levelname)s]: %(message)s [%(name)s::%(funcName)s]'

hikyuu/gui/data/CollectSpotThread.py

@@ -6,7 +6,7 @@ import logging
 import time
 import datetime
 from math import ceil
-from PyQt5.QtCore import QThread, QWaitCondition, QMutex
+from PySide6.QtCore import QThread, QWaitCondition, QMutex
 
 from hikyuu.util import *
 from hikyuu.gui.spot_server import collect, release_nng_senders