hikyuu 2.6.8.3__py3-none-manylinux2014_x86_64.whl → 2.6.9__py3-none-manylinux2014_x86_64.whl

hikyuu/fetcher/stock/zh_block_em.py

@@ -17,7 +17,7 @@ from hikyuu.util import *
 em_num_per_page = 100
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_hybk_names():
     """获取所有行业(板块代码,板块名称)列表"""
     url = "https://19.push2.eastmoney.com/api/qt/clist/get"
@@ -50,7 +50,7 @@ def get_hybk_names():
     return ret
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_hybk_cons_code(blk_code):
     "获取指定行业板块成分代码列表"
     url = "http://30.push2.eastmoney.com/api/qt/clist/get"
@@ -83,16 +83,19 @@ def get_hybk_cons_code(blk_code):
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_hybk_info(code_market_dict, sep=""):
     """获取所有行业板块列表"""
     blk_list = get_hybk_names()
+    time.sleep(random.uniform(1, 3))
     ret = {}
-    for blk in blk_list:
+    total = len(blk_list)
+    for i, blk in enumerate(blk_list):
         stk_codes = get_hybk_cons_code(blk[0])
-        hku_info(f"获取行业板块{blk[1]}成分: {len(stk_codes)}")
+        hku_info(f"{i}|{total} 获取行业板块{blk[1]}成分: {len(stk_codes)}")
         ret[blk[1]] = [
             f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
+        time.sleep(random.uniform(1, 3))
     return ret
 
 
@@ -431,21 +434,23 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     return temp_df
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_gnbk_info(code_market_dict, sep=""):
     """获取所有概念版本列表"""
     blk_names = stock_board_concept_name_em()['板块名称']
     ret = {}
+    total = len(blk_names)
     for i, blk_name in enumerate(blk_names):
         stk_codes = stock_board_concept_cons_em(blk_name)
         stk_codes = stk_codes['代码'].to_list()
-        hku_info(f"{i} 获取概念板块{blk_name}成分: {len(stk_codes)}")
+        hku_info(f"{i}|{total} 获取概念板块{blk_name}成分: {len(stk_codes)}")
         ret[blk_name] = [
             f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
+        time.sleep(random.uniform(1, 3))
     return ret
 
 
-@hku_catch(ret=[], trace=True)
+@hku_catch(ret=[], trace=False)
 def get_dybk_names():
     """获取所有地域板块名称列表"""
     url = "http://13.push2.eastmoney.com/api/qt/clist/get"
@@ -478,7 +483,7 @@ def get_dybk_names():
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_dybk_info(code_market_dict, sep=""):
     """获取所有地域板块列表"""
     blk_list = get_dybk_names()
@@ -499,10 +504,12 @@ def get_all_dybk_info(code_market_dict, sep=""):
     }
 
     ret = {}
-    for v in blk_list:
+    total = len(blk_list)
+    for i, v in enumerate(blk_list):
         blk_code, blk_name = v[0], v[1]
         params["fs"] = f"b:{blk_code} f:!50"
         params["pn"] = 1
+        time.sleep(random.uniform(1, 3))
         r = requests.get(url, params=params, timeout=15)
         data = r.json()
         if data["data"] is None:
@@ -522,15 +529,34 @@ def get_all_dybk_info(code_market_dict, sep=""):
             ret[blk_name].extend(
                 [f"{code_market_dict[v['f12']]}{sep}{v['f12']}" for v in stk_json if v["f12"] in code_market_dict])
             time.sleep(random.uniform(1, 3))
-        hku_info(f'获取地域板块{blk_name}成分: {len(ret[blk_name])}')
+        hku_info(f'{i}|{total} 获取地域板块{blk_name}成分: {len(ret[blk_name])}')
 
     return ret
 
 
-@hku_catch(ret={}, trace=True)
+@hku_catch(ret={}, trace=False)
 def get_all_zsbk_info(code_market_dict, sep=""):
     """获取所有指数成分股列表"""
     blk_info = ak.index_stock_info()
+    blk_info['index_code'] = blk_info['index_code'].astype(str)  # 确保是字符串类型
+    df_000 = blk_info[blk_info['index_code'].str.startswith('000')].reset_index(drop=True)  # 000前缀
+    df_399 = blk_info[blk_info['index_code'].str.startswith('399')].reset_index(drop=True)  # 399前缀
+
+    # 2. 交替合并两个DataFrame
+    merged_rows = []
+    max_length = max(len(df_000), len(df_399))  # 取两个DataFrame的最大长度
+
+    for i in range(max_length):
+        # 先加000前缀的行（如果存在）
+        if i < len(df_000):
+            merged_rows.append(df_000.iloc[i])
+        # 再加399前缀的行（如果存在）
+        if i < len(df_399):
+            merged_rows.append(df_399.iloc[i])
+
+    # 3. 转换为DataFrame
+    blk_info = pd.DataFrame(merged_rows).reset_index(drop=True)
+
     blk_codes = blk_info["index_code"]
     blk_names = blk_info["display_name"]
     ret = {}
@@ -542,17 +568,23 @@ def get_all_zsbk_info(code_market_dict, sep=""):
         # 沪深指数有重复，避免深指覆盖
         if blk_name in ret:
             continue
+
+        time.sleep(random.uniform(1, 3))
         try:
-            stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
-            stk_codes = stk_codes['成分券代码'].to_list()
-            hku_info("{} 获取指数板块{}成分: {}", i, blk_name, len(stk_codes))
+            if blk_code[:3] == "399":
+                stk_codes = ak.index_stock_cons(symbol=blk_code)
+                stk_codes = stk_codes['品种代码'].to_list()
+            else:
+                stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
+                stk_codes = stk_codes['成分券代码'].to_list()
+            hku_info("{}|{} 获取指数板块 {}|{} 成分: {}", i, total, blk_code, blk_name, len(stk_codes))
             ret[blk_name] = [
                 f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
         except KeyboardInterrupt:
             break
-        except:
-            # print("Failed!", blk_code, blk_name)
-            pass
+        except Exception as e:
+            print(f"Failed! {i}, {blk_code}, {blk_name}")
+            # raise e
     return ret
 
 

hikyuu/gui/HikyuuTDX.py

@@ -12,11 +12,10 @@ from logging.handlers import QueueListener
 # 优先加载，处理 VS 17.10 升级后依赖 dll 不兼容问题
 import hikyuu
 
-import PyQt5
-
-from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
-from PyQt5.QtCore import pyqtSlot, QObject, pyqtSignal
-from PyQt5.QtGui import QIcon, QTextCursor, QFont, QPalette, QPixmap
+# 替换PyQt5导入为PySide6
+from PySide6.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
+from PySide6.QtCore import Slot, QObject, Signal
+from PySide6.QtGui import QIcon, QTextCursor, QFont, QPalette, QPixmap
 
 import mysql.connector
 from mysql.connector import errorcode
@@ -43,7 +42,7 @@ from hikyuu.util import *
 
 class EmittingStream(QObject):
     """输出重定向至QT"""
-    textWritten = pyqtSignal(str)
+    textWritten = Signal(str)
 
     def write(self, text):
         self.textWritten.emit(str(text))
@@ -249,7 +248,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         except:
             pass
 
-    @pyqtSlot()
+    @Slot()
     def on_save_pushButton_clicked(self):
         try:
             self.saveConfig()
@@ -333,7 +332,22 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         icon = QIcon(f"{current_dir}/images/hikyuu_small.png")
         star_img = QPixmap(f"{current_dir}/images/star.png")
         self.label_44.setPixmap(star_img)
+        # 修改 label_46 的 HTML 文本，直接在 HTML 中设置字体大小
+
+        label_46_txt = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+hr { height: 1px; border-width: 0; }
+li.unchecked::marker { content: "\2610"; }
+li.checked::marker { content: "\2612"; }
+</style></head><body style="font-weight:400; font-style:normal;">
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>Hikyuu </span><span style="font-weight:700;">专注于量化交易领域的核心技术构建，涵盖交易模型开发、极速计算引擎、高效回测框架及实盘拓展能力</span><span>，定位为量化交易计算引擎，为量化交易爱好者提供高性能底层架构支持。随着社区规模扩大，分散了作者在策略研究上的精力。为保障项目的可持续性，现对捐赠用户提供部分额外功能作为回馈，感谢社区伙伴的支持！</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>捐赠功能以插件的方式提供，采用独立授权许可，完全在 hikyuu 之外，对喜欢自行编译扩展的朋友没有影响。因插件许可授权需要采集硬件信息，如有疑虑只要不申请试用许可和正式许可授权，不会触发硬件信息采集，如申请，视为同意采集。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>详情参见：</span><a href="https://hikyuu.readthedocs.io/zh-cn/latest/vip/vip-plan.html"><span style="text-decoration: underline; color:#3586ff;">捐赠权益</span></a><span style="font-weight:700;"> ，感谢大家的支持！</span></p></body></html>
+"""
+        self.label_46.setText(label_46_txt)
         self.label_46.setOpenExternalLinks(True)
+
         self.label_license.setText(view_license())
         self.fetch_trial_pushButton.setEnabled(not is_valid_license())
 
@@ -434,6 +448,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if (not is_valid_license()) or hdf5_enable or mysql_enable:
             clickhouse_enable = False
         self.enable_clickhouse_radioButton.setChecked(clickhouse_enable)
+        self.enable_clickhouse_radioButton.setEnabled(is_valid_license())
         self.clickhouse_tmpdir_lineEdit.setText(import_config.get('clickhouse', 'tmpdir', fallback='d:/stock'))
         self.clickhouse_tmpdir_pushButton.setEnabled(clickhouse_enable)
         clickhouse_ip = import_config.get('clickhouse', 'host', fallback='127.0.0.1')
@@ -618,7 +633,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             '5MIN': self.hdf5_5min_progressBar
         }
 
-    @pyqtSlot()
+    @Slot()
     def on_fetch_trial_pushButton_clicked(self):
         email = self.email_lineEdit.text()
         info = fetch_trial_license(email)
@@ -626,7 +641,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.label_license.setText(view_license())
         self.fetch_trial_pushButton.setEnabled(not is_valid_license())
 
-    @pyqtSlot()
+    @Slot()
     def on_pytdx_radioButton_clicked(self):
         if self.pytdx_radioButton.isChecked():
             self.tdx_radioButton.setChecked(False)
@@ -634,7 +649,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.use_download = 'pytdx'
         self.on_tdx_or_pytdx_toggled()
 
-    @pyqtSlot()
+    @Slot()
     def on_tdx_radioButton_clicked(self):
         if self.tdx_radioButton.isChecked():
             self.pytdx_radioButton.setChecked(False)
@@ -642,6 +657,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.use_download = 'tdx'
         self.on_tdx_or_pytdx_toggled()
 
+    @Slot()
     def on_qmt_radioButton_clicked(self):
         if self.qmt_radioButton.isChecked():
             self.tdx_radioButton.setChecked(False)
@@ -675,7 +691,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.time_start_dateEdit.setEnabled(False)
             self.use_tdx_number_spinBox.setEnabled(False)
 
-    @pyqtSlot()
+    @Slot()
     def on_select_tdx_dir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -685,7 +701,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.tdx_dir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_hdf5_dir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -695,21 +711,21 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.hdf5_dir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_hdf55_radioButton_clicked(self):
         if self.enable_hdf55_radioButton.isChecked():
             self.enable_mysql_radioButton.setChecked(False)
             self.enable_clickhouse_radioButton.setChecked(False)
         self.on_enable_database_toggled(hdf5=True, mysql=False, clickhouse=False)
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_mysql_radioButton_clicked(self):
         if self.enable_mysql_radioButton.isChecked():
             self.enable_hdf55_radioButton.setChecked(False)
             self.enable_clickhouse_radioButton.setChecked(False)
         self.on_enable_database_toggled(hdf5=False, mysql=True, clickhouse=False)
 
-    @pyqtSlot()
+    @Slot()
     def on_enable_clickhouse_radioButton_clicked(self):
         if self.enable_clickhouse_radioButton.isChecked():
             self.enable_hdf55_radioButton.setChecked(False)
@@ -732,7 +748,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.clickhouse_test_pushButton.setEnabled(clickhouse)
         self.clickhouse_tmpdir_pushButton.setEnabled(clickhouse)
 
-    @pyqtSlot()
+    @Slot()
     def on_mysql_tmpdir_pushButton_clicked(self):
         dlg = QFileDialog()
         dlg.setFileMode(QFileDialog.Directory)
@@ -742,7 +758,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.mysql_tmpdir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_clickhouse_tmpdir_pushButton_clicked(self):
         if not is_valid_license():
             QMessageBox.critical(self, "clickhouse引擎", "需要捐赠授权才能使用clickhouse引擎")
@@ -756,7 +772,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             dirname = dlg.selectedFiles()
             self.clickhouse_tmpdir_lineEdit.setText(dirname[0])
 
-    @pyqtSlot()
+    @Slot()
     def on_mysql_test_pushButton_clicked(self):
         """测试数据库连接"""
         db_config = {
@@ -780,7 +796,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
         QMessageBox.about(self, "测试数据库连接", " 连接成功！")
 
-    @pyqtSlot()
+    @Slot()
     def on_clickhouse_test_pushButton_clicked(self):
         """测试数据库连接"""
         db_config = {
@@ -821,7 +837,8 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if msg_name == 'ESCAPE_TIME':
             self.escape_time = msg_task_name
             self.import_status_label.setText(
-                "耗时：{:>.2f} 秒 （{:>.2f}分钟） {}".format(self.escape_time, self.escape_time / 60, datetime.datetime.now())
+                "耗时：{:>.2f} 秒 （{:>.2f}分钟） {}".format(
+                    self.escape_time, self.escape_time / 60, datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
             )
 
         elif msg_name == 'HDF5_IMPORT':
@@ -890,7 +907,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                 if msg[2] != 'FINISHED':
                     self.import_detail_textEdit.append(msg[2])
 
-    @pyqtSlot()
+    @Slot()
     def on_start_import_pushButton_clicked(self):
         try:
             self.saveConfig()
@@ -965,7 +982,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.escape_time_thread.message.connect(self.on_message_from_thread)
         self.escape_time_thread.start()
 
-    @pyqtSlot()
+    @Slot()
     def on_sched_import_pushButton_clicked(self):
         self.sched_import_pushButton.setEnabled(False)
         if self._is_sched_import_running:
@@ -993,7 +1010,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.sched_import_pushButton.setText("停止定时导入")
         self.sched_import_pushButton.setEnabled(True)
 
-    @pyqtSlot()
+    @Slot()
     def on_collect_start_pushButton_clicked(self):
         if self._is_collect_running:
             if self.collect_spot_thread is not None and self.collect_spot_thread.isRunning():
@@ -1033,6 +1050,41 @@ def start():
     sys.exit(app.exec())
 
 
+def is_font_installed(font_name):
+    """检查字体是否安装"""
+    if sys.platform == "win32":
+        try:
+            import winreg
+            # 打开注册表中的字体项
+            key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts")
+            i = 0
+            while True:
+                try:
+                    name, value, _ = winreg.EnumValue(key, i)
+                    if font_name in name:
+                        winreg.CloseKey(key)
+                        return True
+                    i += 1
+                except WindowsError:
+                    break
+            winreg.CloseKey(key)
+        except:
+            # 如果注册表检查失败，则尝试创建字体对象
+            try:
+                f = QFont(font_name)
+                return f.exactMatch()
+            except:
+                pass
+        return False
+    else:
+        # 非Windows系统简单检查
+        try:
+            f = QFont(font_name)
+            return f.exactMatch()
+        except:
+            return False
+
+
 if __name__ == "__main__":
     import requests
     import urllib
@@ -1040,14 +1092,13 @@ if __name__ == "__main__":
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("pytdx").setLevel(logging.WARNING)
 
-    # 自适应分辨率，防止字体显示不全
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-
     app = QApplication(sys.argv)
-    f = QFont('SimSun')
-    f.setPixelSize(12)
-    app.setFont(f)
+    if sys.platform == 'win32':
+        # 检查Microsoft YaHei字体是否存在
+        if is_font_installed('Microsoft YaHei'):
+            f = QFont('Microsoft YaHei')
+            f.setPixelSize(12)
+            app.setFont(f)
 
     if (len(sys.argv) > 1 and sys.argv[1] == '0'):
         FORMAT = '%(asctime)-15s [%(levelname)s]: %(message)s [%(name)s::%(funcName)s]'

hikyuu/gui/data/CollectSpotThread.py

@@ -6,7 +6,7 @@ import logging
 import time
 import datetime
 from math import ceil
-from PyQt5.QtCore import QThread, QWaitCondition, QMutex
+from PySide6.QtCore import QThread, QWaitCondition, QMutex
 
 from hikyuu.util import *
 from hikyuu.gui.spot_server import collect, release_nng_senders

hikyuu/gui/data/EscapetimeThread.py

@@ -3,10 +3,10 @@
 # cp936
 
 import time
-from PyQt5.QtCore import QThread, pyqtSignal
+from PySide6.QtCore import QThread, Signal
 
 class EscapetimeThread(QThread):
-    message = pyqtSignal(list)
+    message = Signal(list)
 
     def __init__(self):
         super(self.__class__, self).__init__()
@@ -14,19 +14,13 @@ class EscapetimeThread(QThread):
         self.msg_name = 'ESCAPE_TIME'
         self.init_time = time.time()
 
-    def __del__(self):
-        self.working = False
-        #print("EscapetimeThread", "__del__", time.time() - self.init_time)
-        self.wait()
-
-    def send_message(self, msg):
-        self.message.emit([self.msg_name] + msg)
+    def run(self):
+        while self.working:
+            time.sleep(1)
+            current_time = time.time()
+            self.message.emit([self.msg_name, round(current_time - self.init_time, 1)])
 
     def stop(self):
         self.working = False
+        self.quit()
         self.wait()
-
-    def run(self):
-        while self.working:
-            self.msleep(10)
-            self.send_message([(time.time() - self.init_time),])

hikyuu/gui/data/ImportBlockInfoTask.py

@@ -6,7 +6,6 @@
 
 import sqlite3
 import mysql.connector
-from hikyuu.data.common import MARKET, get_stk_code_name_list
 from hikyuu.data.em_block_to_mysql import em_import_block_to_mysql
 from hikyuu.data.em_block_to_sqlite import em_import_block_to_sqlite
 from hikyuu.data.em_block_to_clickhouse import em_import_block_to_clickhouse
@@ -14,11 +13,10 @@ from hikyuu.util import *
 
 
 class ImportBlockInfoTask:
-    def __init__(self, log_queue, queue, config, categorys):
+    def __init__(self, log_queue, queue, config):
         self.log_queue = log_queue
         self.queue = queue
         self.config = config
-        self.categorys = categorys
         self.task_name = 'IMPORT_BLOCKINFO'
         self.status = "no run"
 
@@ -52,16 +50,11 @@ class ImportBlockInfoTask:
 
         count = 0
         try:
-            code_market_dict = {}
-            for market in (MARKET.SH, MARKET.SZ, MARKET.BJ):
-                x = get_stk_code_name_list(market)
-                for v in x:
-                    code_market_dict[v["code"]] = market
-            count = import_block(connect, code_market_dict, self.categorys)
+            count = import_block(connect)
         except Exception as e:
             hku_error(str(e))
 
         connect.close()
 
-        self.queue.put([self.task_name, "BLOCKINFO", f"{self.categorys}板块信息下载完毕: {count}", None, None])
+        self.queue.put([self.task_name, "BLOCKINFO", f"板块信息更新完毕: {count}", None, None])
         self.status = "finished"