hikyuu 2.6.8.3__py3-none-win_amd64.whl → 2.6.8.4__py3-none-win_amd64.whl

hikyuu/gui/importdata.py

@@ -9,6 +9,7 @@ from configparser import ConfigParser
 
 from hikyuu.data.weight_to_sqlite import qianlong_import_weight
 from hikyuu.data.common_pytdx import search_best_tdx
+from hikyuu.data.hku_config_template import generate_default_config
 
 from hikyuu.gui.data.UseTdxImportToH5Thread import UseTdxImportToH5Thread
 from hikyuu.gui.data.UsePytdxImportToH5Thread import UsePytdxImportToH5Thread
@@ -26,7 +27,10 @@ class HKUImportDataCMD:
         # 读取保存的配置文件信息，如果不存在，则使用默认配置
         this_dir = self.getUserConfigDir()
         import_config = ConfigParser()
+        if not os.path.exists(this_dir + '/importdata-gui.ini'):
+            generate_default_config()
         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')

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 0x2a326174610; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x22e3840c9d0; 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 2a326171f80>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 22e3841f540>
     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 0x2a3261757e0; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x22e3844d100; 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 2a32619ec50>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 22e38442310>
     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 0x2a326175d20; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x22e3844d8e0; 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 2a32619fc90>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 22e38442d60>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/lang.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <string>
+#include "hikyuu/utilities/cppdef.h"
 
 #ifndef HKU_API
 #define HKU_API
@@ -19,9 +20,21 @@ namespace hku {
 
 void loadLocalLanguage(const std::string &path = "i8n");
 
-std::string HKU_API htr(const char *id);
+std::string HKU_API lang_htr(const char *id);
 
 // 按上下文获取翻译
-std::string HKU_API hctr(const char *ctx, const char *id);
+std::string HKU_API lang_hctr(const char *ctx, const char *id);
+
+template <typename... Args>
+std::string htr(const char *key, Args &&...args) {
+    std::string fmt_str = lang_htr(key);
+    return fmt::vformat(fmt_str, fmt::make_format_args(std::forward<Args>(args)...));
+}
+
+template <typename... Args>
+std::string chtr(const char *ctx, const char *key, Args &&...args) {
+    std::string fmt_str = lang_hctr(ctx, key);
+    return fmt::vformat(fmt_str, fmt::make_format_args(std::forward<Args>(args)...));
+}
 
 }  // namespace hku

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -107,8 +107,8 @@ protected:
         return true;                                                             \
     }
 
-// 用于检查已 py::object 方式传递的函数参数个数是否符合预期
-inline bool check_pyfunction_arg_num(py::object& func, size_t arg_num) {
+// 用于检查以 py::object 方式传递的函数参数个数是否符合预期
+inline bool check_pyfunction_arg_num(const 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");

hikyuu/include/hikyuu/version.h

@@ -16,9 +16,9 @@
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
 #define HKU_VERSION_ALTER 8
-#define HKU_VERSION_BUILD 202509080001
+#define HKU_VERSION_BUILD 202509100054
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.8 master.bc12c104 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.8 master.4088326f (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */