hikyuu 2.6.8.3__py3-none-manylinux2014_aarch64.whl → 2.7.3__py3-none-manylinux2014_aarch64.whl

hikyuu/__init__.py

@@ -2,9 +2,8 @@
 # -*- coding: utf8 -*-
 # cp936
 
-import pyarrow as pa
 import atexit
-import io
+import time
 import locale
 from pathlib import Path
 import pickle
@@ -67,7 +66,7 @@ except Exception as e:
     print("{}: {}".format(info[0].__name__, info[1]))
     print(traceback.format_exc())
     print("""请使用 pipdeptree -p hikyuu 检查是否存在缺失的依赖包。
-如果没有问题可以在 https://gitee.com/fasiondog/hikyuu 或 https://github.com/fasiondog/hikyuu 
+如果没有问题可以在 https://gitee.com/fasiondog/hikyuu 或 https://github.com/fasiondog/hikyuu
 上提交 issue，同时附上 "用户目录/.hikyuu" 下的 hikyuu_py.log 和 hikyuu.log 日志文件 """)
     raise e
 
@@ -75,7 +74,16 @@ except Exception as e:
 __version__ = get_version()
 
 
+sm = StockManager.instance()
+
+
 def hku_cleanup():
+    # macosx 中clickhouse必须在python中等待退出，其他平台无问题
+    local_sm = StockManager.instance()
+    local_sm.cancel_load()
+    while not local_sm.data_ready:
+        time.sleep(0.1)
+
     # 释放所有K线数据, 用于防止python实现的扩展K线转换函数由于GIL导致退出时异常
     release_extra_ktype()
 
@@ -83,13 +91,37 @@ def hku_cleanup():
 atexit.register(hku_cleanup)
 
 
-sm = StockManager.instance()
+# 尝试寻找 hikyuu_plugin python包，并获取其所在目录
+try:
+    import hikyuu_plugin
+    plugin_path = os.path.dirname(hikyuu_plugin.__file__)
+    plugin_version = hikyuu_plugin.__version__
+
+    # 获取主版本号（格式为x.x.x）
+    def get_major_version(version_str):
+        parts = version_str.split('.')
+        return '.'.join(parts[:3]) if len(parts) >= 3 else version_str
+
+    # 比较hikyuu和hikyuu_plugin的版本号
+    hikyuu_major_version = get_major_version(__version__)
+    plugin_major_version = get_major_version(plugin_version)
+
+    if hikyuu_major_version != plugin_major_version:
+        hku_warn("hikyuu版本 ({}) 与 hikyuu_plugin版本 ({}) 不匹配，请确保使用兼容版本！".format(__version__, plugin_version))
+
+except ImportError:
+    plugin_path = Path.home() / '.hikyuu' / 'plugin'
+    if plugin_path.exists():
+        plugin_path = str(plugin_path)
+    else:
+        plugin_path = os.path.join(os.path.dirname(__file__), 'plugin')
+
+try:
+    from hikyuu_plugin_private import *
+except ImportError:
+    pass
+
 
-plugin_path = Path.home() / '.hikyuu' / 'plugin'
-if plugin_path.exists():
-    plugin_path = str(plugin_path)
-else:
-    plugin_path = os.path.join(os.path.dirname(__file__), 'plugin')
 sm.set_plugin_path(plugin_path)
 # print(f"current plugin path: {plugin_path}")
 
@@ -206,11 +238,13 @@ def load_hikyuu(**kwargs):
     options = {
         "stock_list": ["sh000001"],
         "ktype_list": ["day"],
-        "preload_num: {"day_max": 100000}
+        "preload_num": {"day_max": 100000},
         "load_history_finance": False,
         "load_weight": False,
         "start_spot": False,
         "spot_worker_num": 1,
+        "reload_time": "00:00",
+        "lazy_preload": False,
     }
     load_hikyuu(**options)
 
@@ -221,13 +255,15 @@ def load_hikyuu(**kwargs):
         ktype_list (list): 指定加载的K线类型列表，默认按配置文件设置加载. 如: ['day', 'week', 'month']
                     支持的K线类型有:
                     'day', 'week', 'month', 'quarter', 'halfyear', 'year', 'min', 'min5',
-                    'min15', 'min30', 'min60', 'hour2'
+                    'min15', 'min30', 'min60', 'hour2', 'timeline', 'trans'
         preload_num (dict): {'day_max': 100000, 'week_max': 100000, 'month_max': 100000, ...}
         load_history_finance (boolean): 预加载历史财务数至内存，默认为 True
         load_weight (boolean): 加载权息数据，默认为 True
 
         start_spot (boolean): 启动行情接收，默认为 True
         spot_worker_num (int): 行情接收数据处理线程数，默认为 1
+        reload_time (str): 指定数据重新加载时间(时:分)，格式为 HH:MM, 默认为 00:00
+        lazy_preload (boolean): 日线以下使用懒加载方式进行预加载，默认为 False
     """
     if 'config_file' in kwargs:
         config_file = kwargs['config_file']
@@ -256,6 +292,8 @@ def load_hikyuu(**kwargs):
         hku_param["plugindir"] = ini.get('hikyuu', 'plugindir')
     else:
         hku_param["plugindir"] = os.path.join(os.path.dirname(__file__), "plugin")
+    hku_param["reload_time"] = ini.get('hikyuu', 'reload_time', fallback="00:00")
+    hku_param["lazy_preload"] = ini.getboolean("hikyuu", "lazy_preload", fallback=False)
 
     base_param = Parameter()
     base_info_config = ini.options('baseinfo')
@@ -270,7 +308,7 @@ def load_hikyuu(**kwargs):
     preload_param = Parameter()
     preload_config = ini.options('preload')
     for p in preload_config:
-        if p in ('day', 'week', 'month', 'quarter', 'halfyear', 'year', 'min', 'min5', 'min15', 'min30', 'min60', 'hour2'):
+        if p in ('day', 'week', 'month', 'quarter', 'halfyear', 'year', 'min', 'min5', 'min15', 'min30', 'min60', 'hour2', 'timeline', 'trans'):
             preload_param[p] = ini.getboolean('preload', p)
         else:
             preload_param[p] = ini.getint('preload', p)
@@ -312,7 +350,8 @@ def load_hikyuu(**kwargs):
 
     sm.init(base_param, block_param, kdata_param, preload_param, hku_param, context)
 
-    start_spot = True
+    # 默认不启动行情接收, 防止启动在开盘后因自身合成缺失导致从 dataserver 获取行情也缺失
+    start_spot = False
     if 'HKU_START_SPOT' in os.environ:
         spot_str = os.environ['HKU_START_SPOT'].upper()
         start_spot = spot_str in ('1', 'TRUE')
@@ -513,16 +552,9 @@ def select2(inds, start=Datetime(201801010000), end=Datetime.now(), stks=None):
 
 def realtime_update_inner(source='qq', stk_list=None):
     if stk_list is None:
-        if source == 'qmt':
-            stk_list = [s for s in sm if s.valid and s.type in (
-                constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_ETF,
-                constant.STOCKTYPE_GEM, constant.STOCKTYPE_START, constant.STOCKTYPE_A_BJ)]
-        else:
-            stk_list = [
-                stk.market_code.lower() for stk in sm if stk.valid and stk.type in
-                (constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_GEM,
-                 constant.STOCKTYPE_START, constant.STOCKTYPE_A_BJ)
-            ]
+        stk_list = [s for s in sm if s.valid and s.type in (
+            constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_ETF,
+            constant.STOCKTYPE_GEM, constant.STOCKTYPE_START, constant.STOCKTYPE_A_BJ)]
 
     if source == 'qq':
         from hikyuu.fetcher.stock.zh_stock_a_sina_qq import get_spot