hikyuu 2.1.5__cp311-none-win_amd64.whl → 2.2.1__cp311-none-win_amd64.whl

hikyuu/analysis/analysis.py

@@ -31,6 +31,11 @@ def combinate_ind_analysis(
     :param list keys: 输出 Performance 统计项
     :rtype: pd.DataFrame
     '''
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     pers = inner_combinate_ind_analysis(stk, query, tm, sys, buy_inds, sell_inds, n)
 
     if not keys:
@@ -75,6 +80,11 @@ def combinate_ind_analysis_multi(
     :param int n: 买入信号组合时的周期
     :param list keys: 输出 Performance 统计项
     '''
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     if isinstance(stks, Block):
         blks = stks
     else:
@@ -95,6 +105,11 @@ def combinate_ind_analysis_multi(
 
 
 def analysis_sys_list(stks, query, sys_proto, keys=["累计投入本金", "当前总资产", "现金余额", "未平仓头寸净值", "赢利交易比例%", "赢利交易数", "亏损交易数"]):
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     names = ["证券代码", "证券名称"]
     names.extend(keys)
     ret = {}
@@ -119,6 +134,11 @@ def analysis_sys_list(stks, query, sys_proto, keys=["累计投入本金", "当
 
 
 def analysis_sys_list_multi(stks, query, sys_proto, keys=["累计投入本金", "当前总资产", "现金余额", "未平仓头寸净值", "赢利交易比例%", "赢利交易数", "亏损交易数"]):
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     out = inner_analysis_sys_list(stks, query, sys_proto)
     if not keys:
         ret = out

hikyuu/data/common.py

@@ -91,7 +91,7 @@ def get_stktype_list(quotations=None):
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(30)
 def get_stk_code_name_list(market: str) -> list:
     """
     获取指定证券交易所股票代码与名称列表
@@ -128,7 +128,7 @@ def get_stk_code_name_list(market: str) -> list:
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(60)
 def get_index_code_name_list() -> list:
     """
     获取所有股票指数代码名称列表
@@ -191,7 +191,7 @@ def get_new_holidays():
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(60)
 def get_china_bond10_rate(start_date="19901219"):
     """获取中国国债收益率10年"""
     bond_zh_us_rate_df = ak.bond_zh_us_rate(start_date)

hikyuu/data/mysql_upgrade/0023.sql

@@ -0,0 +1,4 @@
+DELETE FROM `hku_base`.`stkweight`;
+alter table `hku_base`.`stkweight` add `suogu` DOUBLE not null default 0;
+ALTER TABLE `hku_base`.`stkweight` AUTO_INCREMENT = 1;
+UPDATE `hku_base`.`version` set `version` = 23;

hikyuu/data/pytdx_weight_to_mysql.py

@@ -51,7 +51,7 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
         cur.execute(
             "select id, stockid, date, countAsGift, countForSell, priceForSell, \
                     bonus, countOfIncreasement, totalCount, \
-                    freeCount from `hku_base`.`stkweight` where stockid=%s \
+                    freeCount, suogu from `hku_base`.`stkweight` where stockid=%s \
                     order by date desc limit 1" % stockid
         )
         a = [x for x in cur.fetchall()]
@@ -79,10 +79,6 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                     if xdxr['songzhuangu'] is not None:
                         new_last_db_weight[3] = 10000 * xdxr['songzhuangu']
                         update_last_db_weight = True
-                    if xdxr['suogu'] is not None:
-                        # etf 扩股
-                        new_last_db_weight[3] += 100000 * (xdxr['suogu']-1)
-                        update_last_db_weight = True
                     if xdxr['peigu'] is not None:
                         new_last_db_weight[4] = 10000 * xdxr['peigu']
                         update_last_db_weight = True
@@ -100,26 +96,27 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                         new_last_db_weight[9] = xdxr['panhouliutong']
                         update_last_db_weight = True
                         last_free_count = new_last_db_weight[9]
+                    if xdxr['suogu'] is not None:
+                        # etf 扩缩股
+                        new_last_db_weight[10] = xdxr['suogu']
+                        update_last_db_weight = True
                     continue
                 if date not in records:
-                    songzhuangu = 10000 * xdxr['songzhuangu'] if xdxr['songzhuangu'] is not None else 0
-                    songzhuangu += 100000 * (xdxr['suogu']-1) if xdxr['suogu'] is not None else 0
                     records[date] = [
                         stockid,
                         date,
-                        songzhuangu,  # countAsGift
+                        10000 * xdxr['songzhuangu'] if xdxr['songzhuangu'] is not None else 0,  # countAsGift
                         10000 * xdxr['peigu'] if xdxr['peigu'] is not None else 0,  # countForSell
                         1000 * xdxr['peigujia'] if xdxr['peigujia'] is not None else 0,  # priceForSell
                         1000 * xdxr['fenhong'] if xdxr['fenhong'] is not None else 0,  # bonus
                         0,  # countOfIncreasement, pytdx 不区分送股和转增股，统一记在送股
                         xdxr['houzongguben'] if xdxr['houzongguben'] is not None else last_total_count,  # totalCount
-                        xdxr['panhouliutong'] if xdxr['panhouliutong'] is not None else last_free_count  # freeCount
+                        xdxr['panhouliutong'] if xdxr['panhouliutong'] is not None else last_free_count,  # freeCount
+                        xdxr["suogu"] if xdxr["suogu"] is not None else 0
                     ]
                 else:
                     if xdxr['songzhuangu'] is not None:
                         records[date][2] = 10000 * xdxr['songzhuangu']
-                    if xdxr['suogu'] is not None:
-                        records[date][2] += 100000 * (xdxr['suogu']-1)
                     if xdxr['peigu'] is not None:
                         records[date][3] = 10000 * xdxr['peigu']
                     if xdxr['peigujia'] is not None:
@@ -130,6 +127,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                         records[date][7] = xdxr['houzongguben']
                     if xdxr['panhouliutong'] is not None:
                         records[date][8] = xdxr['panhouliutong']
+                    if xdxr['suogu'] is not None:
+                        records[date][9] = xdxr['suogu']
                 if xdxr['houzongguben'] is not None:
                     last_total_count = xdxr['houzongguben']
                 if xdxr['panhouliutong'] is not None:
@@ -144,8 +143,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
             x = new_last_db_weight
             cur.execute(
                 "UPDATE `hku_base`.`stkweight` SET countAsGift=%s, countForSell=%s, priceForSell=%s, \
-                    bonus=%s, totalCount=%s, freeCount=%s \
-                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[0])
+                    bonus=%s, totalCount=%s, freeCount=%s, suogu=%s \
+                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[10], x[0])
             )
             connect.commit()
             cur.close()
@@ -154,8 +153,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
             cur = connect.cursor()
             cur.executemany(
                 "INSERT INTO `hku_base`.`stkweight` (stockid, date, countAsGift, \
-                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount) \
-                             VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s)", [x for x in records.values()]
+                countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu) \
+                VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)", [x for x in records.values()]
             )
             connect.commit()
             cur.close()

hikyuu/data/pytdx_weight_to_sqlite.py

@@ -48,7 +48,7 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
         a = cur.execute(
             "select id, stockid, date, countAsGift, countForSell, priceForSell, \
                     bonus, countOfIncreasement, totalCount, \
-                    freeCount from stkweight where stockid=%s \
+                    freeCount, suogu from stkweight where stockid=%s \
                     order by date desc limit 1" % stockid
         )
         a = [x for x in a]
@@ -76,10 +76,6 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                     if xdxr['songzhuangu'] is not None:
                         new_last_db_weight[3] = int(10000 * xdxr['songzhuangu'])
                         update_last_db_weight = True
-                    if xdxr['suogu'] is not None:
-                        # etf 扩股
-                        new_last_db_weight[3] += int(100000 * (xdxr['suogu']-1))
-                        update_last_db_weight = True
                     if xdxr['peigu'] is not None:
                         new_last_db_weight[4] = int(10000 * xdxr['peigu'])
                         update_last_db_weight = True
@@ -97,14 +93,16 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         new_last_db_weight[9] = round(xdxr['panhouliutong'])
                         update_last_db_weight = True
                         last_free_count = new_last_db_weight[9]
+                    if xdxr['suogu'] is not None:
+                        # etf 扩股
+                        new_last_db_weight[10] = xdxr['suogu']
+                        update_last_db_weight = True
                     continue
                 if date not in records:
-                    songzhuangu = int(10000 * xdxr['songzhuangu']) if xdxr['songzhuangu'] is not None else 0
-                    songzhuangu += int(100000 * (xdxr['suogu']-1)) if xdxr['suogu'] is not None else 0
                     records[date] = [
                         stockid,
                         date,
-                        songzhuangu,  # countForGift
+                        int(10000 * xdxr['songzhuangu']) if xdxr['songzhuangu'] is not None else 0,  # countForGift
                         int(10000 * xdxr['peigu']) if xdxr['peigu'] is not None else 0,  # countForSell
                         int(1000 * xdxr['peigujia']) if xdxr['peigujia'] is not None else 0,  # priceForSell
                         int(1000 * xdxr['fenhong']) if xdxr['fenhong'] is not None else 0,  # bonus
@@ -112,13 +110,12 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         round(xdxr['houzongguben'])
                         if xdxr['houzongguben'] is not None else last_total_count,  # totalCount
                         round(xdxr['panhouliutong'])
-                        if xdxr['panhouliutong'] is not None else last_free_count  # freeCount
+                        if xdxr['panhouliutong'] is not None else last_free_count,  # freeCount
+                        xdxr["suogu"] if xdxr["suogu"] is not None else 0
                     ]
                 else:
                     if xdxr['songzhuangu'] is not None:
                         records[date][2] = int(10000 * xdxr['songzhuangu'])
-                    if xdxr['suogu'] is not None:
-                        records[date][2] += int(100000 * (xdxr['suogu']-1))
                     if xdxr['peigu'] is not None:
                         records[date][3] = int(10000 * xdxr['peigu'])
                     if xdxr['peigujia'] is not None:
@@ -129,6 +126,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         records[date][7] = round(xdxr['houzongguben'])
                     if xdxr['panhouliutong'] is not None:
                         records[date][8] = round(xdxr['panhouliutong'])
+                    if xdxr['suogu'] is not None:
+                        records[date][9] = xdxr['suogu']
                 if xdxr['houzongguben'] is not None:
                     last_total_count = round(xdxr['houzongguben'])
                 if xdxr['panhouliutong'] is not None:
@@ -143,8 +142,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
             x = new_last_db_weight
             cur.execute(
                 "UPDATE StkWeight SET countAsGift=%s, countForSell=%s, priceForSell=%s, \
-                    bonus=%s, totalCount=%s, freeCount=%s \
-                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[0])
+                    bonus=%s, totalCount=%s, freeCount=%s, suogu=%s \
+                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[10], x[0])
             )
             connect.commit()
             cur.close()
@@ -153,8 +152,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
             cur = connect.cursor()
             cur.executemany(
                 "INSERT INTO StkWeight(stockid, date, countAsGift, \
-                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount) \
-                             VALUES (?,?,?,?,?,?,?,?,?)", [x for x in records.values()]
+                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu) \
+                             VALUES (?,?,?,?,?,?,?,?,?,?)", [x for x in records.values()]
             )
             connect.commit()
             cur.close()

hikyuu/data/sqlite_upgrade/0024.sql

@@ -0,0 +1,22 @@
+BEGIN TRANSACTION;
+DROP TABLE `stkWeight`;
+CREATE TABLE "stkWeight" (
+	id INTEGER NOT NULL, 
+	stockid INTEGER, 
+	date INTEGER, 
+	"countAsGift" INTEGER, 
+	"countForSell" INTEGER, 
+	"priceForSell" INTEGER, 
+	bonus INTEGER, 
+	"countOfIncreasement" INTEGER, 
+	"totalCount" INTEGER, 
+	"freeCount" INTEGER, 
+    "suogu" NUMBER,
+	PRIMARY KEY (id AUTOINCREMENT),
+	 FOREIGN KEY(stockid) REFERENCES "Stock" (stockid)
+);
+CREATE INDEX "ix_stkWeight_stockid" ON "stkWeight" (stockid);
+CREATE INDEX "ix_stkWeight_date" ON "stkWeight" (date);
+CREATE INDEX "ix_stkWeight" ON "stkWeight" (stockid, date);
+UPDATE `version` set `version` = 24;
+COMMIT;

hikyuu/gui/HikyuuTDX.py

@@ -267,8 +267,6 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
         current_dir = os.path.dirname(__file__)
         self.setWindowIcon(QIcon("{}/hikyuu.ico".format(current_dir)))
-        # self.setFixedSize(self.width(), self.height())
-        self.import_status_label.setText('')
         self.import_detail_textEdit.clear()
         self.reset_progress_bar()
         self.day_start_dateEdit.setMinimumDate(datetime.date(1990, 12, 19))
@@ -703,6 +701,9 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.start_import_pushButton.setEnabled(False)
         self.reset_progress_bar()
 
+        if config.getboolean('weight', 'enable', fallback=False):
+            self.hdf5_weight_label.setText("正在导入")
+
         self.import_status_label.setText("正在启动任务....")
         QApplication.processEvents()
 

hikyuu/gui/data/ImportHistoryFinanceTask.py

@@ -115,6 +115,13 @@ class ImportHistoryFinanceTask:
                         old_md5 = hashlib.md5(f.read()).hexdigest()
                     if old_md5 != item['hash']:
                         self.download_file(item)
+                    else:
+                        # 不管是否有变化，都导入一次，以便切换引擎时可以导入
+                        shutil.unpack_archive(dest_file, extract_dir=self.dest_dir)
+                        filename = item['filename']
+                        filename = f'{self.dest_dir}/{filename[0:-4]}.dat'
+                        self.import_to_db(filename)
+                        hku_info(f"Import finance file: {filename}")
                 count += 1
                 self.queue.put([self.task_name, None, None, int(100 * count / self.total_count), self.total_count])
             except Exception as e:

hikyuu/gui/data/ImportWeightToSqliteTask.py

@@ -91,8 +91,8 @@ class ImportWeightToSqliteTask:
             hku_check(api.connect(self.host, self.port), "failed connect pytdx {}:{}!", self.host, self.port)
 
             if self.cmd == 'weight':
-                count = pytdx_import_weight(api, connect, self.market)
-                self.logger.info("导入 {} 权息记录数: {}".format(self.market, count))
+                total_count = pytdx_import_weight(api, connect, self.market)
+                self.logger.info("导入 {} 权息记录数: {}".format(self.market, total_count))
                 self.queue.put([self.msg_name, '导入权息数据完毕!', 0, 0, f'{self.market} {total_count}'])
             elif self.cmd == 'finance':
                 self.queue.put([self.msg_name, f'下载通达信当前财务信息({self.market})...', 0, 0, 0])