hikyuu 2.6.8.3__py3-none-win_amd64.whl → 2.6.8.5__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 0x231e218d9a0; 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 231e219e540>
     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 0x231e218df10; 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 231e21ab5e0>
     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 0x231e21ce8e0; 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 231e21c09a0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/config.h

@@ -46,6 +46,9 @@
 // 使用 TA-Lib
 #define HKU_ENABLE_TA_LIB 1
 
+// 使用 Arrow
+#define HKU_ENABLE_ARROW 1
+
 // clang-format on
 
 #endif /* HIKYUU_CONFIG_H_ */

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/plugin/hkuextra.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <arrow/api.h>
 #include "hikyuu/Stock.h"
 #include "hikyuu/indicator/Indicator.h"
 
@@ -57,21 +56,4 @@ bool getStockExtraIndexRange(const Stock& stk, const KQuery& query, size_t& out_
 
 KDataImpPtr getKDataImp(const Stock& stk, const KQuery& query);
 
-//-------------------------------
-// Views 扩展
-//-------------------------------
-
-std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
-                                                        const IndicatorList& inds,
-                                                        const KQuery& query, const string& market);
-
-std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
-                                                        const IndicatorList& inds,
-                                                        const Datetime& date, size_t cal_len,
-                                                        const KQuery::KType& ktype,
-                                                        const string& market);
-
-std::shared_ptr<arrow::Table> getMarketViewParallel(const StockList& stks, const Datetime& date,
-                                                    const string& market);
-
 }  // namespace hku

hikyuu/include/hikyuu/plugin/hkuviews.h

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-08-06
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include <hikyuu/config.h>
+
+#if HKU_ENABLE_ARROW
+#include <arrow/api.h>
+
+namespace hku {
+
+//-------------------------------
+// Views 扩展
+//-------------------------------
+
+std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
+                                                        const IndicatorList& inds,
+                                                        const KQuery& query, const string& market);
+
+std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
+                                                        const IndicatorList& inds,
+                                                        const Datetime& date, size_t cal_len,
+                                                        const KQuery::KType& ktype,
+                                                        const string& market);
+
+std::shared_ptr<arrow::Table> getMarketViewParallel(const StockList& stks, const Datetime& date,
+                                                    const string& market);
+
+}  // namespace hku
+
+#endif  // HKU_ENABLE_ARROW

hikyuu/include/hikyuu/plugin/interface/HkuExtraPluginInterface.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <arrow/api.h>
 #include "hikyuu/utilities/plugin/PluginBase.h"
 
 namespace hku {
@@ -36,19 +35,6 @@ public:
                                          size_t& out_end) = 0;
 
     virtual KDataImpPtr getKDataImp(const Stock& stk, const KQuery& query) = 0;
-
-    virtual std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
-                                                                    const IndicatorList& inds,
-                                                                    const KQuery& query,
-                                                                    const string& market) = 0;
-
-    virtual std::shared_ptr<arrow::Table> getIndicatorsViewParallel(
-      const StockList& stks, const IndicatorList& inds, const Datetime& date, size_t cal_len,
-      const KQuery::KType& ktype, const string& market) = 0;
-
-    virtual std::shared_ptr<arrow::Table> getMarketViewParallel(const StockList& stks,
-                                                                const Datetime& date,
-                                                                const string& market) = 0;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/plugin/interface/HkuViewsPluginInterface.h

@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-05-19
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include <arrow/api.h>
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class HkuViewsPluginInterface : public PluginBase {
+public:
+    HkuViewsPluginInterface() = default;
+    virtual ~HkuViewsPluginInterface() = default;
+
+    virtual std::shared_ptr<arrow::Table> getIndicatorsViewParallel(const StockList& stks,
+                                                                    const IndicatorList& inds,
+                                                                    const KQuery& query,
+                                                                    const string& market) = 0;
+
+    virtual std::shared_ptr<arrow::Table> getIndicatorsViewParallel(
+      const StockList& stks, const IndicatorList& inds, const Datetime& date, size_t cal_len,
+      const KQuery::KType& ktype, const string& market) = 0;
+
+    virtual std::shared_ptr<arrow::Table> getMarketViewParallel(const StockList& stks,
+                                                                const Datetime& date,
+                                                                const string& market) = 0;
+};
+
+}  // namespace hku

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

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "hikyuu/config.h"
+
 #include "BackTestPluginInterface.h"
 #include "DevicePluginInterface.h"
 #include "DataServerPluginInterface.h"
@@ -16,6 +18,10 @@
 #include "DataDriverPluginInterface.h"
 #include "HkuExtraPluginInterface.h"
 
+#if HKU_ENABLE_ARROW
+#include "HkuViewsPluginInterface.h"
+#endif
+
 namespace hku {
 
 #define HKU_PLUGIN_BACKTEST "backtest"
@@ -26,5 +32,6 @@ namespace hku {
 #define HKU_PLUGIN_TMREPORT "tmreport"
 #define HKU_PLUGIN_CLICKHOUSE_DRIVER "clickhousedriver"
 #define HKU_PLUGIN_HKU_EXTRA "hkuextra"
+#define HKU_PLUGIN_HKU_VIEWS "hkuviews"
 
-}
+}  // namespace hku

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -9,12 +9,15 @@
 #ifndef HIKYUU_PYTHON_BIND_UTILS_H
 #define HIKYUU_PYTHON_BIND_UTILS_H
 
+#include <hikyuu/config.h>
+#if HKU_ENABLE_ARROW
+#include <arrow/api.h>
+#endif
 #include <pybind11/pybind11.h>
 
 #include <pybind11/operators.h>
 #include <pybind11/stl.h>
 #include <pybind11/numpy.h>
-#include <arrow/api.h>
 #include <vector>
 #include <string>
 #include "convert_any.h"
@@ -107,8 +110,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");
@@ -124,12 +127,14 @@ inline bool check_pyfunction_arg_num(py::object& func, size_t arg_num) {
  */
 size_t utf8_to_utf32(const std::string& utf8_str, int32_t* out, size_t out_len) noexcept;
 
+#if HKU_ENABLE_ARROW
 /*
  * 将arrow::Table转换为 pyarrow::Table
  * @param table 待转换的arrow::Table
  * @return 转换后的py::object
  */
 py::object to_pyarrow_table(const std::shared_ptr<arrow::Table>& table);
+#endif
 
 }  // namespace hku
 

hikyuu/include/hikyuu/utilities/arithmetic.h

@@ -120,6 +120,11 @@ ValueT roundEx(ValueT number, int ndigits = 0) {
         return static_cast<ValueT>(std::ceil(number * factor - 0.5 - epsilon) / factor);
 }
 
+extern template double HKU_UTILS_API roundEx(double number, int ndigits);
+
+template <>
+float HKU_UTILS_API roundEx(float number, int ndigits);
+
 /**
  * 向上截取，如10.1截取后为11
  * @param number  待处理数据
@@ -194,6 +199,11 @@ ValueT roundDown(ValueT number, int ndigits = 0) {
     return number;
 }
 
+extern template double HKU_UTILS_API roundUp(double number, int ndigits);
+extern template float HKU_UTILS_API roundUp(float number, int ndigits);
+extern template double HKU_UTILS_API roundDown(double number, int ndigits);
+extern template float HKU_UTILS_API roundDown(float number, int ndigits);
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif

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 202509152355
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.8 master.bc12c104 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.8 master.f8b7e83d (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */