hikyuu 2.6.8.3__py3-none-manylinux2014_aarch64.whl → 2.7.3__py3-none-manylinux2014_aarch64.whl

hikyuu/data/pytdx_to_h5.py

@@ -23,13 +23,15 @@
 # SOFTWARE.
 
 import sys
+import os
 import math
 import datetime
 import sqlite3
 from pytdx.hq import TDXParams
+from configparser import ConfigParser
 
 from hikyuu.util.mylog import get_default_logger, hku_error, hku_debug
-from hikyuu import Datetime
+from hikyuu import Datetime, is_valid_license, KDataToHdf5Importer
 from hikyuu.data.common import *
 from hikyuu.data.common_pytdx import to_pytdx_market, pytdx_get_day_trans
 from hikyuu.data.common_sqlite3 import (
@@ -235,6 +237,7 @@ def guess_5min_n_step(last_datetime):
     return (n, step)
 
 
+@hku_catch(trace=True)
 def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, startDate=199012191500):
     market = market.upper()
     pytdx_market = to_pytdx_market(market)
@@ -246,9 +249,9 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
     table = get_h5table(h5file, market, code)
     if table is None:
         hku_error("Can't get table({}{})".format(market, code))
-        return 0
+        return (0, True, Datetime())
 
-    last_datetime = table[-1]['datetime'] if table.nrows > 0 else startDate
+    last_datetime = int(table[-1]['datetime']) if table.nrows > 0 else startDate
 
     today = datetime.date.today()
     if ktype == 'DAY':
@@ -266,10 +269,10 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
         pytdx_kline_type = TDXParams.KLINE_TYPE_5MIN
         today_datetime = (today.year * 10000 + today.month * 100 + today.day) * 10000 + 1500
     else:
-        return 0
+        return (0, True, Datetime(last_datetime))
 
     if today_datetime <= last_datetime:
-        return 0
+        return (0, True, Datetime(last_datetime))
 
     get_bars = api.get_index_bars if stktype == STOCKTYPE.INDEX else api.get_security_bars
 
@@ -286,7 +289,7 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
         bar_list = get_bars(pytdx_kline_type, pytdx_market, code, n * 800, step)
         n -= 1
         if bar_list is None:
-            print(code, "invalid!!")
+            # print(code, "invalid!!")
             continue
 
         for bar in bar_list:
@@ -302,32 +305,36 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
                 hku_error("Failed translate datetime: {}, from {}! {}".format(bar, api.ip, e))
                 continue
 
+            if 'open' not in bar or 'high' not in bar or 'low' not in bar or 'close' not in bar or 'vol' not in bar or 'amount' not in bar:
+                hku_warn(f"Ignore invalid bar: {bar_datetime}, missing fields!")
+                continue
+
             if need_check and bar_datetime == last_datetime:
                 # print(f'{bar_datetime} {ktype} {market}{code}')
                 if abs(last_krecord['openPrice']*0.001 - bar["open"]) / (last_krecord['openPrice']*0.001) > 0.02:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord open: {last_krecord['openPrice']*0.001}, bar: {bar['open']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord['highPrice']*0.001 - bar["high"]) / (last_krecord['highPrice']*0.001) > 0.02:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord high: {last_krecord['highPrice']*0.001}, bar: {bar['high']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord['lowPrice']*0.001 - bar["low"]) / (last_krecord['lowPrice']*0.001) > 0.02:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord low: {last_krecord['lowPrice']*0.001}, bar: {bar['low']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord['closePrice']*0.001 - bar["close"]) / (last_krecord['closePrice']*0.001) > 0.02:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord close: {last_krecord['closePrice']*0.001}, bar: {bar['close']}")
-                    return 0
-                if ktype == 'DAY' and last_krecord['transAmount'] != 0.0 and abs(last_krecord['transAmount'] - round(bar["amount"]*0.001)) / last_krecord['transAmount'] > 0.1:
+                    return (0, False, Datetime(last_datetime))
+                if ktype == 'DAY' and last_krecord['transAmount'] != 0 and (abs(float(last_krecord['transAmount']) - round(bar["amount"]*0.001))) > 10:
                     hku_error(
-                        f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord amount: {last_krecord['transAmount']}, bar: {bar['amount']*0.001}")
-                    return 0
-                if ktype == 'DAY' and last_krecord['transAmount'] != 0.0 and abs(last_krecord['transCount'] - round(bar["vol"])) / last_krecord['transCount'] > 0.1:
+                        f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord amount: {float(last_krecord['transAmount'])}, bar: {round(bar['amount']*0.001)}")
+                    return (0, False, Datetime(last_datetime))
+                if ktype == 'DAY' and last_krecord['transCount'] != 0 and abs(float(last_krecord['transCount']) - bar["vol"]) > 10:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord count: {last_krecord['transCount']}, bar: {bar['vol']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 continue
 
             if today_datetime >= bar_datetime > last_datetime \
@@ -374,7 +381,16 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
         table.remove()
 
     # table.close()
-    return add_record_count
+    return (add_record_count, True, Datetime(last_datetime))
+
+
+@hku_catch(ret=None)
+def get_hdf5_importer(market, ktype):
+    filename = os.path.expanduser('~') + '/.hikyuu/hikyuu.ini'
+    config = ConfigParser()
+    config.read(filename, encoding='utf-8')
+    importer = KDataToHdf5Importer()
+    return importer if importer.set_config(config.get("hikyuu", "datadir"), [market], [ktype]) else None
 
 
 def import_data(connect, market, ktype, quotations, api, dest_dir, startDate=199012190000, progress=ProgressBar):
@@ -397,6 +413,9 @@ def import_data(connect, market, ktype, quotations, api, dest_dir, startDate=199
     if not stock_list:
         return 0
 
+    failed_limit = 20
+    failed_count = 0
+    failed_list = []
     total = len(stock_list)
     for i, stock in enumerate(stock_list):
         if stock[3] == 0 or len(stock[2]) != 6:
@@ -404,7 +423,12 @@ def import_data(connect, market, ktype, quotations, api, dest_dir, startDate=199
                 progress(i, total)
             continue
 
-        this_count = import_one_stock_data(connect, api, h5file, market, ktype, stock, startDate)
+        this_count, success, lastdate = import_one_stock_data(connect, api, h5file, market, ktype, stock, startDate)
+        if not success:
+            failed_count += 1
+            failed_list.append((market, stock[2], lastdate))
+        if failed_count >= failed_limit:
+            break
         add_record_count += this_count
         if this_count > 0:
             if ktype == 'DAY':
@@ -414,8 +438,31 @@ def import_data(connect, market, ktype, quotations, api, dest_dir, startDate=199
         if progress:
             progress(i, total)
 
+    if total > 0 and progress:
+        progress(total, total)
+
     connect.commit()
     h5file.close()
+
+    if 0 < failed_count < failed_limit and is_valid_license():
+        # 删除最后记录
+        ktype_dict = {
+            'DAY': 'DAY',
+            '1MIN': 'MIN',
+            '5MIN': 'MIN5'
+        }
+        nktype = ktype_dict[ktype]
+        h5_importer = get_hdf5_importer(market, nktype)
+        if h5_importer is not None:
+            for r in failed_list:
+                hku_warn("清理 {}{} {}: {}", r[0], r[1], nktype, r[2].start_of_day())
+                h5_importer.remove(r[0], r[1], nktype, r[2].start_of_day())
+            hku_warn(f"已清理 {market} {failed_count} 个失败股票的最后记录，建议重新导入")
+
+    if failed_count >= failed_limit:
+        hku_error(f"{market} {ktype} 连续失败20个股票，已停止导入, 建议重新导入")
+        return add_record_count
+
     return add_record_count
 
 
@@ -475,12 +522,13 @@ def import_on_stock_trans(connect, api, h5file, market, stock_record, max_days):
                     second += 3
                 if second > 59:
                     continue
-                row['datetime'] = cur_date * 1000000 + minute * 100 + second
-                row['price'] = int(record['price'] * 1000)
-                row['vol'] = record['vol']
-                row['buyorsell'] = record['buyorsell']
-                row.append()
-                add_record_count += 1
+                if record['price'] > 0.0 and record['vol'] >= 0.0:
+                    row['datetime'] = cur_date * 1000000 + minute * 100 + second
+                    row['price'] = int(record['price'] * 1000)
+                    row['vol'] = record['vol']
+                    row['buyorsell'] = record['buyorsell']
+                    row.append()
+                    add_record_count += 1
             except Exception as e:
                 hku_error("Failed trans to record! {}", e)
 
@@ -574,12 +622,13 @@ def import_on_stock_time(connect, api, h5file, market, stock_record, max_days):
             elif time == 1360:
                 time = 1400
             try:
-                row['datetime'] = this_date + time
-                row['price'] = int(record['price'] * 1000)
-                row['vol'] = record['vol']
-                row.append()
+                if record['price'] > 0.0 and record['vol'] >= 0.0:
+                    row['datetime'] = this_date + time
+                    row['price'] = int(record['price'] * 1000)
+                    row['vol'] = record['vol']
+                    row.append()
+                    add_record_count += 1
                 time += 1
-                add_record_count += 1
             except Exception as e:
                 hku_error("Failed trans record {}! {}".format(record, e))
 
@@ -620,7 +669,7 @@ if __name__ == '__main__':
     import time
     starttime = time.time()
 
-    dest_dir = "d:\\stock"
+    dest_dir = "/Users/fasiondog/stock"
     tdx_server = '180.101.48.170'
     tdx_port = 7709
     quotations = ['stock', 'fund']

hikyuu/data/pytdx_to_mysql.py

@@ -23,15 +23,17 @@
 # SOFTWARE.
 
 import sys
+import os
 import math
 import datetime
 from pytdx.hq import TDXParams
+from configparser import ConfigParser
 
 from hikyuu.util.mylog import hku_error, hku_debug
 
 import mysql.connector
 
-from hikyuu import Datetime
+from hikyuu import Datetime, is_valid_license, KDataToMySQLImporter
 from .common import *
 from .common_pytdx import to_pytdx_market, pytdx_get_day_trans
 from .common_mysql import (
@@ -318,10 +320,10 @@ def import_one_stock_data(
             today.year * 10000 + today.month * 100 + today.day
         ) * 10000 + 1500
     else:
-        return 0
+        return (0, True, Datetime(last_datetime))
 
     if today_datetime <= last_datetime:
-        return 0
+        return (0, True, Datetime(last_datetime))
 
     get_bars = (
         api.get_index_bars if stktype == STOCKTYPE.INDEX else api.get_security_bars
@@ -348,31 +350,35 @@ def import_one_stock_data(
                 hku_error("Failed translate datetime: {}, from {}! {}".format(bar, api.ip, e))
                 continue
 
+            if 'open' not in bar or 'high' not in bar or 'low' not in bar or 'close' not in bar or 'vol' not in bar or 'amount' not in bar:
+                hku_warn(f"Ignore invalid bar: {bar_datetime}, missing fields!")
+                continue
+
             if last_krecord is not None and bar_datetime == last_datetime:
                 if abs(last_krecord[1] - bar["open"]) / last_krecord[1] > 0.01:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord open: {last_krecord[1]}, bar: {bar['open']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord[2] - bar["high"]) / last_krecord[2] > 0.01:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord high: {last_krecord[2]}, bar: {bar['high']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord[3] - bar["low"]) / last_krecord[3] > 0.01:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord low: {last_krecord[3]}, bar: {bar['low']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 if abs(last_krecord[4] - bar["close"]) / last_krecord[4] > 0.01:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord close: {last_krecord[4]}, bar: {bar['close']}")
-                    return 0
-                if ktype == 'DAY' and last_krecord[5] != 0.0 and abs(last_krecord[5] - bar["amount"]*0.001) / last_krecord[5] > 0.1:
+                    return (0, False, Datetime(last_datetime))
+                if ktype == 'DAY' and last_krecord[5] != 0.0 and abs(last_krecord[5] - bar["amount"]*0.001) > 10:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord amount: {last_krecord[5]}, bar: {bar['amount']*0.001}")
-                    return 0
-                if ktype == 'DAY' and last_krecord[5] != 0.0 and abs(last_krecord[6] - bar["vol"]) / last_krecord[6] > 0.1:
+                    return (0, False, Datetime(last_datetime))
+                if ktype == 'DAY' and last_krecord[6] != 0.0 and abs(last_krecord[6] - bar["vol"]) > 10:
                     hku_error(
                         f"fetch data from tdx error! {bar_datetime} {ktype} {market}{code} last_krecord count: {last_krecord[6]}, bar: {bar['vol']}")
-                    return 0
+                    return (0, False, Datetime(last_datetime))
                 continue
 
             if (
@@ -436,7 +442,17 @@ def import_one_stock_data(
         connect.commit()
         cur.close()
 
-    return len(buf)
+    return (len(buf), True, Datetime(last_datetime))
+
+
+@hku_catch(ret=None)
+def get_mysql_importer():
+    filename = os.path.expanduser('~') + '/.hikyuu/hikyuu.ini'
+    config = ConfigParser()
+    config.read(filename, encoding='utf-8')
+    importer = KDataToMySQLImporter()
+    return importer if importer.set_config(config.get("kdata", "host"), config.getint("kdata", "port", fallback=3306),
+                                           config.get("kdata", "usr"), config.get("kdata", "pwd")) else None
 
 
 @hku_catch(trace=True, re_raise=True)
@@ -466,6 +482,9 @@ def import_data(
 
     stock_list = get_stock_list(connect, market, quotations)
 
+    failed_limit = 20
+    failed_count = 0
+    failed_list = []
     total = len(stock_list)
     for i, stock in enumerate(stock_list):
         if stock[3] == 0 or len(stock[2]) != 6:
@@ -473,9 +492,14 @@ def import_data(
                 progress(i, total)
             continue
 
-        this_count = import_one_stock_data(
+        this_count, success, lastdate = import_one_stock_data(
             connect, api, market, ktype, stock, startDate
         )
+        if not success:
+            failed_count += 1
+            failed_list.append((market, stock[2], lastdate))
+        if failed_count >= failed_limit:
+            break
         add_record_count += this_count
         if this_count > 0:
             if ktype == "DAY":
@@ -487,6 +511,28 @@ def import_data(
             progress(i, total)
 
     connect.commit()
+
+    if total > 0 and progress:
+        progress(total, total)
+
+    if 0 < failed_count < failed_limit and is_valid_license():
+        # 删除最后记录
+        ktype_dict = {
+            'DAY': 'DAY',
+            '1MIN': 'MIN',
+            '5MIN': 'MIN5'
+        }
+        nktype = ktype_dict[ktype]
+        h5_importer = get_mysql_importer(market, nktype)
+        if h5_importer is not None:
+            for r in failed_list:
+                hku_warn("remove {}{} {}: {}", r[0], r[1], nktype, r[2].start_of_day())
+                h5_importer.remove(r[0], r[1], nktype, r[2].start_of_day())
+            hku_warn(f"已清理 {market} {failed_count} 个失败股票的最后记录，建议重新导入")
+
+    if failed_count >= failed_limit:
+        hku_error(f"{market} {ktype} 连续失败20个股票，已停止导入, 建议重新导入")
+        return add_record_count
     return add_record_count
 
 
@@ -584,14 +630,15 @@ def import_on_stock_trans(connect, api, market, stock_record, max_days):
                 if second > 59:
                     continue
 
-                trans_buf.append(
-                    (
-                        cur_date * 1000000 + minute * 100 + second,
-                        record["price"],
-                        record["vol"],
-                        record["buyorsell"],
+                if record['price'] > 0.0 and record['vol'] >= 0.0:
+                    trans_buf.append(
+                        (
+                            cur_date * 1000000 + minute * 100 + second,
+                            record["price"],
+                            record["vol"],
+                            record["buyorsell"],
+                        )
                     )
-                )
             except Exception as e:
                 hku_error("Failed trans to record! {}", e)
 
@@ -717,7 +764,8 @@ def import_on_stock_time(connect, api, market, stock_record, max_days):
             elif time == 1360:
                 time = 1400
             try:
-                time_buf.append((this_date + time, record['price'], record['vol']))
+                if record['price'] > 0.0 and record['vol'] >= 0.0:
+                    time_buf.append((this_date + time, record['price'], record['vol']))
                 time += 1
             except Exception as e:
                 hku_error("Failed trans record {}! {}".format(record, e))

hikyuu/data/pytdx_weight_to_clickhouse.py

@@ -34,7 +34,7 @@ def pytdx_import_weight_to_clickhouse(pytdx_api, connect, market):
 
     total_count = 0
     update_count = 0
-    stock_list = connect.query(f"select code from `hku_base`.`stock` where market='{market}' and valid=1")
+    stock_list = connect.query(f"select code from `hku_base`.`stock` where market='{market}'")
     stockid_list = stock_list.result_rows
 
     for stockrecord in stockid_list:
@@ -55,6 +55,8 @@ def pytdx_import_weight_to_clickhouse(pytdx_api, connect, market):
             db_last_date, last_total_count, last_free_count = (0, 0, 0)
 
         xdxr_list = pytdx_api.get_xdxr_info(pytdx_market, code)
+        if xdxr_list is None:
+            continue
         update_last_db_weight = False
         new_last_db_weight = last_db_weight
         records = {}

hikyuu/data/pytdx_weight_to_mysql.py

@@ -38,7 +38,7 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
     pytdx_market = to_pytdx_market(market)
 
     total_count = 0
-    cur.execute("select stockid, code from `hku_base`.`stock` where marketid=%s and valid=1" % (marketid))
+    cur.execute("select stockid, code from `hku_base`.`stock` where marketid=%s" % (marketid))
     stockid_list = [x for x in cur.fetchall()]
     cur.close()
 
@@ -67,6 +67,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
         cur.close()
 
         xdxr_list = pytdx_api.get_xdxr_info(pytdx_market, code)
+        if xdxr_list is None:
+            continue
         update_last_db_weight = False
         new_last_db_weight = last_db_weight
         records = {}

hikyuu/data/pytdx_weight_to_sqlite.py

@@ -35,7 +35,7 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
     pytdx_market = to_pytdx_market(market)
 
     total_count = 0
-    stockid_list = cur.execute("select stockid, code from Stock where marketid=%s and valid=1" % (marketid))
+    stockid_list = cur.execute("select stockid, code from Stock where marketid=%s" % (marketid))
     stockid_list = [x for x in stockid_list]
     cur.close()
 
@@ -64,6 +64,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
         cur.close()
 
         xdxr_list = pytdx_api.get_xdxr_info(pytdx_market, code)
+        if xdxr_list is None:
+            continue
         update_last_db_weight = False
         new_last_db_weight = last_db_weight
         records = {}

hikyuu/data/sqlite_upgrade/0029.sql

@@ -0,0 +1,4 @@
+BEGIN TRANSACTION;
+update `stocktypeinfo` set `minTradeNumber`=100 where `type`=5 and `description`='ETF';
+UPDATE `version` set `version` = 29;
+COMMIT;

hikyuu/data/tdx_to_clickhouse.py

@@ -189,7 +189,7 @@ def tdx_import_day_data_from_file(connect, filename, ktype, market, stock_record
     with open(filename, 'rb') as src_file:
         data = src_file.read(32)
         while data:
-            record = struct.unpack('iiiiifii', data)
+            record = struct.unpack('IIIIIfII', data)
             if lastdatetime and record[0] <= lastdatetime:
                 data = src_file.read(32)
                 continue
@@ -291,7 +291,7 @@ def tdx_import_min_data_from_file(connect, filename, ktype, market, stock_record
 
             data = src_file.read(32)
             while data:
-                record = struct.unpack('HHfffffii', data)
+                record = struct.unpack('HHfffffII', data)
                 if record[3] >= record[2] >= record[4] > 0\
                         and record[3] >= record[5] >= record[4] > 0\
                         and record[5] >= 0 \

hikyuu/data/tdx_to_h5.py

@@ -124,14 +124,14 @@ def tdx_import_stock_name_from_file(connect, filename, market, quotations=None):
                 length = len(codepre[0])
                 if code[:length] == codepre[0]:
                     count += 1
-                    #print(market, code, newStockDict[code], codepre)
+                    # print(market, code, newStockDict[code], codepre)
                     sql = "insert into Stock(marketid, code, name, type, valid, startDate, endDate) \
                            values (%s, '%s', '%s', %s, %s, %s, %s)" \
                           % (marketid, code, newStockDict[code], codepre[1], 1, today, 99999999)
                     cur.execute(sql)
                     break
 
-    #print('%s新增股票数：%i' % (market.upper(), count))
+    # print('%s新增股票数：%i' % (market.upper(), count))
     connect.commit()
     cur.close()
     return count
@@ -163,7 +163,7 @@ def tdx_import_day_data_from_file(connect, filename, h5file, market, stock_recor
     with open(filename, 'rb') as src_file:
         data = src_file.read(32)
         while data:
-            record = struct.unpack('iiiiifii', data)
+            record = struct.unpack('IIIIIfII', data)
             if lastdatetime and record[0] <= lastdatetime:
                 data = src_file.read(32)
                 continue
@@ -191,8 +191,8 @@ def tdx_import_day_data_from_file(connect, filename, h5file, market, stock_recor
     if add_record_count > 0:
         table.flush()
 
-        #更新基础信息数据库中股票对应的起止日期及其有效标志
-        #if valid == 0:
+        # 更新基础信息数据库中股票对应的起止日期及其有效标志
+        # if valid == 0:
         cur = connect.cursor()
         cur.execute(
             "update stock set valid=1, startdate=%i, enddate=%i where stockid=%i" %
@@ -201,13 +201,13 @@ def tdx_import_day_data_from_file(connect, filename, h5file, market, stock_recor
         connect.commit()
         cur.close()
 
-        #记录最新更新日期
+        # 记录最新更新日期
         if (code == '000001' and marketid == MARKETID.SH) \
-                or (code == '399001' and marketid == MARKETID.SZ)  :
+                or (code == '399001' and marketid == MARKETID.SZ):
             update_last_date(connect, marketid, table[-1]['datetime'] / 10000)
 
     elif table.nrows == 0:
-        #print(market, stock_record)
+        # print(market, stock_record)
         table.remove()
 
     return add_record_count
@@ -290,7 +290,7 @@ def tdx_import_min_data_from_file(connect, filename, h5file, market, stock_recor
 
             data = src_file.read(32)
             while data:
-                record = struct.unpack('HHfffffii', data)
+                record = struct.unpack('HHfffffII', data)
                 if 0 not in record[2:6]:
                     if record[3] >= record[2] >= record[4] \
                             and record[3] >= record[5] >= record[4]:
@@ -314,7 +314,7 @@ def tdx_import_min_data_from_file(connect, filename, h5file, market, stock_recor
     if add_record_count > 0:
         table.flush()
     elif table.nrows == 0:
-        #print(market, stock_record)
+        # print(market, stock_record)
         table.remove()
 
     return add_record_count
@@ -386,7 +386,7 @@ if __name__ == '__main__':
 
     src_dir = "D:\\TdxW_HuaTai"
     dest_dir = "c:\\stock"
-    quotations = ['stock', 'fund']  #通达信盘后数据没有债券
+    quotations = ['stock', 'fund']  # 通达信盘后数据没有债券
 
     connect = sqlite3.connect(dest_dir + "\\stock.db")
     create_database(connect)

hikyuu/data/tdx_to_mysql.py

@@ -171,7 +171,7 @@ def tdx_import_day_data_from_file(connect, filename, ktype, market, stock_record
     with open(filename, 'rb') as src_file:
         data = src_file.read(32)
         while data:
-            record = struct.unpack('iiiiifii', data)
+            record = struct.unpack('IIIIIfII', data)
             if lastdatetime and record[0] <= lastdatetime:
                 data = src_file.read(32)
                 continue
@@ -297,7 +297,7 @@ def tdx_import_min_data_from_file(connect, filename, ktype, market, stock_record
 
             data = src_file.read(32)
             while data:
-                record = struct.unpack('HHfffffii', data)
+                record = struct.unpack('HHfffffII', data)
                 if record[3] >= record[2] >= record[4] > 0\
                         and record[3] >= record[5] >= record[4] > 0\
                         and record[5] >= 0 \

hikyuu/data/zh_bond10_to_clickhouse.py

@@ -13,7 +13,7 @@ from hikyuu.util import *
 def import_zh_bond10_to_clickhouse(connect):
     sql = "select max(date) from hku_base.zh_bond10"
     start_date = connect.command(sql)
-    if type(start_date) == int:
+    if start_date == 0:
         start_date = "19901219"
     else:
         last_date = start_date

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 as DRAWBMP
 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

hikyuu/draw/drawplot/__init__.pyi

@@ -1,12 +1,12 @@
 from __future__ import annotations
-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.cpp.core310 import ConditionBase
+from hikyuu.cpp.core310 import EnvironmentBase
+from hikyuu.cpp.core310 import Indicator
+from hikyuu.cpp.core310 import KData
+from hikyuu.cpp.core310 import Portfolio
+from hikyuu.cpp.core310 import SignalBase
+from hikyuu.cpp.core310 import System
+from hikyuu.cpp.core310 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