hikyuu 2.5.5__py3-none-win_amd64.whl → 2.5.6__py3-none-win_amd64.whl

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -145,8 +145,8 @@ class UseTdxImportToH5Thread(QThread):
         connect = sqlite3.connect(dest_dir + "/stock.db")
         create_database(connect)
 
-        tdx_import_stock_name_from_file(connect, src_dir + "\\T0002\\hq_cache\\shm.tnf", 'SH', self.quotations)
-        tdx_import_stock_name_from_file(connect, src_dir + "\\T0002\\hq_cache\\szm.tnf", 'SZ', self.quotations)
+        tdx_import_stock_name_from_file(connect, src_dir + "/T0002/hq_cache/shm.tnf", 'SH', self.quotations)
+        tdx_import_stock_name_from_file(connect, src_dir + "/T0002/hq_cache/szm.tnf", 'SZ', self.quotations)
 
         self.send_message(['FINISHED_IMPORT_CODE'])
 

hikyuu/hub.py

@@ -344,6 +344,10 @@ class HubManager(metaclass=SingletonType):
         self._session.query(PartModel).filter_by(hub_name=name).delete()
         self._session.query(HubModel).filter_by(name=name).delete()
 
+    @lru_cache
+    def _get_module(self, module_name):
+        return importlib.import_module(module_name)
+
     @dbsession
     def import_part_to_db(self, hub_model):
         part_dict = {
@@ -387,7 +391,8 @@ class HubManager(metaclass=SingletonType):
 
                             # 导入模块
                             try:
-                                part_module = importlib.import_module(module_name)
+                                # part_module = importlib.import_module(module_name)
+                                part_module = self._get_module(module_name)
                             except ModuleNotFoundError:
                                 self.logger.error('{} 缺失 part.py 文件, 位置："{}"！'.format(module_name, entry.path))
                                 continue
@@ -645,18 +650,7 @@ def get_part(name, *args, **kwargs):
     :param args: 其他部件相关参数
     :param kwargs: 其他部件相关参数
     """
-    @lru_cache
-    def _get_part(name, *args, **kwargs):
-        return HubManager().get_part(name, *args, **kwargs)
-
-    try:
-        return _get_part(name, *args, **kwargs)
-    except TypeError as e:
-        if "unhashable type" in str(e):
-            hku_info("{}! 该对象不可hash无法缓存, 可考虑优化", str(e))
-            return HubManager().get_part(name, *args, **kwargs)
-        else:
-            raise e
+    return HubManager().get_part(name, *args, **kwargs)
 
 
 def get_part_list(name_list):

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 0x289448bfdc0; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1b27916c590; 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 289448ce8b0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 1b279530550>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -55,6 +55,9 @@ class HubManager:
     """
     _instance: typing.ClassVar[HubManager]  # value = <hikyuu.hub.HubManager object>
     @staticmethod
+    def _get_module(*args, **kwargs):
+        ...
+    @staticmethod
     def add_local_hub(*args, **kwargs):
         ...
     @staticmethod
@@ -106,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 0x28944903460; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1b27951e630; 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 289448fd5e0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 1b279548e60>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -143,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 0x28944903df0; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1b27951f020; 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 2894490d130>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 1b2795499f0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/utilities/config.h

@@ -26,7 +26,7 @@
 #define HKU_CLOSE_SPEND_TIME 0
 
 #define HKU_USE_SPDLOG_ASYNC_LOGGER 0
-#define HKU_LOG_ACTIVE_LEVEL "2"
+#define HKU_LOG_ACTIVE_LEVEL 2
 
 #define HKU_ENABLE_MO 0
 

hikyuu/include/hikyuu/utilities/datetime/Datetime.h

@@ -299,9 +299,9 @@ typedef std::vector<Datetime> DatetimeList;
 
 /**
  * 获取指定范围的日历日期列表[start,end)，仅仅是日，不含时分秒。
- * @note 为防止内存占用过大，end如果超出系统明日日期，则强制为系统明日日期
+ * @note 如果指定的结束日期过大，可能会耗费大量内存
  * @param start 起始日期
- * @param end 结束日期
+ * @param end 结束日期, 如果为空，将使用 Datetime::max
  * @return [start, end)范围内的日历日期
  */
 DatetimeList HKU_UTILS_API getDateRange(const Datetime &start, const Datetime &end);
@@ -412,7 +412,7 @@ template <>
 class hash<hku::Datetime> {
 public:
     size_t operator()(hku::Datetime const &d) const noexcept {
-        return d.ticks();  // or use boost::hash_combine
+        return std::hash<uint64_t>()(d.ticks());
     }
 };
 

hikyuu/include/hikyuu/utilities/datetime/TimeDelta.h

@@ -320,6 +320,14 @@ inline TimeDelta Microseconds(int64_t microsecs) {
 
 namespace std {
 
+template <>
+class hash<hku::TimeDelta> {
+public:
+    size_t operator()(hku::TimeDelta const &d) const noexcept {
+        return std::hash<int64_t>()(d.ticks());
+    }
+};
+
 inline string to_string(const hku::TimeDelta &delta) {
     return delta.str();
 }

hikyuu/include/hikyuu/utilities/plugin/PluginBase.h

@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-03-18
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef HKU_UTILS_PLUGIN_BASE_H_
+#define HKU_UTILS_PLUGIN_BASE_H_
+
+#include <string>
+#include "hikyuu/utilities/config.h"
+#include "hikyuu/utilities/osdef.h"
+
+namespace hku {
+
+class PluginBase {
+public:
+    PluginBase() = default;
+    virtual ~PluginBase() = default;
+
+    /**
+     * @brief 返回插件信息
+     * @details
+     * 插件信息为json格式，包含name(string)、version(int)、description(string)、author(string)字段
+     * 如：{"name":"unknown","version": 1.0,"description":"","author":"unknown"}
+     * @return std::string
+     */
+    virtual std::string info() const noexcept = 0;
+};
+
+}  // namespace hku
+
+#if HKU_OS_WINDOWS
+#define HKU_PLUGIN_DEFINE(plugin)                                      \
+    extern "C" __declspec(dllexport) hku::PluginBase* createPlugin() { \
+        return new plugin();                                           \
+    }
+#else
+#define HKU_PLUGIN_DEFINE(plugin)                \
+    extern "C" hku::PluginBase* createPlugin() { \
+        return new plugin();                     \
+    }
+#endif
+
+#endif /* HKU_UTILS_PLUGIN_BASE_H_ */

hikyuu/include/hikyuu/utilities/plugin/PluginClient.h

@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-04-06
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "PluginLoader.h"
+
+namespace hku {
+
+template <typename InterfaceT>
+class PluginClient : public InterfaceT {
+public:
+    PluginClient() = delete;
+    PluginClient(const std::string &path, const std::string &filename) {
+        m_loader = std::make_unique<PluginLoader>(path);
+        m_loader->load(filename);
+        m_impl = m_loader->instance<InterfaceT>();
+    }
+    virtual ~PluginClient() = default;
+
+    PluginClient(const PluginClient &) = delete;
+    PluginClient &operator=(const PluginClient &) = delete;
+
+    PluginClient(PluginClient &&rhs) : m_impl(rhs.m_impl), m_loader(std::move(rhs.m_loader)) {
+        rhs.m_impl = nullptr;
+    }
+
+    PluginClient &operator=(PluginClient &&rhs) {
+        if (this != &rhs) {
+            m_loader = std::move(rhs.m_loader);
+            m_impl = rhs.m_impl;
+            rhs.m_impl = nullptr;
+        }
+    }
+
+    std::string info() const noexcept override {
+        return m_impl->info();
+    }
+
+    InterfaceT *getPlugin() const {
+        return m_impl;
+    }
+
+protected:
+    InterfaceT *m_impl;
+
+protected:
+    std::unique_ptr<PluginLoader> m_loader;
+};
+
+}  // namespace hku

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

@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-03-18
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef HKU_UTILS_PLUGIN_LOADER_H_
+#define HKU_UTILS_PLUGIN_LOADER_H_
+
+#include <mutex>
+#include <string>
+#include <memory>
+#include "hikyuu/utilities/config.h"
+#include "hikyuu/utilities/osdef.h"
+#include "hikyuu/utilities/Log.h"
+#include "PluginBase.h"
+
+#if HKU_OS_WINDOWS
+#include <windows.h>
+#endif
+
+#ifndef HKU_UTILS_API
+#define HKU_UTILS_API
+#endif
+
+namespace hku {
+
+class HKU_UTILS_API PluginLoader final {
+public:
+    PluginLoader();
+    explicit PluginLoader(const std::string& path);
+    PluginLoader(const PluginLoader&) = delete;
+    PluginLoader(PluginLoader&&) = delete;
+
+    ~PluginLoader();
+
+    bool load(const std::string& pluginname) noexcept;
+
+    template <typename T>
+    T* instance() const noexcept {
+        HKU_IF_RETURN(!m_plugin, nullptr);
+        return dynamic_cast<T*>(m_plugin.get());
+    }
+
+private:
+    void unload() noexcept;
+    void* getFunciton(const char* symbol) noexcept;
+    std::string getFileName(const std::string& pluginname) const noexcept;
+
+private:
+#if HKU_OS_WINDOWS
+    HMODULE m_handle{nullptr};
+#else
+    void* m_handle{nullptr};
+#endif
+    std::string m_path;
+    std::unique_ptr<PluginBase> m_plugin{nullptr};
+};
+
+}  // namespace hku
+
+#endif /* HKU_UTILS_PLUGIN_LOADER_H_ */

hikyuu/include/hikyuu/utilities/plugin/__init__.py

@@ -0,0 +1 @@
+

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

@@ -242,7 +242,7 @@ private:
     std::vector<std::thread> m_threads;                              // 工作线程
 
     // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17
+#if CPP_STANDARD >= CPP_STANDARD_17 && !defined(__clang__)
     inline static thread_local MQStealQueue<task_type>* m_local_work_queue =
       nullptr;                                                    // 本地任务队列
     inline static thread_local int m_index = -1;                  // 在线程池中的序号

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

@@ -235,7 +235,7 @@ private:
     std::vector<std::thread> m_threads;                                 // 工作线程
 
     // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17
+#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;                  // 在线程池中的序号

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

@@ -239,7 +239,7 @@ private:
     std::vector<std::thread> m_threads;                      // 工作线程
 
     // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17
+#if CPP_STANDARD >= CPP_STANDARD_17 && !defined(__clang__)
     inline static thread_local WorkStealQueue* m_local_work_queue = nullptr;  // 本地任务队列
     inline static thread_local int m_index = -1;                              // 在线程池中的序号
     inline static thread_local InterruptFlag m_thread_need_stop;              // 线程停止运行指示

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

@@ -193,7 +193,7 @@ private:
     std::vector<InterruptFlag*> m_interrupt_flags;   // 线程中断标志
 
     // 线程本地变量
-#if CPP_STANDARD >= CPP_STANDARD_17
+#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

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.5.5"
+#define HKU_VERSION "2.5.6"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 5
-#define HKU_VERSION_ALTER 5
-#define HKU_VERSION_BUILD 202503111534
+#define HKU_VERSION_ALTER 6
+#define HKU_VERSION_BUILD 202504131513
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.5.5 release.0664dca1 (RELEASE)"
+#define HKU_VERSION_GIT "2.5.6 release.2e933ae9 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */

hikyuu/indicator/indicator.py

@@ -90,7 +90,7 @@ def concat_to_df(dates, ind_list, head_stock_code=True, head_ind_name=False):
     示例:
         query = Query(-200)
         k_list = [stk.get_kdata(query) for stk in [sm['sz000001'], sm['sz000002']]]
-        ma_list = [MA(k) for k in k_list]
+        ma_list = [MA(CLOSE(k)) for k in k_list]
         concat_to_df(sm.get_trading_calendar(query), ma_list, head_stock_code=True, head_ind_name=False)
 
     输出：