expose "earlier/later" in lease end type assumption

Author: yellowbean

absbox/local/component.py

@@ -1817,9 +1817,13 @@ def mkAssumpLeaseRent(x):
 def mkAssumpLeaseEndType(x):
     match x:
         case {"byDate":d} | ("byDate", d):
-            return mkTag("CutByDate", vDate(d))
+            return mkTag(("CutByDate", vDate(d)))
         case {"stopByExtNum":n} | ("byExtTimes",n):
-            return mkTag("StopByExtTimes", vInt(n))
+            return mkTag(("StopByExtTimes", vInt(n)))
+        case ("earlierOf", d, n):
+            return mkTag(("EarlierOf", [vDate(d), vInt(n)]))
+        case ("laterOf", d, n):
+            return mkTag(("LaterOf", [vDate(d), vInt(n)]))
         case _:
             raise RuntimeError(f"failed to match {x}:mkAssumpLeaseEndType")
 
@@ -1857,19 +1861,8 @@ def mkDefaultedAssumption(x):
 
 
 def mkDelinqAssumption(x):
-    #return "DummyDelinqAssump"
-    #return mkTag("DummyDelinqAssump")
     return []
 
-def mkEndType(x):
-    match x:
-        case ("byDate", d):
-            return mkTag(("CutByDate",vDate(d)))
-        case ("byExtTimes",n):
-            return mkTag(("StopByExtTimes", vNum(n)))
-        case _:
-            raise RuntimeError(f"failed to match {x} : mkEndType")
-
 def mkPerfAssumption(x):
     "Make assumption on performing assets"
     def mkExtraStress(y):
@@ -1903,7 +1896,7 @@ def mkExtraStress(y):
             return mkTag(("LeaseAssump",[earlyReturnNone(mkAssumpLeaseDefaultType,md)
                                         ,mkAssumpLeaseGap(gap)
                                         ,mkAssumpLeaseRent(rent)
-                                        ,mkEndType(endType)
+                                        ,mkAssumpLeaseEndType(endType)
                                         ]))
         case ("Loan",md,mp,mr,mes):
             d = earlyReturnNone(mkAssumpDefault,md)

absbox/tests/regression/assets.py

@@ -30,3 +30,9 @@
             ,"currentRate": 0.075
             ,"remainTerm": 12
             ,"status": "Current"}]
+
+l1 = ["Lease"
+        ,{"rental":("byDay", 12.0, ["DayOfMonth",15])
+        ,"originTerm": 12
+        ,"originDate": "2022-01-05"}
+        ,{"status":"Current" ,"remainTerm":6 ,"currentBalance":150}]

absbox/tests/regression/test_main.py

@@ -287,4 +287,32 @@ def test_trigger_chgBondRate(setup_api):
                     }
                     })
     r = setup_api.run(withTrigger , read=True ,runAssump = [("interest",("SOFR1Y",0.04))])
-    assert r['bonds']['A1'].rate.to_list() == [0.07, 0.12, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02]
+    assert r['bonds']['A1'].rate.to_list() == [0.07, 0.12, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02]
+
+@pytest.mark.pool
+def test_pool_lease_end(setup_api):
+    """ Lease end date """
+    myPool = {'assets':[l1],'cutoffDate':"2022-01-01"}
+    r = setup_api.runPool(myPool
+                  ,poolAssump=("Pool",("Lease", None, ('days', 20) , ('byAnnualRate', 0.0), ("byExtTimes", 2))
+                                       ,None
+                                       ,None
+                                       )
+                  ,read=True)
+    assert r['PoolConsol'][0].index[-1] == '2024-12-15'
+
+    r = setup_api.runPool(myPool
+                  ,poolAssump=("Pool",("Lease", None, ('days', 20) , ('byAnnualRate', 0.0), ("earlierOf", "2023-11-15", 2))
+                                       ,None
+                                       ,None
+                                       )
+                  ,read=True)
+    assert r['PoolConsol'][0].index[-1] == '2023-12-15'
+
+    r = setup_api.runPool(myPool
+                  ,poolAssump=("Pool",("Lease", None, ('days', 20) , ('byAnnualRate', 0.0), ("laterOf", "2023-11-15", 3))
+                                       ,None
+                                       ,None
+                                       )
+                  ,read=True)
+    assert r['PoolConsol'][0].index[-1] == '2025-12-15'

docs/source/analytics.rst

@@ -507,6 +507,9 @@ Describle the end type of lease projection,either by a ``Date`` or a ``Extend Ti
 
 * ``("byDate", "2026-09-20")`` : the date when lease projection ends
 * ``("byExtTimes", 1)`` : how many times lease will roll over for 1 time
+.. versionadded:: 0.45.9
+* ``("earlierOf", "2026-09-20", 3)`` : the lease projection ends at the earlier of the date or extend time
+* ``("laterOf", "2026-09-20", 3)`` : the lease projection ends at the later of the date or extend time
 
 Summary
 """"""""""""""""