hikyuu 2.6.2__py3-none-win_amd64.whl → 2.6.5__py3-none-win_amd64.whl

hikyuu/gui/HikyuuTDX.py

@@ -34,7 +34,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, fetch_trial_license, view_license
+from hikyuu import can_upgrade, get_last_version, fetch_trial_license, view_license, is_valid_license
 from hikyuu.data import hku_config_template
 from hikyuu.util import *
 
@@ -93,6 +93,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
     def getHikyuuConfigFileName(self):
         return self.getUserConfigDir() + '/hikyuu.ini'
 
+    @hku_catch()
     def saveConfig(self):
         if not os.path.lexists(self.getUserConfigDir()):
             os.mkdir(self.getUserConfigDir())
@@ -105,7 +106,10 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if current_config.getboolean('hdf5', 'enable', fallback=True):
             data_dir = current_config['hdf5']['dir']
             if not os.path.lexists(data_dir + '/tmp'):
-                os.mkdir(data_dir + '/tmp')
+                try:
+                    os.mkdir(data_dir + '/tmp')
+                except:
+                    pass
             # 此处不能使用 utf-8 参数，否则导致Windows下getBlock无法找到板块分类
             with open(filename, 'w', encoding='utf-8') as f:
                 f.write(
@@ -140,8 +144,13 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                     )
                 )
 
-        else:
+        elif current_config.getboolean('mysql', 'enable', fallback=True):
             data_dir = current_config['mysql']['tmpdir']
+            if not os.path.lexists(data_dir + '/tmp'):
+                try:
+                    os.mkdir(data_dir + '/tmp')
+                except:
+                    pass
             with open(filename, 'w', encoding="utf-8") as f:
                 f.write(
                     hku_config_template.mysql_template.format(
@@ -179,15 +188,21 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                     )
                 )
 
-        if not os.path.lexists(data_dir):
-            os.makedirs(data_dir)
+        try:
+            if not data_dir and not os.path.lexists(data_dir):
+                os.makedirs(data_dir)
+        except:
+            pass
 
-        if not os.path.lexists(data_dir + '/block'):
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            dirname, _ = os.path.split(current_dir)
-            dirname = os.path.join(dirname, 'config/block')
-            shutil.copytree(dirname, data_dir + '/block')
-            os.remove(data_dir + '/block/__init__.py')
+        try:
+            if not data_dir and not os.path.lexists(data_dir + '/block'):
+                current_dir = os.path.dirname(os.path.abspath(__file__))
+                dirname, _ = os.path.split(current_dir)
+                dirname = os.path.join(dirname, 'config/block')
+                shutil.copytree(dirname, data_dir + '/block')
+                os.remove(data_dir + '/block/__init__.py')
+        except:
+            pass
 
     @pyqtSlot()
     def on_save_pushButton_clicked(self):
@@ -309,6 +324,8 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
         # 初始化权息与财务数据设置
         self.import_weight_checkBox.setChecked(import_config.getboolean('weight', 'enable', fallback=True))
+        self.import_history_finance_checkBox.setChecked(import_config.getboolean('finance', 'enable', fallback=True))
+        self.import_block_checkBox.setChecked(import_config.getboolean('block', 'enable', fallback=True))
 
         # 初始化通道信目录配置
         tdx_enable = import_config.getboolean('tdx', 'enable', fallback=False)
@@ -350,7 +367,8 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if hdf5_enable:
             mysql_enable = False
         self.enable_mysql_radioButton.setChecked(mysql_enable)
-        self.mysql_tmpdir_lineEdit.setText(import_config.get('mysql', 'tmpdir', fallback='c:/stock'))
+        self.mysql_tmpdir_lineEdit.setText(import_config.get('mysql', 'tmpdir', fallback='d:/stock'))
+        self.mysql_tmpdir_pushButton.setEnabled(mysql_enable)
         mysql_ip = import_config.get('mysql', 'host', fallback='127.0.0.1')
         self.mysql_ip_lineEdit.setText(mysql_ip)
         self.mysql_ip_lineEdit.setEnabled(mysql_enable)
@@ -442,6 +460,12 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         import_config['weight'] = {
             'enable': self.import_weight_checkBox.isChecked(),
         }
+        import_config['finance'] = {
+            'enable': self.import_history_finance_checkBox.isChecked(),
+        }
+        import_config['block'] = {
+            'enable': self.import_block_checkBox.isChecked(),
+        }
         import_config['tdx'] = {'enable': self.tdx_radioButton.isChecked(), 'dir': self.tdx_dir_lineEdit.text()}
         import_config['pytdx'] = {
             'enable': self.pytdx_radioButton.isChecked(),
@@ -597,23 +621,22 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
     def on_enable_hdf55_radioButton_clicked(self):
         if self.enable_hdf55_radioButton.isChecked():
             self.enable_mysql_radioButton.setChecked(False)
-        self.on_enable_hdf5_or_mysql_toggled()
+        self.on_enable_database_toggled(hdf5=True, mysql=False)
 
     @pyqtSlot()
     def on_enable_mysql_radioButton_clicked(self):
         if self.enable_mysql_radioButton.isChecked():
             self.enable_hdf55_radioButton.setChecked(False)
-        self.on_enable_hdf5_or_mysql_toggled()
-
-    def on_enable_hdf5_or_mysql_toggled(self):
-        hdf5_enable = self.enable_hdf55_radioButton.isChecked()
-        mysql_enable = not hdf5_enable
-        self.hdf5_dir_lineEdit.setEnabled(hdf5_enable)
-        self.mysql_ip_lineEdit.setEnabled(mysql_enable)
-        self.mysql_port_lineEdit.setEnabled(mysql_enable)
-        self.mysql_usr_lineEdit.setEnabled(mysql_enable)
-        self.mysql_pwd_lineEdit.setEnabled(mysql_enable)
-        self.mysql_test_pushButton.setEnabled(mysql_enable)
+        self.on_enable_database_toggled(hdf5=False, mysql=True)
+
+    def on_enable_database_toggled(self, hdf5, mysql):
+        self.hdf5_dir_lineEdit.setEnabled(hdf5)
+        self.mysql_ip_lineEdit.setEnabled(mysql)
+        self.mysql_port_lineEdit.setEnabled(mysql)
+        self.mysql_usr_lineEdit.setEnabled(mysql)
+        self.mysql_pwd_lineEdit.setEnabled(mysql)
+        self.mysql_test_pushButton.setEnabled(mysql)
+        self.mysql_tmpdir_pushButton.setEnabled(mysql)
 
     @pyqtSlot()
     def on_mysql_tmpdir_pushButton_clicked(self):

hikyuu/gui/data/ImportBlockInfoTask.py

@@ -29,7 +29,7 @@ class ImportBlockInfoTask:
             sqlite_file = "{}/stock.db".format(self.config['hdf5']['dir'])
             connect = sqlite3.connect(sqlite_file, timeout=1800)
             import_block = em_import_block_to_sqlite
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],

hikyuu/gui/data/ImportHistoryFinanceTask.py

@@ -30,7 +30,6 @@ import mysql.connector
 from pytdx.hq import TdxHq_API
 from hikyuu.data.pytdx_finance_to_mysql import history_finance_import_mysql
 from hikyuu.data.pytdx_finance_to_sqlite import history_finance_import_sqlite
-from hikyuu.data.common_pytdx import search_best_tdx
 from hikyuu.util import *
 
 
@@ -46,13 +45,13 @@ class ImportHistoryFinanceTask:
         self.total_count = 0
         self.status = "no run"
 
-    def connect(self):
-        self.api = TdxHq_API()
+    def connect_to_pytdx(self):
+        api = TdxHq_API()
         # 不是所有服务器都提供下载
-        hku_check(self.api.connect('120.76.152.87', 7709), "failed connect pytdx!")
+        hku_check(api.connect('120.76.152.87', 7709), "failed connect pytdx!")
+        return api
 
     def get_list_info(self):
-        result = []
         content = self.api.get_report_file_by_size('tdxfin/gpcw.txt')
         content = content.decode('utf-8')
         content = content.strip().split('\r\n')
@@ -62,72 +61,77 @@ class ImportHistoryFinanceTask:
 
         return [l2d(i.strip().split(',')) for i in content]
 
-    def import_to_db(self, filename):
+    def connect_db(self):
         if self.config.getboolean('hdf5', 'enable', fallback=True):
             sqlite_file = "{}/stock.db".format(self.config['hdf5']['dir'])
-            connect = sqlite3.connect(sqlite_file, timeout=1800)
-            history_finance_import = history_finance_import_sqlite
-        else:
+            self.db_connect = sqlite3.connect(sqlite_file, timeout=1800)
+            self.history_finance_import = history_finance_import_sqlite
+            self.engine = 'hdf5'
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
                 'host': self.config['mysql']['host'],
                 'port': self.config['mysql']['port']
             }
-            connect = mysql.connector.connect(**db_config)
-            history_finance_import = history_finance_import_mysql
+            self.db_connect = mysql.connector.connect(**db_config)
+            self.history_finance_import = history_finance_import_mysql
+            self.engine = 'mysql'
 
+    def import_to_db(self, filename):
         try:
-            history_finance_import(connect, filename)
+            self.history_finance_import(self.db_connect, filename)
         except Exception as e:
             hku_error(str(e))
-        finally:
-            connect.commit()
-            connect.close()
 
-    def download_file(self, item):
+    def download_file(self, item, dest_dir):
         filename = item['filename']
-        # filesize = item['filesize']
-        # get_report_file_by_size 传入实际的 filesize，实际会出错
-        data = self.api.get_report_file_by_size(f'tdxfin/{filename}', 0)
-        hku_info(f"Download finance file: {filename}")
-        dest_file_name = self.dest_dir + "/" + filename
-        with open(dest_file_name, 'wb') as f:
-            f.write(data)
-        shutil.unpack_archive(dest_file_name, extract_dir=self.dest_dir)
-        self.import_to_db(f'{self.dest_dir}/{filename[0:-4]}.dat')
-        hku_info(f"Import finance file: {self.dest_dir}/{filename[0:-4]}.dat")
+        dest_file_name = dest_dir + "/" + filename
+        need_download = False
+        if not os.path.exists(dest_file_name):
+            need_download = True
+        else:
+            old_md5 = ''
+            with open(dest_file_name, 'rb') as f:
+                old_md5 = hashlib.md5(f.read()).hexdigest()
+            if old_md5 != item['hash']:
+                need_download = True
+
+        if need_download:
+            api = TdxHq_API()
+            # 不是所有服务器都提供下载
+            hku_check(api.connect('120.76.152.87', 7709), "failed connect pytdx!")
+            data = api.get_report_file_by_size(f'tdxfin/{filename}', 0)
+            hku_info(f"Download finance file: {filename}")
+            with open(dest_file_name, 'wb') as f:
+                f.write(data)
+            api.disconnect()
+
+        shutil.unpack_archive(dest_file_name, extract_dir=dest_dir)
+        self.import_to_db(f'{dest_dir}/{filename[0:-4]}.dat')
+        hku_info(f"Import finance file: {dest_dir}/{filename[0:-4]}.dat")
 
     @hku_catch(trace=True)
     def __call__(self):
         self.status = "running"
         capture_multiprocess_all_logger(self.log_queue)
-        self.connect()
+        self.api = self.connect_to_pytdx()
         data_list = self.get_list_info()
         self.total_count = len(data_list)
         count = 0
+        data_list.sort(key=lambda x: x['filename'])
+
+        self.connect_db()
         for item in data_list:
             try:
-                dest_file = '{}/{}'.format(self.dest_dir, item['filename'])
-                if not os.path.exists(dest_file):
-                    self.download_file(item)
-                else:
-                    old_md5 = ''
-                    with open(dest_file, 'rb') as f:
-                        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}")
+                self.download_file(item, self.dest_dir)
                 count += 1
                 self.queue.put([self.task_name, None, None, int(100 * count / self.total_count), self.total_count])
             except Exception as e:
                 hku_error(str(e))
+        self.db_connect.close()
+        self.api.disconnect()
+
         self.queue.put([self.task_name, None, None, None, self.total_count])
         self.status = "finished"
 
@@ -138,6 +142,6 @@ if __name__ == "__main__":
     this_dir = os.path.expanduser('~') + '/.hikyuu'
     import_config = ConfigParser()
     import_config.read(this_dir + '/importdata-gui.ini', encoding='utf-8')
-    task = ImportHistoryFinanceTask(None, None, None, "c:\\stock")
+    task = ImportHistoryFinanceTask(None, None, None, "/Users/fasiondog/stock")
     task()
     print("over!")

hikyuu/gui/data/ImportPytdxTimeToH5Task.py

@@ -64,7 +64,7 @@ class ImportPytdxTimeToH5:
             sqlite_file = "{}/stock.db".format(self.config['hdf5']['dir'])
             connect = sqlite3.connect(sqlite_file, timeout=1800)
             import_time = h5_import_time
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
@@ -84,9 +84,11 @@ class ImportPytdxTimeToH5:
                 connect, self.market, self.quotations, api, self.dest_dir, max_days=self.max_days, progress=progress
             )
             self.logger.info("导入 {} 分时记录数: {}".format(self.market, count))
+            api.disconnect()
         except Exception as e:
             self.logger.error(e)
         finally:
+            api.close()
             connect.commit()
             connect.close()
 

hikyuu/gui/data/ImportPytdxToH5Task.py

@@ -66,12 +66,12 @@ class ImportPytdxToH5:
             connect = sqlite3.connect(sqlite_file, timeout=1800)
             import_data = h5_import_data
             self.logger.debug('use hdf5 import kdata')
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
                 'host': self.config['mysql']['host'],
-                'port': self.config['mysql']['port']
+                'port': int(self.config['mysql']['port'])
             }
             connect = mysql.connector.connect(**db_config)
             import_data = mysql_import_data
@@ -87,10 +87,12 @@ class ImportPytdxToH5:
                 connect, self.market, self.ktype, self.quotations, api, self.dest_dir, self.startDatetime, progress
             )
             self.logger.info("导入 {} {} 记录数: {}".format(self.market, self.ktype, count))
+            api.disconnect()
         except Exception as e:
             self.logger.error("ImportPytdxToH5Task failed! {}".format(e))
             # self.queue.put([self.task_name, self.market, self.ktype, str(e), count])
         finally:
+            api.close()
             connect.commit()
             connect.close()
 

hikyuu/gui/data/ImportPytdxTransToH5Task.py

@@ -64,7 +64,7 @@ class ImportPytdxTransToH5:
             sqlite_file = "{}/stock.db".format(self.config['hdf5']['dir'])
             connect = sqlite3.connect(sqlite_file, timeout=1800)
             import_trans = h5_import_trans
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
@@ -84,9 +84,11 @@ class ImportPytdxTransToH5:
                 connect, self.market, self.quotations, api, self.dest_dir, max_days=self.max_days, progress=progress
             )
             self.logger.info("导入 {} 分笔记录数: {}".format(self.market, count))
+            api.disconnect()
         except Exception as e:
             self.logger.error(e)
         finally:
+            api.close()
             connect.commit()
             connect.close()
 

hikyuu/gui/data/ImportWeightToSqliteTask.py

@@ -67,7 +67,7 @@ class ImportWeightToSqliteTask:
                 pytdx_import_weight = pytdx_import_weight_to_sqlite
                 pytdx_import_finance = pytdx_import_finance_to_sqlite
                 self.logger.debug('use sqlite import weight')
-            else:
+            elif self.config.getboolean('mysql', 'enable', fallback=True):
                 db_config = {
                     'user': self.config['mysql']['usr'],
                     'password': self.config['mysql']['pwd'],
@@ -107,6 +107,7 @@ class ImportWeightToSqliteTask:
             # self.queue.put([self.msg_name, str(e), -1, 0, total_count])
             self.queue.put([self.msg_name, 'INFO', str(e), 0, 0])
         finally:
+            api.close()
             connect.commit()
             connect.close()
 

hikyuu/gui/data/ImportZhBond10Task.py

@@ -27,7 +27,7 @@ class ImportZhBond10Task:
             sqlite_file = "{}/stock.db".format(self.config['hdf5']['dir'])
             connect = sqlite3.connect(sqlite_file, timeout=1800)
             import_zh_bond10 = import_zh_bond10_to_sqlite
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],