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

hikyuu/trade_manage/broker.pyi

@@ -1,30 +1,30 @@
 from __future__ import annotations
-import hikyuu.cpp.core312
-from hikyuu.cpp.core312 import OrderBrokerBase
+import hikyuu.cpp.core313
+from hikyuu.cpp.core313 import OrderBrokerBase
 from hikyuu.util.mylog import hku_error
 import json as json
+import typing
 __all__ = ['OrderBrokerBase', 'OrderBrokerWrap', 'TestOrderBroker', 'crtOB', 'hku_error', 'json']
-class OrderBrokerWrap(hikyuu.cpp.core312.OrderBrokerBase):
+class OrderBrokerWrap(hikyuu.cpp.core313.OrderBrokerBase):
     """
     订单代理包装类，用户可以参考自定义自己的订单代理，加入额外的处理
-           包装只有买卖操作参数只有(code, price, num)的交易接口类
-        
+    包装只有买卖操作参数只有(code, price, num)的交易接口类
     """
+    __firstlineno__: typing.ClassVar[int] = 37
+    __static_attributes__: typing.ClassVar[tuple] = ('_broker')
     def __init__(self, broker, name):
         """
         
-                订单代理包装类，用户可以参考自定义自己的订单代理，加入额外的处理
-                
+        订单代理包装类，用户可以参考自定义自己的订单代理，加入额外的处理
         """
     def _buy(self, datetime, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         """
         
-                实现 OrderBrokerBase 的 _buy 接口
-                :param str market: 证券市场    
-                :param str code: 证券代码
-                :param float price: 买入价格
-                :param int num: 买入数量        
-                
+        实现 OrderBrokerBase 的 _buy 接口
+        :param str market: 证券市场    
+        :param str code: 证券代码
+        :param float price: 买入价格
+        :param int num: 买入数量        
         """
     def _get_asset_info(self):
         ...
@@ -36,6 +36,8 @@ class TestOrderBroker:
     """
     用于测试的订单代理，仅在执行买入/卖出时打印信息
     """
+    __firstlineno__: typing.ClassVar[int] = 74
+    __static_attributes__: typing.ClassVar[tuple] = tuple()
     def __init__(self):
         ...
     def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
@@ -45,10 +47,9 @@ class TestOrderBroker:
 def crtOB(broker, name = 'NO_NAME'):
     """
     
-        快速生成订单代理包装对象
+    快速生成订单代理包装对象
     
-        :param broker: 订单代理示例，必须拥有buy和sell方法，并且参数为 code, price, num
-        :param float slip: 如果当前的卖一价格和指示买入的价格绝对差值不超过slip则下单，
-                            否则忽略; 对卖出操作无效，立即以当前价卖出
-        
+    :param broker: 订单代理示例，必须拥有buy和sell方法，并且参数为 code, price, num
+    :param float slip: 如果当前的卖一价格和指示买入的价格绝对差值不超过slip则下单，
+                        否则忽略; 对卖出操作无效，立即以当前价卖出
     """

hikyuu/trade_manage/broker_easytrader.pyi

@@ -1,14 +1,16 @@
 from __future__ import annotations
-from hikyuu.cpp.core312 import Datetime
+from hikyuu.cpp.core313 import Datetime
 from hikyuu.util.mylog import hku_info
+import typing
 __all__ = ['Datetime', 'EasyTraderOrderBroker', 'hku_info']
 class EasyTraderOrderBroker:
     """
     
-        使用华泰客户端实例
-        注意：buy|sell 中已屏蔽实际通过easytrade下单，防止调试误操作，请自行根据需要打开
-        
+    使用华泰客户端实例
+    注意：buy|sell 中已屏蔽实际通过easytrade下单，防止调试误操作，请自行根据需要打开
     """
+    __firstlineno__: typing.ClassVar[int] = 10
+    __static_attributes__: typing.ClassVar[tuple] = ('buffer', 'user')
     def __init__(self, user):
         ...
     def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):

hikyuu/trade_manage/broker_mail.pyi

@@ -2,54 +2,52 @@ from __future__ import annotations
 from email.header import Header
 from email.mime.text import MIMEText
 import smtplib as smtplib
+import typing
 __all__ = ['Header', 'MIMEText', 'MailOrderBroker', 'smtplib']
 class MailOrderBroker:
     """
     
-        邮件订单代理
-        
+    邮件订单代理
     """
+    __firstlineno__: typing.ClassVar[int] = 37
+    __static_attributes__: typing.ClassVar[tuple] = ('_host', '_pwd', '_receivers', '_sender')
     def __init__(self, host, sender, pwd, receivers):
         """
         
-                邮件订单代理，执行买入/卖出操作时发送 Email
+        邮件订单代理，执行买入/卖出操作时发送 Email
         
-                :param str host: smtp服务器地址
-                :param int port: smtp服务器端口
-                :param str sender: 发件邮箱（既用户名）
-                :param str pwd: 密码
-                :param list receivers: 接受者邮箱列表
-                
+        :param str host: smtp服务器地址
+        :param int port: smtp服务器端口
+        :param str sender: 发件邮箱（既用户名）
+        :param str pwd: 密码
+        :param list receivers: 接受者邮箱列表
         """
     def _sendmail(self, title, msg):
         """
         发送邮件
         
-                :param str title: 邮件标题
-                :param str msg: 邮件内容
-                
+        :param str title: 邮件标题
+        :param str msg: 邮件内容
         """
     def buy(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         """
         执行买入操作，向指定的邮箱发送邮件，格式如下::
         
-                    邮件标题：【Hkyuu提醒】买入 证券代码
-                    邮件内容：买入：证券代码，价格：买入的价格，数量：买入数量
+            邮件标题：【Hkyuu提醒】买入 证券代码
+            邮件内容：买入：证券代码，价格：买入的价格，数量：买入数量
         
-                :param str code: 证券代码
-                :param float price: 买入价格
-                :param int num: 买入数量
-                
+        :param str code: 证券代码
+        :param float price: 买入价格
+        :param int num: 买入数量
         """
     def sell(self, market, code, price, num, stoploss, goal_price, part_from, remark = ''):
         """
         执行卖出操作，向指定的邮箱发送邮件，格式如下::
         
-                    邮件标题：【Hkyuu提醒】卖出 证券代码
-                    邮件内容：卖出：证券代码，价格：卖出的价格，数量：卖出数量
+            邮件标题：【Hkyuu提醒】卖出 证券代码
+            邮件内容：卖出：证券代码，价格：卖出的价格，数量：卖出数量
         
-                :param str code: 证券代码
-                :param float price: 卖出价格
-                :param int num: 卖出数量
-                
+        :param str code: 证券代码
+        :param float price: 卖出价格
+        :param int num: 卖出数量
         """

hikyuu/trade_manage/trade.py

@@ -29,78 +29,23 @@
 # 1. 20130213, Added by fasiondog
 # ===============================================================================
 
-from hikyuu.util.slice import list_getitem
 from hikyuu import *
 import numpy as np
 import pandas as pd
 
 
-def TradeList_to_np(t_list):
-    """转化为numpy结构数组"""
-    t_type = np.dtype(
-        {
-            'names': [
-                '交易日期', '证券代码', '证券名称', '业务名称', '计划交易价格', '实际成交价格', '目标价格', '成交数量', '佣金', '印花税', '过户费', '其它成本',
-                '交易总成本', '止损价', '现金余额', '信号来源'
-            ],
-            'formats':
-            ['datetime64[D]', 'U10', 'U20', 'U10', 'd', 'd', 'd', 'i', 'd', 'd', 'd', 'd', 'd', 'd', 'd', 'U5']
-        }
-    )
-    return np.array(
-        [
-            (
-                t.datetime, t.stock.market_code, t.stock.name, get_business_name(t.business), t.plan_price,
-                t.real_price, t.goal_price, t.number, t.cost.commission, t.cost.stamptax, t.cost.transferfee,
-                t.cost.others, t.cost.total, t.stoploss, t.cash, get_system_part_name(t.part)
-            ) for t in t_list
-        ],
-        dtype=t_type
-    )
+TradeRecordList.to_np = lambda self: trades_to_np(self)
+TradeRecordList.to_df = lambda self: trades_to_df(self)
+TradeRecordList.to_numpy = TradeRecordList.to_np
+TradeRecordList.to_pandas = TradeRecordList.to_df
+TradeRecordList.to_pyarrow = lambda self: trades_to_pa(self)
 
 
-def TradeList_to_df(t):
-    """转化为pandas的DataFrame"""
-    return pd.DataFrame.from_records(TradeList_to_np(t), index='交易日期')
-
-
-TradeRecordList.to_np = TradeList_to_np
-TradeRecordList.to_df = TradeList_to_df
-
-
-def PositionList_to_np(pos_list):
-    """转化为numpy结构数组"""
-    t_type = np.dtype(
-        {
-            'names': ['证券代码', '证券名称', '买入日期', '已持仓天数', '持仓数量', '投入金额', '当前市值', '盈亏金额', '盈亏比例'],
-            'formats': ['U10', 'U20', 'datetime64[D]', 'i', 'i', 'd', 'd', 'd', 'd']
-        }
-    )
-    sm = StockManager.instance()
-    query = Query(-1)
-    data = []
-    for pos in pos_list:
-        invest = pos.buy_money - pos.sell_money + pos.total_cost
-        k = pos.stock.get_kdata(query)
-        cur_val = k[0].close * pos.number
-        bonus = cur_val - invest
-        date_list = sm.get_trading_calendar(Query(Datetime(pos.take_datetime.date())))
-        data.append(
-            (
-                pos.stock.market_code, pos.stock.name, pos.take_datetime, len(date_list), pos.number, invest,
-                cur_val, bonus, 100 * bonus / invest
-            )
-        )
-    return np.array(data, dtype=t_type)
-
-
-def PositionList_to_df(pos_list):
-    """转化为pandas的DataFrame"""
-    return pd.DataFrame.from_records(PositionList_to_np(pos_list), index='证券代码')
-
-
-PositionRecordList.to_np = PositionList_to_np
-PositionRecordList.to_df = PositionList_to_df
+PositionRecordList.to_np = lambda self: positions_to_np(self)
+PositionRecordList.to_df = lambda self: positions_to_df(self)
+PositionRecordList.to_numpy = PositionRecordList.to_np
+PositionRecordList.to_pandas = PositionRecordList.to_df
+PositionRecordList.to_pyarrow = lambda self: positions_to_pa(self)
 
 
 def Performance_to_df(per):