hikyuu 2.6.6__py3-none-win_amd64.whl → 2.6.7__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/__init__.pyi

@@ -9,8 +9,8 @@ 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 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

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.core39 import ConditionBase
+from hikyuu.cpp.core39 import EnvironmentBase
+from hikyuu.cpp.core39 import Indicator
+from hikyuu.cpp.core39 import KData
+from hikyuu.cpp.core39 import Portfolio
+from hikyuu.cpp.core39 import SignalBase
+from hikyuu.cpp.core39 import System
+from hikyuu.cpp.core39 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