owlplanner 2025.6.21__py3-none-any.whl → 2025.8.1__py3-none-any.whl

owlplanner/progress.py

@@ -3,7 +3,7 @@ A simple object to display progress.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+Disclaimers: This code is for educational purposes only and does not constitute financial advice.
 
 """
 

owlplanner/rates.py

@@ -23,7 +23,7 @@ to the last current data year.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+Disclaimers: This code is for educational purposes only and does not constitute financial advice.
 
 """
 
@@ -32,7 +32,6 @@ import numpy as np
 import pandas as pd
 import os
 import sys
-from datetime import date
 
 from owlplanner import mylogging as log
 from owlplanner import utils as u
@@ -120,27 +119,6 @@ def getRatesDistributions(frm, to, mylog=None):
     return means, stdev, corr, covar
 
 
-def historicalValue(amount, year):
-    """
-    Return the deflated value of amount given in this year's dollars as
-    valued at the beginning of the year specified.
-    """
-    thisyear = date.today().year
-    if TO != thisyear - 1:
-        raise RuntimeError(f"Rates file needs to be updated to be current to {thisyear}.")
-    if year < FROM:
-        raise ValueError(f"Only data from {FROM} is available.")
-    if year > thisyear:
-        raise ValueError(f"Year must be < {thisyear} for historical data.")
-
-    span = thisyear - year
-    ub = len(Inflation)
-    for n in range(ub - span, ub):
-        amount /= 1 + Inflation[n] / 100
-
-    return amount
-
-
 class Rates(object):
     """
     Rates are stored in a 4-array in the following order:

owlplanner/tax2025.py

@@ -12,7 +12,7 @@ Module to handle all tax calculations.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+Disclaimers: This code is for educational purposes only and does not constitute financial advice.
 
 """
 
@@ -25,16 +25,16 @@ from datetime import date
 
 taxBracketNames = ["10%", "12/15%", "22/25%", "24/28%", "32/33%", "35%", "37/40%"]
 
-rates_TCJA = np.array([0.10, 0.12, 0.22, 0.24, 0.32, 0.35, 0.370])
-rates_nonTCJA = np.array([0.10, 0.15, 0.25, 0.28, 0.33, 0.35, 0.396])
+rates_OBBBA = np.array([0.10, 0.12, 0.22, 0.24, 0.32, 0.35, 0.370])
+rates_preTCJA = np.array([0.10, 0.15, 0.25, 0.28, 0.33, 0.35, 0.396])
 
 ###############################################################################
 # Start of section where rates need to be actualized every year.
 ###############################################################################
 # Single [0] and married filing jointly [1].
 
-# These are current.
-taxBrackets_TCJA = np.array(
+# These are 2025 current.
+taxBrackets_OBBBA = np.array(
     [
         [11925, 48475, 103350, 197300, 250525, 626350, 9999999],
         [23850, 96950, 206700, 394600, 501050, 751600, 9999999],
@@ -52,7 +52,7 @@ irmaaBrackets = np.array(
 # Following values are incremental IRMAA part B monthly fees.
 irmaaFees = 12 * np.array([185.00, 74.00, 111.00, 110.90, 111.00, 37.00])
 
-# Make projection for non-TCJA using 2017 to current year.
+# Make projection for pre-TCJA using 2017 to current year.
 # taxBrackets_2017 = np.array(
 #    [ [9325, 37950, 91900, 191650, 416700, 418400, 9999999],
 #      [18650, 75900, 153100, 233350, 416700, 470700, 9999999],
@@ -63,26 +63,99 @@ irmaaFees = 12 * np.array([185.00, 74.00, 111.00, 110.90, 111.00, 37.00])
 # For 2025, I used a 30.5% adjustment from 2017, rounded to closest 50.
 #
 # These are speculated.
-taxBrackets_nonTCJA = np.array(
+taxBrackets_preTCJA = np.array(
     [
-        [12150, 49550, 119950, 250200, 544000, 546200, 9999999],
-        [24350, 99100, 199850, 304600, 543950, 614450, 9999999],
+        [12150, 49550, 119950, 250200, 544000, 546200, 9999999],  # Single
+        [24350, 99100, 199850, 304600, 543950, 614450, 9999999],  # MFJ
     ]
 )
 
-# These are current.
-stdDeduction_TCJA = np.array([15000, 30000])
-# These are speculated.
-stdDeduction_nonTCJA = np.array([8300, 16600])
+# These are 2025 current (adjusted for inflation).
+stdDeduction_OBBBA = np.array([15750, 31500])    # Single, MFJ
+# These are speculated (adjusted for inflation).
+stdDeduction_preTCJA = np.array([8300, 16600])  # Single, MFJ
+
+# These are current (adjusted for inflation) per individual.
+extra65Deduction = np.array([2000, 1600])       # Single, MFJ
+
+# Thresholds for capital gains (adjusted for inflation).
+capGainRates = np.array(
+    [
+        [48350, 533400],
+        [96700, 600050],
+    ]
+)
+
+# Thresholds for net investment income tax (not adjusted for inflation).
+niitThreshold = np.array([200000, 250000])
+niitRate = 0.038
 
-# These are current.
-extra65Deduction = np.array([2000, 1600])
+# Thresholds for 65+ bonus for circumventing tax on social security.
+bonusThreshold = np.array([75000, 150000])
 
 ###############################################################################
 # End of section where rates need to be actualized every year.
 ###############################################################################
 
 
+def mediVals(yobs, horizons, gamma_n, Nn, Nq):
+    """
+    Return tuple (nm, L, C) of year index when Medicare starts and vectors L, and C
+    defining end points of constant piecewise linear functions representing IRMAA fees.
+    """
+    thisyear = date.today().year
+    assert Nq == len(irmaaFees), f"Inconsistent value of Nq: {Nq}."
+    assert Nq == len(irmaaBrackets[0]), "Inconsistent IRMAA brackets array."
+    Ni = len(yobs)
+    # What index year will Medicare start? 65 - age.
+    nm = 65 - (thisyear - yobs)
+    nm = np.min(nm)
+    # Has it already started?
+    nm = max(0, nm)
+    Nmed = Nn - nm
+
+    L = np.zeros((Nmed, Nq-1))
+    C = np.zeros((Nmed, Nq))
+
+    # Year starts at offset nm in the plan.
+    for nn in range(Nmed):
+        imed = 0
+        n = nm + nn
+        if thisyear + n - yobs[0] >= 65 and n < horizons[0]:
+            imed += 1
+        if Ni == 2 and thisyear + n - yobs[1] >= 65 and n < horizons[1]:
+            imed += 1
+        if imed:
+            status = 0 if Ni == 1 else 1 if n < horizons[0] and n < horizons[1] else 0
+            L[nn] = gamma_n[n] * irmaaBrackets[status][1:]
+            C[nn] = imed * gamma_n[n] * irmaaFees
+        else:
+            raise RuntimeError("mediVals: This should never happen.")
+
+    return nm, L, C
+
+
+def capitalGainTaxRate(Ni, magi_n, gamma_n, nd, Nn):
+    """
+    Return an array of decimal rates for capital gains.
+    Parameter nd is the index year of first passing of a spouse, if applicable,
+    nd == Nn for single individuals.
+    """
+    status = Ni - 1
+    cgRate_n = np.zeros(Nn)
+
+    for n in range(Nn):
+        if status and n == nd:
+            status -= 1
+
+        if magi_n[n] > gamma_n[n] * capGainRates[status][1]:
+            cgRate_n[n] = 0.20
+        elif magi_n[n] > gamma_n[n] * capGainRates[status][0]:
+            cgRate_n[n] = 0.15
+
+    return cgRate_n
+
+
 def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
     """
     Compute Medicare costs directly.
@@ -107,11 +180,11 @@ def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
     return costs
 
 
-def taxParams(yobs, i_d, n_d, N_n, y_TCJA=2026):
+def taxParams(yobs, i_d, n_d, N_n, gamma_n, MAGI_n, yOBBBA=2099):
     """
     Input is year of birth, index of shortest-lived individual,
     lifespan of shortest-lived individual, total number of years
-    in the plan, and the year that TCJA might expire.
+    in the plan, and the year that preTCJA rates might come back.
 
     It returns 3 time series:
     1) Standard deductions at year n (sigma_n).
@@ -121,15 +194,15 @@ def taxParams(yobs, i_d, n_d, N_n, y_TCJA=2026):
     Returned values are not indexed for inflation.
     """
     # Compute the deltas in-place between brackets, starting from the end.
-    deltaBrackets_TCJA = np.array(taxBrackets_TCJA)
-    deltaBrackets_nonTCJA = np.array(taxBrackets_nonTCJA)
+    deltaBrackets_OBBBA = np.array(taxBrackets_OBBBA)
+    deltaBrackets_preTCJA = np.array(taxBrackets_preTCJA)
     for t in range(6, 0, -1):
         for i in range(2):
-            deltaBrackets_TCJA[i, t] -= deltaBrackets_TCJA[i, t - 1]
-            deltaBrackets_nonTCJA[i, t] -= deltaBrackets_nonTCJA[i, t - 1]
+            deltaBrackets_OBBBA[i, t] -= deltaBrackets_OBBBA[i, t - 1]
+            deltaBrackets_preTCJA[i, t] -= deltaBrackets_preTCJA[i, t - 1]
 
     # Prepare the 3 arrays to return - use transpose for easy slicing.
-    sigma = np.zeros((N_n))
+    sigmaBar = np.zeros((N_n))
     Delta = np.zeros((N_n, 7))
     theta = np.zeros((N_n, 7))
 
@@ -143,51 +216,57 @@ def taxParams(yobs, i_d, n_d, N_n, y_TCJA=2026):
             souls.remove(i_d)
             filingStatus -= 1
 
-        if thisyear + n < y_TCJA:
-            sigma[n] = stdDeduction_TCJA[filingStatus]
-            Delta[n, :] = deltaBrackets_TCJA[filingStatus, :]
+        if thisyear + n < yOBBBA:
+            sigmaBar[n] = stdDeduction_OBBBA[filingStatus] * gamma_n[n]
+            Delta[n, :] = deltaBrackets_OBBBA[filingStatus, :]
         else:
-            sigma[n] = stdDeduction_nonTCJA[filingStatus]
-            Delta[n, :] = deltaBrackets_nonTCJA[filingStatus, :]
+            sigmaBar[n] = stdDeduction_preTCJA[filingStatus] * gamma_n[n]
+            Delta[n, :] = deltaBrackets_preTCJA[filingStatus, :]
 
-        # Add 65+ additional exemption(s).
+        # Add 65+ additional exemption(s) and "bonus" phasing out.
         for i in souls:
             if thisyear + n - yobs[i] >= 65:
-                sigma[n] += extra65Deduction[filingStatus]
+                sigmaBar[n] += extra65Deduction[filingStatus] * gamma_n[n]
+                if thisyear + n <= 2028:
+                    sigmaBar[n] += 6000 * max(0, 1 - 0.06*max(0, MAGI_n[n] - bonusThreshold[filingStatus]))
 
         # Fill in future tax rates for year n.
-        if thisyear + n < y_TCJA:
-            theta[n, :] = rates_TCJA[:]
+        if thisyear + n < yOBBBA:
+            theta[n, :] = rates_OBBBA[:]
         else:
-            theta[n, :] = rates_nonTCJA[:]
+            theta[n, :] = rates_preTCJA[:]
 
     Delta = Delta.transpose()
     theta = theta.transpose()
 
-    # Return series unadjusted for inflation, in STD order.
-    return sigma, theta, Delta
+    # Return series unadjusted for inflation, except for sigmaBar, in STD order.
+    return sigmaBar, theta, Delta
 
 
-def taxBrackets(N_i, n_d, N_n, y_TCJA):
+def taxBrackets(N_i, n_d, N_n, yOBBBA=2099):
     """
     Return dictionary containing future tax brackets
     unadjusted for inflation for plotting.
     """
     if not (0 < N_i <= 2):
         raise ValueError(f"Cannot process {N_i} individuals.")
+
     n_d = min(n_d, N_n)
     status = N_i - 1
 
-    # Number of years left in TCJA from this year.
+    # Number of years left in OBBBA from this year.
     thisyear = date.today().year
-    ytc = y_TCJA - thisyear
+    if yOBBBA < thisyear:
+        raise ValueError(f"Expiration year {yOBBBA} cannot be in the past.")
+
+    ytc = yOBBBA - thisyear
 
     data = {}
     for t in range(len(taxBracketNames) - 1):
         array = np.zeros(N_n)
         for n in range(N_n):
             stat = status if n < n_d else 0
-            array[n] = taxBrackets_TCJA[stat][t] if n < ytc else taxBrackets_nonTCJA[stat][t]
+            array[n] = taxBrackets_OBBBA[stat][t] if n < ytc else taxBrackets_preTCJA[stat][t]
 
         data[taxBracketNames[t]] = array
 
@@ -247,12 +326,12 @@ def rho_in(yobs, N_n):
     thisyear = date.today().year
     for i in range(N_i):
         agenow = thisyear - yobs[i]
+        # Account for increase of RMD age between 2023 and 2032.
+        yrmd = 70 if yobs[i] < 1949 else 72 if 1949 <= yobs[i] <= 1950 else 73 if 1951 <= yobs[i] <= 1959 else 75
         for n in range(N_n):
-            year = thisyear + n
             yage = agenow + n
 
-            # Account for increase of RMD age between 2023 and 2032.
-            if (yage < 73) or (year > 2032 and yage < 75):
+            if yage < yrmd:
                 pass  # rho[i][n] = 0
             else:
                 rho[i][n] = 1.0 / rmdTable[yage - 72]

owlplanner/timelists.py

@@ -12,7 +12,7 @@ Utility functions to read and check timelists.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+Disclaimers: This code is for educational purposes only and does not constitute financial advice.
 
 """
 
@@ -42,7 +42,7 @@ def read(finput, inames, horizons, mylog):
     year, anticipated wages, taxable ctrb, 401k ctrb, Roth 401k ctrb,
     IRA ctrb, Roth IRA ctrb, Roth conv, and big-ticket items.
     Supports xls, xlsx, xlsm, xlsb, odf, ods, and odt file extensions.
-    Returs a dictionary of dataframes by individual's names.
+    Return a dictionary of dataframes by individual's names.
     """
 
     mylog.vprint("Reading wages, contributions, conversions, and big-ticket items over time...")
@@ -93,6 +93,7 @@ def _condition(dfDict, inames, horizons, mylog):
         # Only consider lines in proper year range. Go back 5 years for Roth maturation.
         df = df[df["year"] >= (thisyear - 5)]
         df = df[df["year"] < endyear]
+        df = df.drop_duplicates("year")
         missing = []
         for n in range(-5, horizons[i]):
             year = thisyear + n

owlplanner/utils.py

@@ -6,7 +6,7 @@ This file contains functions for handling data.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+Disclaimers: This code is for educational purposes only and does not constitute financial advice.
 
 """
 

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.06.21"
+__version__ = "2025.08.01"

{owlplanner-2025.6.21.dist-info → owlplanner-2025.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.6.21
+Version: 2025.8.1
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl

owlplanner-2025.8.1.dist-info/RECORD

@@ -0,0 +1,22 @@
+owlplanner/__init__.py,sha256=hJ2i4m2JpHPAKyQLjYOXpJzeEsgcTcKD-Vhm0AIjjWg,592
+owlplanner/abcapi.py,sha256=rtg7d0UbftinokR9VlB49VUjDjzUq3ONnJbhMXVIrgo,6879
+owlplanner/config.py,sha256=JJOtS6HyqA4qUHUZydSGG_RMWaCfVMRSOAfWbt4evMI,12461
+owlplanner/mylogging.py,sha256=OVGeDFO7LIZG91R6HMpZBzjno-B8PH8Fo00Jw2Pdgqw,2558
+owlplanner/plan.py,sha256=keKC9-XeQxza9--D7TaQfcZCLkGDy5yVV9D5pN25MHg,115211
+owlplanner/progress.py,sha256=dUUlFmSAKUei36rUj2BINRY10f_YEUo_e23d0es6nrc,530
+owlplanner/rates.py,sha256=9Nmo8AKsyi5PoCUrzhr06phkSlNTv-TXzj5iYFU76AY,14113
+owlplanner/tax2025.py,sha256=2Jb_UbPT6ye-znRjA0nSaF8T8M17QW4MoRPDoW9XJ8s,10833
+owlplanner/timelists.py,sha256=Q4kBt9kKAa5qxsvOe9wfyUtCQVgiwPmJXTwXUPRBBv8,4066
+owlplanner/utils.py,sha256=afAjeO6Msf6Rn4jwz_7Ody9rHGWlBR7iQFqe1xzLNQc,2513
+owlplanner/version.py,sha256=Or3KaHd8BXidAsAkScGwQRvtWIF5uufpsnfgNdR-Kpw,28
+owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
+owlplanner/plotting/__init__.py,sha256=uhxqtUi0OI-QWNOO2LkXgQViW_9yM3rYb-204Wit974,250
+owlplanner/plotting/base.py,sha256=UimGKpMTV-dVm3BX5Apr_Ltorc7dlDLCRPRQ3RF_v7c,2578
+owlplanner/plotting/factory.py,sha256=EDopIAPQr9zHRgemObko18FlCeRNhNCoLNNFAOq-X6s,1030
+owlplanner/plotting/matplotlib_backend.py,sha256=AOEkapD94U5hGNoS0EdbRoe8mgdMHH4oOvkXADZS914,17957
+owlplanner/plotting/plotly_backend.py,sha256=AO33GxBHGYG5osir_H1iRRtGxdhs4AjfLV2d_xm35nY,33138
+owlplanner-2025.8.1.dist-info/METADATA,sha256=9WRoRbNMdk2kxbT4-Coq912VJixT9rlF1Cv48Po4VJw,54044
+owlplanner-2025.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.8.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.8.1.dist-info/RECORD,,

owlplanner-2025.6.21.dist-info/RECORD

@@ -1,22 +0,0 @@
-owlplanner/__init__.py,sha256=hJ2i4m2JpHPAKyQLjYOXpJzeEsgcTcKD-Vhm0AIjjWg,592
-owlplanner/abcapi.py,sha256=8VCXS7nH_QZYxCUU3lwO0_UPR9Q5fuYQ6DHDLvHVLPg,6878
-owlplanner/config.py,sha256=onGIMqW2WwB9_CUZauDL6LtHGvc8O1cPUKKcK7Oh70M,12617
-owlplanner/mylogging.py,sha256=RKUr-y-1XvKZzLMcfdtm4IM30LuRpJwb2qUeXmAWqME,2557
-owlplanner/plan.py,sha256=VVHyKJiooLXXVLiRFJcauZ3oOYU62CCBe4DlpA08P38,109765
-owlplanner/progress.py,sha256=2DOjOLo6Mo7m21wY-9iZhoUksAyi4VCbb6UL2RegNCw,529
-owlplanner/rates.py,sha256=7jXcuHbkJ3AVIeBYZdwme18rdYslIzCuT-c0cLzvKUU,14819
-owlplanner/tax2025.py,sha256=HVYJq8po28jL5Z_il39ZY7qvf2riUEfxio15Zp7TGj8,7890
-owlplanner/timelists.py,sha256=95rKYknGMi1bonDVIc3xNmiwG0zTSejKyQy_uWCLSiA,4024
-owlplanner/utils.py,sha256=6Ky8ZKfNE9x--3znsZ8VZaT2PptDinszRxWsOCPanu8,2512
-owlplanner/version.py,sha256=Q6lAE5sS9Y-tuy3jNnv43HcB70y7l1kmDPNzx4CR9tc,28
-owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner/plotting/__init__.py,sha256=uhxqtUi0OI-QWNOO2LkXgQViW_9yM3rYb-204Wit974,250
-owlplanner/plotting/base.py,sha256=UimGKpMTV-dVm3BX5Apr_Ltorc7dlDLCRPRQ3RF_v7c,2578
-owlplanner/plotting/factory.py,sha256=EDopIAPQr9zHRgemObko18FlCeRNhNCoLNNFAOq-X6s,1030
-owlplanner/plotting/matplotlib_backend.py,sha256=AOEkapD94U5hGNoS0EdbRoe8mgdMHH4oOvkXADZS914,17957
-owlplanner/plotting/plotly_backend.py,sha256=AO33GxBHGYG5osir_H1iRRtGxdhs4AjfLV2d_xm35nY,33138
-owlplanner-2025.6.21.dist-info/METADATA,sha256=bZI1gHxPSbxJvJP2DuSqiB6Y33x4tdiVgHlKK73wGD4,54045
-owlplanner-2025.6.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.6.21.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.6.21.dist-info/RECORD,,