hikyuu 2.3.1__py3-none-win_amd64.whl → 2.5.1__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 (157) hide show
  1. hikyuu/__init__.py +438 -6
  2. hikyuu/__init__.pyi +647 -496
  3. hikyuu/analysis/__init__.pyi +478 -466
  4. hikyuu/analysis/analysis.pyi +500 -486
  5. hikyuu/core.pyi +480 -468
  6. hikyuu/cpp/core310.pyd +0 -0
  7. hikyuu/cpp/core311.pyd +0 -0
  8. hikyuu/cpp/core312.pyd +0 -0
  9. hikyuu/cpp/core313.pyd +0 -0
  10. hikyuu/cpp/core38.pyd +0 -0
  11. hikyuu/cpp/core39.pyd +0 -0
  12. hikyuu/cpp/hikyuu.dll +0 -0
  13. hikyuu/cpp/hikyuu.lib +0 -0
  14. hikyuu/cpp/sqlite3.dll +0 -0
  15. hikyuu/data/common_mysql.py +24 -7
  16. hikyuu/data/common_pytdx.py +17 -1
  17. hikyuu/data/em_block_to_mysql.py +3 -2
  18. hikyuu/data/em_block_to_sqlite.py +8 -3
  19. hikyuu/data/mysql_upgrade/0026.sql +9 -0
  20. hikyuu/data/sqlite_upgrade/0026.sql +10 -0
  21. hikyuu/draw/__init__.pyi +35 -0
  22. hikyuu/draw/drawplot/__init__.pyi +134 -0
  23. hikyuu/draw/drawplot/bokeh_draw.pyi +796 -0
  24. hikyuu/draw/drawplot/common.pyi +10 -0
  25. hikyuu/draw/drawplot/echarts_draw.py +5 -12
  26. hikyuu/draw/drawplot/echarts_draw.pyi +682 -0
  27. hikyuu/draw/drawplot/matplotlib_draw.py +18 -3
  28. hikyuu/draw/drawplot/matplotlib_draw.pyi +1101 -0
  29. hikyuu/draw/elder.pyi +44 -0
  30. hikyuu/draw/kaufman.pyi +38 -0
  31. hikyuu/draw/volume.pyi +31 -0
  32. hikyuu/examples/notebook/Demo/Demo2.ipynb +1 -1
  33. hikyuu/extend.py +9 -3
  34. hikyuu/extend.pyi +524 -504
  35. hikyuu/fetcher/stock/zh_block_em.py +118 -51
  36. hikyuu/gui/data/EscapetimeThread.py +4 -4
  37. hikyuu/gui/data/ImportBlockInfoTask.py +3 -2
  38. hikyuu/gui/data/ImportHistoryFinanceTask.py +2 -0
  39. hikyuu/gui/data/MainWindow.py +48 -42
  40. hikyuu/gui/importdata.py +13 -26
  41. hikyuu/hub.py +2 -4
  42. hikyuu/hub.pyi +52 -58
  43. hikyuu/include/hikyuu/DataType.h +5 -0
  44. hikyuu/include/hikyuu/Stock.h +7 -0
  45. hikyuu/include/hikyuu/indicator/Indicator.h +1 -1
  46. hikyuu/include/hikyuu/indicator/Indicator2InImp.h +65 -0
  47. hikyuu/include/hikyuu/indicator/IndicatorImp.h +1 -3
  48. hikyuu/include/hikyuu/indicator/build_in.h +7 -0
  49. hikyuu/include/hikyuu/indicator/crt/COST.h +3 -0
  50. hikyuu/include/hikyuu/indicator/crt/CYCLE.h +24 -0
  51. hikyuu/include/hikyuu/indicator/crt/DISCARD.h +27 -0
  52. hikyuu/include/hikyuu/indicator/crt/HSL.h +1 -13
  53. hikyuu/include/hikyuu/indicator/crt/INBLOCK.h +31 -0
  54. hikyuu/include/hikyuu/indicator/crt/INDEX.h +35 -23
  55. hikyuu/include/hikyuu/indicator/crt/JUMPDOWN.h +24 -0
  56. hikyuu/include/hikyuu/indicator/crt/JUMPUP.h +24 -0
  57. hikyuu/include/hikyuu/indicator/crt/LASTVALUE.h +29 -0
  58. hikyuu/include/hikyuu/indicator/crt/LIUTONGPAN.h +1 -0
  59. hikyuu/include/hikyuu/indicator/crt/WINNER.h +38 -0
  60. hikyuu/include/hikyuu/indicator/imp/ICorr.h +6 -21
  61. hikyuu/include/hikyuu/indicator/imp/ICost.h +31 -0
  62. hikyuu/include/hikyuu/indicator/imp/ICycle.h +30 -0
  63. hikyuu/include/hikyuu/indicator/imp/IDiscard.h +28 -0
  64. hikyuu/include/hikyuu/indicator/imp/IDma.h +6 -23
  65. hikyuu/include/hikyuu/indicator/imp/IHsl.h +30 -0
  66. hikyuu/include/hikyuu/indicator/imp/IInBlock.h +30 -0
  67. hikyuu/include/hikyuu/indicator/imp/IIndex.h +26 -0
  68. hikyuu/include/hikyuu/indicator/imp/IJumpDown.h +24 -0
  69. hikyuu/include/hikyuu/indicator/imp/IJumpUp.h +24 -0
  70. hikyuu/include/hikyuu/indicator/imp/ILastValue.h +26 -0
  71. hikyuu/include/hikyuu/indicator/imp/ISpearman.h +5 -20
  72. hikyuu/include/hikyuu/indicator/imp/IWinner.h +26 -0
  73. hikyuu/include/hikyuu/indicator_talib/imp/TaMavp.h +5 -19
  74. hikyuu/include/hikyuu/indicator_talib/imp/ta_defines.h +12 -63
  75. hikyuu/include/hikyuu/indicator_talib/imp/ta_imp.h +7 -53
  76. hikyuu/include/hikyuu/strategy/RunPortfolioInStrategy.h +3 -4
  77. hikyuu/include/hikyuu/strategy/Strategy.h +4 -5
  78. hikyuu/include/hikyuu/trade_manage/TradeRecord.h +5 -1
  79. hikyuu/include/hikyuu/trade_sys/allocatefunds/build_in.h +1 -0
  80. hikyuu/include/hikyuu/trade_sys/allocatefunds/crt/AF_FixedWeightList.h +22 -0
  81. hikyuu/include/hikyuu/trade_sys/allocatefunds/imp/FixedWeightListAllocateFunds.h +25 -0
  82. hikyuu/include/hikyuu/trade_sys/moneymanager/MoneyManagerBase.h +17 -4
  83. hikyuu/include/hikyuu/trade_sys/moneymanager/build_in.h +2 -0
  84. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_FixedCapital.h +6 -0
  85. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_FixedCapitalFunds.h +26 -0
  86. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_FixedCountTps.h +27 -0
  87. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_FixedRisk.h +6 -0
  88. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_FixedUnits.h +6 -0
  89. hikyuu/include/hikyuu/trade_sys/moneymanager/crt/MM_WilliamsFixedRisk.h +7 -0
  90. hikyuu/include/hikyuu/trade_sys/moneymanager/imp/FixedCapitalFundsMM.h +28 -0
  91. hikyuu/include/hikyuu/trade_sys/moneymanager/imp/FixedCountTpsMM.h +44 -0
  92. hikyuu/include/hikyuu/trade_sys/portfolio/Portfolio.h +38 -37
  93. hikyuu/include/hikyuu/trade_sys/portfolio/build_in.h +1 -0
  94. hikyuu/include/hikyuu/trade_sys/portfolio/crt/PF_Simple.h +25 -1
  95. hikyuu/include/hikyuu/trade_sys/portfolio/crt/PF_WithoutAF.h +50 -0
  96. hikyuu/include/hikyuu/trade_sys/portfolio/imp/SimplePortfolio.h +53 -0
  97. hikyuu/include/hikyuu/trade_sys/portfolio/imp/WithoutAFPortfolio.h +57 -0
  98. hikyuu/include/hikyuu/trade_sys/selector/imp/MultiFactorSelector.h +7 -0
  99. hikyuu/include/hikyuu/trade_sys/signal/SignalBase.h +51 -5
  100. hikyuu/include/hikyuu/trade_sys/signal/build_in.h +2 -0
  101. hikyuu/include/hikyuu/trade_sys/signal/crt/SG_Bool.h +2 -1
  102. hikyuu/include/hikyuu/trade_sys/signal/crt/SG_Logic.h +37 -0
  103. hikyuu/include/hikyuu/trade_sys/signal/crt/SG_OneSide.h +28 -0
  104. hikyuu/include/hikyuu/trade_sys/signal/imp/OneSideSignal.h +46 -0
  105. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/AddSignal.h +19 -0
  106. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/AddValueSignal.h +19 -0
  107. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/DivSignal.h +19 -0
  108. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/DivValueSignal.h +22 -0
  109. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/MulSignal.h +19 -0
  110. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/MulValueSignal.h +19 -0
  111. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/OperatorSignal.h +68 -0
  112. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/OperatorValueSignal.h +67 -0
  113. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/SubSignal.h +19 -0
  114. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/SubValueSignal.h +22 -0
  115. hikyuu/include/hikyuu/trade_sys/signal/imp/logic/__init__.py +1 -0
  116. hikyuu/include/hikyuu/trade_sys/stoploss/crt/ST_Indicator.h +1 -1
  117. hikyuu/include/hikyuu/trade_sys/stoploss/imp/IndicatorStoploss.h +3 -4
  118. hikyuu/include/hikyuu/utilities/FilterNode.h +2 -2
  119. hikyuu/include/hikyuu/utilities/Log.h +42 -15
  120. hikyuu/include/hikyuu/utilities/datetime/Datetime.h +1 -1
  121. hikyuu/include/hikyuu/utilities/datetime/TimeDelta.h +2 -2
  122. hikyuu/include/hikyuu/utilities/db_connect/DBCondition.h +4 -0
  123. hikyuu/include/hikyuu/utilities/db_connect/SQLResultSet.h +2 -2
  124. hikyuu/include/hikyuu/utilities/db_connect/mysql/MySQLConnect.h +5 -1
  125. hikyuu/include/hikyuu/utilities/node/NodeServer.h +4 -4
  126. hikyuu/include/hikyuu/utilities/thread/MQStealThreadPool.h +2 -2
  127. hikyuu/include/hikyuu/utilities/thread/MQThreadPool.h +2 -2
  128. hikyuu/include/hikyuu/utilities/thread/StealThreadPool.h +5 -5
  129. hikyuu/include/hikyuu/utilities/thread/ThreadPool.h +2 -2
  130. hikyuu/include/hikyuu/utilities/thread/algorithm.h +16 -10
  131. hikyuu/include/hikyuu/version.h +4 -4
  132. hikyuu/indicator/indicator.py +1 -0
  133. hikyuu/interactive.py +1 -318
  134. hikyuu/trade_manage/__init__.pyi +492 -478
  135. hikyuu/trade_manage/broker.pyi +18 -19
  136. hikyuu/trade_manage/broker_easytrader.pyi +4 -6
  137. hikyuu/trade_manage/broker_mail.pyi +24 -22
  138. hikyuu/trade_manage/trade.pyi +492 -478
  139. hikyuu/util/check.pyi +15 -17
  140. hikyuu/util/mylog.pyi +7 -8
  141. hikyuu/util/notebook.pyi +11 -9
  142. hikyuu/util/singleton.pyi +6 -8
  143. hikyuu/util/slice.pyi +2 -1
  144. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/METADATA +2 -2
  145. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/RECORD +149 -105
  146. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/top_level.txt +1 -0
  147. hikyuu/cpp/__init__.pyi +0 -3
  148. hikyuu/cpp/core310.pyi +0 -12503
  149. hikyuu/cpp/core311.pyi +0 -12503
  150. hikyuu/cpp/core312.pyi +0 -12503
  151. hikyuu/cpp/core313.pyi +0 -12494
  152. hikyuu/cpp/core38.pyi +0 -12503
  153. hikyuu/cpp/core39.pyi +0 -12503
  154. hikyuu/deprecated.py +0 -651
  155. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/LICENSE +0 -0
  156. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/WHEEL +0 -0
  157. {hikyuu-2.3.1.dist-info → hikyuu-2.5.1.dist-info}/entry_points.txt +0 -0
@@ -0,0 +1,10 @@
1
+ from __future__ import annotations
2
+ from hikyuu.cpp.core312 import Query
3
+ __all__ = ['Query', 'get_draw_title']
4
+ def get_draw_title(kdata):
5
+ """
6
+ 根据typ值,返回相应的标题,如 上证指数(日线)
7
+ 参数:kdata: KData实例
8
+ 返回:一个包含stock名称的字符串,可用作绘图时的标题
9
+
10
+ """
@@ -13,7 +13,6 @@ from hikyuu import *
13
13
  class MultiLineTextChart(ChartBase):
14
14
  def __init__(self, init_opts: opts.InitOpts = opts.InitOpts()):
15
15
  super().__init__(init_opts=init_opts)
16
- self._text_data = [] # 存储多行文本数据
17
16
  self._last_x = 50 # 默认起始 x 坐标
18
17
  self._last_y = 5 # 默认起始 y 坐标
19
18
  self._line_height = 20 # 默认行高
@@ -24,13 +23,7 @@ class MultiLineTextChart(ChartBase):
24
23
  if y is not None:
25
24
  self._last_y = y
26
25
 
27
- def add(
28
- self,
29
- text: str,
30
- x = None,
31
- y = None,
32
- text_style = None,
33
- ):
26
+ def add(self, text: str, x = None, y = None, text_style = None):
34
27
  """
35
28
  添加多行文本
36
29
 
@@ -203,7 +196,7 @@ def kplot_line(kdata: KData):
203
196
  xaxis_index=[0, 1], # 同时控制k线图和volume图的x轴缩放
204
197
  type_="slider",
205
198
  pos_top="85%",
206
- range_start=200 * 100 / len(datetimes),
199
+ range_start=(100 - 200 * 100 / len(datetimes)) if len(datetimes) > 200 else 0,
207
200
  range_end=100,
208
201
  ),
209
202
  ],
@@ -363,7 +356,7 @@ def iplot(indicator, kref: KData = None, chart=None, ilongname=False):
363
356
  xaxis_index=0,
364
357
  type_="slider",
365
358
  pos_top="92%",
366
- range_start=200 * 100 / len(datetimes) if len(datetimes) > 200 else 0,
359
+ range_start=(100 - 200 * 100 / len(datetimes)) if len(datetimes) > 200 else 0,
367
360
  range_end=100,
368
361
  )
369
362
  ],
@@ -572,13 +565,13 @@ def sys_performance(sys, ref_stk=None):
572
565
 
573
566
  line = iplot(ref_return, ref_k)
574
567
  line = iplot(funds_return, ref_k, line)
575
- line.set_global_opts(datazoom_opts=[
568
+ line.get_options().update(dataZoom=[
576
569
  opts.DataZoomOpts(
577
570
  is_show=len(ref_dates) > 500,
578
571
  xaxis_index=0,
579
572
  type_="slider",
580
573
  pos_top="92%",
581
- range_start=500 * 100 / len(ref_dates) if len(ref_dates) > 500 else 0,
574
+ range_start=(100 - 500 * 100 / len(ref_dates)) if len(ref_dates) > 500 else 0,
582
575
  range_end=100,
583
576
  ),
584
577
  ])