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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. hikyuu/__init__.py +26 -5
  2. hikyuu/__init__.pyi +609 -614
  3. hikyuu/analysis/__init__.pyi +584 -589
  4. hikyuu/analysis/analysis.pyi +585 -590
  5. hikyuu/core.pyi +586 -591
  6. hikyuu/cpp/__init__.pyi +2 -2
  7. hikyuu/cpp/core310.pyd +0 -0
  8. hikyuu/cpp/core310.pyi +60 -100
  9. hikyuu/cpp/core311.pyd +0 -0
  10. hikyuu/cpp/core311.pyi +60 -100
  11. hikyuu/cpp/core312.pyd +0 -0
  12. hikyuu/cpp/core312.pyi +60 -100
  13. hikyuu/cpp/core313.pyd +0 -0
  14. hikyuu/cpp/core313.pyi +60 -100
  15. hikyuu/cpp/hikyuu.dll +0 -0
  16. hikyuu/cpp/hikyuu.lib +0 -0
  17. hikyuu/cpp/sqlite3.dll +0 -0
  18. hikyuu/data/download_block.py +61 -28
  19. hikyuu/draw/drawplot/__init__.pyi +8 -8
  20. hikyuu/draw/drawplot/bokeh_draw.pyi +600 -605
  21. hikyuu/draw/drawplot/common.pyi +1 -1
  22. hikyuu/draw/drawplot/echarts_draw.pyi +602 -607
  23. hikyuu/draw/drawplot/matplotlib_draw.pyi +612 -617
  24. hikyuu/draw/elder.pyi +11 -11
  25. hikyuu/draw/kaufman.pyi +18 -18
  26. hikyuu/draw/volume.pyi +10 -10
  27. hikyuu/extend.py +0 -7
  28. hikyuu/extend.pyi +594 -599
  29. hikyuu/fetcher/stock/zh_block_em.py +0 -60
  30. hikyuu/gui/HikyuuTDX.py +18 -1
  31. hikyuu/gui/data/MainWindow.py +36 -10
  32. hikyuu/gui/images/liandongxiaopu.png +0 -0
  33. hikyuu/hub.pyi +6 -6
  34. hikyuu/include/hikyuu/Stock.h +2 -2
  35. hikyuu/include/hikyuu/config.h +0 -3
  36. hikyuu/include/hikyuu/plugin/device.h +10 -0
  37. hikyuu/include/hikyuu/plugin/interface/DevicePluginInterface.h +2 -0
  38. hikyuu/include/hikyuu/plugin/interface/plugins.h +0 -5
  39. hikyuu/include/hikyuu/python/pybind_utils.h +0 -12
  40. hikyuu/include/hikyuu/trade_sys/slippage/build_in.h +5 -1
  41. hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_LogNormal.h +22 -0
  42. hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_Normal.h +22 -0
  43. hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_TruncNormal.h +25 -0
  44. hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_Uniform.h +23 -0
  45. hikyuu/include/hikyuu/trade_sys/slippage/imp/LogNormalSlippage.h +28 -0
  46. hikyuu/include/hikyuu/trade_sys/slippage/imp/NormalSlippage.h +28 -0
  47. hikyuu/include/hikyuu/trade_sys/slippage/imp/TruncNormalSlippage.h +28 -0
  48. hikyuu/include/hikyuu/trade_sys/slippage/imp/UniformSlippage.h +24 -0
  49. hikyuu/include/hikyuu/version.h +5 -5
  50. hikyuu/plugin/backtest.dll +0 -0
  51. hikyuu/plugin/clickhousedriver.dll +0 -0
  52. hikyuu/plugin/dataserver.dll +0 -0
  53. hikyuu/plugin/dataserver_parquet.dll +0 -0
  54. hikyuu/plugin/device.dll +0 -0
  55. hikyuu/plugin/extind.dll +0 -0
  56. hikyuu/plugin/hkuextra.dll +0 -0
  57. hikyuu/plugin/import2hdf5.dll +0 -0
  58. hikyuu/plugin/tmreport.dll +0 -0
  59. hikyuu/trade_manage/__init__.pyi +600 -605
  60. hikyuu/trade_manage/broker.pyi +3 -3
  61. hikyuu/trade_manage/broker_easytrader.pyi +1 -1
  62. hikyuu/trade_manage/trade.py +0 -2
  63. hikyuu/trade_manage/trade.pyi +600 -605
  64. hikyuu/util/singleton.pyi +1 -1
  65. {hikyuu-2.6.9.dist-info → hikyuu-2.7.0.dist-info}/METADATA +24 -20
  66. {hikyuu-2.6.9.dist-info → hikyuu-2.7.0.dist-info}/RECORD +69 -70
  67. {hikyuu-2.6.9.dist-info → hikyuu-2.7.0.dist-info}/top_level.txt +0 -1
  68. hikyuu/cpp/arrow.dll +0 -0
  69. hikyuu/cpp/core39.pyd +0 -0
  70. hikyuu/cpp/core39.pyi +0 -14818
  71. hikyuu/cpp/msvcp140-a118642f3ae8774fb9dc223e15c4a52e.dll +0 -0
  72. hikyuu/cpp/parquet.dll +0 -0
  73. hikyuu/include/hikyuu/plugin/hkuviews.h +0 -36
  74. hikyuu/include/hikyuu/plugin/interface/HkuViewsPluginInterface.h +0 -34
  75. hikyuu/include/hikyuu/views/__init__.py +0 -1
  76. hikyuu/include/hikyuu/views/arrow_common.h +0 -38
  77. hikyuu/include/hikyuu/views/arrow_views.h +0 -117
  78. hikyuu/plugin/hkuviews.dll +0 -0
  79. {hikyuu-2.6.9.dist-info → hikyuu-2.7.0.dist-info}/WHEEL +0 -0
  80. {hikyuu-2.6.9.dist-info → hikyuu-2.7.0.dist-info}/entry_points.txt +0 -0
hikyuu/__init__.py CHANGED
@@ -84,11 +84,32 @@ atexit.register(hku_cleanup)
84
84
 
85
85
  sm = StockManager.instance()
86
86
 
87
- plugin_path = Path.home() / '.hikyuu' / 'plugin'
88
- if plugin_path.exists():
89
- plugin_path = str(plugin_path)
90
- else:
91
- plugin_path = os.path.join(os.path.dirname(__file__), 'plugin')
87
+ # 尝试寻找 hikyuu_plugin python包,并获取其所在目录
88
+ try:
89
+ import hikyuu_plugin
90
+ plugin_path = os.path.dirname(hikyuu_plugin.__file__)
91
+ plugin_version = hikyuu_plugin.__version__
92
+
93
+ # 获取主版本号(格式为x.x.x)
94
+ def get_major_version(version_str):
95
+ parts = version_str.split('.')
96
+ return '.'.join(parts[:3]) if len(parts) >= 3 else version_str
97
+
98
+ # 比较hikyuu和hikyuu_plugin的版本号
99
+ hikyuu_major_version = get_major_version(__version__)
100
+ plugin_major_version = get_major_version(plugin_version)
101
+
102
+ if hikyuu_major_version != plugin_major_version:
103
+ hku_warn("hikyuu版本 ({}) 与 hikyuu_plugin版本 ({}) 不匹配,请确保使用兼容版本!".format(__version__, plugin_version))
104
+
105
+ except ImportError:
106
+ plugin_path = Path.home() / '.hikyuu' / 'plugin'
107
+ if plugin_path.exists():
108
+ plugin_path = str(plugin_path)
109
+ else:
110
+ plugin_path = os.path.join(os.path.dirname(__file__), 'plugin')
111
+
112
+
92
113
  sm.set_plugin_path(plugin_path)
93
114
  # print(f"current plugin path: {plugin_path}")
94
115