tea-bond 0.3.13__tar.gz → 0.3.14__tar.gz

{tea_bond-0.3.13 → tea_bond-0.3.14}/Cargo.lock

@@ -2195,7 +2195,7 @@ dependencies = [
 
 [[package]]
 name = "pybond"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "chrono",
  "itertools 0.14.0",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "tea-bond"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "anyhow",
  "chrono",
@@ -3136,7 +3136,7 @@ dependencies = [
 
 [[package]]
 name = "tea-calendar"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "chrono",
 ]

{tea_bond-0.3.13 → tea_bond-0.3.14}/Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["tea-bond", "tea-calendar"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.13"
+version = "0.3.14"
 edition = "2024"
 
 [workspace.dependencies]

{tea_bond-0.3.13 → tea_bond-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tea-bond
-Version: 0.3.13
+Version: 0.3.14
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{tea_bond-0.3.13/pybond → tea_bond-0.3.14}/pybond/pl.py

@@ -280,7 +280,15 @@ class TfEvaluators:
         Returns:
             Polars expression for bond remaining year
         """
-        return self._call_plugin("evaluators_remain_year")
+        return self._call_plugin("bonds_remain_year")
+
+    @property
+    def carry_date(self):
+        return self._call_plugin("bonds_carry_date")
+
+    @property
+    def maturity_date(self):
+        return self._call_plugin("bonds_maturity_date")
 
 
 class Bonds:
@@ -329,6 +337,12 @@ class Bonds:
         """
         return self._evaluator(date=date).remain_year
 
+    def carry_date(self):
+        return self._evaluator().carry_date
+
+    def maturity_date(self):
+        return self._evaluator().maturity_date
+
     def accrued_interest(self, date: IntoExpr = "date"):
         """
         Calculate accrued interest for the bond (应计利息).

{tea_bond-0.3.13/pybond → tea_bond-0.3.14}/pybond/pnl.py

@@ -115,7 +115,7 @@ def trading_from_pos(
     pos: IntoExpr,
     open: IntoExpr,
     finish_price: IntoExpr | None = None,
-    cash: float = 1e8,
+    cash: IntoExpr = 1e8,
     multiplier: float = 1,
     qty_tick: float = 1.0,
     *,
@@ -125,15 +125,16 @@ def trading_from_pos(
     pos = parse_into_expr(pos)
     open = parse_into_expr(open)
     finish_price = parse_into_expr(finish_price)
+    cash = parse_into_expr(cash)
     kwargs = {
-        "cash": cash,
-        "multiplier": multiplier,
-        "qty_tick": qty_tick,
+        "cash": None,
+        "multiplier": float(multiplier),
+        "qty_tick": float(qty_tick),
         "stop_on_finish": stop_on_finish,
         "finish_price": None,
     }
     return register_plugin(
-        args=[time, pos, open, finish_price],
+        args=[time, pos, open, finish_price, cash],
         kwargs=kwargs,
         symbol="trading_from_pos",
         is_elementwise=False,

{tea_bond-0.3.13 → tea_bond-0.3.14/pybond}/pybond/pl.py

@@ -280,7 +280,15 @@ class TfEvaluators:
         Returns:
             Polars expression for bond remaining year
         """
-        return self._call_plugin("evaluators_remain_year")
+        return self._call_plugin("bonds_remain_year")
+
+    @property
+    def carry_date(self):
+        return self._call_plugin("bonds_carry_date")
+
+    @property
+    def maturity_date(self):
+        return self._call_plugin("bonds_maturity_date")
 
 
 class Bonds:
@@ -329,6 +337,12 @@ class Bonds:
         """
         return self._evaluator(date=date).remain_year
 
+    def carry_date(self):
+        return self._evaluator().carry_date
+
+    def maturity_date(self):
+        return self._evaluator().maturity_date
+
     def accrued_interest(self, date: IntoExpr = "date"):
         """
         Calculate accrued interest for the bond (应计利息).

{tea_bond-0.3.13 → tea_bond-0.3.14/pybond}/pybond/pnl.py

@@ -115,7 +115,7 @@ def trading_from_pos(
     pos: IntoExpr,
     open: IntoExpr,
     finish_price: IntoExpr | None = None,
-    cash: float = 1e8,
+    cash: IntoExpr = 1e8,
     multiplier: float = 1,
     qty_tick: float = 1.0,
     *,
@@ -125,15 +125,16 @@ def trading_from_pos(
     pos = parse_into_expr(pos)
     open = parse_into_expr(open)
     finish_price = parse_into_expr(finish_price)
+    cash = parse_into_expr(cash)
     kwargs = {
-        "cash": cash,
-        "multiplier": multiplier,
-        "qty_tick": qty_tick,
+        "cash": None,
+        "multiplier": float(multiplier),
+        "qty_tick": float(qty_tick),
         "stop_on_finish": stop_on_finish,
         "finish_price": None,
     }
     return register_plugin(
-        args=[time, pos, open, finish_price],
+        args=[time, pos, open, finish_price, cash],
         kwargs=kwargs,
         symbol="trading_from_pos",
         is_elementwise=False,

{tea_bond-0.3.13 → tea_bond-0.3.14}/pybond/src/batch_eval.rs

@@ -525,7 +525,7 @@ fn evaluators_last_trading_date(
 }
 
 #[polars_expr(output_type=Date)]
-fn evaluators_remain_year(
+fn bonds_remain_year(
     inputs: &[Series],
     kwargs: EvaluatorBatchParams,
 ) -> PolarsResult<Series> {
@@ -544,6 +544,46 @@ fn evaluators_remain_year(
     Ok(result.into_series())
 }
 
+#[polars_expr(output_type=Date)]
+fn bonds_carry_date(
+    inputs: &[Series],
+    kwargs: EvaluatorBatchParams,
+) -> PolarsResult<Series> {
+    let result: Int32Chunked = batch_eval(
+        inputs,
+        kwargs,
+        |e: TfEvaluator| e,
+        |e: &TfEvaluator| {
+            Some(e.bond.carry_date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
+        },
+        false,
+        true,
+    )?
+    .into_iter()
+    .collect_trusted();
+    Ok(result.into_date().into_series())
+}
+
+#[polars_expr(output_type=Date)]
+fn bonds_maturity_date(
+    inputs: &[Series],
+    kwargs: EvaluatorBatchParams,
+) -> PolarsResult<Series> {
+    let result: Int32Chunked = batch_eval(
+        inputs,
+        kwargs,
+        |e: TfEvaluator| e,
+        |e: &TfEvaluator| {
+            Some(e.bond.maturity_date.num_days_from_ce() - EPOCH_DAYS_FROM_CE)
+        },
+        false,
+        true,
+    )?
+    .into_iter()
+    .collect_trusted();
+    Ok(result.into_date().into_series())
+}
+
 #[derive(Deserialize)]
 struct FindWorkdayKwargs {
     market: Market,

{tea_bond-0.3.13 → tea_bond-0.3.14}/pybond/src/pnl.rs

@@ -141,11 +141,14 @@ fn get_trading_output_type(input_fields: &[Field]) -> PolarsResult<Field> {
 fn trading_from_pos(inputs: &[Series], mut kwargs: pnl::TradeFromPosOpt) -> PolarsResult<Series> {
     use pyo3_polars::export::polars_core::utils::CustomIterTools;
     use tevec::export::polars::prelude::*;
-    let (time, pos, open, finish_price) = (&inputs[0], &inputs[1], &inputs[2], &inputs[3]);
-    let (pos, open, finish_price) = auto_cast!(Float64(pos, open, finish_price));
+    let (time, pos, open, finish_price, cash) = (&inputs[0], &inputs[1], &inputs[2], &inputs[3], &inputs[4]);
+    let (pos, open, finish_price, cash) = auto_cast!(Float64(pos, open, finish_price, cash));
     if let Some(p) = finish_price.f64()?.iter().next() {
         kwargs.finish_price = p
     };
+    if let Some(c) = cash.f64()?.iter().next() {
+        kwargs.cash = c
+    };
     let res = match time.dtype() {
         DataType::Date => {
             let trade_vec =

{tea_bond-0.3.13 → tea_bond-0.3.14}/tea-bond/src/bond/mod.rs

@@ -152,7 +152,7 @@ impl Bond {
                 self.carry_date
             );
             return Ok(self.carry_date);
-        } else if date >= self.maturity_date {
+        } else if date > self.maturity_date {
             eprintln!(
                 "Calculating date {} is after the bond {} 's maturity date {}, the result may be incorrect",
                 date,

{tea_bond-0.3.13 → tea_bond-0.3.14}/tea-bond/src/pnl/mod.rs

@@ -88,24 +88,27 @@ where
             .checked_add_days(Days::new(settle_time.unwrap() as u64))
             .unwrap();
         let (trade_price, close): (Option<f64>, Option<f64>) = if let Some(bond) = &symbol {
-            if last_settle_time != Some(settle_time) {
-                // 新的一天重新计算相关信息
-                let cp_dates = bond.get_nearest_cp_date(settle_time).unwrap();
-                accrued_interest = bond
-                    .calc_accrued_interest(settle_time, Some(cp_dates))
-                    .unwrap();
-                last_cp_date = bond.mkt.find_workday(cp_dates.0, 0);
-                // 当天初始仓位会产生的票息
-                if settle_time == last_cp_date {
-                    state.coupon_paid += coupon_paid * multiplier * state.pos;
+            if !bond.is_zero_coupon() {
+                if last_settle_time != Some(settle_time) {
+                    // 新的一天重新计算相关信息
+                    let cp_dates = bond.get_nearest_cp_date(settle_time).unwrap();
+                    accrued_interest = bond
+                        .calc_accrued_interest(settle_time, Some(cp_dates))
+                        .unwrap();
+                    last_cp_date = bond.mkt.find_workday(cp_dates.0, 0);
+                    // 当天初始仓位会产生的票息
+                    if settle_time == last_cp_date {
+                        // 调节应计利息
+                        accrued_interest = coupon_paid;
+                        state.coupon_paid += coupon_paid * multiplier * state.pos;
+                    }
+                    last_settle_time = Some(settle_time);
+                }
+                // 交易当天会产生付息
+                if (settle_time == last_cp_date) & (qty != 0.) {
+                    state.coupon_paid += coupon_paid * multiplier * qty;
                 }
-                last_settle_time = Some(settle_time);
-            }
-            // 当前需要付息
-            if settle_time == last_cp_date {
-                state.coupon_paid += coupon_paid * multiplier * qty;
             }
-
             (
                 clean_price.map(|v| v.f64() + accrued_interest),
                 clean_close.map(|v| v.f64() + accrued_interest),

{tea_bond-0.3.13 → tea_bond-0.3.14}/tea-bond/src/pnl/trade_from_signal.rs

@@ -11,8 +11,7 @@ pub struct Trade<T> {
 
 #[derive(Deserialize)]
 pub struct TradeFromPosOpt {
-    // pub symbol: SmallStr,
-    pub cash: f64,
+    pub cash: Option<f64>,
     pub multiplier: f64,
     pub qty_tick: f64,
     pub stop_on_finish: bool,
@@ -48,6 +47,7 @@ where
     let mut last_pos = 0.;
     let mut open_price: f64 = 0.;
     let mut open_qty: f64 = 0.;
+    let cash = opt.cash.unwrap();
     let mut trades = Vec::with_capacity(INIT_TRADE_COUNT);
 
     // 记录最后一个可用 (time, price)，用于 stop_on_finish
@@ -57,7 +57,6 @@ where
         if pos.not_none() && open.not_none() {
             let pos = pos.unwrap().f64();
             let price = open.unwrap().f64();
-
             // 记录最新可用的时间与价格
             last_tp = Some((time.clone(), price));
 
@@ -66,17 +65,20 @@ where
                 // 目标名义 -> 成交量（正买负卖）
                 let qty = if pos.abs() > EPS {
                     let p = if open_price > 0. { open_price } else { price };
-                    let raw_qty = dpos * opt.cash / (p * opt.multiplier);
+                    let raw_qty = dpos * cash / (p * opt.multiplier);
                     // 量化到最小变动单位（朝 0 截断，避免超买/超卖）
                     quantize_inside(raw_qty, opt.qty_tick)
                 } else {
                     -open_qty
                 };
-                if dpos.signum() == open_qty.signum() {
-                    open_price = (open_price * open_qty + qty * price) / (qty + open_qty)
+                if open_qty == 0. {
+                    // 开仓情况
+                    open_price = price;
+                } else if dpos.signum() == open_qty.signum() {
+                    open_price = (open_price * open_qty + qty * price) / (qty + open_qty);
                 } else if open_qty.abs() > qty.abs() {
                     // 反向加仓, 价格为新的开仓价格
-                    open_price = price
+                    open_price = price;
                 };
                 // 减仓情况的价格不改变
 
@@ -97,7 +99,7 @@ where
     });
 
     // 收尾是否强制平仓
-    if opt.stop_on_finish && open_qty != 0.0 {
+    if opt.stop_on_finish && (open_qty != 0.0) {
         if let Some((t, p)) = last_tp {
             let p = if let Some(p) = opt.finish_price { p } else { p };
             trades.push(Trade {