hikyuu 2.6.6__py3-none-win_amd64.whl → 2.6.8__py3-none-win_amd64.whl

hikyuu/hub.pyi

@@ -28,22 +28,23 @@ 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 0x1fc04455310; ConfigModel>
+    __firstlineno__: typing.ClassVar[int] = 39
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840fd400; ConfigModel>
+    __static_attributes__: typing.ClassVar[tuple] = tuple()
     __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 1fc046b1590>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 20a84129450>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
         
-            Sets attributes on the constructed instance using the names and
-            values in ``kwargs``.
+        Sets attributes on the constructed instance using the names and
+        values in ``kwargs``.
         
-            Only keys that are present as
-            attributes of the instance's class are allowed. These could be,
-            for example, any mapped columns or relationships.
-            
+        Only keys that are present as
+        attributes of the instance's class are allowed. These could be,
+        for example, any mapped columns or relationships.
         """
     def __repr__(self):
         ...
@@ -53,6 +54,8 @@ class HubManager:
     """
     策略库管理
     """
+    __firstlineno__: typing.ClassVar[int] = 171
+    __static_attributes__: typing.ClassVar[tuple] = ('_scoped_Session', '_session', 'logger', 'remote_cache_dir')
     _instance: typing.ClassVar[HubManager]  # value = <hikyuu.hub.HubManager object>
     @staticmethod
     def _get_module(*args, **kwargs):
@@ -109,70 +112,82 @@ 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 0x1fc04693590; HubModel>
+    __firstlineno__: typing.ClassVar[int] = 54
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840ddd10; HubModel>
+    __static_attributes__: typing.ClassVar[tuple] = tuple()
     __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 1fc046c9ef0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 20a84141d60>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
         
-            Sets attributes on the constructed instance using the names and
-            values in ``kwargs``.
+        Sets attributes on the constructed instance using the names and
+        values in ``kwargs``.
         
-            Only keys that are present as
-            attributes of the instance's class are allowed. These could be,
-            for example, any mapped columns or relationships.
-            
+        Only keys that are present as
+        attributes of the instance's class are allowed. These could be,
+        for example, any mapped columns or relationships.
         """
     def __repr__(self):
         ...
     def __str__(self):
         ...
 class HubNameRepeatError(Exception):
+    __firstlineno__: typing.ClassVar[int] = 99
+    __static_attributes__: typing.ClassVar[tuple] = ('name')
     def __init__(self, name):
         ...
     def __str__(self):
         ...
 class HubNotFoundError(Exception):
+    __firstlineno__: typing.ClassVar[int] = 107
+    __static_attributes__: typing.ClassVar[tuple] = ('name')
     def __init__(self, name):
         ...
     def __str__(self):
         ...
 class ModuleConflictError(Exception):
+    __firstlineno__: typing.ClassVar[int] = 115
+    __static_attributes__: typing.ClassVar[tuple] = ('conflict_module', 'hub_name', 'hub_path')
     def __init__(self, hub_name, conflict_module, hub_path):
         ...
     def __str__(self):
         ...
 class PartModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1fc0322b3b0; PartModel>
+    __firstlineno__: typing.ClassVar[int] = 75
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840de5d0; PartModel>
+    __static_attributes__: typing.ClassVar[tuple] = tuple()
     __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 1fc046caa80>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 20a841427b0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
         
-            Sets attributes on the constructed instance using the names and
-            values in ``kwargs``.
+        Sets attributes on the constructed instance using the names and
+        values in ``kwargs``.
         
-            Only keys that are present as
-            attributes of the instance's class are allowed. These could be,
-            for example, any mapped columns or relationships.
-            
+        Only keys that are present as
+        attributes of the instance's class are allowed. These could be,
+        for example, any mapped columns or relationships.
         """
     def __repr__(self):
         ...
     def __str__(self):
         ...
 class PartNameError(Exception):
+    __firstlineno__: typing.ClassVar[int] = 136
+    __static_attributes__: typing.ClassVar[tuple] = ('name')
     def __init__(self, name):
         ...
     def __str__(self):
         ...
 class PartNotFoundError(Exception):
+    __firstlineno__: typing.ClassVar[int] = 127
+    __static_attributes__: typing.ClassVar[tuple] = ('cause', 'name')
     def __init__(self, name, cause):
         ...
     def __str__(self):
@@ -181,34 +196,30 @@ def add_local_hub(name, path):
     """
     增加本地数据仓库
     
-        :param str name: 仓库名称
-        :param str path: 本地全路径
-        
+    :param str name: 仓库名称
+    :param str path: 本地全路径
     """
 def add_remote_hub(name, url, branch = 'main'):
     """
     增加远程策略仓库
     
-        :param str name: 本地仓库名称（自行起名）
-        :param str url: git 仓库地址
-        :param str branch: git 仓库分支
-        
+    :param str name: 本地仓库名称（自行起名）
+    :param str url: git 仓库地址
+    :param str branch: git 仓库分支
     """
 def build_hub(name, cmd = 'buildall'):
     """
     构建 cpp 部分 part
     
-        :param str name: 仓库名称
-        :param str cmd: 同仓库下 python setup.py 后的命令参数，如: build -t ind -n cpp_example
-        
+    :param str name: 仓库名称
+    :param str cmd: 同仓库下 python setup.py 后的命令参数，如: build -t ind -n cpp_example
     """
 def dbsession(func):
     ...
 def get_current_hub(*args, **kwargs):
     """
     用于在仓库part.py中获取当前所在的仓库名。
-        示例： get_current_hub(__file__)
-        
+    示例： get_current_hub(__file__)
     """
 def get_hub_name_list():
     """
@@ -218,49 +229,43 @@ def get_hub_path(name):
     """
     获取仓库所在的本地路径
     
-        :param str name: 仓库名
-        
+    :param str name: 仓库名
     """
 def get_part(name, *args, **kwargs):
     """
     获取指定策略部件
     
-        :param str name: 策略部件名称
-        :param args: 其他部件相关参数
-        :param kwargs: 其他部件相关参数
-        
+    :param str name: 策略部件名称
+    :param args: 其他部件相关参数
+    :param kwargs: 其他部件相关参数
     """
 def get_part_info(name):
     """
     获取策略部件信息
     
-        :param str name: 部件名称
-        
+    :param str name: 部件名称
     """
 def get_part_list(name_list):
     """
     
-        获取指定策略部件列表
+    获取指定策略部件列表
     
-        :param list name_list: 部件名称列表
-        :return: 部件列表
-        :rtype: list
-        
+    :param list name_list: 部件名称列表
+    :return: 部件列表
+    :rtype: list
     """
 def get_part_module(part_name: str):
     """
     获取部件模块
-        :param str part_name: 部件名称
-        :return: 部件模块
-        :rtype: module
-        
+    :param str part_name: 部件名称
+    :return: 部件模块
+    :rtype: module
     """
 def get_part_name_list(hub = None, part_type = None):
     """
     获取部件名称列表
-        :param str hub: 仓库名
-        :param str part_type: 部件类型
-        
+    :param str hub: 仓库名
+    :param str part_type: 部件类型
     """
 def handle_remove_read_only(func, path, exc):
     ...
@@ -270,26 +275,23 @@ def remove_hub(name):
     """
     删除指定的仓库
     
-        :param str name: 仓库名称
-        
+    :param str name: 仓库名称
     """
 def search_part(name: str = None, hub: str = None, part_type: str = None, label: str = None):
     """
     搜索部件
     
-        :param str name: 部件名称
-        :param str hub: 仓库名
-        :param str part_type: 部件类型
-        :param str label: 标签
-        :return: 部件名称列表
-        :rtype: list
-        
+    :param str name: 部件名称
+    :param str hub: 仓库名
+    :param str part_type: 部件类型
+    :param str label: 标签
+    :return: 部件名称列表
+    :rtype: list
     """
 def update_hub(name):
     """
     更新指定仓库
     
-        :param str name: 仓库名称
-        
+    :param str name: 仓库名称
     """
 help_part = print_part_info

hikyuu/include/hikyuu/DataType.h

@@ -40,10 +40,7 @@
 #include "utilities/arithmetic.h"
 #include "utilities/SpendTimer.h"
 #include "utilities/config.h"
-
-#if HKU_ENABLE_MO
-#include "utilities/mo/mo.h"
-#endif
+#include "lang.h"
 
 #if HKU_SUPPORT_SERIALIZATION
 #include <boost/serialization/nvp.hpp>
@@ -90,9 +87,9 @@ namespace hku {
  * @{
  */
 
-// MSVC 的 __cpluscplus 之在 VS2017 之后才有正确的版本号，且只支持 C++17 及以上, 详见：
+// MSVC 的 __cpluscplus 在 VS2017 之后才有正确的版本号，且只支持 C++17 及以上, 详见：
 // https://docs.microsoft.com/zh-cn/cpp/build/reference/zc-cplusplus?view=vs-2019
-#if defined(_MSC_VER) || __cplusplus < 201103L
+#if CPP_STANDARD < CPP_STANDARD_11
 #if !defined(int64_t)
 typedef long long int64_t;
 #endif
@@ -149,12 +146,6 @@ using std::vector;
 typedef vector<price_t> PriceList;
 typedef vector<string> StringList;
 
-#if HKU_ENABLE_MO
-using mo::_tr;
-#else
-#define _tr(x) x
-#endif
-
 using std::isfinite;
 using std::isinf;
 using std::isnan;

hikyuu/include/hikyuu/KData.h

@@ -57,6 +57,9 @@ public:
         return getKRecord(datetime);
     }
 
+    const KRecord& front() const;
+    const KRecord& back() const;
+
     /**
      * 通过当前 KData 获取一个保持数据类型、复权类型不变的新的 KData
      * @note 新的 KData 并不一定是原 KData 的子集
@@ -65,6 +68,13 @@ public:
      */
     KData getKData(const Datetime& start, const Datetime& end) const;
 
+    /**
+     * 获取相同时间范围内的其他类型K线数据，如日线下对应的分钟线数据
+     * @param ktype
+     * @return KData
+     */
+    KData getKData(const KQuery::KType& ktype) const;
+
     /** 按日期查询对应的索引位置，注：是 KData 中的位置，不是在 Stock 中原始K记录的位置 */
     size_t getPos(const Datetime& datetime) const;
 
@@ -110,17 +120,70 @@ public:
     Indicator amo() const;
 
 public:
-    typedef KRecordList::iterator iterator;
-    typedef KRecordList::const_iterator const_iterator;
-    iterator begin();
-    iterator end();
-    const_iterator cbegin() const;
-    const_iterator cend() const;
     const KRecord* data() const;
     KRecord* data();  // 谨慎使用（用于强制调整数据）
 
+    // 常量迭代器定义
+    class const_iterator {
+    public:
+        using iterator_category = std::forward_iterator_tag;
+        using value_type = const KRecord;
+        using difference_type = std::ptrdiff_t;
+        using pointer = const KRecord*;
+        using reference = const KRecord&;
+
+        const_iterator(const KData& container, size_t index)
+        : container_(container), index_(index) {}
+
+        reference operator*() const {
+            return container_[index_];
+        }
+        pointer operator->() const {
+            return &(container_[index_]);
+        }
+
+        const_iterator& operator++() {
+            ++index_;
+            return *this;
+        }
+
+        const_iterator operator++(int) {
+            const_iterator temp = *this;
+            ++index_;
+            return temp;
+        }
+
+        bool operator==(const const_iterator& other) const {
+            return &container_ == &other.container_ && index_ == other.index_;
+        }
+
+        bool operator!=(const const_iterator& other) const {
+            return !(*this == other);
+        }
+
+    private:
+        const KData& container_;  // 常量引用容器
+        size_t index_;            // 当前索引
+    };
+
+    using iterator = const_iterator;
+
+    const_iterator begin() const {
+        return const_iterator(*this, 0);
+    }
+    const_iterator end() const {
+        return const_iterator(*this, size());
+    }
+
+    const_iterator cbegin() const {
+        return const_iterator(*this, 0);
+    }
+    const_iterator cend() const {
+        return const_iterator(*this, size());
+    }
+
 private:
-    static KRecord ms_null_krecord;
+    static shared_ptr<KDataImp> ms_null_kdata_imp;
 
 private:
     KDataImpPtr m_imp;
@@ -177,7 +240,9 @@ KData HKU_API getKData(const string& market_code, int64_t start = 0, int64_t end
 
 inline KData::KData(const KData& x) : m_imp(x.m_imp) {}
 
-inline KData::KData(KData&& x) : m_imp(std::move(x.m_imp)) {}
+inline KData::KData(KData&& x) : m_imp(std::move(x.m_imp)) {
+    x.m_imp = ms_null_kdata_imp;
+}
 
 inline KData& KData::operator=(const KData& x) {
     if (this == &x)
@@ -190,6 +255,7 @@ inline KData& KData::operator=(KData&& x) {
     if (this == &x)
         return *this;
     m_imp = std::move(x.m_imp);
+    x.m_imp = ms_null_kdata_imp;
     return *this;
 }
 
@@ -203,7 +269,7 @@ inline const KRecord& KData::getKRecord(size_t pos) const {
 
 inline const KRecord& KData::getKRecord(Datetime datetime) const {
     size_t pos = getPos(datetime);
-    return pos != Null<size_t>() ? getKRecord(pos) : ms_null_krecord;
+    return pos != Null<size_t>() ? getKRecord(pos) : KRecord::NullKRecord;
 }
 
 inline size_t KData::getPos(const Datetime& datetime) const {
@@ -226,6 +292,14 @@ inline const Stock& KData::getStock() const {
     return m_imp->getStock();
 }
 
+inline const KRecord& KData::front() const {
+    return m_imp->front();
+}
+
+inline const KRecord& KData::back() const {
+    return m_imp->back();
+}
+
 inline size_t KData::startPos() const {
     return m_imp->startPos();
 }
@@ -242,22 +316,6 @@ inline bool KData::operator!=(const KData& other) const {
     return !(*this == other);
 }
 
-inline KData::iterator KData::begin() {
-    return m_imp->begin();
-}
-
-inline KData::iterator KData::end() {
-    return m_imp->end();
-}
-
-inline KData::const_iterator KData::cbegin() const {
-    return m_imp->cbegin();
-}
-
-inline KData::const_iterator KData::cend() const {
-    return m_imp->cend();
-}
-
 inline const KRecord* KData::data() const {
     return m_imp->data();
 }

hikyuu/include/hikyuu/KDataImp.h

@@ -1,13 +1,11 @@
 /*
- * KDataImp.h
+ *  Copyright (c) 2025 hikyuu.org
  *
- *  Created on: 2013-2-4
+ *  Created on: 2025-08-28
  *      Author: fasiondog
  */
 
 #pragma once
-#ifndef KDATAIMP_H_
-#define KDATAIMP_H_
 
 #include "Stock.h"
 
@@ -15,7 +13,7 @@ namespace hku {
 
 class HKU_API KDataImp {
 public:
-    KDataImp();
+    KDataImp() = default;
     KDataImp(const Stock& stock, const KQuery& query);
     virtual ~KDataImp();
 
@@ -27,72 +25,59 @@ public:
         return m_stock;
     }
 
-    const KRecord& getKRecord(size_t pos) const {
-        return m_buffer[pos];
+    virtual bool empty() const {
+        return true;
     }
 
-    bool empty() const {
-        return m_buffer.empty();
+    virtual size_t size() const {
+        return 0;
     }
 
-    size_t size() {
-        return m_buffer.size();
+    virtual size_t startPos() const {
+        return 0;
     }
 
-    size_t startPos();
-    size_t endPos();
-    size_t lastPos();
-
-    size_t getPos(const Datetime& datetime);
-
-    const KRecord* data() const {
-        return m_buffer.data();
+    virtual size_t endPos() const {
+        return 0;
     }
 
-    KRecord* data() {
-        return m_buffer.data();
+    virtual size_t lastPos() const {
+        return 0;
     }
 
-    DatetimeList getDatetimeList() const;
+    virtual size_t getPos(const Datetime& datetime) const {
+        return Null<size_t>();
+    }
 
-public:
-    typedef KRecordList::iterator iterator;
-    typedef KRecordList::const_iterator const_iterator;
+    virtual const KRecord& getKRecord(size_t pos) const {
+        return KRecord::NullKRecord;
+    }
 
-    iterator begin() {
-        return m_buffer.begin();
+    virtual const KRecord& front() const {
+        return KRecord::NullKRecord;
     }
 
-    iterator end() {
-        return m_buffer.end();
+    virtual const KRecord& back() const {
+        return KRecord::NullKRecord;
     }
 
-    const_iterator cbegin() const {
-        return m_buffer.cbegin();
+    virtual const KRecord* data() const {
+        return nullptr;
     }
 
-    const_iterator cend() const {
-        return m_buffer.cend();
+    virtual KRecord* data() {
+        return nullptr;
     }
 
-private:
-    void _getPosInStock();
-    void _recoverForward();
-    void _recoverBackward();
-    void _recoverEqualForward();
-    void _recoverEqualBackward();
-    void _recoverForUpDay();
+    virtual DatetimeList getDatetimeList() const {
+        return DatetimeList();
+    }
 
-private:
-    KRecordList m_buffer;
+protected:
     KQuery m_query;
     Stock m_stock;
-    size_t m_start;
-    size_t m_end;
-    bool m_have_pos_in_stock;
 };
 
 typedef shared_ptr<KDataImp> KDataImpPtr;
 
 } /* namespace hku */
-#endif /* KDATAIMP_H_ */

hikyuu/include/hikyuu/KDataPrivatedBufferImp.h

@@ -0,0 +1,73 @@
+/*
+ * KDataPrivatedBufferImp.h
+ *
+ *  Created on: 2013-2-4
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "KDataImp.h"
+
+namespace hku {
+
+class HKU_API KDataPrivatedBufferImp : public KDataImp {
+public:
+    KDataPrivatedBufferImp();
+    KDataPrivatedBufferImp(const Stock& stock, const KQuery& query);
+    virtual ~KDataPrivatedBufferImp();
+
+    virtual bool empty() const override {
+        return m_buffer.empty();
+    }
+
+    virtual size_t size() const override {
+        return m_buffer.size();
+    }
+
+    virtual size_t startPos() const override;
+    virtual size_t endPos() const override;
+    virtual size_t lastPos() const override;
+
+    virtual size_t getPos(const Datetime& datetime) const override;
+
+    virtual const KRecord& getKRecord(size_t pos) const override {
+        return m_buffer[pos];
+    }
+
+    virtual const KRecord& front() const override {
+        return m_buffer.front();
+    }
+
+    virtual const KRecord& back() const override {
+        return m_buffer.back();
+    }
+
+    virtual const KRecord* data() const override {
+        return m_buffer.data();
+    }
+
+    virtual KRecord* data() override {
+        return m_buffer.data();
+    }
+
+    virtual DatetimeList getDatetimeList() const override;
+
+private:
+    void _getPosInStock() const;
+    void _recoverForward();
+    void _recoverBackward();
+    void _recoverEqualForward();
+    void _recoverEqualBackward();
+    void _recoverForUpDay();
+
+private:
+    KRecordList m_buffer;
+    mutable size_t m_start{0};
+    mutable size_t m_end{0};
+    mutable bool m_have_pos_in_stock{false};
+};
+
+typedef shared_ptr<KDataPrivatedBufferImp> KDataPrivatedBufferImpPtr;
+
+} /* namespace hku */