owlplanner 2025.6.3__tar.gz → 2025.6.21__tar.gz

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.6.3
+Version: 2025.6.21
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -837,6 +837,8 @@ which are all tracked separately for married individuals. Asset transition to th
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
 
+Maturation rules for Roth contributions and conversions are implemented as constraints
+limiting withdrawal amounts to cover Roth account balances for 5 years after the events.
 Medicare and IRMAA calculations are performed through a self-consistent loop on cash flow constraints.
 Future values are simple projections of current values with the assumed inflation rates.
 
@@ -885,7 +887,7 @@ assets to support, even with no estate being left.
 - Streamlit Community Cloud [Streamlit](https://streamlit.io)
 - Contributors: Josh (noimjosh@gmail.com) for Docker image code,
  Dale Seng (sengsational) for great insights and suggestions,
- Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions.
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions, Clark Jefcoat (hubcity) for fruitful interactions.
 
 ---------------------------------------------------------------------
 
@@ -893,8 +895,8 @@ Copyright © 2024 - Martin-D. Lacasse
 
 Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Code output has been verified with analytical solutions and other approaches.
-Nevertheless, accuracy of results are not guaranteed.
+Code output has been verified with analytical solutions when applicable, and comparative approaches otherwise.
+Nevertheless, accuracy of results is not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/README.md

@@ -131,6 +131,8 @@ which are all tracked separately for married individuals. Asset transition to th
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
 
+Maturation rules for Roth contributions and conversions are implemented as constraints
+limiting withdrawal amounts to cover Roth account balances for 5 years after the events.
 Medicare and IRMAA calculations are performed through a self-consistent loop on cash flow constraints.
 Future values are simple projections of current values with the assumed inflation rates.
 
@@ -179,7 +181,7 @@ assets to support, even with no estate being left.
 - Streamlit Community Cloud [Streamlit](https://streamlit.io)
 - Contributors: Josh (noimjosh@gmail.com) for Docker image code,
  Dale Seng (sengsational) for great insights and suggestions,
- Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions.
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions, Clark Jefcoat (hubcity) for fruitful interactions.
 
 ---------------------------------------------------------------------
 
@@ -187,8 +189,8 @@ Copyright © 2024 - Martin-D. Lacasse
 
 Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Code output has been verified with analytical solutions and other approaches.
-Nevertheless, accuracy of results are not guaranteed.
+Code output has been verified with analytical solutions when applicable, and comparative approaches otherwise.
+Nevertheless, accuracy of results is not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/docs/owl.tex

@@ -32,7 +32,7 @@
 \begin{document}
 \title{Formulation of the optimization model in Owl}
 \author{Martin-D. Lacasse}
-\date{March 14, 2025}
+\date{June 13, 2025}
 \maketitle
 \thispagestyle{fancy}
 \fancyfoot[R]{\copyright\ 2024 - Martin-D. Lacasse}
@@ -709,6 +709,24 @@ add the market returns to the savings balances.
 		x_{in} \le \min(b_{i1n}, x_{max}).
 	\end{equation}
 
+	Roth conversions are also governed by a 5-year maturation rule for withdrawals. This means
+	that withdrawals will need to be smaller than the balance minus the sum of all contributions
+	and conversions that happened over the last 5 years. For that purpose, the Wages and Contributions
+	file which stores $\omega_{in}, \kappa_{ijn}, \ldots$, will go back 5 years, and the Roth
+	conversions in that year range will be interpreted as having happened. We will use
+	these arrays to store previous conversions and contributions at the end of the array so that
+	they can be retrieved with negative indices in Python. Mathematically, we want that
+	\begin{equation}
+		w_{i2n} \le b_{i2n} - \sum_{n'=n-5}^n [ \kappa{i2n'} + x_{in'}.
+	\end{equation}
+	However, conversions are sometimes a variable $x_{in}$
+	and sometimes a parameter $X_{in}$, depending on the sign of $n$.
+	This leads to
+	\begin{equation}
+		b_{i2n} - w_{i2n} - \sum_{n'=\max(n-5, 0}^{n-1} x_{in'}
+		\ge \sum_{n'=n-5}^{\min(-1, n-1)} X_{in} + \sum_{n'=n-5}^{n-1} \kappa{i2n'}.
+	\end{equation}
+
 \paragraph*{Net spending}
 	For calculating the net spending $g_n$, we consider the cash flow of all withdrawals,
 	wages, social security and pension benefits, and big-ticket items. 

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "owlplanner"
-version = "2025.06.03"
+version = "2025.06.21"
 authors = [
   { name="Martin-D. Lacasse", email="martin.d.lacasse@gmail.com" },
 ]

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/requirements.txt

@@ -7,5 +7,5 @@ odfpy
 plotly
 pulp
 scipy
-streamlit
+streamlit >= 1.46
 toml

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/src/owlplanner/plan.py

@@ -304,8 +304,8 @@ class Plan(object):
         # Parameters from timeLists initialized to zero.
         self.omega_in = np.zeros((self.N_i, self.N_n))
         self.Lambda_in = np.zeros((self.N_i, self.N_n))
-        self.myRothX_in = np.zeros((self.N_i, self.N_n))
-        self.kappa_ijn = np.zeros((self.N_i, self.N_j, self.N_n))
+        self.myRothX_in = np.zeros((self.N_i, self.N_n + 5))
+        self.kappa_ijn = np.zeros((self.N_i, self.N_j, self.N_n + 5))
 
         # Previous 3 years for Medicare.
         self.prevMAGI = np.zeros((2))
@@ -920,14 +920,17 @@ class Plan(object):
         # Now fill in parameters which are in $.
         for i, iname in enumerate(self.inames):
             h = self.horizons[i]
-            self.omega_in[i, :h] = self.timeLists[iname]["anticipated wages"].iloc[:h]
-            self.kappa_ijn[i, 0, :h] = self.timeLists[iname]["taxable ctrb"].iloc[:h]
-            self.kappa_ijn[i, 1, :h] = self.timeLists[iname]["401k ctrb"].iloc[:h]
-            self.kappa_ijn[i, 2, :h] = self.timeLists[iname]["Roth 401k ctrb"].iloc[:h]
-            self.kappa_ijn[i, 1, :h] += self.timeLists[iname]["IRA ctrb"].iloc[:h]
-            self.kappa_ijn[i, 2, :h] += self.timeLists[iname]["Roth IRA ctrb"].iloc[:h]
-            self.myRothX_in[i, :h] = self.timeLists[iname]["Roth conv"].iloc[:h]
-            self.Lambda_in[i, :h] = self.timeLists[iname]["big-ticket items"].iloc[:h]
+            self.omega_in[i, :h] = self.timeLists[iname]["anticipated wages"].iloc[5:5+h]
+            self.Lambda_in[i, :h] = self.timeLists[iname]["big-ticket items"].iloc[5:5+h]
+
+            # Values for last 5 years of Roth conversion and contributions stored at the end
+            # of array and accessed with negative index.
+            self.kappa_ijn[i, 0, :h+5] = np.roll(self.timeLists[iname]["taxable ctrb"], -5)
+            self.kappa_ijn[i, 1, :h+5] = np.roll(self.timeLists[iname]["401k ctrb"], -5)
+            self.kappa_ijn[i, 1, :h+5] += np.roll(self.timeLists[iname]["IRA ctrb"], -5)
+            self.kappa_ijn[i, 2, :h+5] = np.roll(self.timeLists[iname]["Roth 401k ctrb"], -5)
+            self.kappa_ijn[i, 2, :h+5] += np.roll(self.timeLists[iname]["Roth IRA ctrb"], -5)
+            self.myRothX_in[i, :h+5] = np.roll(self.timeLists[iname]["Roth conv"], -5)
 
         self.caseStatus = "modified"
 
@@ -984,8 +987,9 @@ class Plan(object):
         ]
         for i, iname in enumerate(self.inames):
             h = self.horizons[i]
-            df = pd.DataFrame(0, index=np.arange(h), columns=cols)
-            df["year"] = self.year_n[:h]
+            df = pd.DataFrame(0, index=np.arange(0, h+5), columns=cols)
+            # df["year"] = self.year_n[:h]
+            df["year"] = np.arange(self.year_n[0] - 5, self.year_n[h-1]+1)
             self.timeLists[iname] = df
 
         self.caseStatus = "modified"
@@ -1086,6 +1090,7 @@ class Plan(object):
         self._add_standard_exemption_bounds()
         self._add_defunct_constraints()
         self._add_roth_conversion_constraints(options)
+        self._add_roth_maturation_constraints()
         self._add_withdrawal_limits()
         self._add_conversion_limits()
         self._add_objective_constraints(objective, options)
@@ -1127,6 +1132,45 @@ class Plan(object):
                 for j in range(self.N_j):
                     self.B.setRange(_q3(self.C["w"], self.i_d, j, n, self.N_i, self.N_j, self.N_n), 0, 0)
 
+    def _add_roth_maturation_constraints(self):
+        """
+        Withdrawals from Roth accounts are subject to the 5-year rule for conversion.
+        Conversions and gains are subject to the 5-year rule since conversion.
+        Contributions can be withdrawn at any time (without 59.5 penalty) but
+        gains on contributions are subject to the 5-year rule since the opening of the account.
+        A retainer is put on all conversions and associated gains, and gains on all recent contributions.
+        """
+        # Assume 10% per year for contributions and conversions for past 5 years.
+        # Future years will use the assumed returns.
+        oldTau1 = 1.10
+        for i in range(self.N_i):
+            h = self.horizons[i]
+            for n in range(h):
+                rhs = 0
+                # To add compounded gains to original amount.
+                cgains = 1
+                row = self.A.newRow()
+                row.addElem(_q3(self.C["b"], i, 2, n, self.N_i, self.N_j, self.N_n + 1), 1)
+                row.addElem(_q3(self.C["w"], i, 2, n, self.N_i, self.N_j, self.N_n), -1)
+                for dn in range(1, 6):
+                    nn = n - dn
+                    if nn < 0:  # Past of future is in the past:
+                        # Parameters are stored at the end of contributions and conversions arrays.
+                        cgains *= oldTau1
+                        # If only an contribution - without conversion.
+                        # rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                        rhs += cgains * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                    else:       # Past of future is in the future: use variables and parameters.
+                        ksum2 = np.sum(self.alpha_ijkn[i, 2, :, nn] * self.tau_kn[:, nn], axis=0)
+                        Tau1 = 1 + ksum2
+                        cgains *= Tau1
+                        row.addElem(_q2(self.C["x"], i, nn, self.N_i, self.N_n), -cgains)
+                        # If only a contribution - without conversion.
+                        # rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn]
+                        rhs += cgains * self.kappa_ijn[i, 2, nn]
+
+                self.A.addRow(row, rhs, np.inf)
+
     def _add_roth_conversion_constraints(self, options):
         if "maxRothConversion" in options and options["maxRothConversion"] == "file":
             for i in range(self.N_i):
@@ -1949,7 +1993,7 @@ class Plan(object):
         self.Q_n = np.sum(
             (
                 self.mu
-                * (self.b_ijn[:, 0, :-1] - self.w_ijn[:, 0, :] + self.d_in[:, :] + 0.5 * self.kappa_ijn[:, 0, :])
+                * (self.b_ijn[:, 0, :-1] - self.w_ijn[:, 0, :] + self.d_in[:, :] + 0.5 * self.kappa_ijn[:, 0, :Nn])
                 + tau_0prev * self.w_ijn[:, 0, :]
             )
             * self.alpha_ijkn[:, 0, 0, :-1],
@@ -2370,7 +2414,7 @@ class Plan(object):
         the default behavior of setDefaultPlots().
         """
         value = self._checkValue(value)
-        title = self._name + "\nIncome Tax"
+        title = self._name + "\nFederal Income Tax"
         if tag:
             title += " - " + tag
         # All taxes: ordinary income and dividends.
@@ -2489,16 +2533,16 @@ class Plan(object):
         # Account balances except final year.
         accDic = {
             "taxable bal": self.b_ijn[:, 0, :-1],
-            "taxable ctrb": self.kappa_ijn[:, 0, :],
+            "taxable ctrb": self.kappa_ijn[:, 0, :self.N_n],
             "taxable dep": self.d_in,
             "taxable wdrwl": self.w_ijn[:, 0, :],
             "tax-deferred bal": self.b_ijn[:, 1, :-1],
-            "tax-deferred ctrb": self.kappa_ijn[:, 1, :],
+            "tax-deferred ctrb": self.kappa_ijn[:, 1, :self.N_n],
             "tax-deferred wdrwl": self.w_ijn[:, 1, :],
             "(included RMDs)": self.rmd_in[:, :],
             "Roth conv": self.x_in,
             "tax-free bal": self.b_ijn[:, 2, :-1],
-            "tax-free ctrb": self.kappa_ijn[:, 2, :],
+            "tax-free ctrb": self.kappa_ijn[:, 2, :self.N_n],
             "tax-free wdrwl": self.w_ijn[:, 2, :],
         }
         for i in range(self.N_i):
@@ -2595,12 +2639,12 @@ class Plan(object):
             planData[self.inames[i] + " txbl dep"] = self.d_in[i, :]
             planData[self.inames[i] + " txbl wrdwl"] = self.w_ijn[i, 0, :]
             planData[self.inames[i] + " tx-def bal"] = self.b_ijn[i, 1, :-1]
-            planData[self.inames[i] + " tx-def ctrb"] = self.kappa_ijn[i, 1, :]
+            planData[self.inames[i] + " tx-def ctrb"] = self.kappa_ijn[i, 1, :self.N_n]
             planData[self.inames[i] + " tx-def wdrl"] = self.w_ijn[i, 1, :]
             planData[self.inames[i] + " (RMD)"] = self.rmd_in[i, :]
             planData[self.inames[i] + " Roth conv"] = self.x_in[i, :]
             planData[self.inames[i] + " tx-free bal"] = self.b_ijn[i, 2, :-1]
-            planData[self.inames[i] + " tx-free ctrb"] = self.kappa_ijn[i, 2, :]
+            planData[self.inames[i] + " tx-free ctrb"] = self.kappa_ijn[i, 2, :self.N_n]
             planData[self.inames[i] + " tax-free wdrwl"] = self.w_ijn[i, 2, :]
             planData[self.inames[i] + " big-ticket items"] = self.Lambda_in[i, :]
 

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/src/owlplanner/timelists.py

@@ -21,7 +21,7 @@ import pandas as pd
 
 
 # Expected headers in each excel sheet, one per individual.
-timeHorizonItems = [
+_timeHorizonItems = [
     "year",
     "anticipated wages",
     "taxable ctrb",
@@ -59,14 +59,14 @@ def read(finput, inames, horizons, mylog):
             raise Exception(f"Could not read file {finput}: {e}.") from e
         streamName = f"file '{finput}'"
 
-    timeLists = condition(dfDict, inames, horizons, mylog)
+    timeLists = _condition(dfDict, inames, horizons, mylog)
 
     mylog.vprint(f"Successfully read time horizons from {streamName}.")
 
     return finput, timeLists
 
 
-def condition(dfDict, inames, horizons, mylog):
+def _condition(dfDict, inames, horizons, mylog):
     """
     Make sure that time horizons contain all years up to life expectancy,
     and that values are positive (except big-ticket items).
@@ -83,24 +83,24 @@ def condition(dfDict, inames, horizons, mylog):
 
         df = df.loc[:, ~df.columns.str.contains("^Unnamed")]
         for col in df.columns:
-            if col == "" or col not in timeHorizonItems:
+            if col == "" or col not in _timeHorizonItems:
                 df.drop(col, axis=1, inplace=True)
 
-        for item in timeHorizonItems:
+        for item in _timeHorizonItems:
             if item not in df.columns:
                 raise ValueError(f"Item {item} not found for {iname}.")
 
-        # Only consider lines in proper year range.
-        df = df[df["year"] >= thisyear]
+        # 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]
         missing = []
-        for n in range(horizons[i]):
+        for n in range(-5, horizons[i]):
             year = thisyear + n
             if not (df[df["year"] == year]).any(axis=None):
                 df.loc[len(df)] = [year, 0, 0, 0, 0, 0, 0, 0, 0]
                 missing.append(year)
             else:
-                for item in timeHorizonItems:
+                for item in _timeHorizonItems:
                     if item != "big-ticket items" and df[item].iloc[n] < 0:
                         raise ValueError(f"Item {item} for {iname} in year {df['year'].iloc[n]} is < 0.")
 

owlplanner-2025.6.21/src/owlplanner/version.py

@@ -0,0 +1 @@
+__version__ = "2025.06.21"

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/tests/test_repro.py

@@ -36,7 +36,7 @@ def test_case1():
     p = createJackAndJillPlan('case1')
     p.setRates('historical', 1969)
     p.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 500})
-    assert p.basis == pytest.approx(81989.0, abs=0.5)
+    assert p.basis == pytest.approx(81986.3, abs=0.5)
     assert p.bequest == pytest.approx(500000, abs=0.5)
 
 
@@ -45,7 +45,7 @@ def test_case2():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p.bequest == pytest.approx(595786.5, abs=0.5)
 
 
 def test_config1():
@@ -54,7 +54,7 @@ def test_config1():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p.bequest == pytest.approx(595786.5, abs=0.5)
     p.saveConfig()
     base_filename = 'case_' + name
     full_filename = 'case_' + name + '.toml'
@@ -62,11 +62,11 @@ def test_config1():
     p2 = owl.readConfig(base_filename)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p2.bequest == pytest.approx(595786.5, abs=0.5)
     p3 = owl.readConfig(full_filename)
     p3.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p3.basis == pytest.approx(80000, abs=0.5)
-    assert p3.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p3.bequest == pytest.approx(595786.5, abs=0.5)
     os.remove(full_filename)
 
 
@@ -76,14 +76,14 @@ def test_config2():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p.bequest == pytest.approx(595786.5, abs=0.5)
     iostring = StringIO()
     p.saveConfig(iostring)
     # print('iostream:', iostream.getvalue())
     p2 = owl.readConfig(iostring)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p2.bequest == pytest.approx(595786.5, abs=0.5)
 
 
 def test_clone1():
@@ -92,23 +92,23 @@ def test_clone1():
     p.setRates('historical', 1969)
     p.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p.basis == pytest.approx(80000, abs=0.5)
-    assert p.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p.bequest == pytest.approx(595786.5, abs=0.5)
     name2 = 'testclone1.2'
     p2 = owl.clone(p, name2)
     p2.solve('maxBequest', options={'maxRothConversion': 100, 'netSpending': 80})
     assert p2.basis == pytest.approx(80000, abs=0.5)
-    assert p2.bequest == pytest.approx(595953.5, abs=0.5)
+    assert p2.bequest == pytest.approx(595786.5, abs=0.5)
 
 
 def test_clone2():
     name = 'testclone2.1'
     p = createJackAndJillPlan(name)
     p.setRates('historical', 1969)
-    p.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 0})
-    assert p.basis == pytest.approx(92328.1, abs=0.5)
-    assert p.bequest == pytest.approx(0, abs=0.5)
+    p.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 10})
+    assert p.basis == pytest.approx(92121.5, abs=0.5)
+    assert p.bequest == pytest.approx(10000, abs=0.5)
     name2 = 'testclone2.2'
     p2 = owl.clone(p, name2)
-    p2.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 0})
-    assert p2.basis == pytest.approx(92328.1, abs=0.5)
-    assert p2.bequest == pytest.approx(0, abs=0.5)
+    p2.solve('maxSpending', options={'maxRothConversion': 100, 'bequest': 10})
+    assert p2.basis == pytest.approx(92121.5, abs=0.5)
+    assert p2.bequest == pytest.approx(10000, abs=0.5)

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/ui/About_Owl.py

@@ -37,22 +37,23 @@ Copyright © 2025 - Martin-D. Lacasse
  and [Streamlit](https://streamlit.io) for the front-end.
 - Contributors: Josh Williams (noimjosh) for Docker image code,
  Dale Seng (sengsational) for great insights and suggestions,
- Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions.
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions,
+ Clark Jefcoat (hubcity) for fruitful interactions.
 - Owl image is from [freepik](https://freepik.com).
 
 #### :orange[Bugs and Feature Requests]
-- Please submit bugs and feature requests through
+Please submit bugs and feature requests through
 [GitHub](https://github.com/mdlacasse/owl/issues) if you have a GitHub account
-or directly by [email](mailto://martin.d.lacasse@gmail.com).
+or directly by [email](mailto:martin.d.lacasse@gmail.com).
 Or just drop me a line to report your experience with the tool. :thumbsup:
 
 #### :orange[Privacy]
-- This app does not store or forward any information. All data entered is lost
+This app does not store or forward any information. All data entered is lost
 after a session is closed. You can choose to download selected parts of your
 own data to your computer before closing the session.
 
 #### :orange[License]
-- This software is released under the
+This software is released under the
 [Gnu General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html#license-text).
 
 #### :orange[Disclaimer]

{owlplanner-2025.6.3 → owlplanner-2025.6.21}/ui/Current_Assets.py

@@ -10,13 +10,17 @@ if ret is None or kz.caseHasNoPlan():
 else:
     st.write("#### :orange[Savings Account Balances]")
     accounts = {"txbl": "taxable", "txDef": "tax-deferred", "txFree": "tax-free"}
+    hdetails = {"txbl": "Brokerage and savings accounts excluding emergency fund. ",
+                "txDef": "IRA, 401k, 403b and the like. ",
+                "txFree": "Roth IRA, Roth 401k, Roth 403b and the like. "}
     col1, col2, col3 = st.columns(3, gap="large", vertical_alignment="top")
     with col1:
         iname = kz.getKey("iname0")
         for key in accounts:
             nkey = key + str(0)
             kz.initKey(nkey, 0)
-            ret = kz.getNum(f"{iname}'s {accounts[key]} account ($k)", nkey, help=kz.help1000)
+            ret = kz.getNum(f"{iname}'s {accounts[key]} account ($k)", nkey,
+                            help=hdetails[key]+kz.help1000)
 
         today = date.today()
         thisyear = today.year
@@ -32,32 +36,34 @@ else:
             for key in accounts:
                 nkey = key + str(1)
                 kz.initKey(nkey, 0)
-                ret = kz.getNum(f"{iname1}'s {accounts[key]} account ($k)", nkey, help=kz.help1000)
+                ret = kz.getNum(f"{iname1}'s {accounts[key]} account ($k)", nkey,
+                                help=hdetails[key]+kz.help1000)
 
     if kz.getKey("status") == "married":
         st.divider()
-        st.write("##### :orange[Survivor's Spousal Beneficiary Fractions]")
+        st.write("#### :orange[Survivor's Spousal Beneficiary Fractions]")
         col1, col2, col3 = st.columns(3, gap="large", vertical_alignment="top")
         with col1:
             nkey = "benf" + str(0)
             kz.initKey(nkey, 1)
             helpmsg = "Fraction of account left to surviving spouse."
-            ret = kz.getNum(accounts["txbl"].capitalize(), nkey, format="%.2f", max_value=1.0, step=0.05, help=helpmsg)
+            ret = kz.getNum(accounts["txbl"].capitalize(), nkey, format="%.2f", max_value=1.0,
+                            step=0.05, help=helpmsg)
 
         with col2:
             nkey = "benf" + str(1)
             kz.initKey(nkey, 1)
-            ret = kz.getNum(accounts["txDef"].capitalize(), nkey, format="%.2f", max_value=1.0, step=0.05, help=helpmsg)
+            ret = kz.getNum(accounts["txDef"].capitalize(), nkey, format="%.2f", max_value=1.0,
+                            step=0.05, help=helpmsg)
 
         with col3:
             nkey = "benf" + str(2)
             kz.initKey(nkey, 1)
-            ret = kz.getNum(
-                accounts["txFree"].capitalize(), nkey, format="%.2f", max_value=1.0, step=0.05, help=helpmsg
-            )
+            ret = kz.getNum(accounts["txFree"].capitalize(), nkey, format="%.2f", max_value=1.0,
+                            step=0.05, help=helpmsg)
 
         st.write("#####")
-        st.write("##### :orange[Surplus Deposit Fraction]")
+        st.write("#### :orange[Surplus Deposit Fraction]")
         col1, col2, col3 = st.columns(3, gap="large", vertical_alignment="top")
         with col1:
             kz.initKey("surplusFraction", 0.5)