hikyuu 2.6.1__py3-none-win_amd64.whl → 2.6.2__py3-none-win_amd64.whl

hikyuu/__init__.pyi

@@ -179,8 +179,8 @@ from hikyuu.cpp.core39 import Portfolio
 from hikyuu.cpp.core39 import PositionRecord
 from hikyuu.cpp.core39 import PositionRecordList
 from hikyuu.cpp.core39 import ProfitGoalBase
-from hikyuu.cpp.core39 import Query
 from hikyuu.cpp.core39 import Query as Q
+from hikyuu.cpp.core39 import Query
 from hikyuu.cpp.core39 import RECOVER_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_FORWARD
@@ -562,8 +562,8 @@ from hikyuu.hub import get_part_info
 from hikyuu.hub import get_part_list
 from hikyuu.hub import get_part_module
 from hikyuu.hub import get_part_name_list
-from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import print_part_info
+from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import remove_hub
 from hikyuu.hub import search_part
 from hikyuu.hub import update_hub
@@ -615,8 +615,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error
@@ -795,7 +795,7 @@ V: cpp.core39.Indicator  # value = Indicator{...
 VOL: cpp.core39.Indicator  # value = Indicator{...
 WARN: cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.WARN: 3>
 __copyright__: str = '\nApache License Version 2.0\n\nCopyright (c) 2010-2017 fasiondog\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n'
-__version__: str = '2.6.1'
+__version__: str = '2.6.2'
 blocka = None
 blockbj = None
 blockg = None

hikyuu/core.pyi

@@ -498,5 +498,5 @@ INFO: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.INFO: 2>
 OFF: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.OFF: 6>
 TRACE: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.TRACE: 0>
 WARN: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.WARN: 3>
-__version__: str = '2.6.1'
+__version__: str = '2.6.2'
 constant: hikyuu.cpp.core39.Constant  # value = <hikyuu.cpp.core39.Constant object>

hikyuu/cpp/core310.pyi

@@ -5749,8 +5749,24 @@ class StrategyContext:
     @staticmethod
     def _pybind11_conduit_v1_(*args, **kwargs):
         ...
-    def __init__(self, stock_code_list = None):
+    @typing.overload
+    def __init__(self) -> None:
         ...
+    @typing.overload
+    def __init__(self, arg0: list[str]) -> None:
+        ...
+    @typing.overload
+    def __init__(self, stock_list: list[str], ktype_list: list[str], preload_num: dict[str, int] = {}) -> None:
+        """
+        __init__(self, stock_list, ktype_list, [preload_num={}])
+                
+          创建策略上下文
+        
+          :param stock_list: 需要加载的证券代码列表，如：["sz000001", "sz000002"], 如包含 'ALL', 表示加载全部
+          :param ktype_list: 需要加载的K线类型列表, 如：["day", "min"], 未指定时取全局配置文件中配置的默认值
+          :param preload_num: 预加载数量，默认为空，如：{"min_max": 100, "day_max": 200}. 未指定时取全局配置文件中配置的默认值
+          :return: 策略上下文对象
+        """
     def __repr__(self) -> str:
         ...
     def __str__(self) -> str:
@@ -8053,10 +8069,10 @@ def CN_OPLine(arg0: Indicator) -> ConditionBase:
         :rtype: ConditionBase
     """
 @typing.overload
-def CONTEXT(fill_null: bool = True) -> Indicator:
+def CONTEXT(fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     ...
 @typing.overload
-def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
+def CONTEXT(ind: Indicator, fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     """
     CONTEXT(ind)
         
@@ -8065,7 +8081,9 @@ def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
         则需使用 ind = CONTEXT(CLOSE(k1)), 此时 ind(k2) 将仍旧使用 k1 的收盘价。
         
         :param Indicator ind: 指标对象
-        :param bool fill_null: 日期对齐时，缺失日期对应填充空值
+        :param bool fill_null: 日期对齐时，缺失日期对应填充空值，否则使用前值填充。
+        :param bool use_self_ktype: 公式计算时使用自身独立上下文中的KTYPE
+        :param bool use_self_recover_type: 公式计算时使用自身独立上下文中的RECOVER_TYPE
         :rtype: Indicator
     """
 def CONTEXT_K(arg0: Indicator) -> KData:

hikyuu/cpp/core311.pyi

@@ -5749,8 +5749,24 @@ class StrategyContext:
     @staticmethod
     def _pybind11_conduit_v1_(*args, **kwargs):
         ...
-    def __init__(self, stock_code_list = None):
+    @typing.overload
+    def __init__(self) -> None:
         ...
+    @typing.overload
+    def __init__(self, arg0: list[str]) -> None:
+        ...
+    @typing.overload
+    def __init__(self, stock_list: list[str], ktype_list: list[str], preload_num: dict[str, int] = {}) -> None:
+        """
+        __init__(self, stock_list, ktype_list, [preload_num={}])
+                
+          创建策略上下文
+        
+          :param stock_list: 需要加载的证券代码列表，如：["sz000001", "sz000002"], 如包含 'ALL', 表示加载全部
+          :param ktype_list: 需要加载的K线类型列表, 如：["day", "min"], 未指定时取全局配置文件中配置的默认值
+          :param preload_num: 预加载数量，默认为空，如：{"min_max": 100, "day_max": 200}. 未指定时取全局配置文件中配置的默认值
+          :return: 策略上下文对象
+        """
     def __repr__(self) -> str:
         ...
     def __str__(self) -> str:
@@ -8053,10 +8069,10 @@ def CN_OPLine(arg0: Indicator) -> ConditionBase:
         :rtype: ConditionBase
     """
 @typing.overload
-def CONTEXT(fill_null: bool = True) -> Indicator:
+def CONTEXT(fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     ...
 @typing.overload
-def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
+def CONTEXT(ind: Indicator, fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     """
     CONTEXT(ind)
         
@@ -8065,7 +8081,9 @@ def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
         则需使用 ind = CONTEXT(CLOSE(k1)), 此时 ind(k2) 将仍旧使用 k1 的收盘价。
         
         :param Indicator ind: 指标对象
-        :param bool fill_null: 日期对齐时，缺失日期对应填充空值
+        :param bool fill_null: 日期对齐时，缺失日期对应填充空值，否则使用前值填充。
+        :param bool use_self_ktype: 公式计算时使用自身独立上下文中的KTYPE
+        :param bool use_self_recover_type: 公式计算时使用自身独立上下文中的RECOVER_TYPE
         :rtype: Indicator
     """
 def CONTEXT_K(arg0: Indicator) -> KData:

hikyuu/cpp/core312.pyi

@@ -5749,8 +5749,24 @@ class StrategyContext:
     @staticmethod
     def _pybind11_conduit_v1_(*args, **kwargs):
         ...
-    def __init__(self, stock_code_list = None):
+    @typing.overload
+    def __init__(self) -> None:
         ...
+    @typing.overload
+    def __init__(self, arg0: list[str]) -> None:
+        ...
+    @typing.overload
+    def __init__(self, stock_list: list[str], ktype_list: list[str], preload_num: dict[str, int] = {}) -> None:
+        """
+        __init__(self, stock_list, ktype_list, [preload_num={}])
+                
+          创建策略上下文
+        
+          :param stock_list: 需要加载的证券代码列表，如：["sz000001", "sz000002"], 如包含 'ALL', 表示加载全部
+          :param ktype_list: 需要加载的K线类型列表, 如：["day", "min"], 未指定时取全局配置文件中配置的默认值
+          :param preload_num: 预加载数量，默认为空，如：{"min_max": 100, "day_max": 200}. 未指定时取全局配置文件中配置的默认值
+          :return: 策略上下文对象
+        """
     def __repr__(self) -> str:
         ...
     def __str__(self) -> str:
@@ -8053,10 +8069,10 @@ def CN_OPLine(arg0: Indicator) -> ConditionBase:
         :rtype: ConditionBase
     """
 @typing.overload
-def CONTEXT(fill_null: bool = True) -> Indicator:
+def CONTEXT(fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     ...
 @typing.overload
-def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
+def CONTEXT(ind: Indicator, fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     """
     CONTEXT(ind)
         
@@ -8065,7 +8081,9 @@ def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
         则需使用 ind = CONTEXT(CLOSE(k1)), 此时 ind(k2) 将仍旧使用 k1 的收盘价。
         
         :param Indicator ind: 指标对象
-        :param bool fill_null: 日期对齐时，缺失日期对应填充空值
+        :param bool fill_null: 日期对齐时，缺失日期对应填充空值，否则使用前值填充。
+        :param bool use_self_ktype: 公式计算时使用自身独立上下文中的KTYPE
+        :param bool use_self_recover_type: 公式计算时使用自身独立上下文中的RECOVER_TYPE
         :rtype: Indicator
     """
 def CONTEXT_K(arg0: Indicator) -> KData:

hikyuu/cpp/core313.pyi

@@ -5732,8 +5732,24 @@ class StrategyContext:
     @staticmethod
     def _pybind11_conduit_v1_(*args, **kwargs):
         ...
-    def __init__(self, stock_code_list = None):
+    @typing.overload
+    def __init__(self) -> None:
         ...
+    @typing.overload
+    def __init__(self, arg0: list[str]) -> None:
+        ...
+    @typing.overload
+    def __init__(self, stock_list: list[str], ktype_list: list[str], preload_num: dict[str, int] = {}) -> None:
+        """
+        __init__(self, stock_list, ktype_list, [preload_num={}])
+                
+          创建策略上下文
+        
+          :param stock_list: 需要加载的证券代码列表，如：["sz000001", "sz000002"], 如包含 'ALL', 表示加载全部
+          :param ktype_list: 需要加载的K线类型列表, 如：["day", "min"], 未指定时取全局配置文件中配置的默认值
+          :param preload_num: 预加载数量，默认为空，如：{"min_max": 100, "day_max": 200}. 未指定时取全局配置文件中配置的默认值
+          :return: 策略上下文对象
+        """
     def __repr__(self) -> str:
         ...
     def __str__(self) -> str:
@@ -8030,10 +8046,10 @@ def CN_OPLine(arg0: Indicator) -> ConditionBase:
         :rtype: ConditionBase
     """
 @typing.overload
-def CONTEXT(fill_null: bool = True) -> Indicator:
+def CONTEXT(fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     ...
 @typing.overload
-def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
+def CONTEXT(ind: Indicator, fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     """
     CONTEXT(ind)
         
@@ -8042,7 +8058,9 @@ def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
         则需使用 ind = CONTEXT(CLOSE(k1)), 此时 ind(k2) 将仍旧使用 k1 的收盘价。
         
         :param Indicator ind: 指标对象
-        :param bool fill_null: 日期对齐时，缺失日期对应填充空值
+        :param bool fill_null: 日期对齐时，缺失日期对应填充空值，否则使用前值填充。
+        :param bool use_self_ktype: 公式计算时使用自身独立上下文中的KTYPE
+        :param bool use_self_recover_type: 公式计算时使用自身独立上下文中的RECOVER_TYPE
         :rtype: Indicator
     """
 def CONTEXT_K(arg0: Indicator) -> KData:

hikyuu/cpp/core39.pyi

@@ -5749,8 +5749,24 @@ class StrategyContext:
     @staticmethod
     def _pybind11_conduit_v1_(*args, **kwargs):
         ...
-    def __init__(self, stock_code_list = None):
+    @typing.overload
+    def __init__(self) -> None:
         ...
+    @typing.overload
+    def __init__(self, arg0: list[str]) -> None:
+        ...
+    @typing.overload
+    def __init__(self, stock_list: list[str], ktype_list: list[str], preload_num: dict[str, int] = {}) -> None:
+        """
+        __init__(self, stock_list, ktype_list, [preload_num={}])
+                
+          创建策略上下文
+        
+          :param stock_list: 需要加载的证券代码列表，如：["sz000001", "sz000002"], 如包含 'ALL', 表示加载全部
+          :param ktype_list: 需要加载的K线类型列表, 如：["day", "min"], 未指定时取全局配置文件中配置的默认值
+          :param preload_num: 预加载数量，默认为空，如：{"min_max": 100, "day_max": 200}. 未指定时取全局配置文件中配置的默认值
+          :return: 策略上下文对象
+        """
     def __repr__(self) -> str:
         ...
     def __str__(self) -> str:
@@ -8053,10 +8069,10 @@ def CN_OPLine(arg0: Indicator) -> ConditionBase:
         :rtype: ConditionBase
     """
 @typing.overload
-def CONTEXT(fill_null: bool = True) -> Indicator:
+def CONTEXT(fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     ...
 @typing.overload
-def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
+def CONTEXT(ind: Indicator, fill_null: bool = False, use_self_ktype: bool = False, use_self_recover_type: bool = False) -> Indicator:
     """
     CONTEXT(ind)
         
@@ -8065,7 +8081,9 @@ def CONTEXT(ind: Indicator, fill_null: bool = True) -> Indicator:
         则需使用 ind = CONTEXT(CLOSE(k1)), 此时 ind(k2) 将仍旧使用 k1 的收盘价。
         
         :param Indicator ind: 指标对象
-        :param bool fill_null: 日期对齐时，缺失日期对应填充空值
+        :param bool fill_null: 日期对齐时，缺失日期对应填充空值，否则使用前值填充。
+        :param bool use_self_ktype: 公式计算时使用自身独立上下文中的KTYPE
+        :param bool use_self_recover_type: 公式计算时使用自身独立上下文中的RECOVER_TYPE
         :rtype: Indicator
     """
 def CONTEXT_K(arg0: Indicator) -> KData:

hikyuu/draw/__init__.pyi

@@ -9,8 +9,8 @@ from hikyuu.draw.drawplot import gcf
 from hikyuu.draw.drawplot import get_current_draw_engine
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWBAND
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWICON
-from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWLINE
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER_FIX

hikyuu/draw/drawplot/__init__.pyi

@@ -25,8 +25,8 @@ from hikyuu.draw.drawplot.echarts_draw import sys_performance as ec_sys_performa
 from hikyuu.draw.drawplot.echarts_draw import sysplot as ec_sysplot
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWBAND
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWICON
-from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWLINE
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER_FIX

hikyuu/draw/drawplot/bokeh_draw.pyi

@@ -552,8 +552,8 @@ from hikyuu.hub import get_part_info
 from hikyuu.hub import get_part_list
 from hikyuu.hub import get_part_module
 from hikyuu.hub import get_part_name_list
-from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import print_part_info
+from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import remove_hub
 from hikyuu.hub import search_part
 from hikyuu.hub import update_hub
@@ -607,8 +607,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error

hikyuu/draw/drawplot/echarts_draw.pyi

@@ -540,8 +540,8 @@ from hikyuu.hub import get_part_info
 from hikyuu.hub import get_part_list
 from hikyuu.hub import get_part_module
 from hikyuu.hub import get_part_name_list
-from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import print_part_info
+from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import remove_hub
 from hikyuu.hub import search_part
 from hikyuu.hub import update_hub
@@ -595,8 +595,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error

hikyuu/draw/drawplot/matplotlib_draw.pyi

@@ -543,8 +543,8 @@ from hikyuu.hub import get_part_info
 from hikyuu.hub import get_part_list
 from hikyuu.hub import get_part_module
 from hikyuu.hub import get_part_name_list
-from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import print_part_info
+from hikyuu.hub import print_part_info as help_part
 from hikyuu.hub import remove_hub
 from hikyuu.hub import search_part
 from hikyuu.hub import update_hub
@@ -598,8 +598,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error

hikyuu/extend.py

@@ -353,17 +353,3 @@ Parameter.__iter__ = Parameter_iter
 Parameter.keys = Parameter_keys
 Parameter.items = Parameter_items
 Parameter.to_dict = Parameter_to_dict
-
-# ------------------------------------------------------------------
-# 增强 StrategyContext
-# ------------------------------------------------------------------
-__old_StrategyContext_init__ = StrategyContext.__init__
-
-
-def __new_StrategyContext_init__(self, stock_code_list=None):
-    __old_StrategyContext_init__(self)
-    if stock_code_list is not None:
-        self.stock_list = stock_code_list
-
-
-StrategyContext.__init__ = __new_StrategyContext_init__

hikyuu/extend.pyi

@@ -446,12 +446,11 @@ from hikyuu.cpp.core39 import ZONGGUBEN
 from hikyuu.cpp.core39 import ZSCORE
 from hikyuu.cpp.core39 import __add__ as __old_TimeDelta_add__
 from hikyuu.cpp.core39 import __add__ as __old_Datetime_add__
+from hikyuu.cpp.core39 import __init__ as __old_Datetime_init__
 from hikyuu.cpp.core39 import __init__ as __old_TimeDelta_init__
 from hikyuu.cpp.core39 import __init__ as old_Query_init
-from hikyuu.cpp.core39 import __init__ as __old_StrategyContext_init__
-from hikyuu.cpp.core39 import __init__ as __old_Datetime_init__
-from hikyuu.cpp.core39 import __sub__ as __old_Datetime_sub__
 from hikyuu.cpp.core39 import __sub__ as __old_TimeDelta_sub__
+from hikyuu.cpp.core39 import __sub__ as __old_Datetime_sub__
 from hikyuu.cpp.core39 import active_device
 from hikyuu.cpp.core39 import backtest
 from hikyuu.cpp.core39 import batch_calculate_inds
@@ -586,8 +585,6 @@ def __new_Datetime_sub__(self, td):
         :rtype: Datetime
         
     """
-def __new_StrategyContext_init__(self, stock_code_list = None):
-    ...
 def __new_TimeDelta_add__(self, td):
     """
     可和 TimeDelta, datetime.timedelta, Datetime执行相加操作

hikyuu/hub.pyi

@@ -28,11 +28,11 @@ import sys as sys
 import typing
 __all__: list = ['add_remote_hub', 'add_local_hub', 'update_hub', 'remove_hub', 'build_hub', 'help_part', 'get_part', 'get_part_list', 'get_hub_path', 'get_part_info', 'get_part_module', 'print_part_info', 'get_hub_name_list', 'get_part_name_list', 'get_current_hub', 'search_part']
 class ConfigModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1dfa5a64520; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12cebc10; ConfigModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_config', MetaData(), Column('id', Integer(), table=<hub_config>, primary_key=True, nullable=False, default=Sequence('config_id_seq', metadata=MetaData())), Column('key', String(), table=<hub_config>), Column('value', String(), table=<hub_config>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('key', String(), table=<hub_config>)))
     __tablename__: typing.ClassVar[str] = 'hub_config'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 1dfa5abce50>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 1bb12d3db30>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -109,11 +109,11 @@ class HubManager:
     def print_part_info(self, name):
         ...
 class HubModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1dfa5adee20; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12d75280; HubModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_repo', MetaData(), Column('id', Integer(), table=<hub_repo>, primary_key=True, nullable=False, default=Sequence('remote_id_seq', metadata=MetaData())), Column('name', String(), table=<hub_repo>), Column('hub_type', String(), table=<hub_repo>), Column('local_base', String(), table=<hub_repo>), Column('local', String(), table=<hub_repo>), Column('url', String(), table=<hub_repo>), Column('branch', String(), table=<hub_repo>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_repo>)))
     __tablename__: typing.ClassVar[str] = 'hub_repo'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 1dfa5af0900>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 1bb12d6e5e0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -146,11 +146,11 @@ class ModuleConflictError(Exception):
     def __str__(self):
         ...
 class PartModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1dfa5b044f0; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12d851f0; PartModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_part', MetaData(), Column('id', Integer(), table=<hub_part>, primary_key=True, nullable=False, default=Sequence('part_id_seq', metadata=MetaData())), Column('hub_name', String(), table=<hub_part>), Column('part', String(), table=<hub_part>), Column('name', String(), table=<hub_part>), Column('author', String(), table=<hub_part>), Column('version', String(), table=<hub_part>), Column('doc', String(), table=<hub_part>), Column('module_name', String(), table=<hub_part>), Column('label', String(), table=<hub_part>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_part>)))
     __tablename__: typing.ClassVar[str] = 'hub_part'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 1dfa5afd3b0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 1bb12d83090>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/indicator/crt/CONTEXT.h

@@ -13,10 +13,14 @@ namespace hku {
 
 /**
  * 独立上下文指标
+ * @param ind 待包装指标
+ * @param fill_null 是否填充空值，默认为 false
  * @ingroup Indicator
  */
-Indicator HKU_API CONTEXT(const Indicator& ind, bool fill_null = true);
-Indicator HKU_API CONTEXT(bool fill_null = true);
+Indicator HKU_API CONTEXT(const Indicator& ind, bool fill_null = false, bool use_self_ktype = false,
+                          bool use_self_recover_type = false);
+Indicator HKU_API CONTEXT(bool fill_null = false, bool use_self_ktype = false,
+                          bool use_self_recover_type = false);
 
 /**
  * 获取指标上下文

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.1"
+#define HKU_VERSION "2.6.2"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 1
-#define HKU_VERSION_BUILD 202505131152
+#define HKU_VERSION_ALTER 2
+#define HKU_VERSION_BUILD 202505141721
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.1 release.08c0b804 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.2 release.16442c98 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */

hikyuu/trade_manage/__init__.pyi

@@ -169,8 +169,8 @@ from hikyuu.cpp.core39 import PG_FixedPercent
 from hikyuu.cpp.core39 import PG_NoGoal
 from hikyuu.cpp.core39 import POS
 from hikyuu.cpp.core39 import POW
-from hikyuu.cpp.core39 import PRICELIST as VALUE
 from hikyuu.cpp.core39 import PRICELIST
+from hikyuu.cpp.core39 import PRICELIST as VALUE
 from hikyuu.cpp.core39 import Parameter
 from hikyuu.cpp.core39 import Performance
 from hikyuu.cpp.core39 import Portfolio
@@ -552,8 +552,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error

hikyuu/trade_manage/trade.pyi

@@ -169,8 +169,8 @@ from hikyuu.cpp.core39 import PG_FixedPercent
 from hikyuu.cpp.core39 import PG_NoGoal
 from hikyuu.cpp.core39 import POS
 from hikyuu.cpp.core39 import POW
-from hikyuu.cpp.core39 import PRICELIST as VALUE
 from hikyuu.cpp.core39 import PRICELIST
+from hikyuu.cpp.core39 import PRICELIST as VALUE
 from hikyuu.cpp.core39 import Parameter
 from hikyuu.cpp.core39 import Performance
 from hikyuu.cpp.core39 import Portfolio
@@ -542,8 +542,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug
+from hikyuu.util.mylog import hku_debug as hku_trace
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error

hikyuu/util/singleton.pyi

@@ -12,7 +12,7 @@ class SingletonType(type):
                 self.name = name
         
     """
-    _instance_lock: typing.ClassVar[_thread.lock]  # value = <unlocked _thread.lock object at 0x000001DFA58CA660>
+    _instance_lock: typing.ClassVar[_thread.lock]  # value = <unlocked _thread.lock object at 0x000001BB12B71300>
     @classmethod
     def __call__(cls, *args, **kwargs):
         ...

{hikyuu-2.6.1.dist-info → hikyuu-2.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hikyuu
-Version: 2.6.1
+Version: 2.6.2
 Summary: Hikyuu Quant Framework for System Trading Analysis and backtester
 Home-page: http://hikyuu.org/
 Author: fasiondog

{hikyuu-2.6.1.dist-info → hikyuu-2.6.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 hikyuu/LICENSE.txt,sha256=Pw3M20qvGBnI4pcLKZc6A6rbxL2qT6vqAs2OWXRhlbE,1085
 hikyuu/__init__.py,sha256=EcjW7VH0KLToXcdmUxTBuNH3jQ41HAbxmCq4LMU4E-E,18201
-hikyuu/__init__.pyi,sha256=_EzSIafg158v2CgPxwa2PeNZzDVHKVwcCAzMfR4MFGc,48624
+hikyuu/__init__.pyi,sha256=6rp0uYMz9ZAVblZsU7ZR1ALyeEs7rqw7lANtVCPodO4,48624
 hikyuu/core.py,sha256=emuXJhJkl8UELdZD_xqXlV_sfiuWR5d5lO-SO2oem3g,660
-hikyuu/core.pyi,sha256=oHHLjfza-og6OBYcC9bXUs2ro6fGLR-11vaBDjWXSGc,28292
-hikyuu/extend.py,sha256=3Q84dYguLE51BVNkGPiJhawZDDJhIu7DizztBrqaBV0,11919
-hikyuu/extend.pyi,sha256=rC_LWB_ZQw25TVsWfBKvoUplj6IaWQxK8efoTo7QvTY,32760
+hikyuu/core.pyi,sha256=l9mmoZeAuRWN50RL9cfiMOloQbdKtw8Dn0pVfiZUYaQ,28292
+hikyuu/extend.py,sha256=hd364x2IWpHWL3Br4NSzj5i__oJkQzVFH738NaTcwoc,11446
+hikyuu/extend.pyi,sha256=ASwPEH-Tczc1jIwnwSMmKV7sbojlpOTaV0DTk6WkGlA,32614
 hikyuu/hub.py,sha256=56TuLxF-3sOOMn9UKjEQWvTIlVicLj1dIHmaIKEERzM,28641
-hikyuu/hub.pyi,sha256=5r3Oh_3ZrMeXpWY8AlkWX3b0-McJ_3qXs90w0SV4CE4,10751
+hikyuu/hub.pyi,sha256=0l3-Owl_d-Z5WV57eiIEnCH7vfD01PANn3A1Bp8cyZk,10751
 hikyuu/interactive.py,sha256=Wwl3_FaczN_33wtSpRFipqUEuTdkQAqIjQxHE4skL-0,2343
 hikyuu/setup.py,sha256=lTOmlSqiAGVDLfbAi1Jt0Ek8ab8VvlymO6RmY0_lGPo,4413
 hikyuu/analysis/__init__.py,sha256=b1jcxxmFC0j_vxiDwmCIC4KrfDdAXAfz8CVKgGMm-Cw,266
@@ -26,18 +26,18 @@ hikyuu/cpp/boost_date_time-mt.dll,sha256=Khb0E9WRvvl_3QNuolrK6v1U8mDSV-GxXHhnDrs
 hikyuu/cpp/boost_serialization-mt.dll,sha256=xBcyOqnv-S1-6JGhJspBn-De4nqAFTOyDsm6sRNa9SA,218112
 hikyuu/cpp/boost_wserialization-mt.dll,sha256=04E1rjKlSvGoTBvSxstrBq7ayFG3oRuyJw__nWvne2Q,156672
 hikyuu/cpp/concrt140.dll,sha256=eCkQsj-KZexHf4hve8vcZxAzVK8mO9MMDcyrv7xQa6E,317320
-hikyuu/cpp/core310.pyd,sha256=cOfTZJDjHfdr9ckB78QPklXR-UyxBGSZLuw-RLBBLsk,3953664
-hikyuu/cpp/core310.pyi,sha256=d84f2dZrQ8B8idprzSIgBu-sDNA8T36xlwG-6QrlUBw,424897
-hikyuu/cpp/core311.pyd,sha256=U-7CY3TUMBBVP8AD-GWskqz-ZaFLOUfNK2vLPHOKQ68,3957248
-hikyuu/cpp/core311.pyi,sha256=Teo3ARJQ6zhIbc5GQNNN8zPxvA7qk8hXyyKvyL9xq0s,424897
-hikyuu/cpp/core312.pyd,sha256=DRqziQwLGF0-oIrrz1PfgoSS-O9X86bCoRxq6LQIpp4,4036096
-hikyuu/cpp/core312.pyi,sha256=FnKjVwZeTEBvoywhPpjgHGE1osb-HBxScH_CJBaYnfA,424897
-hikyuu/cpp/core313.pyd,sha256=na3Xrm_niAaSJeQBvhyadQGUV0Zo0ZJt4W_U1WMsE08,4036096
-hikyuu/cpp/core313.pyi,sha256=yCnIot26ovr6XDU9-8sTw4M7nvnlj-bOxaDbkCO-KLI,424058
-hikyuu/cpp/core39.pyd,sha256=sN3Kj863VgJqGmKW7UmTLOUDJwzvePZHMQOsVzIauGU,3394048
-hikyuu/cpp/core39.pyi,sha256=DJnI-Uf1-b_cy4jX2C_lbw5uVTBMPDe74cS396rU-Js,424896
-hikyuu/cpp/hikyuu.dll,sha256=iRIXd20P0ZtmNkx0sU1KUIUinPPQppZZIktny_8dBH0,14003712
-hikyuu/cpp/hikyuu.lib,sha256=hc-ACioeJqftV2ScXTHFxQ0KQUoRY7sEmkWunNyuH7M,13674910
+hikyuu/cpp/core310.pyd,sha256=ipAgEHDaB3LW9zSL14AVf0beAj3SaCffkUHQnD1bKQI,3954688
+hikyuu/cpp/core310.pyi,sha256=sDnRaB0JZHFQrpTxY8e2XD4u29y775U66HAWLL8rCCU,426113
+hikyuu/cpp/core311.pyd,sha256=mSOf-FBAZgYZiivgsLoudqcOzufru5kP9mMtxSOqQQw,3958272
+hikyuu/cpp/core311.pyi,sha256=n0NIPpe-TUg0cUu7H2hzcMAw9mr7O4YR34_RMxKoZno,426113
+hikyuu/cpp/core312.pyd,sha256=q6tskYJv9wlrpyR8rl0WV-t5bKF4WBeluHRwpFKhcck,4038656
+hikyuu/cpp/core312.pyi,sha256=6q-PX-AZEMeB8bQ7vQRygnGL7EcGIfsfwJ5144axZLo,426113
+hikyuu/cpp/core313.pyd,sha256=0n39uPHw1515OQPNO8H1mH7AjeB6ANWhXAVjEF5_UWY,4039168
+hikyuu/cpp/core313.pyi,sha256=JuLmt8ejwgQptpgb2pg17QUXnYeQHc-FSmdW_ZGdojY,425274
+hikyuu/cpp/core39.pyd,sha256=ytCF_RkUusOKzfhPk7bvJhuDos1Klz5kNX6bJ87NJxw,3394560
+hikyuu/cpp/core39.pyi,sha256=siQJJobjlw34DBh2YYQKVIoSmVCJC1k6tR_V7JBktE0,426112
+hikyuu/cpp/hikyuu.dll,sha256=Hv-TMTPyBYJWG_2RVaN6o4BszjkBKR-f-Pq9PFBK3bY,14017024
+hikyuu/cpp/hikyuu.lib,sha256=UhQxzrooGVTZkvDKatLgsPByOYxUHFGHDIHytSV5fVw,13674930
 hikyuu/cpp/hku_hdf5.dll,sha256=WhPTtLT9eAaOcLthBLArv_ps-A5xiTXrYAwXHsbKeDI,3434496
 hikyuu/cpp/hku_hdf5_cpp.dll,sha256=KL7R_MmydRnNi6X1vrkCOPJ6x027J8IEb6vCbTrV60E,301056
 hikyuu/cpp/hku_hdf5_hl.dll,sha256=bPgCUWb9eppYXjqL846IiLeWiB9QvRF_syGHTlqpImI,119808
@@ -50,7 +50,7 @@ hikyuu/cpp/msvcp140_1.dll,sha256=fVIjj_Wnr29KXiKbGnRlog_BfitAHaXakhWjBzvyOMI,255
 hikyuu/cpp/msvcp140_2.dll,sha256=7iKzQDJoy6w_KA8aSaf6KFwNAdpgH2kU1v5qrEMGjvo,187312
 hikyuu/cpp/msvcp140_atomic_wait.dll,sha256=qUuIolfmRRSn4Zu-xSI5Hyg4rJMH1ZetstPq-I-FTeM,57224
 hikyuu/cpp/msvcp140_codecvt_ids.dll,sha256=FPlDVH0f2xJQWe6537FGWXr5bKrD6pkCV4WV6bDHH7Q,21392
-hikyuu/cpp/sqlite3.dll,sha256=yHWT-YSNMlqSGnKQ9KFG0PWGtzKiQlXCuh-2cJK4kaE,1098240
+hikyuu/cpp/sqlite3.dll,sha256=rKe-39f2e-XnOYktgE8VLCIPjLNSFrwrN-zU-s1Bc98,1098240
 hikyuu/cpp/vcruntime140.dll,sha256=1mw7Rwkc6z-NPMFlpD0oWukZIRoMD8t0SR7ldNjUZPg,98736
 hikyuu/cpp/vcruntime140_1.dll,sha256=F1gIWmFSe0J8Q4DwyXbSmovuiJ8qxIDDVqPxZkM79w4,38304
 hikyuu/data/__init__.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
@@ -139,7 +139,7 @@ hikyuu/data_driver/__init__.py,sha256=mc_vrQqcvM1k8v8yotk4oTcyjsIrBFY66PhIlN2ccD
 hikyuu/data_driver/jqdata_data_driver.py,sha256=dlwodzUd8zOxwvg3M3r0Zpd1V7v2wndD4yGs45HI07w,9359
 hikyuu/data_driver/pytdx_data_driver.py,sha256=9wPWM_JxD7wM4vlau3ohh_dtI_rI0B-4tn_UOA6TiFA,10154
 hikyuu/draw/__init__.py,sha256=khA5iV0u_Rjon0UG0SWPCRM4hYHbrIPNSua_NQRwwV8,2600
-hikyuu/draw/__init__.pyi,sha256=eZXAkWF9BRMth9yDJwLfwmGCLVIzf7vhxOynOIU8lrI,1987
+hikyuu/draw/__init__.pyi,sha256=6SWX3evrK3eyeJykHlisfg71HSbye007-tBmEaZ7S-E,1987
 hikyuu/draw/elder.py,sha256=NyG8qbOWZxuG7pOjkHAgf16AEJCLYLTrmzXFjzMPv3E,5530
 hikyuu/draw/elder.pyi,sha256=qFd9E3jicckmQgYFkrSPSx7aQ1VFQgGdqxeFmfJ6-ME,2171
 hikyuu/draw/kaufman.py,sha256=Kx7lJ1fVwWiAFFGKmmwU1rRVyPGZagROV4p-lgAF5dc,7279
@@ -147,15 +147,15 @@ hikyuu/draw/kaufman.pyi,sha256=WLGNF61XcpmhO7bPizLCl4AlxdBUHy4QndaERFK80jY,2006
 hikyuu/draw/volume.py,sha256=gt8BbnI7ct_JMi1nIvx5CLVbKuk5wI4Onzq7S7sIcng,4788
 hikyuu/draw/volume.pyi,sha256=J9ATSvKEEG4k0CgzQyTGQ4Z65d9jvkJnCeCaUmJBdlA,1487
 hikyuu/draw/drawplot/__init__.py,sha256=uvS2697BlDqs3aEPjMkCxmBl68_Vmhf8ZohUCDhwHko,10362
-hikyuu/draw/drawplot/__init__.pyi,sha256=sgQ9BUiJuIQadTDbdVgiNtrA6g7jak8BZEBbakJ61fo,6731
+hikyuu/draw/drawplot/__init__.pyi,sha256=drAELe1TvjlPtpBty_d1KLAa87m2f7Pu8LGt_2UJyBw,6731
 hikyuu/draw/drawplot/bokeh_draw.py,sha256=87LkP1W4KDgFZzuFOcwYY0j_7aZtxwqMKNldkMPy2kQ,20249
-hikyuu/draw/drawplot/bokeh_draw.pyi,sha256=k2OxlzAOchG3vb3m0tQgY1umxd9rVjKFeL1lvxIq8N0,48177
+hikyuu/draw/drawplot/bokeh_draw.pyi,sha256=c3PDu8UzVLVMysWR8VKLaFS4JH8B1MvwsWJ6CY6illo,48177
 hikyuu/draw/drawplot/common.py,sha256=Cq4jMg3-LrvXHVIFhac6iX5lWpmYMLOyJCGbn2BiLXE,3186
 hikyuu/draw/drawplot/common.pyi,sha256=W3yY8Te3bacMd2CX7w73YnJ4mcmpItpjksFQdDnlBjQ,362
 hikyuu/draw/drawplot/echarts_draw.py,sha256=_mUIB3lJoedVLz1g_tYlWIqt3HqPCCFSJ2pAFnn4Z8g,21033
-hikyuu/draw/drawplot/echarts_draw.pyi,sha256=UUK8Z-mP37AOwnZJbepZZR8kYZS2W3_QGrfs7jtSUh8,43148
+hikyuu/draw/drawplot/echarts_draw.pyi,sha256=efoknL1WAbZyxpvw7Uilg9UcwKJKf0TcWeRoge3vsNc,43148
 hikyuu/draw/drawplot/matplotlib_draw.py,sha256=3dS3iLQtzFS_3VT6ktPwbhi0stVgDtPbt5OrRe15tGs,60019
-hikyuu/draw/drawplot/matplotlib_draw.pyi,sha256=PdWNchgXDA4A-vGlQK9KxYY-EgEWBlq7ytC9mYcPLww,66830
+hikyuu/draw/drawplot/matplotlib_draw.pyi,sha256=mBEcv7VmCByWwgtzWXcBM1EnzCiF2wQwwE-WRuXzEys,66830
 hikyuu/draw/drawplot/icon/1.png,sha256=I21nZoJ2secsZZYSeWcSzzgtKsuKIJtBeFKQ7xp_trU,786
 hikyuu/draw/drawplot/icon/10.png,sha256=o8cfsnmu0dltqyh3F-U-6IxJz9HvSFing1b11UaLlSQ,570
 hikyuu/draw/drawplot/icon/11.png,sha256=6ayNsr6Ym30jpv5Y1NGOtf8Ne9__WiA8VL4IwGsB73Y,852
@@ -298,7 +298,7 @@ hikyuu/include/hikyuu/config.h,sha256=2Xngmq48_xjI19yX-9KkIgRRg61saNOIpePV3uQufS
 hikyuu/include/hikyuu/debug.h,sha256=r54YJUkujUt5D9Xj11fpIw9c93kZsqU3ykljXBsqxo0,843
 hikyuu/include/hikyuu/doc.h,sha256=M5Va0lgJSlORIkMvUhmV480V0XcxwyyL3wu_fCMcVI4,6967
 hikyuu/include/hikyuu/hikyuu.h,sha256=D4n8yy8BLhRyceGCzAIbrTCoyvEOGa0NtygcQW6accI,1583
-hikyuu/include/hikyuu/version.h,sha256=xqsRNPv43AGLy1zUIEcYhTOTALJfzuyb76lZxRxf0yk,508
+hikyuu/include/hikyuu/version.h,sha256=7mCCDhrwWAllK8qAdUKb6XLT0ymNSnvS8auSwmQPqlw,508
 hikyuu/include/hikyuu/analysis/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 hikyuu/include/hikyuu/analysis/analysis_sys.h,sha256=WJpfpLeKqpUjGFwmiRf_NCX8NvAHqBRuPDxMi4n-iVs,3239
 hikyuu/include/hikyuu/analysis/combinate.h,sha256=--OhYTVLQ8bUNgl47V0uNO0IjSULxu7bXhYWbjNY4Ig,4196
@@ -379,7 +379,7 @@ hikyuu/include/hikyuu/indicator/crt/BARSSINCE.h,sha256=4m_7sB40iAxyJwxsTSbJCOdHA
 hikyuu/include/hikyuu/indicator/crt/BETWEEN.h,sha256=pIunuaGt_ct1019X1UxkZna-6X5OQMRrb_cYdqRoKJ4,3130
 hikyuu/include/hikyuu/indicator/crt/BLOCKSETNUM.h,sha256=C7OCoSEkfX3XjFTaWPOckSERKkv0BJKVYqsNMQzndr4,451
 hikyuu/include/hikyuu/indicator/crt/CEILING.h,sha256=3zpVPJb2HnuqDlbJvjvr2tT2kCT0vm4cnTOiSh54wAo,794
-hikyuu/include/hikyuu/indicator/crt/CONTEXT.h,sha256=TPoUy1hlDdKcsTXG669RLIjvW2GeH1wxyph9jKAs3V4,671
+hikyuu/include/hikyuu/indicator/crt/CONTEXT.h,sha256=vmefvyKHgiCzcYAZ700NicP08wajwtX2BomjsZAJVc8,946
 hikyuu/include/hikyuu/indicator/crt/CORR.h,sha256=jjVJ-SGah-cgm1g-wxnFZpXfvGbTr74VLMzRSYSYNEI,765
 hikyuu/include/hikyuu/indicator/crt/COS.h,sha256=H_KiSe4l6IcRk1xpB0ULuiihMAQ72NheHXUmZEDNkbg,596
 hikyuu/include/hikyuu/indicator/crt/COST.h,sha256=SlwQp8LFqD9ppugG6ulIl-oQY_7tDEeysyGAicvM2Y0,904
@@ -955,8 +955,8 @@ hikyuu/indicator/indicator.py,sha256=V9hRboK72TInsuHFIMReJv61Fgia85QEGFrKpPfO9zM
 hikyuu/indicator/pyind.py,sha256=dRWOUkidDOpozCdsTtj_84nuV4fdUKWcddGTC0mEbFk,1735
 hikyuu/indicator/talib_wrap.py,sha256=LqmuiPSOgz98d-RmtEtcxYctjA4WOzdsMXcxveqdUYM,50670
 hikyuu/plugin/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-hikyuu/plugin/backtest.dll,sha256=92fjTjvud14QiEEe_7xB_fd8QW4yHrEjGmtyRQTXkK4,1510912
-hikyuu/plugin/dataserver.dll,sha256=5Rh-Uk3jDwolUCHjx2a9Mu72ZbGSFgelUdK-S_cQCJs,1660416
+hikyuu/plugin/backtest.dll,sha256=zxhTZ7ICWztdVKYF120IHBP2t5Sxz6GJZv6-htVnc2s,1510912
+hikyuu/plugin/dataserver.dll,sha256=14sJ5zjyav40Ck8aBWZAeiosp0hZrvi4isov6KgY1HE,1660416
 hikyuu/plugin/device.dll,sha256=_LdiOq1vFz2ZRZETWRv72L5b-yNHLkA0HAcpJa2GlE8,1533440
 hikyuu/plugin/import2hdf5.dll,sha256=yvgI1skVDZ6bGnAp31A4EJok4Ptn9LDG-w5LQpRn3u8,1426944
 hikyuu/shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -994,7 +994,7 @@ hikyuu/tools/h5_data_clear.py,sha256=mbro9e9H2GTMjO_-1mDPBEbDPec8iydL6An2aOSQuAg
 hikyuu/tools/mysql_clear_last_day_data.py,sha256=BYiPMHm-wMXiJdRnwEVrlDii3ohK3wNb7LbsP4n1o_s,1692
 hikyuu/tools/update_block_info.py,sha256=WH9dMsdP8vciY3zp2RgJgZBmZoDGnBANbFoTVtjyhzg,5011
 hikyuu/trade_manage/__init__.py,sha256=T70USQgynFJnr4oRButUBc3p3wRkzBvm4HCS9H8gRGE,1393
-hikyuu/trade_manage/__init__.pyi,sha256=aj9bhdlyIzqBVQ5ufIcrdECOfKANzwTDlq34KKuxkk8,38294
+hikyuu/trade_manage/__init__.pyi,sha256=q1RNqvR1mLntl9VsK0p9kal8rJ0HudT4WUB8t9aHWq0,38294
 hikyuu/trade_manage/broker.py,sha256=PO3P34JxBNyzDeMgu4XZZOOtI7PWrgwOOymKT_1HBSc,4025
 hikyuu/trade_manage/broker.pyi,sha256=tpLqdWD2IILSCcnmt9JC_ELJgYPZawCkPoeY4boa0os,2149
 hikyuu/trade_manage/broker_easytrader.py,sha256=nUISgaOGkwR1bCnenPz3kUsdPQLx2a1J9xF1xTOPqYA,2319
@@ -1002,7 +1002,7 @@ hikyuu/trade_manage/broker_easytrader.pyi,sha256=Kce90o2Ay77oyM09uTFO0n3NkG3Vgmf
 hikyuu/trade_manage/broker_mail.py,sha256=jdmKL_0GlLwSlMbxBxC_4DwjavIARXRbseO84A7251s,4032
 hikyuu/trade_manage/broker_mail.pyi,sha256=S9-_rgxr7-OuSQWbRBMmdOLV3nV6oa05dN9VV7S0FZQ,2060
 hikyuu/trade_manage/trade.py,sha256=V0vko4zFA1UpU_gGpFoAwCSHLP71xAWTdOulVKemP4o,4281
-hikyuu/trade_manage/trade.pyi,sha256=mtijwnB5wMsP4TxBUxzJpYGJ462yKYDnARjhppozUAc,37904
+hikyuu/trade_manage/trade.pyi,sha256=T5l8BvT9v4zSFthgvmNb804Z0zZWcBz4qdK7tGHwo_c,37904
 hikyuu/trade_sys/__init__.py,sha256=BSAozrOrdSyuPT_3fCKN4f8SSWEQkgK4Fsu-uc_eK-Y,1223
 hikyuu/trade_sys/trade_sys.py,sha256=OfssOZn5JaFU6by_GRo84NFN9gtKTsELkIYOiNsoEtw,8836
 hikyuu/util/__init__.py,sha256=P7j7bLK-vnAEGYBuO96t450aa8GtqvpzjGY78cBCC6A,1133
@@ -1014,13 +1014,13 @@ hikyuu/util/mylog.pyi,sha256=U2aLHhSnsw0R215mSJs3jUNgpBBshiUWchYp7Cpoglk,2717
 hikyuu/util/notebook.py,sha256=zToRjn0gqrs11SC6CK3IvJUWcerBMID_byxSn255BWk,1159
 hikyuu/util/notebook.pyi,sha256=mTCfKaC8ItfDR7GSWbfXajvvTXr5CI40H8yStKRjTdg,564
 hikyuu/util/singleton.py,sha256=ADnNpIUK63Q7iqkVv9XVptAPHg3iPlPGv1eYCPXjn34,793
-hikyuu/util/singleton.pyi,sha256=aMe2hLLvtiu2YnrFRIu-zRF62Vfcx8ZvEMohRn8e5zA,549
+hikyuu/util/singleton.pyi,sha256=FFOX6qXlwN7_dFvg_3KxDy07rD0BMdoEGnLCb863478,549
 hikyuu/util/slice.py,sha256=ZPvGFc7MO3USnAS4ADMnjJaPqTRFV0nXY_ssgfysxJ4,1759
 hikyuu/util/slice.pyi,sha256=9YS29Ehh3qbGC0F6Ieur25VcuftQL7C4c5nxmybWKHU,243
 hikyuu/util/timeout.py,sha256=n1KdeXfXgh6fJKdrxmmL5PU6zIkeuVp1LKMwll8okDo,3031
-hikyuu-2.6.1.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-hikyuu-2.6.1.dist-info/METADATA,sha256=F-9_7nPlwmsurOTV35hPLwTxpwPG0WstTK31vVsVJeA,12098
-hikyuu-2.6.1.dist-info/WHEEL,sha256=37evyuMEjsyAveQX40iT43Lz7iWGYiYX5J9a6lEUCNg,97
-hikyuu-2.6.1.dist-info/entry_points.txt,sha256=lKAXjEs7kBs3KiRG88yAXos2X9L2-zQ_YQh0DsKE3kY,137
-hikyuu-2.6.1.dist-info/top_level.txt,sha256=T02YJ9L9hXttWy4-tbqITwiZJmXlJ5mqSN1O_pEA2GI,4366
-hikyuu-2.6.1.dist-info/RECORD,,
+hikyuu-2.6.2.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+hikyuu-2.6.2.dist-info/METADATA,sha256=Y8dyvsAD1jL1hHKkslwKsRaxg3myTMOAEf5v_7XNULE,12098
+hikyuu-2.6.2.dist-info/WHEEL,sha256=37evyuMEjsyAveQX40iT43Lz7iWGYiYX5J9a6lEUCNg,97
+hikyuu-2.6.2.dist-info/entry_points.txt,sha256=lKAXjEs7kBs3KiRG88yAXos2X9L2-zQ_YQh0DsKE3kY,137
+hikyuu-2.6.2.dist-info/top_level.txt,sha256=T02YJ9L9hXttWy4-tbqITwiZJmXlJ5mqSN1O_pEA2GI,4366
+hikyuu-2.6.2.dist-info/RECORD,,