tea-bond 0.3.12__cp38-abi3-win_amd64.whl → 0.3.14__cp38-abi3-win_amd64.whl

pybond/pd.py

@@ -291,6 +291,12 @@ class TfEvaluators:
             "last_trading_date"
         ].to_pandas()
 
+    @property
+    def remain_year(self):
+        return self.pl_df.select(remain_year=self._evaluators.remain_year)[
+            "remain_year"
+        ].to_pandas()
+
 
 class Bonds:
     """
@@ -387,6 +393,12 @@ class Bonds:
             "remain_cp_num"
         ].to_pandas()
 
+    def remain_year(self, date: str | pd.Series):
+        df = pl.DataFrame({"bond": self.bond, "date": date})
+        return df.select(remain_year=PlBonds("bond").remain_year("date"))[
+            "remain_year"
+        ].to_pandas()
+
 
 class Futures:
     def __init__(self, future: str | pd.Series):

pybond/pl.py

@@ -269,6 +269,27 @@ class TfEvaluators:
         """
         return self._call_plugin("evaluators_last_trading_date")
 
+    @property
+    def remain_year(self):
+        """
+        Calculate bond remaining year (债券剩余期限).
+
+        Args:
+            date: Evaluation date column expression
+
+        Returns:
+            Polars expression for bond remaining 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:
     """
@@ -310,6 +331,18 @@ class Bonds:
             reinvest_rate=None,
         )
 
+    def remain_year(self, date: IntoExpr = "date"):
+        """
+        Calculate remain year for the bond (剩余期限).
+        """
+        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 (应计利息).

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.12.dist-info → tea_bond-0.3.14.dist-info}/METADATA

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

{tea_bond-0.3.12.dist-info → tea_bond-0.3.14.dist-info}/RECORD

@@ -15,12 +15,12 @@ pybond/nb/nb_datetime.py,sha256=sg3Vmg2n2P_A186QgOGSOKBq-Tr72ht_Yw064yYrWXE,1067
 pybond/nb/nb_duration.py,sha256=bndVSHdG_yV0_vEWeAHd9Lq_UQ-8nkPnEC9cN2A2ca4,1709
 pybond/nb/nb_evaluators.py,sha256=GBsW3UuGf8iVUWr2DTISXzdYoGV5ITEOVFJivBNmWkc,15544
 pybond/nb/nb_time.py,sha256=5KNrWYcPwZUHoxvZKvh3qdhjB0DjRkxbUzONSv6OfhY,8928
-pybond/pd.py,sha256=aMalUv_TBzT48BXdp7whzZ9g64p8uiPZrk9LaI1UaIU,13821
-pybond/pl.py,sha256=WhiBv6IOs5-jxK78xd75KXZSogoFyJ0XJ-v23Gjp_ho,13966
-pybond/pnl.py,sha256=FSIN6YJ9P44nsJGgnpdsf7b5MS96ziGMmQAlPzG8lb4,3605
+pybond/pd.py,sha256=ghqoO9-wB0f3yjpYf5BMbz0Mu8Z1BVTbngcf1G4_Y9Y,14234
+pybond/pl.py,sha256=lGNnf85fJpad0wOjxehyJCBUWbzbRAdhrY5iW6Tg-zc,14850
+pybond/pnl.py,sha256=gIrKG-okNwDiMdfCy8Kz8wE7jgnVAGYCstFvxIncCwk,3662
 pybond/polars_utils.py,sha256=XJ7DXpBfMEm3DilAun7E8S_6ShqQxi--ZSFV8CyRCxA,2697
-pybond/pybond.pyd,sha256=ML3k6ZZ2GAueGC5drTVCcPN_yg33JK6O3dFBspo1HhA,23583744
+pybond/pybond.pyd,sha256=zvNhqF6sjTBxXHQCP0-Eg29xFzPkZBKwzOrSeUbRVio,23701504
 pybond/pybond.pyi,sha256=qzOfqoysuUW7rnZYxEmGEJXK_UrCjMvQ29Y_mJOBN1Y,11621
-tea_bond-0.3.12.dist-info/METADATA,sha256=LZOQ6O98UhsurMn3R23Kvk5klAjsDmqmo6xabz8cnzc,258
-tea_bond-0.3.12.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
-tea_bond-0.3.12.dist-info/RECORD,,
+tea_bond-0.3.14.dist-info/METADATA,sha256=pyYrjVnz2Oweg6SfVp5iaXUbHUGl6L4EHe2DM5Oy3OY,258
+tea_bond-0.3.14.dist-info/WHEEL,sha256=CG8OzNtm0LMpJ2zhrjswlO8N-965OeMLklsQAG-nMvQ,94
+tea_bond-0.3.14.dist-info/RECORD,,