hikyuu 2.6.3__py3-none-win_amd64.whl → 2.6.6__py3-none-win_amd64.whl

hikyuu/gui/data/ImportTdxToH5Task.py

@@ -30,6 +30,7 @@ from hikyuu.util.check import hku_catch
 from hikyuu.util.mylog import class_logger
 from hikyuu.data.tdx_to_h5 import tdx_import_data as h5_import_data
 from hikyuu.data.tdx_to_mysql import tdx_import_data as mysql_import_data
+from hikyuu.data.tdx_to_clickhouse import tdx_import_data as clickhouse_import_data
 from hikyuu.util import capture_multiprocess_all_logger, get_default_logger
 
 
@@ -91,7 +92,7 @@ class ImportTdxToH5Task:
             import_data = h5_import_data
             self.logger.debug('use hdf5 import kdata')
             use_hdf = True
-        else:
+        elif self.config.getboolean('mysql', 'enable', fallback=True):
             db_config = {
                 'user': self.config['mysql']['usr'],
                 'password': self.config['mysql']['pwd'],
@@ -101,6 +102,17 @@ class ImportTdxToH5Task:
             connect = mysql.connector.connect(**db_config)
             import_data = mysql_import_data
             self.logger.debug('use mysql import kdata')
+        elif self.config.getboolean('clickhouse', 'enable', fallback=True):
+            db_config = {
+                'username': self.config['clickhouse']['usr'],
+                'password': self.config['clickhouse']['pwd'],
+                'host': self.config['clickhouse']['host'],
+                'port': self.config['clickhouse']['http_port']
+            }
+            import clickhouse_connect
+            connect = clickhouse_connect.get_client(**db_config)
+            import_data = clickhouse_import_data
+            self.logger.debug('use clickhouse import kdata')
 
         count = 0
         try:

hikyuu/gui/data/ImportWeightToSqliteTask.py

@@ -28,6 +28,7 @@ import hashlib
 import sqlite3
 import urllib.request
 import mysql.connector
+import clickhouse_connect
 
 from pytdx.hq import TdxHq_API
 from hikyuu.data.common import MARKET, g_market_list
@@ -37,6 +38,8 @@ from hikyuu.data.pytdx_weight_to_sqlite import pytdx_import_weight_to_sqlite
 from hikyuu.data.pytdx_weight_to_mysql import pytdx_import_weight_to_mysql
 from hikyuu.data.pytdx_finance_to_sqlite import pytdx_import_finance_to_sqlite
 from hikyuu.data.pytdx_finance_to_mysql import pytdx_import_finance_to_mysql
+from hikyuu.data.pytdx_finance_to_clickhouse import pytdx_import_finance_to_clickhouse
+from hikyuu.data.pytdx_weight_to_clickhouse import pytdx_import_weight_to_clickhouse
 from hikyuu.util import capture_multiprocess_all_logger, get_default_logger
 from hikyuu.util.check import hku_catch, hku_check
 
@@ -67,7 +70,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'],
@@ -78,6 +81,17 @@ class ImportWeightToSqliteTask:
                 pytdx_import_weight = pytdx_import_weight_to_mysql
                 pytdx_import_finance = pytdx_import_finance_to_mysql
                 self.logger.debug('use mysql import weight')
+            elif self.config.getboolean('clickhouse', 'enable', fallback=True):
+                db_config = {
+                    'username': self.config['clickhouse']['usr'],
+                    'password': self.config['clickhouse']['pwd'],
+                    'host': self.config['clickhouse']['host'],
+                    'port': self.config['clickhouse']['http_port']
+                }
+                connect = clickhouse_connect.get_client(**db_config)
+                pytdx_import_weight = pytdx_import_weight_to_clickhouse
+                pytdx_import_finance = pytdx_import_finance_to_clickhouse
+                self.logger.debug('use clickhouse import weight')
 
         except Exception as e:
             # self.queue.put([self.msg_name, str(e), -1, 0, total_count])
@@ -107,7 +121,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:
-            connect.commit()
+            api.close()
             connect.close()
 
         self.queue.put([self.msg_name, '', 0, None, total_count])

hikyuu/gui/data/ImportZhBond10Task.py

@@ -6,8 +6,10 @@
 
 import sqlite3
 import mysql.connector
+import clickhouse_connect
 from hikyuu.data.zh_bond10_to_mysql import import_zh_bond10_to_mysql
 from hikyuu.data.zh_bond10_to_sqlite import import_zh_bond10_to_sqlite
+from hikyuu.data.zh_bond10_to_clickhouse import import_zh_bond10_to_clickhouse
 from hikyuu.util import *
 
 
@@ -27,7 +29,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'],
@@ -36,6 +38,15 @@ class ImportZhBond10Task:
             }
             connect = mysql.connector.connect(**db_config)
             import_zh_bond10 = import_zh_bond10_to_mysql
+        elif self.config.getboolean('clickhouse', 'enable', fallback=True):
+            db_config = {
+                'username': self.config['clickhouse']['usr'],
+                'password': self.config['clickhouse']['pwd'],
+                'host': self.config['clickhouse']['host'],
+                'port': self.config['clickhouse']['http_port']
+            }
+            connect = clickhouse_connect.get_client(**db_config)
+            import_zh_bond10 = import_zh_bond10_to_clickhouse
 
         try:
             import_zh_bond10(connect)