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

hikyuu/include/hikyuu/utilities/thread/MQThreadPool.h

@@ -54,7 +54,7 @@ public:
     explicit MQThreadPool(size_t n, bool until_empty = true)
     : m_done(false), m_worker_num(n), m_runnging_until_empty(until_empty) {
         try {
-            m_interrupt_flags.resize(m_worker_num, nullptr);
+            m_thread_need_stop.resize(m_worker_num);
             for (int i = 0; i < m_worker_num; i++) {
                 // 创建工作线程及其任务队列
                 m_queues.push_back(
@@ -105,7 +105,7 @@ public:
     /** 向线程池提交任务 */
     template <typename FunctionType>
     auto submit(FunctionType f) {
-        if (m_thread_need_stop.isSet() || m_done) {
+        if (m_done) {
             throw std::logic_error("You can't submit a task to the stopped MQThreadPool!");
         }
 
@@ -117,15 +117,17 @@ public:
         size_t min_count = std::numeric_limits<size_t>::max();
         int index = 0;
         for (int i = 0; i < m_worker_num; ++i) {
-            size_t cur_count = m_queues[i]->size();
-            if (cur_count == 0) {
-                index = i;
-                break;
-            }
+            if (!m_thread_need_stop[i].isSet()) {
+                size_t cur_count = m_queues[i]->size();
+                if (cur_count == 0) {
+                    index = i;
+                    break;
+                }
 
-            if (cur_count < min_count) {
-                min_count = cur_count;
-                index = i;
+                if (cur_count < min_count) {
+                    min_count = cur_count;
+                    index = i;
+                }
             }
         }
 
@@ -146,17 +148,12 @@ public:
      * 等待各线程完成当前执行的任务后立即结束退出
      */
     void stop() {
-        if (m_done) {
+        if (m_done.exchange(true, std::memory_order_relaxed)) {
             return;
         }
 
-        m_done = true;
-
-        // 同时加入结束任务指示，以便在dll退出时也能够终止
         for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_interrupt_flags[i]) {
-                m_interrupt_flags[i]->set();
-            }
+            m_thread_need_stop[i].set();
             m_queues[i]->push(FuncWrapper());
         }
 
@@ -181,33 +178,16 @@ public:
         }
 
         // 指示各工作线程在未获取到工作任务时，停止运行
-        if (m_runnging_until_empty) {
-            while (true) {
-                bool can_quit = true;
-                for (size_t i = 0; i < m_worker_num; i++) {
-                    if (m_queues[i]->size() != 0) {
-                        can_quit = false;
-                        break;
-                    }
-                }
-
-                if (can_quit) {
-                    break;
-                }
-
-                std::this_thread::yield();
-            }
-
+        if (!m_runnging_until_empty) {
             m_done = true;
             for (size_t i = 0; i < m_worker_num; i++) {
-                if (m_interrupt_flags[i]) {
-                    m_interrupt_flags[i]->set();
-                }
+                m_thread_need_stop[i].set();
             }
         }
 
         for (size_t i = 0; i < m_worker_num; i++) {
             m_queues[i]->push(FuncWrapper());
+            m_queues[i]->notify_all();
         }
 
         // 等待线程结束
@@ -217,10 +197,6 @@ public:
             }
         }
 
-        for (size_t i = 0; i < m_worker_num; i++) {
-            m_queues[i]->clear();
-        }
-
         m_done = true;
     }
 
@@ -231,38 +207,19 @@ private:
     bool m_runnging_until_empty;  // 运行直到队列空时停止
 
     std::vector<std::unique_ptr<ThreadSafeQueue<task_type>>> m_queues;  // 线程任务队列
-    std::vector<InterruptFlag*> m_interrupt_flags;                      // 线程终止标志
+    std::vector<InterruptFlag> m_thread_need_stop;                      // 线程终止标志
     std::vector<std::thread> m_threads;                                 // 工作线程
 
-    // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17 && !defined(__clang__)
-    inline static thread_local ThreadSafeQueue<task_type>* m_local_work_queue =
-      nullptr;                                                    // 本地任务队列
-    inline static thread_local int m_index = -1;                  // 在线程池中的序号
-    inline static thread_local InterruptFlag m_thread_need_stop;  // 线程停止运行指示
-#else
-    static thread_local ThreadSafeQueue<task_type>* m_local_work_queue;  // 本地任务队列
-    static thread_local int m_index;                                     // 在线程池中的序号
-    static thread_local InterruptFlag m_thread_need_stop;                // 线程停止运行指示
-#endif
-
     void worker_thread(int index) {
-        m_index = index;
-        m_interrupt_flags[index] = &m_thread_need_stop;
-        m_local_work_queue = m_queues[m_index].get();
-        while (!m_thread_need_stop.isSet() || !m_done) {
-            run_pending_task();
-        }
-        m_local_work_queue = nullptr;
-        m_interrupt_flags[m_index] = nullptr;
-    }
-
-    static void run_pending_task() {
-        task_type task;
-        m_local_work_queue->wait_and_pop(task);
-        if (task.isNullTask()) {
-            m_thread_need_stop.set();
-        } else {
+        auto *local_queue = m_queues[index].get();
+        auto *local_stop_flag = &m_thread_need_stop[index];
+        while (!local_stop_flag->isSet() || !m_done) {
+            task_type task;
+            local_queue->wait_and_pop(task);
+            if (task.isNullTask()) {
+                local_stop_flag->set();
+                break;
+            }
             task();
         }
     }

hikyuu/include/hikyuu/utilities/thread/ThreadPool.h

@@ -19,16 +19,13 @@
 #include "ThreadSafeQueue.h"
 #include "InterruptFlag.h"
 #include "../cppdef.h"
+#include "../Log.h"
 
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #endif
 
-#ifndef HKU_UTILS_API
-#define HKU_UTILS_API
-#endif
-
 namespace hku {
 
 /**
@@ -37,11 +34,7 @@ namespace hku {
  * @details
  * @ingroup ThreadPool
  */
-#ifdef _MSC_VER
 class ThreadPool {
-#else
-class HKU_UTILS_API ThreadPool {
-#endif
 public:
     /**
      * 默认构造函数，创建和当前系统CPU数一致的线程数
@@ -56,7 +49,6 @@ public:
     explicit ThreadPool(size_t n, bool until_empty = true)
     : m_done(false), m_worker_num(n), m_running_until_empty(until_empty) {
         try {
-            m_interrupt_flags.resize(m_worker_num, nullptr);
             // 初始完毕所有线程资源后再启动线程
             for (int i = 0; i < m_worker_num; i++) {
                 // 创建工作线程及其任务队列
@@ -94,7 +86,7 @@ public:
     /** 向线程池提交任务 */
     template <typename FunctionType>
     auto submit(FunctionType f) {
-        if (m_thread_need_stop.isSet() || m_done) {
+        if (m_done) {
             throw std::logic_error("You can't submit a task to the stopped task group!");
         }
         typedef typename std::invoke_result<FunctionType>::type result_type;
@@ -122,20 +114,17 @@ public:
      * 等待各线程完成当前执行的任务后立即结束退出
      */
     void stop() {
-        if (m_done) {
+        if (m_done.exchange(true, std::memory_order_relaxed)) {
             return;
         }
 
-        m_done = true;
-
         // 同时加入结束任务指示，以便在dll退出时也能够终止
         for (size_t i = 0; i < m_worker_num; i++) {
-            if (m_interrupt_flags[i]) {
-                m_interrupt_flags[i]->set();
-            }
             m_master_work_queue.push(FuncWrapper());
         }
 
+        m_master_work_queue.notify_all();
+
         for (size_t i = 0; i < m_worker_num; i++) {
             if (m_threads[i].joinable()) {
                 m_threads[i].join();
@@ -155,31 +144,25 @@ public:
         }
 
         // 指示各工作线程在未获取到工作任务时，停止运行
-        if (m_running_until_empty) {
-            while (m_master_work_queue.size() > 0) {
-                std::this_thread::yield();
-            }
+        if (!m_running_until_empty) {
             m_done = true;
-            for (size_t i = 0; i < m_worker_num; i++) {
-                if (m_interrupt_flags[i]) {
-                    m_interrupt_flags[i]->set();
-                }
-            }
         }
 
-        for (size_t i = 0; i < m_worker_num; i++) {
+        // 仍旧有可能某个线程没有获取到，导致没有终止
+        for (size_t i = 0; i < 2 * m_worker_num; i++) {
             m_master_work_queue.push(FuncWrapper());
         }
 
-        // 等待线程结束
+        m_master_work_queue.notify_all();
+
         for (size_t i = 0; i < m_worker_num; i++) {
             if (m_threads[i].joinable()) {
                 m_threads[i].join();
             }
         }
 
-        m_master_work_queue.clear();
         m_done = true;
+        m_master_work_queue.clear();
     }
 
 private:
@@ -190,36 +173,18 @@ private:
 
     ThreadSafeQueue<task_type> m_master_work_queue;  // 主线程任务队列
     std::vector<std::thread> m_threads;              // 工作线程
-    std::vector<InterruptFlag*> m_interrupt_flags;   // 线程中断标志
-
-    // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17 && !defined(__clang__)
-    inline static thread_local InterruptFlag m_thread_need_stop;  // 线程停止运行指示
-    inline static thread_local int m_index = -1;                  // 在线程池中的序号
-#else
-    static thread_local InterruptFlag m_thread_need_stop;  // 线程停止运行指示
-    static thread_local int m_index;                       // 在线程池中的序号
-#endif
 
     void worker_thread(int index) {
-        m_index = index;
-        m_interrupt_flags[index] = &m_thread_need_stop;
-        while (!m_thread_need_stop.isSet() && !m_done) {
-            run_pending_task();
-            // std::this_thread::yield();
-        }
-        m_interrupt_flags[index] = nullptr;
-    }
-
-    void run_pending_task() {
-        task_type task;
-        m_master_work_queue.wait_and_pop(task);
-        if (task.isNullTask()) {
-            m_thread_need_stop.set();
-        } else {
+        while (!m_done) {
+            task_type task;
+            m_master_work_queue.wait_and_pop(task);
+            if (task.isNullTask()) {
+                break;
+            }
             task();
         }
     }
+
 };  // namespace hku
 
 } /* namespace hku */

hikyuu/include/hikyuu/utilities/thread/ThreadSafeQueue.h

@@ -90,6 +90,10 @@ public:
         m_queue.swap(tmp);
     }
 
+    void notify_all() {
+        m_cond.notify_all();
+    }
+
 private:
     mutable std::mutex m_mutex;
     std::queue<T> m_queue;

hikyuu/include/hikyuu/utilities/thread/algorithm.h

@@ -11,9 +11,13 @@
 #include <functional>
 #include <vector>
 #include "ThreadPool.h"
-#include "StealThreadPool.h"
 #include "MQThreadPool.h"
-#include "MQStealThreadPool.h"
+
+//----------------------------------------------------------------
+// Note: 除 ThreadPool/MQThreadPool 外，其他线程池由于使用
+//       了 thread_local，本质为全局变量，只适合全局单例的方式使用,
+//       否则会出现不同线程池示例互相影响导致出错。
+//----------------------------------------------------------------
 
 namespace hku {
 
@@ -26,10 +30,6 @@ inline std::vector<range_t> parallelIndexRange(size_t start, size_t end) {
     }
 
     size_t total = end - start;
-    if (total == 0) {
-        return ret;
-    }
-
     size_t cpu_num = std::thread::hardware_concurrency();
     if (cpu_num == 1) {
         ret.emplace_back(start, end);
@@ -51,7 +51,7 @@ inline std::vector<range_t> parallelIndexRange(size_t start, size_t end) {
     return ret;
 }
 
-template <typename FunctionType, class TaskGroup = MQStealThreadPool>
+template <typename FunctionType, class TaskGroup = MQThreadPool>
 void parallel_for_index_void(size_t start, size_t end, FunctionType f) {
     auto ranges = parallelIndexRange(start, end);
     TaskGroup tg;
@@ -66,7 +66,7 @@ void parallel_for_index_void(size_t start, size_t end, FunctionType f) {
     return;
 }
 
-template <typename FunctionType, class TaskGroup = MQStealThreadPool>
+template <typename FunctionType, class TaskGroup = MQThreadPool>
 auto parallel_for_index(size_t start, size_t end, FunctionType f) {
     auto ranges = parallelIndexRange(start, end);
     TaskGroup tg;
@@ -93,7 +93,7 @@ auto parallel_for_index(size_t start, size_t end, FunctionType f) {
     return ret;
 }
 
-template <typename FunctionType, class TaskGroup = MQStealThreadPool>
+template <typename FunctionType, class TaskGroup = MQThreadPool>
 auto parallel_for_range(size_t start, size_t end, FunctionType f) {
     auto ranges = parallelIndexRange(start, end);
     TaskGroup tg;

hikyuu/include/hikyuu/utilities/thread/thread.h

@@ -8,3 +8,7 @@
 #pragma once
 
 #include "algorithm.h"
+#include "GlobalThreadPool.h"
+#include "GlobalMQThreadPool.h"
+#include "GlobalStealThreadPool.h"
+#include "GlobalMQStealThreadPool.h"

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.2"
+#define HKU_VERSION "2.6.3"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 2
-#define HKU_VERSION_BUILD 202505141721
+#define HKU_VERSION_ALTER 3
+#define HKU_VERSION_BUILD 202505252323
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.2 release.16442c98 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.3 release.127e122b (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */

hikyuu/trade_manage/__init__.pyi

@@ -120,10 +120,10 @@ from hikyuu.cpp.core39 import KDataToHdf5Importer
 from hikyuu.cpp.core39 import KRecord
 from hikyuu.cpp.core39 import KRecordList
 from hikyuu.cpp.core39 import LAST
-from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LASTVALUE as CONST
-from hikyuu.cpp.core39 import LIUTONGPAN
+from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LIUTONGPAN as CAPITAL
+from hikyuu.cpp.core39 import LIUTONGPAN
 from hikyuu.cpp.core39 import LLV
 from hikyuu.cpp.core39 import LLVBARS
 from hikyuu.cpp.core39 import LN
@@ -169,8 +169,8 @@ from hikyuu.cpp.core39 import PG_FixedPercent
 from hikyuu.cpp.core39 import PG_NoGoal
 from hikyuu.cpp.core39 import POS
 from hikyuu.cpp.core39 import POW
-from hikyuu.cpp.core39 import PRICELIST
 from hikyuu.cpp.core39 import PRICELIST as VALUE
+from hikyuu.cpp.core39 import PRICELIST
 from hikyuu.cpp.core39 import Parameter
 from hikyuu.cpp.core39 import Performance
 from hikyuu.cpp.core39 import Portfolio
@@ -178,6 +178,7 @@ from hikyuu.cpp.core39 import PositionRecord
 from hikyuu.cpp.core39 import PositionRecordList
 from hikyuu.cpp.core39 import ProfitGoalBase
 from hikyuu.cpp.core39 import Query
+from hikyuu.cpp.core39 import RANK
 from hikyuu.cpp.core39 import RECOVER_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_FORWARD
@@ -445,6 +446,21 @@ from hikyuu.cpp.core39 import VIGOR
 from hikyuu.cpp.core39 import WEAVE
 from hikyuu.cpp.core39 import WEEK
 from hikyuu.cpp.core39 import WINNER
+from hikyuu.cpp.core39 import WITHDAY
+from hikyuu.cpp.core39 import WITHHALFYEAR
+from hikyuu.cpp.core39 import WITHHOUR
+from hikyuu.cpp.core39 import WITHHOUR2
+from hikyuu.cpp.core39 import WITHHOUR4
+from hikyuu.cpp.core39 import WITHKTYPE
+from hikyuu.cpp.core39 import WITHMIN
+from hikyuu.cpp.core39 import WITHMIN15
+from hikyuu.cpp.core39 import WITHMIN30
+from hikyuu.cpp.core39 import WITHMIN5
+from hikyuu.cpp.core39 import WITHMIN60
+from hikyuu.cpp.core39 import WITHMONTH
+from hikyuu.cpp.core39 import WITHQUARTER
+from hikyuu.cpp.core39 import WITHWEEK
+from hikyuu.cpp.core39 import WITHYEAR
 from hikyuu.cpp.core39 import WMA
 from hikyuu.cpp.core39 import YEAR
 from hikyuu.cpp.core39 import ZHBOND10
@@ -552,8 +568,8 @@ from hikyuu.util.mylog import add_class_logger_handler
 from hikyuu.util.mylog import capture_multiprocess_all_logger
 from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
-from hikyuu.util.mylog import hku_debug
 from hikyuu.util.mylog import hku_debug as hku_trace
+from hikyuu.util.mylog import hku_debug
 from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
 from hikyuu.util.mylog import hku_error
@@ -583,7 +599,7 @@ from . import broker
 from . import broker_easytrader
 from . import broker_mail
 from . import trade
-__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MAXYEAR', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MINYEAR', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'crtBrokerTM', 'crtOB', 'crtSEOptimal', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_data_from_buffer_server', 'get_date_range', 'get_kdata', 'get_last_version', 'get_log_level', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'isinf', 'isnan', 'list_getitem', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'pd', 'pickle', 'pyind', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'talib_wrap', 'time', 'timedelta', 'timeout', 'timezone', 'toPriceList', 'traceback', 'trade', 'tzinfo', 'util', 'view_license', 'with_trace']
+__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MAXYEAR', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MINYEAR', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RANK', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WITHDAY', 'WITHHALFYEAR', 'WITHHOUR', 'WITHHOUR2', 'WITHHOUR4', 'WITHKTYPE', 'WITHMIN', 'WITHMIN15', 'WITHMIN30', 'WITHMIN5', 'WITHMIN60', 'WITHMONTH', 'WITHQUARTER', 'WITHWEEK', 'WITHYEAR', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'crtBrokerTM', 'crtOB', 'crtSEOptimal', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_data_from_buffer_server', 'get_date_range', 'get_kdata', 'get_last_version', 'get_log_level', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'isinf', 'isnan', 'list_getitem', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'pd', 'pickle', 'pyind', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'talib_wrap', 'time', 'timedelta', 'timeout', 'timezone', 'toPriceList', 'traceback', 'trade', 'tzinfo', 'util', 'view_license', 'with_trace']
 AMO: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 BASE_DIR: str = 'D:\\workspace\\hikyuu\\hikyuu'
 CLOSE: hikyuu.cpp.core39.Indicator  # value = Indicator{...

hikyuu/trade_manage/broker.py

@@ -46,7 +46,7 @@ class OrderBrokerWrap(OrderBrokerBase):
         super(OrderBrokerWrap, self).__init__(name)
         self._broker = broker
 
-    def _buy(self, datetime, market, code, price, num, stoploss, goal_price, part_from):
+    def _buy(self, datetime, market, code, price, num, stoploss, goal_price, part_from, remark=""):
         """
         实现 OrderBrokerBase 的 _buy 接口
         :param str market: 证券市场    
@@ -54,11 +54,11 @@ class OrderBrokerWrap(OrderBrokerBase):
         :param float price: 买入价格
         :param int num: 买入数量        
         """
-        self._broker.buy(market, code, price, num, stoploss, goal_price, part_from)
+        self._broker.buy(market, code, price, num, stoploss, goal_price, part_from, remark)
 
-    def _sell(self, datetime, market, code, price, num, stoploss, goal_price, part_from):
+    def _sell(self, datetime, market, code, price, num, stoploss, goal_price, part_from, remark=""):
         """实现 OrderBrokerBase 的 _sell 接口"""
-        self._broker.sell(market, code, price, num, stoploss, goal_price, part_from)
+        self._broker.sell(market, code, price, num, stoploss, goal_price, part_from, remark)
 
     def _get_asset_info(self):
         try:
@@ -77,11 +77,11 @@ class TestOrderBroker:
     def __init__(self):
         pass
 
-    def buy(self, market, code, price, num, stoploss, goal_price, part_from):
-        print(f"买入：{market}{code}, 价格: {price}, 数量: {num} 预期止损价: {stoploss}, 预期目标价: {goal_price}, 信号来源: {part_from}")
+    def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark=""):
+        print(f"买入：{market}{code}, 价格: {price}, 数量: {num} 预期止损价: {stoploss}, 预期目标价: {goal_price}, 信号来源: {part_from}, 备注: {remark}")
 
-    def sell(self, market, code, price, num, stoploss, goal_price, part_from):
-        print(f"卖出：{market}{code}, 价格: {price}, 数量: {num}, 信号来源: {part_from}")
+    def sell(self, market, code, price, num, stoploss, goal_price, part_from, remark=""):
+        print(f"卖出：{market}{code}, 价格: {price}, 数量: {num}, 信号来源: {part_from}, 备注: {remark}")
 
 
 def crtOB(broker, name="NO_NAME"):

hikyuu/trade_manage/broker.pyi

@@ -16,7 +16,7 @@ class OrderBrokerWrap(hikyuu.cpp.core39.OrderBrokerBase):
                 订单代理包装类，用户可以参考自定义自己的订单代理，加入额外的处理
                 
         """
-    def _buy(self, datetime, market, code, price, num, stoploss, goal_price, part_from):
+    def _buy(self, datetime, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         """
         
                 实现 OrderBrokerBase 的 _buy 接口
@@ -28,7 +28,7 @@ class OrderBrokerWrap(hikyuu.cpp.core39.OrderBrokerBase):
         """
     def _get_asset_info(self):
         ...
-    def _sell(self, datetime, market, code, price, num, stoploss, goal_price, part_from):
+    def _sell(self, datetime, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         """
         实现 OrderBrokerBase 的 _sell 接口
         """
@@ -38,9 +38,9 @@ class TestOrderBroker:
     """
     def __init__(self):
         ...
-    def buy(self, market, code, price, num, stoploss, goal_price, part_from):
+    def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         ...
-    def sell(self, market, code, price, num, stoploss, goal_price, part_from):
+    def sell(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         ...
 def crtOB(broker, name = 'NO_NAME'):
     """

hikyuu/trade_manage/broker_easytrader.py

@@ -17,13 +17,13 @@ class EasyTraderOrderBroker:
         self.user = user
         self.buffer = {}
 
-    def buy(self, market, code, price, num, stoploss, goal_price, part_from):
+    def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark=""):
         # self.user.buy(code, price=price, amount=num)
         market_code = f"{market}{code}"
         print(f"计划买入：{market_code}  {price}  {num}")
         self.buffer[market_code] = (num, stoploss, goal_price)
 
-    def sell(self, market, code, price, num, stoploss, goal_price, part_from):
+    def sell(self, market, code, price, num, stoploss, goal_price, part_from, remark=""):
         # self.user.sell(code, price=price, amount=num)
         market_code = f"{market}{code}"
         print(f"计划卖出：{market_code}  {price}  {num}")
@@ -59,5 +59,5 @@ class EasyTraderOrderBroker:
                              number=v['可用余额'], stoploss=stoploss, goal_price=goal_price, cost_price=v['成本价']))
 
         ret = dict(datetime=str(Datetime.now()), cash=cash, positions=positions)
-        print(ret)
+        # print(ret)
         return ret

hikyuu/trade_manage/broker_easytrader.pyi

@@ -11,11 +11,11 @@ class EasyTraderOrderBroker:
     """
     def __init__(self, user):
         ...
-    def buy(self, market, code, price, num, stoploss, goal_price, part_from):
+    def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         ...
     def get_asset_info(self):
         """
         以下只适用于华泰
         """
-    def sell(self, market, code, price, num, stoploss, goal_price, part_from):
+    def sell(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         ...