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

hikyuu/hub.pyi

@@ -28,23 +28,22 @@ 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):
-    __firstlineno__: typing.ClassVar[int] = 39
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840fd400; ConfigModel>
-    __static_attributes__: typing.ClassVar[tuple] = tuple()
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x181e87cbc40; 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 20a84129450>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 181e87df4f0>
     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):
         ...
@@ -54,8 +53,6 @@ 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):
@@ -112,82 +109,70 @@ class HubManager:
     def print_part_info(self, name):
         ...
 class HubModel(sqlalchemy.orm.decl_api.Base):
-    __firstlineno__: typing.ClassVar[int] = 54
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840ddd10; HubModel>
-    __static_attributes__: typing.ClassVar[tuple] = tuple()
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x181e880b3a0; 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 20a84141d60>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 181e880a180>
     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):
-    __firstlineno__: typing.ClassVar[int] = 75
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x20a840de5d0; PartModel>
-    __static_attributes__: typing.ClassVar[tuple] = tuple()
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x181e880b8e0; 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 20a841427b0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 181e880abd0>
     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):
@@ -196,30 +181,34 @@ 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():
     """
@@ -229,43 +218,49 @@ 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):
     ...
@@ -275,23 +270,26 @@ 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/KData.h

@@ -75,6 +75,14 @@ public:
      */
     KData getKData(const KQuery::KType& ktype) const;
 
+    /**
+     * 通过索引获取其子集 [star, end)
+     * @param start 起始索引
+     * @param end 结束索引
+     * @return KData
+     */
+    KData getKData(int64_t start, int64_t end = Null<int64_t>()) const;
+
     /** 按日期查询对应的索引位置，注：是 KData 中的位置，不是在 Stock 中原始K记录的位置 */
     size_t getPos(const Datetime& datetime) const;
 

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -14,6 +14,7 @@
 #include <pybind11/operators.h>
 #include <pybind11/stl.h>
 #include <pybind11/numpy.h>
+#include <arrow/api.h>
 #include <vector>
 #include <string>
 #include "convert_any.h"
@@ -123,6 +124,13 @@ inline bool check_pyfunction_arg_num(py::object& func, size_t arg_num) {
  */
 size_t utf8_to_utf32(const std::string& utf8_str, int32_t* out, size_t out_len) noexcept;
 
+/*
+ * 将arrow::Table转换为 pyarrow::Table
+ * @param table 待转换的arrow::Table
+ * @return 转换后的py::object
+ */
+py::object to_pyarrow_table(const std::shared_ptr<arrow::Table>& table);
+
 }  // namespace hku
 
 #endif  // HIKYUU_PYTHON_BIND_UTILS_H

hikyuu/include/hikyuu/version.h

@@ -16,9 +16,9 @@
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
 #define HKU_VERSION_ALTER 8
-#define HKU_VERSION_BUILD 202509060002
+#define HKU_VERSION_BUILD 202509070200
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.8 release.5d5956d0 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.8 master.4be22a77 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */