hikyuu 2.6.6__py3-none-win_amd64.whl → 2.6.8__py3-none-win_amd64.whl

hikyuu/data/common_clickhouse.py

@@ -136,58 +136,11 @@ def get_table(connect, market, code, ktype):
         'transdata': 'transdata',
     }
     nktype = ktype_dict[ktype.lower()]
-    connect.command(f"create database if not exists hku_data")
     if nktype == 'timeline':
-        sql = f"""
-                CREATE table if not exists hku_data.timeline (
-                    `market` String,
-                    `code` String,
-                    `date` DateTime,
-                    `price` DOUBLE,
-                    `vol` DOUBLE
-                )
-                ENGINE = MergeTree()
-                PRIMARY KEY (market, code, date);
-                """
-        # print(sql)
-        connect.command(sql)
         return (f'hku_data.timeline', market.upper(), code.upper())
-
     elif nktype == 'transdata':
-        sql = f"""
-                CREATE table if not exists hku_data.transdata (
-                    `market` String,
-                    `code` String,
-                    `date` DateTime,
-                    `price` DOUBLE,
-                    `vol` DOUBLE,
-                    `buyorsell` int
-                )
-                ENGINE = MergeTree()
-                PRIMARY KEY (market, code, date);
-                """
-        # print(sql)
-        connect.command(sql)
         return (f'hku_data.transdata', market.upper(), code.upper())
-
     else:
-        sql = f"""
-                CREATE table if not exists hku_data.{nktype}_k (
-                    `market` String,
-                    `code` String,
-                    `date` DateTime,
-                    `open` DOUBLE,
-                    `high` DOUBLE,
-                    `low` DOUBLE,
-                    `close` DOUBLE,
-                    `amount` DOUBLE,
-                    `volume` DOUBLE
-                )
-                ENGINE = MergeTree()
-                PRIMARY KEY (market, code, date);
-                """
-        # print(sql)
-        connect.command(sql)
         return (f'hku_data.{nktype}_k', market.upper(), code.upper())
 
 

hikyuu/data/tdx_to_h5.py

@@ -363,7 +363,7 @@ def tdx_import_data(connect, market, ktype, quotations, src_dir, dest_dir, progr
                 progress(i, total)
             continue
 
-        filename = src_dir + "\\" + market.lower() + stock[2] + suffix
+        filename = os.path.join(src_dir, f"{market.lower()}{stock[2]}{suffix}")
         this_count = func_import_from_file(connect, filename, h5file, market, stock)
         add_record_count += this_count
         if this_count > 0:

hikyuu/draw/drawplot/__init__.pyi

@@ -1,12 +1,12 @@
 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.cpp.core312 import TradeManager
+from hikyuu.cpp.core313 import ConditionBase
+from hikyuu.cpp.core313 import EnvironmentBase
+from hikyuu.cpp.core313 import Indicator
+from hikyuu.cpp.core313 import KData
+from hikyuu.cpp.core313 import Portfolio
+from hikyuu.cpp.core313 import SignalBase
+from hikyuu.cpp.core313 import System
+from hikyuu.cpp.core313 import TradeManager
 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
@@ -25,8 +25,8 @@ from hikyuu.draw.drawplot.echarts_draw import sys_performance as ec_sys_performa
 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 DRAWIMG
 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
@@ -68,54 +68,49 @@ __all__: list = ['use_draw_engine', 'get_current_draw_engine', 'create_figure',
 def adjust_axes_show(axeslist):
     """
     用于调整上下紧密相连的坐标轴显示时，其上一坐标轴最小值刻度和下一坐标轴最大值刻度
-        显示重叠的问题。
+    显示重叠的问题。
     
-        :param axeslist: 上下相连的坐标轴列表 (ax1,ax2,...)
-        
+    :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
-        
+    :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同时下跌，显示绿色
+    当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
-        
+    :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轴坐标显示
+    设置指定坐标轴的日期显示，根据指定的K线类型优化X轴坐标显示
     
-        :param axes: 指定的坐标轴
-        :param dates: Datetime构成可迭代序列
-        :param Query.KType typ: K线类型
-        
+    :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
-        
+    :param int n: 坐标轴数量
+    :param figsize: (宽, 高)
+    :return: (ax1, ax2, ...) 根据指定的坐标轴数量而定，超出[1,4]个坐标轴时，返回None
     """
 def gca():
     ...