hikyuu 2.3.1__py3-none-win_amd64.whl → 2.5.1__py3-none-win_amd64.whl

hikyuu/data/common_mysql.py

@@ -29,7 +29,12 @@ from pathlib import Path
 import mysql.connector
 
 from hikyuu.data.common import get_stktype_list, get_new_holidays
-from hikyuu.util import hku_debug
+from hikyuu.util import hku_debug, hku_info
+
+
+def get_mysql_connect_version():
+    m, n, _ = mysql.connector.__version__.split('.')
+    return int(m) + float(n) * 0.1
 
 
 def is_exist_db(connect):
@@ -56,13 +61,19 @@ def create_database(connect):
     """创建数据库"""
     sql_dir = os.path.dirname(__file__) + "/mysql_upgrade"
     cur = connect.cursor()
+    mysql_version = get_mysql_connect_version()
     if not is_exist_db(connect):
         filename = sql_dir + "/createdb.sql"
         with open(filename, 'r', encoding='utf8') as f:
             sql = f.read()
-        for x in cur.execute(sql, multi=True):
-            # print(x.statement)
-            pass
+        if mysql_version >= 9.2:
+            cur.execute(sql)
+            _ = cur.fetchall()
+            while cur.nextset():
+                _ = cur.fetchall()
+        else:
+            for x in cur.execute(sql, multi=True):
+                pass
 
     db_version = get_db_version(connect)
     files = [x for x in Path(sql_dir).iterdir()
@@ -73,9 +84,15 @@ def create_database(connect):
     files.sort()
     for file in files:
         sql = file.read_text(encoding='utf8')
-        for x in cur.execute(sql, multi=True):
-            # print(x.statement)
-            pass
+        if mysql_version >= 9.2:
+            cur.execute(sql, map_results=False)
+            _ = cur.fetchall()
+            while cur.nextset():
+                _ = cur.fetchall()
+        else:
+            for x in cur.execute(sql, multi=True):
+                # print(x.statement)
+                pass
 
     connect.commit()
     cur.close()

hikyuu/data/common_pytdx.py

@@ -77,7 +77,23 @@ def search_best_tdx():
         res = executor.map(ping2, hosts, timeout=2)
     x = [i for i in res if i[0] == True]
     x.sort(key=lambda item: item[1])
-    return x
+
+    # 校验 host 是否存在错误，取同样数据，相同结果最多的集合
+    values = {}
+    for host in x:
+        api = TdxHq_API(multithread=False)
+        if api.connect(host[2], host[3]):
+            x = api.get_security_bars(9, 0, '159915', 0, 1)
+            if x and len(x) > 0:
+                if x[0]['close'] not in values:
+                    values[x[0]['close']] = [host]
+                else:
+                    values[x[0]['close']].append(host)
+    ret = []
+    for _, host in values.items():
+        if len(host) > len(ret):
+            ret = host
+    return ret
 
 
 def pytdx_get_day_trans(api, pymarket, code, date):

hikyuu/data/em_block_to_mysql.py

@@ -74,7 +74,7 @@ def em_import_block_to_mysql(connect, code_market_dict, categorys=('行业板块
     hku_info("更新数据库")
     cur = connect.cursor()
     if len(blks) == 1:
-        sql = f"delete from hku_base.block where category in ({blks[0]})"
+        sql = f"delete from hku_base.block where category in ('{blks[0]}')"
     else:
         sql = f"delete from hku_base.block where category in {tuple(blks)}"
     cur.execute(sql)
@@ -88,11 +88,12 @@ def em_import_block_to_mysql(connect, code_market_dict, categorys=('行业板块
 
     if insert_records:
         sql = "insert into hku_base.block (category, name, market_code) values (%s,%s,%s)"
+        hku_info(f"insert block records: {len(insert_records)}")
         cur.executemany(sql, insert_records)
 
     connect.commit()
     cur.close()
-    pass
+    return len(insert_records)
 
 
 if __name__ == "__main__":

hikyuu/data/em_block_to_sqlite.py

@@ -69,13 +69,15 @@ def em_import_block_to_sqlite(connect, code_market_dict, categorys=('行业板
     if success_fetch_zs:
         blks.append('指数板块')
 
+    print(blks)
+
     if not blks:
         return
 
     hku_info("更新数据库")
     cur = connect.cursor()
     if len(blks) == 1:
-        sql = f"delete from block where category in ({blks[0]})"
+        sql = f"delete from block where category in ('{blks[0]}')"
     else:
         sql = f"delete from block where category in {tuple(blks)}"
     hku_info(sql)
@@ -90,10 +92,12 @@ def em_import_block_to_sqlite(connect, code_market_dict, categorys=('行业板
 
     if insert_records:
         sql = "insert into block (category, name, market_code) values (?,?,?)"
+        hku_info(f"insert block records: {len(insert_records)}")
         cur.executemany(sql, insert_records)
 
     connect.commit()
     cur.close()
+    return len(insert_records)
 
 
 if __name__ == "__main__":
@@ -101,7 +105,8 @@ if __name__ == "__main__":
     from hikyuu.data.common_sqlite3 import create_database
 
     # dest_dir = "/home/fasiondog/stock"
-    dest_dir = "d:\\stock"
+    dest_dir = "/Users/fasiondog/stock"
+    # dest_dir = "d:\\stock"
 
     connect = sqlite3.connect(dest_dir + "/stock.db")
     create_database(connect)
@@ -112,6 +117,6 @@ if __name__ == "__main__":
         code_market_dict[v["code"]] = MARKET.SH
     # print(code_market_dict)
 
-    em_import_block_to_sqlite(connect, code_market_dict)
+    em_import_block_to_sqlite(connect, code_market_dict, categorys=('地域板块',))
 
     connect.close()

hikyuu/data/mysql_upgrade/0026.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `hku_base`.`coderuletype` modify `id` int(11)  auto_increment;
+INSERT INTO `hku_base`.`coderuletype` (`marketid`,`codepre`,`type`,`description`) VALUES (3,'899',2,'北证指数');
+UPDATE `hku_base`.`market` SET `code`='899050' WHERE `marketid`=3;
+INSERT INTO `hku_base`.`stock` (`marketid`, `code`, `name`, `type`, `valid`, `startDate`, `endDate`)
+SELECT 3, '899050', '北证50', 2, 1, 20220429, 99999999
+WHERE NOT EXISTS (
+    SELECT `stockid` FROM `hku_base`.`stock` WHERE `marketid`=3 and `code`='899050'
+);
+UPDATE `hku_base`.`version` set `version` = 26;

hikyuu/data/sqlite_upgrade/0026.sql

@@ -0,0 +1,10 @@
+BEGIN TRANSACTION;
+INSERT INTO `coderuletype` (marketid,codepre,type,description) VALUES (3,'899',2,'北证指数');
+UPDATE `market` SET `code`='899050' WHERE `marketid`=3;
+INSERT INTO `Stock` (`marketid`, `code`, `name`, `type`, `valid`, `startDate`, `endDate`)
+SELECT 3, '899050', '北证50', 2, 1, 20220429, 99999999
+WHERE NOT EXISTS (
+    SELECT stockid FROM `Stock` WHERE `marketid`=3 and `code`='899050'
+);
+UPDATE `version` set `version` = 26;
+COMMIT;

hikyuu/draw/__init__.pyi

@@ -0,0 +1,35 @@
+from __future__ import annotations
+from hikyuu.draw.drawplot import adjust_axes_show
+from hikyuu.draw.drawplot import ax_draw_macd
+from hikyuu.draw.drawplot import ax_draw_macd2
+from hikyuu.draw.drawplot import ax_set_locator_formatter
+from hikyuu.draw.drawplot import create_figure
+from hikyuu.draw.drawplot import gca
+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 DRAWLINE
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER_FIX
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWRECTREL
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWSL
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWTEXT
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWTEXT_FIX
+from hikyuu.draw.drawplot.matplotlib_draw import PLOYLINE
+from hikyuu.draw.drawplot.matplotlib_draw import RGB
+from hikyuu.draw.drawplot.matplotlib_draw import SHOWICONS
+from hikyuu.draw.drawplot.matplotlib_draw import STICKLINE
+from hikyuu.draw.drawplot import show_gcf
+from hikyuu.draw.drawplot import use_draw_engine
+from . import drawplot
+from . import elder
+from . import kaufman
+from . import volume
+__all__: list = ['vl', 'el', 'kf', 'use_draw_engine', 'get_current_draw_engine', 'create_figure', 'ax_set_locator_formatter', 'adjust_axes_show', 'ax_draw_macd', 'ax_draw_macd2', 'gcf', 'gca', 'show_gcf', 'DRAWNULL', 'STICKLINE', 'DRAWBAND', 'RGB', 'PLOYLINE', 'DRAWLINE', 'DRAWTEXT', 'DRAWNUMBER', 'DRAWTEXT_FIX', 'DRAWNUMBER_FIX', 'DRAWSL', 'DRAWIMG', 'DRAWICON', 'DRAWBMP', 'SHOWICONS', 'DRAWRECTREL']
+DRAWNULL: float  # value = nan
+el = elder
+kf = kaufman
+vl = volume

hikyuu/draw/drawplot/__init__.pyi

@@ -0,0 +1,134 @@
+from __future__ import annotations
+from hikyuu.cpp.core312 import ConditionBase
+from hikyuu.cpp.core312 import EnvironmentBase
+from hikyuu.cpp.core312 import Indicator
+from hikyuu.cpp.core312 import KData
+from hikyuu.cpp.core312 import Portfolio
+from hikyuu.cpp.core312 import SignalBase
+from hikyuu.cpp.core312 import System
+from hikyuu.draw.drawplot.bokeh_draw import ax_draw_macd as bk_ax_draw_macd
+from hikyuu.draw.drawplot.bokeh_draw import ax_draw_macd2 as bk_ax_draw_macd2
+from hikyuu.draw.drawplot.bokeh_draw import create_figure as bk_create_figure
+from hikyuu.draw.drawplot.bokeh_draw import gca as bk_gca
+from hikyuu.draw.drawplot.bokeh_draw import gcf as bk_gcf
+from hikyuu.draw.drawplot.bokeh_draw import ibar as bk_ibar
+from hikyuu.draw.drawplot.bokeh_draw import iplot as bk_iplot
+from hikyuu.draw.drawplot.bokeh_draw import kplot as bk_kplot
+from hikyuu.draw.drawplot.bokeh_draw import sgplot as bk_sgplot
+from hikyuu.draw.drawplot.bokeh_draw import show_gcf as bk_show_gcf
+from hikyuu.draw.drawplot.bokeh_draw import use_bokeh_in_notebook
+from hikyuu.draw.drawplot.echarts_draw import ibar as ec_ibar
+from hikyuu.draw.drawplot.echarts_draw import iplot as ec_iplot
+from hikyuu.draw.drawplot.echarts_draw import kplot as ec_kplot
+from hikyuu.draw.drawplot.echarts_draw import sys_performance as ec_sys_performance
+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
+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
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWRECTREL
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWSL
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWTEXT
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWTEXT_FIX
+from hikyuu.draw.drawplot.matplotlib_draw import PLOYLINE
+from hikyuu.draw.drawplot.matplotlib_draw import RGB
+from hikyuu.draw.drawplot.matplotlib_draw import SHOWICONS
+from hikyuu.draw.drawplot.matplotlib_draw import STICKLINE
+from hikyuu.draw.drawplot.matplotlib_draw import adjust_axes_show as mpl_adjust_axes_show
+from hikyuu.draw.drawplot.matplotlib_draw import ax_draw_macd as mpl_ax_draw_macd
+from hikyuu.draw.drawplot.matplotlib_draw import ax_draw_macd2 as mpl_ax_draw_macd2
+from hikyuu.draw.drawplot.matplotlib_draw import ax_set_locator_formatter as mpl_ax_set_locator_formatter
+from hikyuu.draw.drawplot.matplotlib_draw import cnplot as mpl_cnplot
+from hikyuu.draw.drawplot.matplotlib_draw import create_figure as mpl_create_figure
+from hikyuu.draw.drawplot.matplotlib_draw import evplot as mpl_evplot
+from hikyuu.draw.drawplot.matplotlib_draw import ibar as mpl_ibar
+from hikyuu.draw.drawplot.matplotlib_draw import iplot as mpl_iplot
+from hikyuu.draw.drawplot.matplotlib_draw import kplot as mpl_kplot
+from hikyuu.draw.drawplot.matplotlib_draw import mkplot as mpl_mkplot
+from hikyuu.draw.drawplot.matplotlib_draw import set_mpl_params
+from hikyuu.draw.drawplot.matplotlib_draw import sgplot as mpl_sgplot
+from hikyuu.draw.drawplot.matplotlib_draw import sys_performance as mpl_sys_performance
+from hikyuu.draw.drawplot.matplotlib_draw import sysplot as mpl_sysplot
+import matplotlib as matplotlib
+from matplotlib.pyplot import gca as mpl_gca
+from matplotlib.pyplot import gcf as mpl_gcf
+from . import bokeh_draw
+from . import common
+from . import echarts_draw
+from . import matplotlib_draw
+__all__: list = ['use_draw_engine', 'get_current_draw_engine', 'create_figure', 'gcf', 'show_gcf', 'gca', 'ax_draw_macd', 'ax_draw_macd2', 'use_bokeh_in_notebook', 'use_draw_with_echarts', 'DRAWNULL', 'STICKLINE', 'DRAWBAND', 'RGB', 'PLOYLINE', 'DRAWLINE', 'DRAWTEXT', 'DRAWNUMBER', 'DRAWTEXT_FIX', 'DRAWNUMBER_FIX', 'DRAWSL', 'DRAWIMG', 'DRAWICON', 'DRAWBMP', 'SHOWICONS', 'DRAWRECTREL']
+def adjust_axes_show(axeslist):
+    """
+    用于调整上下紧密相连的坐标轴显示时，其上一坐标轴最小值刻度和下一坐标轴最大值刻度
+        显示重叠的问题。
+    
+        :param axeslist: 上下相连的坐标轴列表 (ax1,ax2,...)
+        
+    """
+def ax_draw_macd(axes, kdata, n1 = 12, n2 = 26, n3 = 9):
+    """
+    绘制MACD
+    
+        :param axes: 指定的坐标轴
+        :param KData kdata: KData
+        :param int n1: 指标 MACD 的参数1
+        :param int n2: 指标 MACD 的参数2
+        :param int n3: 指标 MACD 的参数3
+        
+    """
+def ax_draw_macd2(axes, ref, kdata, n1 = 12, n2 = 26, n3 = 9):
+    """
+    绘制MACD。
+        当BAR值变化与参考序列ref变化不一致时，显示为灰色，
+        当BAR和参考序列ref同时上涨，显示红色
+        当BAR和参考序列ref同时下跌，显示绿色
+    
+        :param axes: 指定的坐标轴
+        :param ref: 参考序列，EMA
+        :param KData kdata: KData
+        :param int n1: 指标 MACD 的参数1
+        :param int n2: 指标 MACD 的参数2
+        :param int n3: 指标 MACD 的参数3
+        
+    """
+def ax_set_locator_formatter(axes, dates, typ):
+    """
+     设置指定坐标轴的日期显示，根据指定的K线类型优化X轴坐标显示
+    
+        :param axes: 指定的坐标轴
+        :param dates: Datetime构成可迭代序列
+        :param Query.KType typ: K线类型
+        
+    """
+def create_figure(n = 1, figsize = None):
+    """
+    生成含有指定坐标轴数量的窗口，最大只支持4个坐标轴。
+    
+        :param int n: 坐标轴数量
+        :param figsize: (宽, 高)
+        :return: (ax1, ax2, ...) 根据指定的坐标轴数量而定，超出[1,4]个坐标轴时，返回None
+        
+    """
+def gca():
+    ...
+def gcf():
+    ...
+def get_current_draw_engine():
+    ...
+def set_current_draw_engine(engine):
+    ...
+def show_gcf():
+    ...
+def use_draw_engine(engine = 'matplotlib'):
+    ...
+def use_draw_with_bokeh():
+    ...
+def use_draw_with_echarts():
+    ...
+def use_draw_with_matplotlib():
+    ...
+DRAWNULL: float  # value = nan
+g_draw_engine: str = 'matplotlib'