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

hikyuu/include/hikyuu/global/SpotRecord.h

@@ -16,37 +16,21 @@ namespace hku {
  * @ingroup Agent
  */
 struct HKU_API SpotRecord {
-    string market;            ///< 市场标识
-    string code;              ///< 证券代码
-    string name;              ///< 证券名称
-    Datetime datetime;        ///< 数据时间
-    price_t yesterday_close;  ///< 昨日收盘价
-    price_t open;             ///< 开盘价
-    price_t high;             ///< 最高价
-    price_t low;              ///< 最低价
-    price_t close;            ///< 收盘价
-    price_t amount;           ///< 成交金额 （千元）
-    price_t volume;           ///< 成交量（手）
-    price_t bid1;             ///< 买一价
-    price_t bid1_amount;      ///< 买一数量（手）
-    price_t bid2;             ///< 买二价
-    price_t bid2_amount;      ///< 买二数量
-    price_t bid3;             ///< 买三价
-    price_t bid3_amount;      ///< 买三数量
-    price_t bid4;             ///< 买四价
-    price_t bid4_amount;      ///< 买四数量
-    price_t bid5;             ///< 买五价
-    price_t bid5_amount;      ///< 买五数量
-    price_t ask1;             ///< 卖一价
-    price_t ask1_amount;      ///< 卖一数量
-    price_t ask2;             ///< 卖二价
-    price_t ask2_amount;      ///< 卖二数量
-    price_t ask3;             ///< 卖三价
-    price_t ask3_amount;      ///< 卖三数量
-    price_t ask4;             ///< 卖四价
-    price_t ask4_amount;      ///< 卖四数量
-    price_t ask5;             ///< 卖五价
-    price_t ask5_amount;      ///< 卖五数量
+    string market;              ///< 市场标识
+    string code;                ///< 证券代码
+    string name;                ///< 证券名称
+    Datetime datetime;          ///< 数据时间
+    price_t yesterday_close;    ///< 昨日收盘价
+    price_t open;               ///< 开盘价
+    price_t high;               ///< 最高价
+    price_t low;                ///< 最低价
+    price_t close;              ///< 收盘价
+    price_t amount;             ///< 成交金额 （千元）
+    price_t volume;             ///< 成交量（手）
+    vector<double> bid;         ///< 委买价
+    vector<double> bid_amount;  ///< 委买量
+    vector<double> ask;         ///< 委卖价
+    vector<double> ask_amount;  ///< 委卖量
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/global/agent/spot_generated.h

@@ -36,26 +36,10 @@ struct Spot FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_CLOSE = 20,
     VT_AMOUNT = 22,
     VT_VOLUME = 24,
-    VT_BID1 = 26,
-    VT_BID1_AMOUNT = 28,
-    VT_BID2 = 30,
-    VT_BID2_AMOUNT = 32,
-    VT_BID3 = 34,
-    VT_BID3_AMOUNT = 36,
-    VT_BID4 = 38,
-    VT_BID4_AMOUNT = 40,
-    VT_BID5 = 42,
-    VT_BID5_AMOUNT = 44,
-    VT_ASK1 = 46,
-    VT_ASK1_AMOUNT = 48,
-    VT_ASK2 = 50,
-    VT_ASK2_AMOUNT = 52,
-    VT_ASK3 = 54,
-    VT_ASK3_AMOUNT = 56,
-    VT_ASK4 = 58,
-    VT_ASK4_AMOUNT = 60,
-    VT_ASK5 = 62,
-    VT_ASK5_AMOUNT = 64
+    VT_BID = 26,
+    VT_BID_AMOUNT = 28,
+    VT_ASK = 30,
+    VT_ASK_AMOUNT = 32
   };
   const ::flatbuffers::String *market() const {
     return GetPointer<const ::flatbuffers::String *>(VT_MARKET);
@@ -90,65 +74,17 @@ struct Spot FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   double volume() const {
     return GetField<double>(VT_VOLUME, 0.0);
   }
-  double bid1() const {
-    return GetField<double>(VT_BID1, 0.0);
+  const ::flatbuffers::Vector<double> *bid() const {
+    return GetPointer<const ::flatbuffers::Vector<double> *>(VT_BID);
   }
-  double bid1_amount() const {
-    return GetField<double>(VT_BID1_AMOUNT, 0.0);
+  const ::flatbuffers::Vector<double> *bid_amount() const {
+    return GetPointer<const ::flatbuffers::Vector<double> *>(VT_BID_AMOUNT);
   }
-  double bid2() const {
-    return GetField<double>(VT_BID2, 0.0);
+  const ::flatbuffers::Vector<double> *ask() const {
+    return GetPointer<const ::flatbuffers::Vector<double> *>(VT_ASK);
   }
-  double bid2_amount() const {
-    return GetField<double>(VT_BID2_AMOUNT, 0.0);
-  }
-  double bid3() const {
-    return GetField<double>(VT_BID3, 0.0);
-  }
-  double bid3_amount() const {
-    return GetField<double>(VT_BID3_AMOUNT, 0.0);
-  }
-  double bid4() const {
-    return GetField<double>(VT_BID4, 0.0);
-  }
-  double bid4_amount() const {
-    return GetField<double>(VT_BID4_AMOUNT, 0.0);
-  }
-  double bid5() const {
-    return GetField<double>(VT_BID5, 0.0);
-  }
-  double bid5_amount() const {
-    return GetField<double>(VT_BID5_AMOUNT, 0.0);
-  }
-  double ask1() const {
-    return GetField<double>(VT_ASK1, 0.0);
-  }
-  double ask1_amount() const {
-    return GetField<double>(VT_ASK1_AMOUNT, 0.0);
-  }
-  double ask2() const {
-    return GetField<double>(VT_ASK2, 0.0);
-  }
-  double ask2_amount() const {
-    return GetField<double>(VT_ASK2_AMOUNT, 0.0);
-  }
-  double ask3() const {
-    return GetField<double>(VT_ASK3, 0.0);
-  }
-  double ask3_amount() const {
-    return GetField<double>(VT_ASK3_AMOUNT, 0.0);
-  }
-  double ask4() const {
-    return GetField<double>(VT_ASK4, 0.0);
-  }
-  double ask4_amount() const {
-    return GetField<double>(VT_ASK4_AMOUNT, 0.0);
-  }
-  double ask5() const {
-    return GetField<double>(VT_ASK5, 0.0);
-  }
-  double ask5_amount() const {
-    return GetField<double>(VT_ASK5_AMOUNT, 0.0);
+  const ::flatbuffers::Vector<double> *ask_amount() const {
+    return GetPointer<const ::flatbuffers::Vector<double> *>(VT_ASK_AMOUNT);
   }
   bool Verify(::flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
@@ -167,26 +103,14 @@ struct Spot FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
            VerifyField<double>(verifier, VT_CLOSE, 8) &&
            VerifyField<double>(verifier, VT_AMOUNT, 8) &&
            VerifyField<double>(verifier, VT_VOLUME, 8) &&
-           VerifyField<double>(verifier, VT_BID1, 8) &&
-           VerifyField<double>(verifier, VT_BID1_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_BID2, 8) &&
-           VerifyField<double>(verifier, VT_BID2_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_BID3, 8) &&
-           VerifyField<double>(verifier, VT_BID3_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_BID4, 8) &&
-           VerifyField<double>(verifier, VT_BID4_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_BID5, 8) &&
-           VerifyField<double>(verifier, VT_BID5_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_ASK1, 8) &&
-           VerifyField<double>(verifier, VT_ASK1_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_ASK2, 8) &&
-           VerifyField<double>(verifier, VT_ASK2_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_ASK3, 8) &&
-           VerifyField<double>(verifier, VT_ASK3_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_ASK4, 8) &&
-           VerifyField<double>(verifier, VT_ASK4_AMOUNT, 8) &&
-           VerifyField<double>(verifier, VT_ASK5, 8) &&
-           VerifyField<double>(verifier, VT_ASK5_AMOUNT, 8) &&
+           VerifyOffset(verifier, VT_BID) &&
+           verifier.VerifyVector(bid()) &&
+           VerifyOffset(verifier, VT_BID_AMOUNT) &&
+           verifier.VerifyVector(bid_amount()) &&
+           VerifyOffset(verifier, VT_ASK) &&
+           verifier.VerifyVector(ask()) &&
+           VerifyOffset(verifier, VT_ASK_AMOUNT) &&
+           verifier.VerifyVector(ask_amount()) &&
            verifier.EndTable();
   }
 };
@@ -228,65 +152,17 @@ struct SpotBuilder {
   void add_volume(double volume) {
     fbb_.AddElement<double>(Spot::VT_VOLUME, volume, 0.0);
   }
-  void add_bid1(double bid1) {
-    fbb_.AddElement<double>(Spot::VT_BID1, bid1, 0.0);
-  }
-  void add_bid1_amount(double bid1_amount) {
-    fbb_.AddElement<double>(Spot::VT_BID1_AMOUNT, bid1_amount, 0.0);
-  }
-  void add_bid2(double bid2) {
-    fbb_.AddElement<double>(Spot::VT_BID2, bid2, 0.0);
-  }
-  void add_bid2_amount(double bid2_amount) {
-    fbb_.AddElement<double>(Spot::VT_BID2_AMOUNT, bid2_amount, 0.0);
-  }
-  void add_bid3(double bid3) {
-    fbb_.AddElement<double>(Spot::VT_BID3, bid3, 0.0);
-  }
-  void add_bid3_amount(double bid3_amount) {
-    fbb_.AddElement<double>(Spot::VT_BID3_AMOUNT, bid3_amount, 0.0);
-  }
-  void add_bid4(double bid4) {
-    fbb_.AddElement<double>(Spot::VT_BID4, bid4, 0.0);
-  }
-  void add_bid4_amount(double bid4_amount) {
-    fbb_.AddElement<double>(Spot::VT_BID4_AMOUNT, bid4_amount, 0.0);
-  }
-  void add_bid5(double bid5) {
-    fbb_.AddElement<double>(Spot::VT_BID5, bid5, 0.0);
-  }
-  void add_bid5_amount(double bid5_amount) {
-    fbb_.AddElement<double>(Spot::VT_BID5_AMOUNT, bid5_amount, 0.0);
-  }
-  void add_ask1(double ask1) {
-    fbb_.AddElement<double>(Spot::VT_ASK1, ask1, 0.0);
-  }
-  void add_ask1_amount(double ask1_amount) {
-    fbb_.AddElement<double>(Spot::VT_ASK1_AMOUNT, ask1_amount, 0.0);
-  }
-  void add_ask2(double ask2) {
-    fbb_.AddElement<double>(Spot::VT_ASK2, ask2, 0.0);
-  }
-  void add_ask2_amount(double ask2_amount) {
-    fbb_.AddElement<double>(Spot::VT_ASK2_AMOUNT, ask2_amount, 0.0);
-  }
-  void add_ask3(double ask3) {
-    fbb_.AddElement<double>(Spot::VT_ASK3, ask3, 0.0);
-  }
-  void add_ask3_amount(double ask3_amount) {
-    fbb_.AddElement<double>(Spot::VT_ASK3_AMOUNT, ask3_amount, 0.0);
-  }
-  void add_ask4(double ask4) {
-    fbb_.AddElement<double>(Spot::VT_ASK4, ask4, 0.0);
+  void add_bid(::flatbuffers::Offset<::flatbuffers::Vector<double>> bid) {
+    fbb_.AddOffset(Spot::VT_BID, bid);
   }
-  void add_ask4_amount(double ask4_amount) {
-    fbb_.AddElement<double>(Spot::VT_ASK4_AMOUNT, ask4_amount, 0.0);
+  void add_bid_amount(::flatbuffers::Offset<::flatbuffers::Vector<double>> bid_amount) {
+    fbb_.AddOffset(Spot::VT_BID_AMOUNT, bid_amount);
   }
-  void add_ask5(double ask5) {
-    fbb_.AddElement<double>(Spot::VT_ASK5, ask5, 0.0);
+  void add_ask(::flatbuffers::Offset<::flatbuffers::Vector<double>> ask) {
+    fbb_.AddOffset(Spot::VT_ASK, ask);
   }
-  void add_ask5_amount(double ask5_amount) {
-    fbb_.AddElement<double>(Spot::VT_ASK5_AMOUNT, ask5_amount, 0.0);
+  void add_ask_amount(::flatbuffers::Offset<::flatbuffers::Vector<double>> ask_amount) {
+    fbb_.AddOffset(Spot::VT_ASK_AMOUNT, ask_amount);
   }
   explicit SpotBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
@@ -312,47 +188,11 @@ inline ::flatbuffers::Offset<Spot> CreateSpot(
     double close = 0.0,
     double amount = 0.0,
     double volume = 0.0,
-    double bid1 = 0.0,
-    double bid1_amount = 0.0,
-    double bid2 = 0.0,
-    double bid2_amount = 0.0,
-    double bid3 = 0.0,
-    double bid3_amount = 0.0,
-    double bid4 = 0.0,
-    double bid4_amount = 0.0,
-    double bid5 = 0.0,
-    double bid5_amount = 0.0,
-    double ask1 = 0.0,
-    double ask1_amount = 0.0,
-    double ask2 = 0.0,
-    double ask2_amount = 0.0,
-    double ask3 = 0.0,
-    double ask3_amount = 0.0,
-    double ask4 = 0.0,
-    double ask4_amount = 0.0,
-    double ask5 = 0.0,
-    double ask5_amount = 0.0) {
+    ::flatbuffers::Offset<::flatbuffers::Vector<double>> bid = 0,
+    ::flatbuffers::Offset<::flatbuffers::Vector<double>> bid_amount = 0,
+    ::flatbuffers::Offset<::flatbuffers::Vector<double>> ask = 0,
+    ::flatbuffers::Offset<::flatbuffers::Vector<double>> ask_amount = 0) {
   SpotBuilder builder_(_fbb);
-  builder_.add_ask5_amount(ask5_amount);
-  builder_.add_ask5(ask5);
-  builder_.add_ask4_amount(ask4_amount);
-  builder_.add_ask4(ask4);
-  builder_.add_ask3_amount(ask3_amount);
-  builder_.add_ask3(ask3);
-  builder_.add_ask2_amount(ask2_amount);
-  builder_.add_ask2(ask2);
-  builder_.add_ask1_amount(ask1_amount);
-  builder_.add_ask1(ask1);
-  builder_.add_bid5_amount(bid5_amount);
-  builder_.add_bid5(bid5);
-  builder_.add_bid4_amount(bid4_amount);
-  builder_.add_bid4(bid4);
-  builder_.add_bid3_amount(bid3_amount);
-  builder_.add_bid3(bid3);
-  builder_.add_bid2_amount(bid2_amount);
-  builder_.add_bid2(bid2);
-  builder_.add_bid1_amount(bid1_amount);
-  builder_.add_bid1(bid1);
   builder_.add_volume(volume);
   builder_.add_amount(amount);
   builder_.add_close(close);
@@ -360,6 +200,10 @@ inline ::flatbuffers::Offset<Spot> CreateSpot(
   builder_.add_high(high);
   builder_.add_open(open);
   builder_.add_yesterday_close(yesterday_close);
+  builder_.add_ask_amount(ask_amount);
+  builder_.add_ask(ask);
+  builder_.add_bid_amount(bid_amount);
+  builder_.add_bid(bid);
   builder_.add_datetime(datetime);
   builder_.add_name(name);
   builder_.add_code(code);
@@ -380,30 +224,18 @@ inline ::flatbuffers::Offset<Spot> CreateSpotDirect(
     double close = 0.0,
     double amount = 0.0,
     double volume = 0.0,
-    double bid1 = 0.0,
-    double bid1_amount = 0.0,
-    double bid2 = 0.0,
-    double bid2_amount = 0.0,
-    double bid3 = 0.0,
-    double bid3_amount = 0.0,
-    double bid4 = 0.0,
-    double bid4_amount = 0.0,
-    double bid5 = 0.0,
-    double bid5_amount = 0.0,
-    double ask1 = 0.0,
-    double ask1_amount = 0.0,
-    double ask2 = 0.0,
-    double ask2_amount = 0.0,
-    double ask3 = 0.0,
-    double ask3_amount = 0.0,
-    double ask4 = 0.0,
-    double ask4_amount = 0.0,
-    double ask5 = 0.0,
-    double ask5_amount = 0.0) {
+    const std::vector<double> *bid = nullptr,
+    const std::vector<double> *bid_amount = nullptr,
+    const std::vector<double> *ask = nullptr,
+    const std::vector<double> *ask_amount = nullptr) {
   auto market__ = market ? _fbb.CreateString(market) : 0;
   auto code__ = code ? _fbb.CreateString(code) : 0;
   auto name__ = name ? _fbb.CreateString(name) : 0;
   auto datetime__ = datetime ? _fbb.CreateString(datetime) : 0;
+  auto bid__ = bid ? _fbb.CreateVector<double>(*bid) : 0;
+  auto bid_amount__ = bid_amount ? _fbb.CreateVector<double>(*bid_amount) : 0;
+  auto ask__ = ask ? _fbb.CreateVector<double>(*ask) : 0;
+  auto ask_amount__ = ask_amount ? _fbb.CreateVector<double>(*ask_amount) : 0;
   return hikyuu::flat::CreateSpot(
       _fbb,
       market__,
@@ -417,26 +249,10 @@ inline ::flatbuffers::Offset<Spot> CreateSpotDirect(
       close,
       amount,
       volume,
-      bid1,
-      bid1_amount,
-      bid2,
-      bid2_amount,
-      bid3,
-      bid3_amount,
-      bid4,
-      bid4_amount,
-      bid5,
-      bid5_amount,
-      ask1,
-      ask1_amount,
-      ask2,
-      ask2_amount,
-      ask3,
-      ask3_amount,
-      ask4,
-      ask4_amount,
-      ask5,
-      ask5_amount);
+      bid__,
+      bid_amount__,
+      ask__,
+      ask_amount__);
 }
 
 struct SpotList FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {

hikyuu/include/hikyuu/global/schedule/scheduler.h

@@ -14,7 +14,7 @@ namespace hku {
 /**
  * 获取全局调度实例指针
  */
-TimerManager *getScheduler();
+HKU_API TimerManager* getScheduler();
 
 /**
  * 用于程序退出时释放全局调度实例，仅内部使用

hikyuu/include/hikyuu/indicator/Indicator.h

@@ -205,6 +205,43 @@ public:
 
     string str() const;
 
+public:
+    class Iterator {
+    private:
+        const Indicator& container;
+        size_t index;
+
+    public:
+        Iterator(const Indicator& cont, size_t idx) : container(cont), index(idx) {}
+
+        Iterator& operator++() {
+            index++;
+            return *this;
+        }
+
+        value_t operator*() const {
+            return container.get(index);
+        }
+
+        bool operator!=(const Iterator& other) const {
+            return index != other.index;
+        }
+
+        bool operator==(const Iterator& other) const {
+            return index == other.index;
+        }
+    };
+
+    Iterator begin() const {
+        return Iterator(*this, 0);
+    }
+
+    Iterator end() const {
+        return Iterator(*this, size());
+    }
+
+    typedef Iterator iterator;
+
 protected:
     IndicatorImpPtr m_imp;
 

hikyuu/include/hikyuu/lang.h

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-08-09
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include <string>
+
+#ifndef HKU_API
+#define HKU_API
+#endif
+
+namespace hku {
+
+// 注意仅在 hikyuu 相关项目内部使用，避免对项目造成污染
+
+void loadLocalLanguage(const std::string &path = "i8n");
+
+std::string HKU_API htr(const char *id);
+
+// 按上下文获取翻译
+std::string HKU_API hctr(const char *ctx, const char *id);
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/KDataToHdf5Importer.h

@@ -17,15 +17,23 @@ public:
     KDataToHdf5Importer();
     virtual ~KDataToHdf5Importer();
 
-    bool setConfig(const string& datapath, const vector<string>& markets = {"SH", "SZ", "BJ"});
+    bool setConfig(const string& datapath, const vector<string>& markets = {"SH", "SZ", "BJ"},
+                   const vector<string>& ktypes = {"DAY", "MIN", "MIN5", "TIMELINE", "TRANSDATA"});
 
     Datetime getLastDatetime(const string& market, const string& code, const KQuery::KType& ktype);
 
     void addKRecordList(const string& market, const string& code, const vector<KRecord>& krecords,
                         const KQuery::KType& ktype);
 
+    void addTimeLineList(const string& market, const string& code, const TimeLineList& timeline);
+
+    void addTransList(const string& market, const string& code, const TransRecordList& translist);
+
     void updateIndex(const string& market, const string& code, const KQuery::KType& ktype);
 
+    void remove(const string& market, const string& code, const KQuery::KType& ktype,
+                Datetime start);
+
 private:
     ImportKDataToHdf5PluginInterface* m_plugin{nullptr};
 };

hikyuu/include/hikyuu/plugin/dataserver.h

@@ -8,11 +8,36 @@
 #pragma once
 
 #include "hikyuu/DataType.h"
+#include "hikyuu/Stock.h"
+#include "hikyuu/global/SpotRecord.h"
 
 namespace hku {
 
-void HKU_API startDataServer(const std::string& addr = "tcp://0.0.0.0:9201", size_t work_num = 2);
+void HKU_API startDataServer(const std::string& addr = "tcp://0.0.0.0:9201", size_t work_num = 2,
+                             bool save_tick = false, bool buf_tick = false);
 
 void HKU_API stopDataServer();
 
+/**
+ * 从 dataserver 数据缓存服务器拉取更新最新的缓存数据
+ * @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);
+
+/**
+ * @brief 从 dataserver 获取指定证券大于等于指定日期的缓存 spot 数据
+ * @param addr 缓存服务地址，如: tcp://192.168.1.1:9201
+ * @param market 市场代码
+ * @param code 证券代码
+ * @param datetime 查询时间
+ * @return vector<SpotRecord>
+ */
+vector<SpotRecord> HKU_API getSpotFromBufferServer(const std::string& addr,
+                                                   const std::string& market,
+                                                   const std::string& code,
+                                                   const Datetime& datetime);
+
 }  // namespace hku

hikyuu/include/hikyuu/plugin/device.h

@@ -14,8 +14,9 @@ namespace hku {
 /**
  * @brief 激活设备
  * @param active_code 授权码
+ * @param replace 超过设备限制时，强制替换最早激活的设备
  */
-void HKU_API activeDevice(const std::string& active_code);
+void HKU_API activeDevice(const std::string& active_code, bool replace = false);
 
 /** 查看授权信息 */
 std::string HKU_API viewLicense();

hikyuu/include/hikyuu/plugin/hkuextra.h

@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-08-06
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/Stock.h"
+
+namespace hku {
+
+/**
+ * @brief 注册扩展 K 线类型, 按时间合成
+ * @param ktype 扩展 K 线类型
+ * @param basetype 对应的基础 K 线类型
+ * @param minutes 每根K线所包含的分钟数
+ * @param getPhaseEnd 获取K线所属的阶段结束时间
+ */
+void HKU_API registerExtraKType(const string& ktype, const string& basetype, int32_t minutes,
+                                std::function<Datetime(const Datetime&)> getPhaseEnd);
+
+/**
+ * 注册K线扩展类型，按 bar 数量合成
+ * @param ktype 扩展 K 线类型
+ * @param basetype 对应的基础 K 线类型
+ * @param nbars 每根K线所包含的基础K线数
+ */
+void HKU_API registerExtraKType(const string& ktype, const string& basetype, int32_t nbars);
+
+/**
+ * 释放扩展K线
+ * @note 某些情况下，注册扩展K线时，使用了 python 定义的周期结束日期转换函数，退出时可能引起 python
+ * GIL 报错，需手工提前释放扩展K线
+ */
+void HKU_API releaseExtraKType();
+
+//-------------------------------
+// 以下函数为内部使用，无需引出
+//-------------------------------
+
+bool isExtraKType(const string& ktype);
+
+int32_t getKTypeExtraMinutes(const string& ktype);
+
+std::vector<string> getExtraKTypeList();
+
+KRecordList getExtraKRecordList(const Stock& stk, const KQuery& query);
+
+size_t getStockExtraCount(const Stock& stk, const string& ktype);
+
+bool getStockExtraIndexRange(const Stock& stk, const KQuery& query, size_t& out_start,
+                             size_t& out_end);
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/DataDriverPluginInterface.h

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-07-01
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/data_driver/KDataDriver.h"
+#include "hikyuu/data_driver/BlockInfoDriver.h"
+#include "hikyuu/data_driver/BaseInfoDriver.h"
+#include "hikyuu/utilities/plugin/PluginBase.h"
+
+namespace hku {
+
+class DataDriverPluginInterface : public PluginBase {
+public:
+    DataDriverPluginInterface() = default;
+    virtual ~DataDriverPluginInterface() = default;
+
+    virtual KDataDriverPtr getKDataDriver() = 0;
+    virtual BlockInfoDriverPtr getBlockInfoDriver() = 0;
+    virtual BaseInfoDriverPtr getBaseInfoDriver() = 0;
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/plugin/interface/DataServerPluginInterface.h

@@ -16,7 +16,8 @@ public:
     DataServerPluginInterface() = default;
     virtual ~DataServerPluginInterface() = default;
 
-    virtual void start(const std::string& addr, size_t work_num) noexcept = 0;
+    virtual void start(const std::string& addr, size_t work_num, bool save_tick,
+                       bool buf_tick) noexcept = 0;
     virtual void stop() noexcept = 0;
 };
 

hikyuu/include/hikyuu/plugin/interface/DevicePluginInterface.h

@@ -16,7 +16,7 @@ public:
     DevicePluginInterface() = default;
     virtual ~DevicePluginInterface() = default;
 
-    virtual void activate(const std::string& active_code) noexcept = 0;
+    virtual void activate(const std::string& active_code, bool replace) noexcept = 0;
     virtual std::string viewLicense() noexcept = 0;
     virtual void removeLicense() noexcept = 0;
     virtual std::string fetchTrialLicense(const std::string& email) noexcept = 0;