hikyuu 2.5.5__py3-none-win_amd64.whl → 2.6.0__py3-none-win_amd64.whl

hikyuu/gui/HikyuuTDX.py

@@ -16,7 +16,7 @@ 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
+from PyQt5.QtGui import QIcon, QTextCursor, QFont, QPalette, QPixmap
 
 import mysql.connector
 from mysql.connector import errorcode
@@ -33,7 +33,7 @@ from hikyuu.gui.data.CollectSpotThread import CollectSpotThread
 from hikyuu.gui.data.SchedImportThread import SchedImportThread
 from hikyuu.gui.spot_server import release_nng_senders
 
-from hikyuu import can_upgrade, get_last_version
+from hikyuu import can_upgrade, get_last_version, fetch_trial_license, view_license
 from hikyuu.data import hku_config_template
 from hikyuu.util import *
 
@@ -267,7 +267,14 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.log_textEdit.document().setMaximumBlockCount(1000)
 
         current_dir = os.path.dirname(__file__)
-        icon = QIcon(f"{current_dir}/hikyuu_small.png")
+        icon = QIcon(f"{current_dir}/images/hikyuu_small.png")
+        star_img = QPixmap(f"{current_dir}/images/star.png")
+        self.label_44.setPixmap(star_img)
+        self.label_46.setOpenExternalLinks(True)
+        self.label_license.setText(view_license())
+        if os.path.exists(self.getUserConfigDir() + '/.hikyuu.lic'):
+            self.fetch_trial_pushButton.setEnabled(False)
+
         self.setWindowIcon(icon)
         QApplication.instance().setWindowIcon(icon)
         self.import_detail_textEdit.clear()
@@ -494,6 +501,15 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             '5MIN': self.hdf5_5min_progressBar
         }
 
+    @pyqtSlot()
+    def on_fetch_trial_pushButton_clicked(self):
+        email = self.email_lineEdit.text()
+        info = fetch_trial_license(email)
+        QMessageBox.about(self, "获取试用许可", info)
+        self.label_license.setText(view_license())
+        if os.path.exists(self.getUserConfigDir() + '/.hikyuu.lic'):
+            self.fetch_trial_pushButton.setEnabled(False)
+
     @pyqtSlot()
     def on_pytdx_radioButton_clicked(self):
         if self.pytdx_radioButton.isChecked():

hikyuu/gui/data/MainWindow.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'MainWindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.11
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1269, 690)
+        MainWindow.resize(1269, 797)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.centralwidget)
@@ -165,7 +165,7 @@ class Ui_MainWindow(object):
         self.label_6.setObjectName("label_6")
         self.gridLayout_4.addWidget(self.label_6, 3, 0, 1, 1)
         self.min5_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(8, 0, 0)))
+        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 28), QtCore.QTime(8, 0, 0)))
         self.min5_start_dateEdit.setCalendarPopup(True)
         self.min5_start_dateEdit.setObjectName("min5_start_dateEdit")
         self.gridLayout_4.addWidget(self.min5_start_dateEdit, 1, 1, 1, 1)
@@ -187,7 +187,7 @@ class Ui_MainWindow(object):
         self.trans_start_dateEdit.setObjectName("trans_start_dateEdit")
         self.gridLayout_4.addWidget(self.trans_start_dateEdit, 3, 1, 1, 1)
         self.day_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(8, 0, 0)))
+        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 28), QtCore.QTime(8, 0, 0)))
         self.day_start_dateEdit.setCalendarPopup(True)
         self.day_start_dateEdit.setObjectName("day_start_dateEdit")
         self.gridLayout_4.addWidget(self.day_start_dateEdit, 0, 1, 1, 1)
@@ -681,6 +681,61 @@ class Ui_MainWindow(object):
         self.horizontalLayout_17.addWidget(self.textBrowser)
         self.verticalLayout_2.addLayout(self.horizontalLayout_17)
         self.tabWidget.addTab(self.tab, "")
+        self.tab_star = QtWidgets.QWidget()
+        self.tab_star.setEnabled(True)
+        self.tab_star.setObjectName("tab_star")
+        self.label_44 = QtWidgets.QLabel(self.tab_star)
+        self.label_44.setGeometry(QtCore.QRect(40, 370, 291, 171))
+        self.label_44.setText("")
+        self.label_44.setPixmap(QtGui.QPixmap("../images/star.png"))
+        self.label_44.setScaledContents(True)
+        self.label_44.setObjectName("label_44")
+        self.label_46 = QtWidgets.QLabel(self.tab_star)
+        self.label_46.setGeometry(QtCore.QRect(30, 10, 561, 201))
+        self.label_46.setObjectName("label_46")
+        self.line_2 = QtWidgets.QFrame(self.tab_star)
+        self.line_2.setGeometry(QtCore.QRect(30, 200, 531, 16))
+        self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_2.setObjectName("line_2")
+        self.label_47 = QtWidgets.QLabel(self.tab_star)
+        self.label_47.setGeometry(QtCore.QRect(40, 230, 121, 16))
+        self.label_47.setObjectName("label_47")
+        self.line_3 = QtWidgets.QFrame(self.tab_star)
+        self.line_3.setGeometry(QtCore.QRect(30, 310, 531, 16))
+        self.line_3.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_3.setObjectName("line_3")
+        self.label_48 = QtWidgets.QLabel(self.tab_star)
+        self.label_48.setGeometry(QtCore.QRect(40, 340, 211, 16))
+        self.label_48.setObjectName("label_48")
+        self.line_4 = QtWidgets.QFrame(self.tab_star)
+        self.line_4.setGeometry(QtCore.QRect(30, 560, 531, 16))
+        self.line_4.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line_4.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line_4.setObjectName("line_4")
+        self.label_49 = QtWidgets.QLabel(self.tab_star)
+        self.label_49.setGeometry(QtCore.QRect(40, 580, 81, 16))
+        self.label_49.setObjectName("label_49")
+        self.label_license = QtWidgets.QLabel(self.tab_star)
+        self.label_license.setGeometry(QtCore.QRect(40, 610, 521, 91))
+        self.label_license.setObjectName("label_license")
+        self.widget = QtWidgets.QWidget(self.tab_star)
+        self.widget.setGeometry(QtCore.QRect(40, 260, 511, 33))
+        self.widget.setObjectName("widget")
+        self.horizontalLayout_20 = QtWidgets.QHBoxLayout(self.widget)
+        self.horizontalLayout_20.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout_20.setObjectName("horizontalLayout_20")
+        self.label_45 = QtWidgets.QLabel(self.widget)
+        self.label_45.setObjectName("label_45")
+        self.horizontalLayout_20.addWidget(self.label_45)
+        self.email_lineEdit = QtWidgets.QLineEdit(self.widget)
+        self.email_lineEdit.setObjectName("email_lineEdit")
+        self.horizontalLayout_20.addWidget(self.email_lineEdit)
+        self.fetch_trial_pushButton = QtWidgets.QPushButton(self.widget)
+        self.fetch_trial_pushButton.setObjectName("fetch_trial_pushButton")
+        self.horizontalLayout_20.addWidget(self.fetch_trial_pushButton)
+        self.tabWidget.addTab(self.tab_star, "")
         self.horizontalLayout_12.addWidget(self.tabWidget)
         self.verticalLayout_6 = QtWidgets.QVBoxLayout()
         self.verticalLayout_6.setObjectName("verticalLayout_6")
@@ -759,19 +814,19 @@ class Ui_MainWindow(object):
 "hr { height: 1px; border-width: 0; }\n"
 "li.unchecked::marker { content: \"\\2610\"; }\n"
 "li.checked::marker { content: \"\\2612\"; }\n"
-"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证日线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证日线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证5分钟线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证5分钟线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证1分钟线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证1分钟线记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证分笔记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证分笔记录：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证分时数据：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证分时数据：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入权息数据数：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入完毕！</span></p></body></html>"))
+"</style></head><body style=\" font-family:\'.AppleSystemUIFont\'; font-size:13pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入上证日线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入深证日线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入上证5分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入深证5分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入上证1分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入深证1分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入上证分笔记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入深证分笔记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入上证分时数据：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入深证分时数据：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入权息数据数：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">导入完毕！</span></p></body></html>"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "执行导入"))
         self.groupBox_6.setTitle(_translate("MainWindow", "预加载设置"))
         self.label_35.setText(_translate("MainWindow", "此处为 Hikyuu 运行时的数据预加载设置，请根据机器内存大小选择"))
@@ -819,12 +874,20 @@ class Ui_MainWindow(object):
 "hr { height: 1px; border-width: 0; }\n"
 "li.unchecked::marker { content: \"\\2610\"; }\n"
 "li.checked::marker { content: \"\\2612\"; }\n"
-"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">注：</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:10pt; font-weight:600; color:#ff0000;\">1、行情采集服务仅对预加载数据有效</span><span style=\" font-family:\'SimSun\';\">，在行情采集服务运行期间，hikyuu.interactive运行时将自动连接采集服务获取行情数据，并更新预加载的内容数据。</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\';\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">2、如使用芝麻代理（</span><a href=\"http://h.zhimaruanjian.com/\"><span style=\" font-family:\'SimSun\'; text-decoration: underline; color:#0000ff;\">http://h.zhimaruanjian.com/</span></a><span style=\" font-family:\'SimSun\';\">），请自行申请（需付费），并确保ip为其白名单。</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\';\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-weight:696; color:#0000ff;\">3、此处采集为网络采集，更推荐直接运行安装目录下gui子目录下的 start_qmt.py ,使用miniqmt 实时服务。该程序独立运行，不用关闭，和这里的采集效果一样。注意：miniqmt需要QMT交易端配合，且在同一机器上执行。</span></p></body></html>"))
+"</style></head><body style=\" font-family:\'.AppleSystemUIFont\'; font-size:13pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">注：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:10pt; font-weight:600; color:#ff0000;\">1、行情采集服务仅对预加载数据有效</span><span style=\" font-family:\'SimSun\'; font-size:9pt;\">，在行情采集服务运行期间，hikyuu.interactive运行时将自动连接采集服务获取行情数据，并更新预加载的内容数据。</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\'; font-size:9pt;\"><br /></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt;\">2、如使用芝麻代理（</span><a href=\"http://h.zhimaruanjian.com/\"><span style=\" font-family:\'SimSun\'; font-size:9pt; text-decoration: underline; color:#0000ff;\">http://h.zhimaruanjian.com/</span></a><span style=\" font-family:\'SimSun\'; font-size:9pt;\">），请自行申请（需付费），并确保ip为其白名单。</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\'; font-size:9pt;\"><br /></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:9pt; font-weight:696; color:#0000ff;\">3、此处采集为网络采集，更推荐直接运行安装目录下gui子目录下的 start_qmt.py ,使用miniqmt 实时服务。该程序独立运行，不用关闭，和这里的采集效果一样。注意：miniqmt需要QMT交易端配合，且在同一机器上执行。</span></p></body></html>"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "行情采集服务"))
+        self.label_46.setText(_translate("MainWindow", "<html><head/><body><p>Hikyuu 专注于量化交易领域的核心技术构建，涵盖交易模型开发、极速计算引擎、高效回测框架<br/>及实盘拓展能力，定位为量化交易的基础设施级计算引擎。项目设计理念聚焦技术内核，暂不涉及<br/>GUI 界面开发，致力于为量化交易爱好者和专业提供高性能底层架构支持。 </p><p>随着社区规模扩大，项目持续迭代及技术支持事务逐渐分散了作者在策略研究上的精力。为保障技<br/>术研发的专注度与可持续性，现推出扩展 VIP 支持计划，通过提供专属功能模块作为回馈，构建良<br/>性的项目发展生态。我们诚挚期待社区伙伴的支持 —— 无论是通过项目捐赠还是加入 VIP 计划，<br/>您的参与都将直接助力 Hikyuu 的技术创新，共同推动量化交易基础设施的迭代升级。 </p><p>详情参见：<a href=\"https://gitee.com/fasiondog/hikyuu/blob/master/vip-plan.md\"><span style=\" text-decoration: underline; color:#3586ff;\">项目支持计划</span></a></p></body></html>"))
+        self.label_47.setText(_translate("MainWindow", "申请试用许可"))
+        self.label_48.setText(_translate("MainWindow", "加入知识星球，获取星球许可"))
+        self.label_49.setText(_translate("MainWindow", "当前授权信息"))
+        self.label_license.setText(_translate("MainWindow", "TextLabel"))
+        self.label_45.setText(_translate("MainWindow", "电子邮件地址:"))
+        self.fetch_trial_pushButton.setText(_translate("MainWindow", "申请试用许可"))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_star), _translate("MainWindow", "项目支持"))
         self.label_41.setText(_translate("MainWindow", "执行日志"))

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -145,8 +145,8 @@ class UseTdxImportToH5Thread(QThread):
         connect = sqlite3.connect(dest_dir + "/stock.db")
         create_database(connect)
 
-        tdx_import_stock_name_from_file(connect, src_dir + "\\T0002\\hq_cache\\shm.tnf", 'SH', self.quotations)
-        tdx_import_stock_name_from_file(connect, src_dir + "\\T0002\\hq_cache\\szm.tnf", 'SZ', self.quotations)
+        tdx_import_stock_name_from_file(connect, src_dir + "/T0002/hq_cache/shm.tnf", 'SH', self.quotations)
+        tdx_import_stock_name_from_file(connect, src_dir + "/T0002/hq_cache/szm.tnf", 'SZ', self.quotations)
 
         self.send_message(['FINISHED_IMPORT_CODE'])
 

hikyuu/gui/dataserver.py

@@ -0,0 +1,25 @@
+#!/usr/bin/python
+# -*- coding: utf8 -*-
+#
+# Create on: 2025-04-15
+#    Author: fasiondog
+
+from hikyuu import start_data_server, stop_data_server
+import time
+import sys
+
+if __name__ == "__main__":
+    data_server_addr = "tcp://0.0.0.0:9201" if len(sys.argv) <= 1 else sys.argv[1]
+    work_num = 2 if len(sys.argv) <= 2 else int(sys.argv[2])
+
+    try:
+        start_data_server(data_server_addr, work_num)
+
+        while True:
+            try:
+                time.sleep(1)
+            except KeyboardInterrupt:
+                break
+
+    finally:
+        stop_data_server()

hikyuu/hub.py

@@ -344,6 +344,10 @@ class HubManager(metaclass=SingletonType):
         self._session.query(PartModel).filter_by(hub_name=name).delete()
         self._session.query(HubModel).filter_by(name=name).delete()
 
+    @lru_cache
+    def _get_module(self, module_name):
+        return importlib.import_module(module_name)
+
     @dbsession
     def import_part_to_db(self, hub_model):
         part_dict = {
@@ -387,7 +391,8 @@ class HubManager(metaclass=SingletonType):
 
                             # 导入模块
                             try:
-                                part_module = importlib.import_module(module_name)
+                                # part_module = importlib.import_module(module_name)
+                                part_module = self._get_module(module_name)
                             except ModuleNotFoundError:
                                 self.logger.error('{} 缺失 part.py 文件, 位置："{}"！'.format(module_name, entry.path))
                                 continue
@@ -645,18 +650,7 @@ def get_part(name, *args, **kwargs):
     :param args: 其他部件相关参数
     :param kwargs: 其他部件相关参数
     """
-    @lru_cache
-    def _get_part(name, *args, **kwargs):
-        return HubManager().get_part(name, *args, **kwargs)
-
-    try:
-        return _get_part(name, *args, **kwargs)
-    except TypeError as e:
-        if "unhashable type" in str(e):
-            hku_info("{}! 该对象不可hash无法缓存, 可考虑优化", str(e))
-            return HubManager().get_part(name, *args, **kwargs)
-        else:
-            raise e
+    return HubManager().get_part(name, *args, **kwargs)
 
 
 def get_part_list(name_list):

hikyuu/hub.pyi

@@ -28,11 +28,11 @@ import sys as sys
 import typing
 __all__: list = ['add_remote_hub', 'add_local_hub', 'update_hub', 'remove_hub', 'build_hub', 'help_part', 'get_part', 'get_part_list', 'get_hub_path', 'get_part_info', 'get_part_module', 'print_part_info', 'get_hub_name_list', 'get_part_name_list', 'get_current_hub', 'search_part']
 class ConfigModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x289448bfdc0; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b2ffb758e0; ConfigModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_config', MetaData(), Column('id', Integer(), table=<hub_config>, primary_key=True, nullable=False, default=Sequence('config_id_seq', metadata=MetaData())), Column('key', String(), table=<hub_config>), Column('value', String(), table=<hub_config>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('key', String(), table=<hub_config>)))
     __tablename__: typing.ClassVar[str] = 'hub_config'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 289448ce8b0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 2b280530e10>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -55,6 +55,9 @@ class HubManager:
     """
     _instance: typing.ClassVar[HubManager]  # value = <hikyuu.hub.HubManager object>
     @staticmethod
+    def _get_module(*args, **kwargs):
+        ...
+    @staticmethod
     def add_local_hub(*args, **kwargs):
         ...
     @staticmethod
@@ -106,11 +109,11 @@ class HubManager:
     def print_part_info(self, name):
         ...
 class HubModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x28944903460; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b280513020; HubModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_repo', MetaData(), Column('id', Integer(), table=<hub_repo>, primary_key=True, nullable=False, default=Sequence('remote_id_seq', metadata=MetaData())), Column('name', String(), table=<hub_repo>), Column('hub_type', String(), table=<hub_repo>), Column('local_base', String(), table=<hub_repo>), Column('local', String(), table=<hub_repo>), Column('url', String(), table=<hub_repo>), Column('branch', String(), table=<hub_repo>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_repo>)))
     __tablename__: typing.ClassVar[str] = 'hub_repo'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 289448fd5e0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 2b280549720>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -143,11 +146,11 @@ class ModuleConflictError(Exception):
     def __str__(self):
         ...
 class PartModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x28944903df0; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x2b280513800; PartModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_part', MetaData(), Column('id', Integer(), table=<hub_part>, primary_key=True, nullable=False, default=Sequence('part_id_seq', metadata=MetaData())), Column('hub_name', String(), table=<hub_part>), Column('part', String(), table=<hub_part>), Column('name', String(), table=<hub_part>), Column('author', String(), table=<hub_part>), Column('version', String(), table=<hub_part>), Column('doc', String(), table=<hub_part>), Column('module_name', String(), table=<hub_part>), Column('label', String(), table=<hub_part>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_part>)))
     __tablename__: typing.ClassVar[str] = 'hub_part'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 2894490d130>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 2b28054a2b0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/StockManager.h

@@ -13,6 +13,7 @@
 #include <thread>
 #include "hikyuu/utilities/Parameter.h"
 #include "hikyuu/utilities/thread/thread.h"
+#include "hikyuu/utilities/plugin/PluginManager.h"
 #include "hikyuu/data_driver/DataDriverFactory.h"
 #include "Block.h"
 #include "MarketInfo.h"
@@ -235,6 +236,17 @@ public:
         return m_load_tg.get();
     }
 
+    /** 设置插件路径（仅在初始化之前有效） */
+    void setPluginPath(const std::string& path);
+
+    /** 获取当前插件路径 */
+    const string& getPluginPath() const {
+        return m_plugin_manager.pluginPath();
+    }
+
+    template <typename PluginInterfaceT>
+    PluginInterfaceT* getPlugin(const std::string& pluginname) noexcept;
+
 public:
     typedef StockMapIterator const_iterator;
     const_iterator begin() const {
@@ -312,6 +324,8 @@ private:
     StrategyContext m_context;
 
     std::unique_ptr<ThreadPool> m_load_tg;  // 异步数据加载辅助线程组
+
+    PluginManager m_plugin_manager;
 };
 
 inline size_t StockManager::size() const {
@@ -367,6 +381,15 @@ inline vector<HistoryFinanceInfo> StockManager::getHistoryFinance(const Stock& s
     return m_baseInfoDriver->getHistoryFinance(stk.market(), stk.code(), start, end);
 }
 
+inline void StockManager::setPluginPath(const std::string& path) {
+    m_plugin_manager.pluginPath(path);
+}
+
+template <typename PluginInterfaceT>
+inline PluginInterfaceT* StockManager::getPlugin(const std::string& pluginname) noexcept {
+    return m_plugin_manager.getPlugin<PluginInterfaceT>(pluginname);
+}
+
 }  // namespace hku
 
 #endif /* STOCKMANAGER_H_ */

hikyuu/include/hikyuu/global/agent/spot_generated.h

@@ -8,9 +8,9 @@
 
 // Ensure the included flatbuffers.h is the same version as when this file was
 // generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
+static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
+              FLATBUFFERS_VERSION_MINOR == 2 &&
+              FLATBUFFERS_VERSION_REVISION == 10,
              "Non-compatible flatbuffers version included");
 
 namespace hikyuu {

hikyuu/include/hikyuu/plugin/__init__.py

@@ -0,0 +1 @@
+

hikyuu/include/hikyuu/plugin/backtest.h

@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-12
+ *      Author: fasiondog
+ */
+
+#pragma once
+#include "hikyuu/strategy/Strategy.h"
+
+namespace hku {
+
+/**
+ * @brief 策略回测（事件驱动方式）
+ *
+ * @param context 策略上下文
+ * @param on_bar 策略主体执行函数
+ * @param tm 策略测试账户
+ * @param start_date 起始日期
+ * @param end_date 结束日期（不包含本身）
+ * @param ktype K线类型
+ * @param ref_market 所属市场
+ * @param mode 模式  0: 当前bar收盘价执行买卖操作；1: 下一bar开盘价执行买卖操作;
+ */
+void HKU_API backtest(const StrategyContext& context, const std::function<void(Strategy*)>& on_bar,
+                      const TradeManagerPtr& tm, const Datetime& start_date,
+                      const Datetime& end_date = Null<Datetime>(),
+                      const KQuery::KType& ktype = KQuery::DAY, const string& ref_market = "SH",
+                      int mode = 0);
+
+// 仅在 sm.init 之后使用
+void HKU_API backtest(const std::function<void(Strategy*)>& on_bar, const TradeManagerPtr& tm,
+                      const Datetime& start_date, const Datetime& end_date = Null<Datetime>(),
+                      const KQuery::KType& ktype = KQuery::DAY, const string& ref_market = "SH",
+                      int mode = 0);
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/dataserver.h

@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-15
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/DataType.h"
+
+namespace hku {
+
+void HKU_API startDataServer(const std::string& addr = "tcp://0.0.0.0:9201", size_t work_num = 2);
+
+void HKU_API stopDataServer();
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/device.h

@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-12
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/DataType.h"
+
+namespace hku {
+
+/**
+ * @brief 激活设备
+ * @param active_code 授权码
+ */
+void HKU_API activeDevice(const std::string& active_code);
+
+// 查看当前授权
+std::string HKU_API viewLicense();
+
+// 移除授权
+void HKU_API removeLicense();
+
+// 获取试用授权
+std::string HKU_API fetchTrialLicense(const std::string& email);
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/BackTestPluginInterface.h

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-08
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/strategy/Strategy.h"
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class BackTestPluginInterface : public PluginBase {
+public:
+    BackTestPluginInterface() = default;
+    virtual ~BackTestPluginInterface() = default;
+
+    virtual void backtest(const StrategyContext& context,
+                          const std::function<void(Strategy*)>& on_bar, const TradeManagerPtr& tm,
+                          const Datetime& start_date, const Datetime& end_date,
+                          const KQuery::KType& ktype, const string& ref_market, int mode) = 0;
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/DataServerPluginInterface.h

@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-08
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class DataServerPluginInterface : public PluginBase {
+public:
+    DataServerPluginInterface() = default;
+    virtual ~DataServerPluginInterface() = default;
+
+    virtual void start(const std::string& addr, size_t work_num) noexcept = 0;
+    virtual void stop() noexcept = 0;
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/DevicePluginInterface.h

@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-08
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class DevicePluginInterface : public PluginBase {
+public:
+    DevicePluginInterface() = default;
+    virtual ~DevicePluginInterface() = default;
+
+    virtual void activate(const std::string& active_code) noexcept = 0;
+    virtual std::string viewLicense() noexcept = 0;
+    virtual void removeLicense() noexcept = 0;
+    virtual std::string fetchTrialLicense(const std::string& email) noexcept = 0;
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/__init__.py

@@ -0,0 +1 @@
+

hikyuu/include/hikyuu/plugin/interface/plugins.h

@@ -0,0 +1,20 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-10
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "BackTestPluginInterface.h"
+#include "DevicePluginInterface.h"
+#include "DataServerPluginInterface.h"
+
+namespace hku {
+
+#define HKU_PLUGIN_BACKTEST "backtest"
+#define HKU_PLUGIN_DEVICE "device"
+#define HKU_PLUGIN_DATASERVER "dataserver"
+
+}

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -98,6 +98,14 @@ public:                                                                      \
         return std::shared_ptr<classname>(keep_python_state_alive, ptr);     \
     }
 
+// 用于检查已 py::object 方式传递的函数参数个数是否符合预期
+inline bool check_pyfunction_arg_num(py::object& func, size_t arg_num) {
+    py::module_ inspect = py::module_::import("inspect");
+    py::object sig = inspect.attr("signature")(func);
+    py::object params = sig.attr("parameters");
+    return len(params) == arg_num;
+}
+
 }  // namespace hku
 
 #endif  // HIKYUU_PYTHON_BIND_UTILS_H

hikyuu/include/hikyuu/strategy/BrokerTradeManager.h

@@ -23,7 +23,8 @@ public:
 
     virtual shared_ptr<TradeManagerBase> _clone() override;
 
-    virtual void fetchAssetInfoFromBroker(const OrderBrokerPtr& broker) override;
+    virtual void fetchAssetInfoFromBroker(const OrderBrokerPtr& broker,
+                                          const Datetime& datetime = Null<Datetime>()) override;
 
     /**
      * 根据权息信息更新当前持仓与交易情况