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

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

@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-05-19
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class HkuExtraPluginInterface : public PluginBase {
+public:
+    HkuExtraPluginInterface() = default;
+    virtual ~HkuExtraPluginInterface() = default;
+
+    virtual void registerKTypeExtra(const string& ktype, const string& basetype, int32_t minutes,
+                                    std::function<Datetime(const Datetime&)> getPhaseEnd) = 0;
+
+    virtual void releaseKExtra() = 0;
+
+    virtual bool isExtraKType(const string& ktype) = 0;
+
+    virtual std::vector<string> getExtraKTypeList() = 0;
+
+    virtual int32_t getKTypeExtraMinutes(const string& ktype) = 0;
+
+    virtual KRecordList getExtraKRecordList(const Stock& stk, const KQuery& query) = 0;
+
+    virtual size_t getStockExtraCount(const Stock& stk, const string& ktype) = 0;
+
+    virtual bool getStockExtraIndexRange(const Stock& stk, const KQuery& query, size_t& out_start,
+                                         size_t& out_end) = 0;
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/ImportKDataToHdf5PluginInterface.h

@@ -9,6 +9,8 @@
 
 #include "hikyuu/KRecord.h"
 #include "hikyuu/KQuery.h"
+#include "hikyuu/TimeLineRecord.h"
+#include "hikyuu/TransRecord.h"
 #include "hikyuu/utilities/plugin/PluginBase.h"
 
 namespace hku {
@@ -18,7 +20,8 @@ public:
     ImportKDataToHdf5PluginInterface() = default;
     virtual ~ImportKDataToHdf5PluginInterface() = default;
 
-    virtual bool setConfig(const string& datapath, const vector<string>& markets) = 0;
+    virtual bool setConfig(const string& datapath, const vector<string>& markets,
+                           const vector<string>& ktypes) = 0;
 
     virtual Datetime getLastDatetime(const string& market, const string& code,
                                      const KQuery::KType& ktype) = 0;
@@ -26,8 +29,17 @@ public:
     virtual void addKRecordList(const string& market, const string& code,
                                 const vector<KRecord>& krecords, const KQuery::KType& ktype) = 0;
 
+    virtual void addTimeLineList(const string& market, const string& code,
+                                 const TimeLineList& timeline) = 0;
+
+    virtual void addTransList(const string& market, const string& code,
+                              const TransRecordList& translist) = 0;
+
     virtual void updateIndex(const string& market, const string& code,
                              const KQuery::KType& ktype) = 0;
+
+    virtual void remove(const string& market, const string& code, const KQuery::KType& ktype,
+                        Datetime start) = 0;
 };
 
 }  // namespace hku

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

@@ -13,6 +13,8 @@
 #include "ImportKDataToHdf5PluginInterface.h"
 #include "ExtendIndicatorsPluginInterface.h"
 #include "TMReportPluginInterface.h"
+#include "DataDriverPluginInterface.h"
+#include "HkuExtraPluginInterface.h"
 
 namespace hku {
 
@@ -22,5 +24,7 @@ namespace hku {
 #define HKU_PLUGIN_IMPORTKDATATOHDF5 "import2hdf5"
 #define HKU_PLUGIN_EXTEND_INDICATOR "extind"
 #define HKU_PLUGIN_TMREPORT "tmreport"
+#define HKU_PLUGIN_CLICKHOUSE_DRIVER "clickhousedriver"
+#define HKU_PLUGIN_HKU_EXTRA "hkuextra"
 
 }

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -106,6 +106,15 @@ inline bool check_pyfunction_arg_num(py::object& func, size_t arg_num) {
     return len(params) == arg_num;
 }
 
+/*
+ * 将utf8编码的字符串转换为utf32编码
+ * @param utf8_str 待转换的字符串
+ * @param out 存储转换结果的数组(需自行预先分配内存)
+ * @param out_len out数组的长度
+ * @return 实际转码点数
+ */
+size_t utf8_to_utf32(const std::string& utf8_str, int32_t* out, size_t out_len) noexcept;
+
 }  // namespace hku
 
 #endif  // HIKYUU_PYTHON_BIND_UTILS_H

hikyuu/include/hikyuu/strategy/Strategy.h

@@ -267,14 +267,5 @@ void HKU_API runInStrategy(const PFPtr& pf, const KQuery& query, const OrderBrok
                            const TradeCostPtr& costfunc,
                            const std::vector<OrderBrokerPtr>& other_brokers = {});
 
-/**
- * 从 hikyuu 数据缓存服务器拉取更新最新的缓存数据
- * @param addr 缓存服务地址，如: tcp://192.168.1.1:9201
- * @param stklist 待更新的股票列表
- * @param ktype 指定更新的K线类型
- */
-void HKU_API getDataFromBufferServer(const std::string& addr, const StockList& stklist,
-                                     const KQuery::KType& ktype);
-
 /** @} */
 }  // namespace hku

hikyuu/include/hikyuu/trade_manage/TradeRecord.h

@@ -84,7 +84,7 @@ public:
     price_t stoploss;   ///< 止损价
     price_t cash;       ///< 现金余额
     SystemPart from;    ///< 辅助记录交易系统部件，区别是哪个部件发出的指示，Null<int>()表示无效
-    string remark;      ///< 备注
+    string remark;      ///< 备注(最大100编码字符)
 
 #if HKU_SUPPORT_SERIALIZATION
 private:

hikyuu/include/hikyuu/utilities/config.h

@@ -28,8 +28,6 @@
 #define HKU_USE_SPDLOG_ASYNC_LOGGER 0
 #define HKU_LOG_ACTIVE_LEVEL 2
 
-#define HKU_ENABLE_MO 0
-
 #define HKU_ENABLE_HTTP_CLIENT 1
 #define HKU_ENABLE_HTTP_CLIENT_SSL 0
 #define HKU_ENABLE_HTTP_CLIENT_ZIP 0

hikyuu/include/hikyuu/utilities/os.h

@@ -79,6 +79,12 @@ std::string HKU_UTILS_API getUserDir();
  */
 std::string HKU_UTILS_API getCurrentDir();
 
+/**
+ * 获取dll自身所在目录
+ * @note 仅支持linux/macos。windows下获取的是exe所在路径！
+ */
+std::string HKU_UTILS_API getDllSelfDir();
+
 /**
  * 输出终端是否支持彩色控制字符
  */
@@ -99,4 +105,7 @@ std::string HKU_UTILS_API getPlatform();
 /** 获取当前CPU架构名称 */
 std::string HKU_UTILS_API getCpuArch();
 
+/** 获取当前系统语言名称(全部小写返回) */
+std::string HKU_UTILS_API getSystemLanguage();
+
 }  // namespace hku

hikyuu/include/hikyuu/utilities/plugin/PluginLoader.h

@@ -46,7 +46,8 @@ public:
 
     bool load(const std::string& pluginname) noexcept {
         std::string filename = getFileName(pluginname);
-        HKU_WARN_IF_RETURN(!existFile(filename), false, "file({}) not exist!", filename);
+        // HKU_WARN_IF_RETURN(!existFile(filename), false, "file({}) not exist!", filename);
+        HKU_DEBUG_IF_RETURN(!existFile(filename), false, "file({}) not exist!", filename);
 
 #if HKU_OS_WINDOWS
         m_handle = LoadLibrary(HKU_PATH(filename).c_str());

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.5"
+#define HKU_VERSION "2.6.7"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 5
-#define HKU_VERSION_BUILD 202507031531
+#define HKU_VERSION_ALTER 7
+#define HKU_VERSION_BUILD 202508150017
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.5 release.113bf7ee (RELEASE)"
+#define HKU_VERSION_GIT "2.6.7 release.95439630 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */

hikyuu/include/hikyuu/view/MarketView.h

@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-08-13
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/Stock.h"
+
+namespace hku {
+
+/**
+ * 实时行情记录(用于显示打印)
+ * @ingroup View
+ */
+struct HKU_API MarketViewRecord {
+    Stock stock;                                      ///< 证券
+    Datetime date;                                    ///< 日期
+    price_t open{Null<price_t>()};                    ///< 开盘价
+    price_t high{Null<price_t>()};                    ///< 最高价
+    price_t low{Null<price_t>()};                     ///< 最低价
+    price_t close{Null<price_t>()};                   ///< 收盘价
+    price_t amount{Null<price_t>()};                  ///< 成交额
+    price_t volume{Null<price_t>()};                  ///< 成交量
+    price_t yesterday_close{Null<price_t>()};         ///< 昨收价
+    price_t turnover{Null<price_t>()};                ///< 换手率(%)
+    price_t amplitude{Null<price_t>()};               ///< 振幅(%)
+    price_t price_change{Null<price_t>()};            ///< 涨跌幅(%)
+    price_t total_market_cap{Null<price_t>()};        ///< 总市值
+    price_t circulating_market_cap{Null<price_t>()};  ///< 流通市值
+    price_t pe{Null<price_t>()};                      ///< 动态市盈率
+    price_t pb{Null<price_t>()};                      ///< 市净率
+};
+
+using MarketView = vector<MarketViewRecord>;
+
+/**
+ * 获取指定股票集合在指定交易日的行情数据，不包含当日停牌无数据的股票
+ * @ingroup View
+ * @param stks 股票列表
+ * @param date 交易日
+ * @param market 市场代码（用于获取交易日历）
+ * @return MarketView
+ */
+MarketView HKU_API getMarketView(const StockList& stks, const Datetime& date,
+                                 const string& market = "SH");
+
+/**
+ * 获取指定股票集合在最后交易日的行情数据，不包含当日停牌无数据的股票。如自动接收行情数据，则为实时行情数据
+ * @ingroup View
+ * @param stks 股票列表
+ * @param market 市场代码（用于获取交易日历）
+ * @return MarketView
+ */
+MarketView HKU_API getMarketView(const StockList& stks, const string& market = "SH");
+
+}  // namespace hku

hikyuu/indicator/__init__.py

@@ -26,4 +26,3 @@
 
 from .indicator import *
 from .pyind import *
-from .talib_wrap import *

hikyuu/indicator/indicator.py

@@ -29,50 +29,9 @@ from hikyuu import Datetime
 import pandas as pd
 
 
-def indicator_iter(indicator):
-    for i in range(len(indicator)):
-        yield indicator[i]
-
-
-def indicator_getitem(data, i):
-    """
-    :param i: int | Datetime | slice | str 类型
-    """
-    if isinstance(i, int):
-        length = len(data)
-        index = length + i if i < 0 else i
-        if index < 0 or index >= length:
-            raise IndexError("index out of range: %d" % i)
-        return data.get(index)
-
-    elif isinstance(i, slice):
-        return [data.get(x) for x in range(*i.indices(len(data)))]
-
-    elif isinstance(i, Datetime):
-        return data.get_by_datetime(i)
-
-    elif isinstance(i, str):
-        return data.get_by_datetime(Datetime(i))
-
-    else:
-        raise IndexError("Error index type")
-
-
-Indicator.__getitem__ = indicator_getitem
-Indicator.__iter__ = indicator_iter
-
-
 def indicator_to_df(indicator):
     """转化为pandas.DataFrame"""
-    if indicator.get_result_num() == 1:
-        return pd.DataFrame(indicator.to_np(), columns=[indicator.name])
-    data = {}
-    name = indicator.name
-    columns = []
-    for i in range(indicator.get_result_num()):
-        data[name + str(i)] = indicator.get_result(i)
-        columns.append(name + str(i + 1))
-    return pd.DataFrame(data, columns=columns)
+    return pd.DataFrame.from_records(indicator.to_np())
 
 
 Indicator.to_df = indicator_to_df
@@ -107,17 +66,19 @@ def concat_to_df(dates, ind_list, head_stock_code=True, head_ind_name=False):
         198	2024-03-06 00:00:00	10.070455	9.776818
         199	2024-03-07 00:00:00	10.101364	9.738182
     """
-    df = pd.DataFrame(dates, columns=['date'])
-    for ind in ind_list:
-        x = ALIGN(ind, dates)
+    df = dates.to_df('ms')
+    if not ind_list:
+        return df
+    for i in range(len(ind_list)):
+        ind = ind_list[i]
         if head_ind_name and head_stock_code:
-            x.name = f"{ind.name}/{ind.get_context().get_stock().market_code}"
+            name = f"{ind.name}/{ind.get_context().get_stock().market_code}"
         elif head_ind_name:
-            x.name = ind.name
+            name = f'{ind.name}{i}'
         else:
-            x.name = ind.get_context().get_stock().market_code
-        df = pd.concat([df, x.to_df()], axis=1)
-    df.set_index('date')
+            name = ind.get_context().get_stock().market_code
+        df = pd.merge(df, ind.to_df()[['datetime', 'value1']].rename(
+            columns={'value1': name}), on='datetime', how='left')
     return df
 
 
@@ -137,10 +98,10 @@ def df_to_ind(df, col_name, col_date=None):
     :return: Indicator
     """
     if col_date is not None:
-        dates = df[col_date].to_list()
+        dates = df[col_date]
         dates = DatetimeList([Datetime(x) for x in dates])
-        return PRICELIST(df[col_name].to_list(), align_dates=dates)
-    return PRICELIST(df[col_name].to_list())
+        return PRICELIST(df[col_name], align_dates=dates)
+    return PRICELIST(df[col_name])
 
 
 # 避免 python 中公式原型必须加括号

hikyuu/test/test_init.py

@@ -7,6 +7,8 @@
 # 历史：1）20130128, Added by fasiondog
 #===============================================================================
 from hikyuu import *
+from configparser import ConfigParser
+from functools import lru_cache
 
 import os
 #curdir = os.path.dirname(os.path.realpath(__file__))
@@ -34,3 +36,60 @@ hikyuu_init(config_file)
 sm = StockManager.instance()
 #endtime = time.time()
 #print "%.2fs" % (endtime-starttime)
+
+# 仅在模块加载时读取一次配置
+_config = ConfigParser()
+_config.read(config_file)
+_tdx_dir = _config.get('tdx', 'dir', fallback='/mnt/tdx')
+
+
+@lru_cache(maxsize=None)
+def get_real_tdx_filepath(code, market='sh'):
+    """
+    获取真实的通达信.day文件路径。
+    
+    该函数按以下顺序确定文件路径:
+    1. 检查环境变量 `HKU_real_tdx_file_path` 是否被设置。
+    2. 如果未设置, 则检查配置文件中 "tdx"->"dir" 指定的路径。
+    3. 如果未配置, 则使用 /mnt/tdx/vipdoc/。
+    4. 如果上述路径不存在, 则检查 test_data/vipdoc/ 是否存在, 如果存在, 则使用该路径。
+    5. 如果上述路径都不存在, 则自动回退到在项目根目录下的 `test_data` 文件夹中寻找同名文件作为备用。
+    
+    这使得测试既能适应有权访问生产数据环境的开发者, 也能让其他贡献者使用
+    项目内提供的样本数据来运行测试, 避免了因路径问题导致的测试挂起或失败。
+    
+    :param str code: 股票代码 (如 '600000', '000001')
+    :param str market: 市场简称 (如 'sh', 'sz')
+    :return: 最终确定的文件路径 (可能不存在, 由调用方处理)
+    """
+    # 检查环境变量
+    env_path = os.environ.get('HKU_real_tdx_file_path')
+    if env_path and os.path.exists(env_path):
+        print(f"get_real_tdx_filepath return: {env_path}")
+        return env_path
+
+    market_subdir = f"{market.lower()}/lday"
+    filename = f"{market.lower()}{code}.day"
+
+    # 检查配置文件指定的路径
+    base_path = os.path.join(_tdx_dir, 'vipdoc')
+    if os.path.exists(base_path):
+        primary_path = os.path.join(base_path, market_subdir, filename)
+        if os.path.exists(primary_path):
+            print(f"get_real_tdx_filepath return: {primary_path}")
+            return primary_path
+
+    # 检查 test_data/vipdoc/
+    project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+    test_data_vipdoc_path = os.path.join(project_root, 'test_data', 'vipdoc')
+    if os.path.exists(test_data_vipdoc_path):
+        primary_path = os.path.join(test_data_vipdoc_path, market_subdir, filename)
+        if os.path.exists(primary_path):
+            print(f"get_real_tdx_filepath return: {primary_path}")
+            return primary_path
+
+    # 如果主路径文件不存在, 则尝试从 test_data 目录寻找同名文件作为备用
+    test_data_dir = os.path.join(project_root, 'test_data')
+    fallback_path = os.path.join(test_data_dir, filename)
+    print(f"get_real_tdx_filepath return: {fallback_path}")
+    return fallback_path