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

hikyuu/__init__.py

@@ -84,11 +84,32 @@ atexit.register(hku_cleanup)
 
 sm = StockManager.instance()
 
-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')
+# 尝试寻找 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')
+
+
 sm.set_plugin_path(plugin_path)
 # print(f"current plugin path: {plugin_path}")
 
@@ -311,7 +332,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')
@@ -512,16 +534,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