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

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -24,18 +24,30 @@
 
 import logging
 import sqlite3
+import datetime
+import mysql.connector
+import queue
 from multiprocessing import Queue, Process
 from PyQt5.QtCore import QThread, pyqtSignal
 from hikyuu.gui.data.ImportTdxToH5Task import ImportTdxToH5Task
 from hikyuu.gui.data.ImportWeightToSqliteTask import ImportWeightToSqliteTask
+from hikyuu.gui.data.ImportTdxToH5Task import ImportTdxToH5Task
 from hikyuu.gui.data.ImportHistoryFinanceTask import ImportHistoryFinanceTask
-
+from hikyuu.gui.data.ImportBlockInfoTask import ImportBlockInfoTask
+from hikyuu.gui.data.ImportZhBond10Task import ImportZhBond10Task
 from pytdx.hq import TdxHq_API
-from hikyuu.data.common import g_market_list
-from hikyuu.data.common_sqlite3 import create_database
 from hikyuu.data.common_pytdx import search_best_tdx
-from hikyuu.data.tdx_to_h5 import tdx_import_stock_name_from_file
-from hikyuu.util import *
+
+from hikyuu.data.common import *
+from hikyuu.data.common_sqlite3 import import_new_holidays as sqlite_import_new_holidays
+from hikyuu.data.common_sqlite3 import create_database as sqlite_create_database
+from hikyuu.data.pytdx_to_h5 import import_index_name as sqlite_import_index_name
+from hikyuu.data.pytdx_to_h5 import import_stock_name as sqlite_import_stock_name
+from hikyuu.data.common_mysql import create_database as mysql_create_database
+from hikyuu.data.common_mysql import import_new_holidays as mysql_import_new_holidays
+from hikyuu.data.pytdx_to_mysql import import_index_name as mysql_import_index_name
+from hikyuu.data.pytdx_to_mysql import import_stock_name as mysql_import_stock_name
+from hikyuu.util.mylog import class_logger
 
 
 class UseTdxImportToH5Thread(QThread):
@@ -43,66 +55,120 @@ class UseTdxImportToH5Thread(QThread):
 
     def __init__(self, parent, config):
         super(UseTdxImportToH5Thread, self).__init__()
-        self.logger = logging.getLogger(self.__class__.__name__)
         self.parent = parent
         self.log_queue = parent.mp_log_q if parent is not None else None
         self.config = config
         self.msg_name = 'HDF5_IMPORT'
 
         self.process_list = []
-
-        src_dir = config['tdx']['dir']
-        dest_dir = config['hdf5']['dir']
-        sqlite_file_name = dest_dir + "/stock.db"
+        self.hosts = []
+        self.tasks = []
 
         self.quotations = []
         if self.config['quotation']['stock']:
             self.quotations.append('stock')
         if self.config['quotation']['fund']:
             self.quotations.append('fund')
-        # if self.config['quotation']['future']:
-        #    self.quotations.append('future')
 
-        # 通达信盘后没有债券数据。另外，如果用Pytdx下载债券数据，
-        # 每个债券本身的数据很少但债券种类太多占用空间和时间太多，用途较少不再考虑导入
-        # if self.config['quotation']['bond']:
-        #    self.quotations.append('bond')
+        self.queue = Queue()
 
-        hosts = search_best_tdx()
-        api = TdxHq_API()
-        hku_check(api.connect(hosts[0][2], hosts[0][3]), "failed connect pytdx {}:{}!", hosts[0][2], hosts[0][3])
+    def __del__(self):
+        for p in self.process_list:
+            if p.is_alive():
+                p.terminate()
+
+    def send_message(self, msg):
+        self.message.emit([self.msg_name] + msg)
+
+    def init_task(self):
+        config = self.config
+        src_dir = config['tdx']['dir']
+        dest_dir = config['hdf5']['dir']
 
-        self.queue = Queue()
         self.tasks = []
+        if self.config.getboolean('finance', 'enable', fallback=True):
+            self.tasks.append(
+                ImportHistoryFinanceTask(self.log_queue, self.queue, self.config, dest_dir))
+
+        self.tasks.append(ImportBlockInfoTask(self.log_queue, self.queue,
+                          self.config, ('行业板块', '概念板块', '地域板块', '指数板块')))
+        self.tasks.append(ImportZhBond10Task(self.log_queue, self.queue, self.config))
+
+        task_count = 0
+        market_count = len(g_market_list)
+        if self.config.getboolean('ktype', 'day', fallback=False):
+            task_count += market_count
+        if self.config.getboolean('ktype', 'min5', fallback=False):
+            task_count += market_count
+        if self.config.getboolean('ktype', 'min', fallback=False):
+            task_count += market_count
+        # 本地暂不支持分时和分笔导入
+        # if self.config.getboolean('ktype', 'trans', fallback=False):
+        #     task_count += market_count
+        # if self.config.getboolean('ktype', 'time', fallback=False):
+        #     task_count += market_count
+        if self.config.getboolean('weight', 'enable', fallback=False):
+            task_count += (market_count*2)
+
+        self.logger.info('搜索通达信服务器')
+        self.send_message(['INFO', '搜索通达信服务器'])
+        self.hosts = search_best_tdx()
+        if not self.hosts:
+            self.logger.warn('无法连接通达信行情服务器！请检查网络设置！')
+            self.send_message(['INFO', '无法连接通达信行情服务器！请检查网络设置！'])
+            return
+
+        if task_count == 0:
+            self.send_message(['INFO', '未选择需要导入的行情数据！'])
+            return
+
+        use_tdx_number = min(
+            task_count, len(self.hosts),
+            self.config.getint('pytdx', 'use_tdx_number', fallback=10))
+        split = task_count // use_tdx_number
+        use_hosts = []
+        for i in range(use_tdx_number):
+            for j in range(split):
+                use_hosts.append((self.hosts[i][2], self.hosts[i][3]))
+        if len(use_hosts) < task_count:
+            for i in range(task_count - len(use_hosts)):
+                use_hosts.insert(0, (self.hosts[0][2], self.hosts[0][3]))
+        # for i in range(len(use_hosts)):
+        #     print(i, use_hosts[i])
 
         cur_host = 0
         if self.config.getboolean('weight', 'enable', fallback=False):
             for market in g_market_list:
                 self.tasks.append(
                     ImportWeightToSqliteTask(self.log_queue, self.queue,
-                                             self.config, dest_dir, market, 'weight', hosts[cur_host][2],
-                                             hosts[cur_host][3]))
+                                             self.config, dest_dir, market, 'weight', self.hosts[cur_host][2],
+                                             self.hosts[cur_host][3]))
                 cur_host += 1
-                if cur_host >= len(hosts):
+                if cur_host >= len(self.hosts):
                     cur_host = 0
                 self.tasks.append(
                     ImportWeightToSqliteTask(self.log_queue, self.queue,
-                                             self.config, dest_dir, market, 'finance', hosts[cur_host][2],
-                                             hosts[cur_host][3]))
+                                             self.config, dest_dir, market, 'finance', self.hosts[cur_host][2],
+                                             self.hosts[cur_host][3]))
                 cur_host += 1
-                if cur_host >= len(hosts):
+                if cur_host >= len(self.hosts):
                     cur_host = 0
 
-        if self.config.getboolean('finance', 'enable', fallback=True):
-            self.tasks.append(ImportHistoryFinanceTask(self.log_queue, self.queue, self.config, dest_dir))
         if self.config.getboolean('ktype', 'day', fallback=False):
+            self.tasks.append(
+                ImportTdxToH5Task(self.log_queue, self.queue, config, 'BJ', 'DAY', self.quotations, src_dir, dest_dir)
+            )
             self.tasks.append(
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SH', 'DAY', self.quotations, src_dir, dest_dir)
             )
             self.tasks.append(
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SZ', 'DAY', self.quotations, src_dir, dest_dir)
             )
+
         if self.config.getboolean('ktype', 'min5', fallback=False):
+            self.tasks.append(
+                ImportTdxToH5Task(self.log_queue, self.queue, config, 'BJ', '5MIN', self.quotations, src_dir, dest_dir)
+            )
             self.tasks.append(
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SH', '5MIN', self.quotations, src_dir, dest_dir)
             )
@@ -110,6 +176,9 @@ class UseTdxImportToH5Thread(QThread):
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SZ', '5MIN', self.quotations, src_dir, dest_dir)
             )
         if self.config.getboolean('ktype', 'min', fallback=False):
+            self.tasks.append(
+                ImportTdxToH5Task(self.log_queue, self.queue, config, 'BJ', '1MIN', self.quotations, src_dir, dest_dir)
+            )
             self.tasks.append(
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SH', '1MIN', self.quotations, src_dir, dest_dir)
             )
@@ -117,38 +186,71 @@ class UseTdxImportToH5Thread(QThread):
                 ImportTdxToH5Task(self.log_queue, self.queue, config, 'SZ', '1MIN', self.quotations, src_dir, dest_dir)
             )
 
-    def __del__(self):
-        for p in self.process_list:
-            if p.is_alive():
-                p.terminate()
-
-    def send_message(self, msg):
-        self.message.emit([self.msg_name] + msg)
-
     def run(self):
         try:
+            self.init_task()
             self._run()
         except Exception as e:
+            self.logger.error(str(e))
             self.send_message(['THREAD', 'FAILURE', str(e)])
         else:
+            self.logger.info('导入完毕')
             self.send_message(['THREAD', 'FINISHED'])
 
     @hku_catch(trace=True, re_raise=True)
     def _run(self):
-        src_dir = self.config['tdx']['dir']
-        dest_dir = self.config['hdf5']['dir']
-        hdf5_import_progress = {'SH': {'DAY': 0, '1MIN': 0, '5MIN': 0}, 'SZ': {'DAY': 0, '1MIN': 0, '5MIN': 0}}
+        hdf5_import_progress = {}
+        trans_progress = {}
+        time_progress = {}
+        for market in g_market_list:
+            hdf5_import_progress[market] = {'DAY': 0, '1MIN': 0, '5MIN': 0}
+            trans_progress[market] = 0
+            time_progress[market] = 0
 
         # 正在导入代码表
-        self.send_message(['START_IMPORT_CODE'])
+        self.logger.info('导入股票代码表')
+        self.send_message(['INFO', '导入股票代码表'])
+
+        if self.config.getboolean('hdf5', 'enable', fallback=True):
+            connect = sqlite3.connect("{}/stock.db".format(
+                self.config['hdf5']['dir']))
+            create_database = sqlite_create_database
+            import_new_holidays = sqlite_import_new_holidays
+            import_index_name = sqlite_import_index_name
+            import_stock_name = sqlite_import_stock_name
+        else:
+            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)
+            create_database = mysql_create_database
+            import_new_holidays = mysql_import_new_holidays
+            import_index_name = mysql_import_index_name
+            import_stock_name = mysql_import_stock_name
 
-        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)
+        pytdx_api = TdxHq_API()
+        hku_check(pytdx_api.connect(self.hosts[0][2], self.hosts[0][3]),
+                  "failed connect pytdx {}:{}", self.hosts[0][2],
+                  self.hosts[0][3])
 
-        self.send_message(['FINISHED_IMPORT_CODE'])
+        self.logger.info("导入交易所休假日历")
+        import_new_holidays(connect)
+
+        count = import_index_name(connect)
+        self.logger.info("指数数量: {}".format(count))
+
+        for market in g_market_list:
+            count = import_stock_name(connect, pytdx_api, market,
+                                      self.quotations)
+            if count > 0:
+                self.logger.info("{} 新增股票数: {}".format(market, count))
+                self.send_message(
+                    ['INFO', '{} 新增股票数：{}'.format(market, count)])
 
         self.process_list.clear()
         for task in self.tasks:
@@ -157,26 +259,80 @@ class UseTdxImportToH5Thread(QThread):
             p.start()
 
         finished_count = len(self.tasks)
+        market_count = len(g_market_list)
         while finished_count > 0:
-            message = self.queue.get()
-            taskname, market, ktype, progress, total = message
-            if progress is None:
-                finished_count -= 1
-                if taskname == 'IMPORT_KDATA':
-                    self.send_message(['IMPORT_KDATA', 'FINISHED', market, ktype, total])
+            try:
+                message = self.queue.get(timeout=10)
+                taskname, market, ktype, progress, total = message
+                if progress is None:
+                    finished_count -= 1
+                    if taskname in ('IMPORT_KDATA', 'IMPORT_TRANS',
+                                    'IMPORT_TIME'):
+                        self.send_message(
+                            [taskname, 'FINISHED', market, ktype, total])
+                    elif taskname == 'IMPORT_BLOCKINFO':
+                        self.send_message([taskname, ktype])
+                    elif taskname == 'IMPORT_ZH_BOND10':
+                        self.send_message([taskname, ktype])
+                    elif taskname == 'IMPORT_WEIGHT':
+                        pass
+                    else:
+                        self.send_message([taskname, 'FINISHED'])
+                    continue
+
+                if taskname == 'IMPORT_WEIGHT':
+                    if market == 'INFO':
+                        self.send_message(['INFO', ktype])
+                    self.send_message([taskname, market, total])
+                elif taskname == 'IMPORT_FINANCE':
+                    self.send_message([taskname, progress])
+                elif taskname == 'IMPORT_KDATA':
+                    hdf5_import_progress[market][ktype] = progress
+                    current_progress = 0
+                    for market in g_market_list:
+                        current_progress += hdf5_import_progress[market][ktype]
+                    current_progress = current_progress // market_count
+                    self.send_message([taskname, ktype, current_progress])
+                elif taskname == 'IMPORT_TRANS':
+                    trans_progress[market] = progress
+                    current_progress = 0
+                    for market in g_market_list:
+                        current_progress += trans_progress[market]
+                    current_progress = current_progress // market_count
+                    self.send_message([taskname, ktype, current_progress])
+                elif taskname == 'IMPORT_TIME':
+                    time_progress[market] = progress
+                    current_progress = 0
+                    for market in g_market_list:
+                        current_progress += time_progress[market]
+                    current_progress = current_progress // market_count
+                    self.send_message([taskname, ktype, current_progress])
+                elif taskname == 'IMPORT_BLOCKINFO':
+                    self.send_message([taskname, market, ktype])
                 else:
-                    self.send_message([taskname, 'FINISHED'])
-                continue
-
-            if taskname == 'IMPORT_WEIGHT':
-                if market == 'INFO':
-                    self.send_message(['INFO', ktype])
-                self.send_message(['IMPORT_WEIGHT', market, total])
-            elif taskname == 'IMPORT_KDATA':
-                hdf5_import_progress[market][ktype] = progress
-                current_progress = (hdf5_import_progress['SH'][ktype] + hdf5_import_progress['SZ'][ktype]) // 2
-                self.send_message(['IMPORT_KDATA', ktype, current_progress])
-            elif taskname == 'IMPORT_FINANCE':
-                self.send_message([taskname, progress])
-            else:
-                self.logger.error("Unknow task: {}".format(taskname))
+                    self.logger.error("Unknow task: {}".format(taskname))
+            except queue.Empty:
+                if finished_count > 0:
+                    ok = False
+                    for p in self.process_list:
+                        if p.is_alive():
+                            ok = True
+                            break
+                    if not ok:
+                        for task in self.tasks:
+                            self.logger.info(
+                                f"task ({task.__class__.__name__}) status: {task.status}!"
+                            )
+                        for p in self.process_list:
+                            self.logger.info(
+                                f"Process exit code: {p.exitcode}")
+                        finished_count = 0
+                        self.logger.error(
+                            "All process is finished, but some tasks are running!"
+                        )
+
+            except Exception as e:
+                self.logger.error(str(e))
+
+
+class_logger(UseTdxImportToH5Thread)

hikyuu/gui/importdata.py

@@ -3,7 +3,8 @@
 # cp936
 
 import os.path
-import sys, time
+import sys
+import time
 from configparser import ConfigParser
 
 from hikyuu.data.weight_to_sqlite import qianlong_import_weight
@@ -14,7 +15,8 @@ from hikyuu.gui.data.UsePytdxImportToH5Thread import UsePytdxImportToH5Thread
 
 
 class HKUImportDataCMD:
-    def __init__(self):
+    def __init__(self, ignore_kdata=False):
+        self.ignore_kdata = ignore_kdata  # 忽略K线数据导入
         self.initThreads()
 
     def getUserConfigDir(self):
@@ -25,6 +27,12 @@ class HKUImportDataCMD:
         this_dir = self.getUserConfigDir()
         import_config = ConfigParser()
         import_config.read(this_dir + '/importdata-gui.ini', encoding='utf-8')
+        if self.ignore_kdata:
+            import_config.set('ktype', 'day', 'False')
+            import_config.set('ktype', 'min', 'False')
+            import_config.set('ktype', 'min5', 'False')
+            import_config.set('ktype', 'trans', 'False')
+            import_config.set('ktype', 'time', 'False')
         return import_config
 
     def initThreads(self):
@@ -46,7 +54,8 @@ class HKUImportDataCMD:
     def print_progress(self, ktype, progress):
         if progress != self.progress[ktype]:
             print(
-                'import progress: {}%  - {} - 已耗时 {:>.2f} 分钟'.format(progress, self.info_type[ktype], self.time_escaped())
+                'import progress: {}%  - {} - 已耗时 {:>.2f} 分钟'.format(progress,
+                                                                     self.info_type[ktype], self.time_escaped())
             )
             self.progress[ktype] = progress
 
@@ -65,11 +74,12 @@ class HKUImportDataCMD:
                 if status == 'FAILURE':
                     self.details.append(msg[3])
                 print("\n导入完毕, 共耗时 {:>.2f} 分钟".format(self.time_escaped()))
-                print('\n=========================================================')
-                print("导入详情:")
-                for info in self.details:
-                    print(info)
-                print('=========================================================')
+                if not self.ignore_kdata:
+                    print('\n=========================================================')
+                    print("导入详情:")
+                    for info in self.details:
+                        print(info)
+                    print('=========================================================')
                 self.import_running = False
 
             elif msg_task_name == 'IMPORT_KDATA':
@@ -144,10 +154,13 @@ class HKUImportDataCMD:
         self.hdf5_import_thread.run()
 
 
-def main():
-    x = HKUImportDataCMD()
+def main(ignore_kdata=False):
+    x = HKUImportDataCMD(ignore_kdata=ignore_kdata)
     x.start_import_data()
 
 
 if __name__ == '__main__':
-    main()
+    if len(sys.argv) > 1 and sys.argv[1] == '--ignore-kdata':
+        main(ignore_kdata=True)
+    else:
+        main(ignore_kdata=False)

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 0x2b2ffb758e0; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12cebc10; 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 2b280530e10>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 1bb12d3db30>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -109,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 0x2b280513020; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12d75280; 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 2b280549720>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 1bb12d6e5e0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -146,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 0x2b280513800; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1bb12d851f0; 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 2b28054a2b0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 1bb12d83090>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/KData.h

@@ -117,6 +117,7 @@ public:
     const_iterator cbegin() const;
     const_iterator cend() const;
     const KRecord* data() const;
+    KRecord* data();  // 谨慎使用（用于强制调整数据）
 
 private:
     static KRecord ms_null_krecord;
@@ -261,6 +262,10 @@ inline const KRecord* KData::data() const {
     return m_imp->data();
 }
 
+inline KRecord* KData::data() {
+    return m_imp->data();
+}
+
 } /* namespace hku */
 
 #if FMT_VERSION >= 90000

hikyuu/include/hikyuu/KDataImp.h

@@ -49,6 +49,10 @@ public:
         return m_buffer.data();
     }
 
+    KRecord* data() {
+        return m_buffer.data();
+    }
+
     DatetimeList getDatetimeList() const;
 
 public:

hikyuu/include/hikyuu/data_driver/kdata/mysql/KRecordTable.h

@@ -9,6 +9,7 @@
 #define HIKYUU_DATA_DRIVER_KDATA_MYSQL_KRECORDTABLE_H
 
 #include "../../../KQuery.h"
+#include "../../../KRecord.h"
 #include "../../../utilities/db_connect/SQLStatementBase.h"
 
 namespace hku {
@@ -32,6 +33,45 @@ public:
         to_lower(m_db_name);
     };
 
+    KRecordTable(const string& market, const string& code, const KQuery::KType& ktype,
+                 const KRecord& record)
+    : KRecordTable(market, code, ktype) {
+        m_date = record.datetime.ymdhm();
+        m_open = record.openPrice;
+        m_high = record.highPrice;
+        m_low = record.lowPrice;
+        m_close = record.closePrice;
+        m_count = record.transCount;
+        m_amount = record.transAmount;
+    }
+
+    KRecordTable(const KRecordTable&) = default;
+    KRecordTable& operator=(const KRecordTable&) = default;
+    KRecordTable(KRecordTable&& rhs)
+    : m_db_name(std::move(rhs.m_db_name)),
+      m_code(std::move(rhs.m_code)),
+      m_date(rhs.m_date),
+      m_open(rhs.m_open),
+      m_high(rhs.m_high),
+      m_low(rhs.m_low),
+      m_close(rhs.m_close),
+      m_amount(rhs.m_amount),
+      m_count(rhs.m_count) {}
+
+    KRecordTable& operator=(KRecordTable&& rhs) {
+        if (&rhs != this) {
+            m_db_name = std::move(rhs.m_db_name);
+            m_code = std::move(rhs.m_code);
+            m_date = rhs.m_date;
+            m_open = rhs.m_open;
+            m_high = rhs.m_high;
+            m_low = rhs.m_low;
+            m_close = rhs.m_close;
+            m_amount = rhs.m_amount;
+        }
+        return *this;
+    }
+
     Datetime date() const {
         return m_date == 0 ? Null<Datetime>() : Datetime((uint64_t)m_date);
     }
@@ -90,8 +130,7 @@ public:
 
     string getSelectSQLNoDB() {
         return fmt::format(
-          "select `date`,`open`,`high`, `low`, `close`, `amount`, `count` from `{}`",
-          m_code);
+          "select `date`,`open`,`high`, `low`, `close`, `amount`, `count` from `{}`", m_code);
     }
 
     void save(const SQLStatementPtr& st) const {

hikyuu/include/hikyuu/indicator/crt/CONTEXT.h

@@ -13,10 +13,14 @@ namespace hku {
 
 /**
  * 独立上下文指标
+ * @param ind 待包装指标
+ * @param fill_null 是否填充空值，默认为 false
  * @ingroup Indicator
  */
-Indicator HKU_API CONTEXT(const Indicator& ind, bool fill_null = true);
-Indicator HKU_API CONTEXT(bool fill_null = true);
+Indicator HKU_API CONTEXT(const Indicator& ind, bool fill_null = false, bool use_self_ktype = false,
+                          bool use_self_recover_type = false);
+Indicator HKU_API CONTEXT(bool fill_null = false, bool use_self_ktype = false,
+                          bool use_self_recover_type = false);
 
 /**
  * 获取指标上下文

hikyuu/include/hikyuu/indicator/crt/COUNT.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#ifndef COUNT_H_
-#define COUNT_H_
+#ifndef INDICATOR_CRT_COUNT_H_
+#define INDICATOR_CRT_COUNT_H_
 
 #include "../Indicator.h"
 
@@ -51,4 +51,4 @@ inline Indicator HKU_API COUNT(const Indicator& ind, const Indicator& n) {
 
 }  // namespace hku
 
-#endif /* CVAL_H_ */
+#endif /* INDICATOR_CRT_COUNT_H_ */

hikyuu/include/hikyuu/indicator/crt/DISCARD.h

@@ -11,7 +11,7 @@
 #ifndef INDICATOR_CRT_DISCARD_H_
 #define INDICATOR_CRT_DISCARD_H_
 
-#include "CVAL.h"
+#include "../Indicator.h"
 
 namespace hku {
 

hikyuu/include/hikyuu/indicator/crt/ISINF.h

@@ -9,7 +9,7 @@
 #ifndef INDICATOR_CRT_ISINF_H_
 #define INDICATOR_CRT_ISINF_H_
 
-#include "CVAL.h"
+#include "../Indicator.h"
 
 namespace hku {
 

hikyuu/include/hikyuu/indicator/crt/ISINFA.h

@@ -9,7 +9,7 @@
 #ifndef INDICATOR_CRT_ISINFA_H_
 #define INDICATOR_CRT_ISINFA_H_
 
-#include "CVAL.h"
+#include "../Indicator.h"
 
 namespace hku {