owlplanner 2025.1.28__tar.gz → 2025.2__tar.gz

{owlplanner-2025.1.28 → owlplanner-2025.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.1.28
+Version: 2025.2
 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.1.28 → owlplanner-2025.2}/pyproject.toml

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

{owlplanner-2025.1.28 → owlplanner-2025.2}/src/owlplanner/plan.py

@@ -295,6 +295,9 @@ class Plan(object):
         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))
 
+        # Previous 2 years for Medicare.
+        self.prevMAGI = np.zeros((2))
+
         # Scenario starts at the beginning of this year and ends at the end of the last year.
         self.mylog.vprint('Preparing scenario of %d years for %d individual%s.'
                           % (self.N_n, self.N_i, ['', 's'][self.N_i - 1]))
@@ -403,8 +406,6 @@ class Plan(object):
         self.mylog.vprint('Renaming plan %s -> %s.' % (self._name, newname))
         self._name = newname
 
-        return None
-
     def setSpousalDepositFraction(self, eta):
         """
         Set spousal deposit and withdrawal fraction. Default 0.5.
@@ -424,8 +425,6 @@ class Plan(object):
             self.mylog.vprint('\t%s: %.1f, %s: %.1f' % (self.inames[0], (1 - eta), self.inames[1], eta))
             self.eta = eta
 
-        return None
-
     def setDefaultPlots(self, value):
         """
         Set plots between nominal values or today's $.
@@ -434,8 +433,6 @@ class Plan(object):
         self.defaultPlots = self._checkValue(value)
         self.mylog.vprint('Setting plots default value to %s.' % value)
 
-        return None
-
     def setDividendRate(self, mu):
         """
         Set dividend rate on equities. Rate is in percent. Default 2%.
@@ -446,8 +443,6 @@ class Plan(object):
         self.mu = mu
         self.caseStatus = 'modified'
 
-        return None
-
     def setLongTermCapitalTaxRate(self, psi):
         """
         Set long-term income tax rate. Rate is in percent. Default 15%.
@@ -458,8 +453,6 @@ class Plan(object):
         self.psi = psi
         self.caseStatus = 'modified'
 
-        return None
-
     def setBeneficiaryFractions(self, phi):
         """
         Set fractions of savings accounts that is left to surviving spouse.
@@ -477,8 +470,6 @@ class Plan(object):
             self.mylog.vprint('Consider changing spousal deposit fraction for better convergence.')
             self.mylog.vprint('\tRecommended: setSpousalDepositFraction(%d)' % self.i_d)
 
-        return None
-
     def setHeirsTaxRate(self, nu):
         """
         Set the heirs tax rate on the tax-deferred portion of the estate.
@@ -490,8 +481,6 @@ class Plan(object):
         self.nu = nu
         self.caseStatus = 'modified'
 
-        return None
-
     def setPension(self, amounts, ages, units='k'):
         """
         Set value of pension for each individual and commencement age.
@@ -521,8 +510,6 @@ class Plan(object):
         self.pensionAges = np.array(ages, dtype=np.int32)
         self.caseStatus = 'modified'
 
-        return None
-
     def setSocialSecurity(self, amounts, ages, units='k'):
         """
         Set value of social security for each individual and commencement age.
@@ -560,8 +547,6 @@ class Plan(object):
         self.caseStatus = 'modified'
         self._adjustedParameters = False
 
-        return None
-
     def setSpendingProfile(self, profile, percent=60, dip=15, increase=12, delay=0):
         """
         Generate time series for spending profile. Surviving spouse fraction can be specified
@@ -589,8 +574,6 @@ class Plan(object):
         self.smileDelay = delay
         self.caseStatus = 'modified'
 
-        return None
-
     def setRates(self, method, frm=None, to=None, values=None, stdev=None, corr=None):
         """
         Generate rates for return and inflation based on the method and
@@ -632,8 +615,6 @@ class Plan(object):
         self._adjustedParameters = False
         self.caseStatus = 'modified'
 
-        return None
-
     def regenRates(self):
         """
         Regenerate the rates using the arguments specified during last setRates() call.
@@ -648,8 +629,6 @@ class Plan(object):
             corr=self.rateCorr,
         )
 
-        return None
-
     def value(self, amount, year):
         """
         Return value of amount deflated or inflated at the beginning
@@ -711,8 +690,6 @@ class Plan(object):
             u.d(np.sum(taxable) + 0.7 * np.sum(taxDeferred) + np.sum(taxFree)),
         )
 
-        return None
-
     def setInterpolationMethod(self, method, center=15, width=5):
         """
         Interpolate assets allocation ratios from initial value (today) to
@@ -739,8 +716,6 @@ class Plan(object):
 
         self.mylog.vprint('Asset allocation interpolation method set to %s.' % method)
 
-        return None
-
     def setAllocationRatios(self, allocType, taxable=None, taxDeferred=None, taxFree=None, generic=None):
         """
         Single function for setting all types of asset allocations.
@@ -874,8 +849,6 @@ class Plan(object):
 
         self.mylog.vprint('Interpolating assets allocation ratios using', self.interpMethod, 'method.')
 
-        return None
-
     def readContributions(self, filename):
         """
         Provide the name of the file containing the financial events
@@ -1636,6 +1609,7 @@ class Plan(object):
             'noRothConversions',
             'withMedicare',
             'solver',
+            'previousMAGIs',
         ]
         # We will modify options if required.
         if options is None:
@@ -1664,6 +1638,17 @@ class Plan(object):
         if objective == 'maxSpending' and 'bequest' not in myoptions:
             self.mylog.vprint('Using bequest of $1.')
 
+        if 'previousMAGIs' in myoptions:
+            magi = myoptions['previousMAGIs']
+            if len(magi) != 2:
+                raise ValueError("previousMAGIs must have two values.")
+
+            if 'units' in options:
+                units = u.getUnits(options['units'])
+            else:
+                units = 1000
+            self.prevMAGI = units * np.array(magi)
+
         self._adjustParameters()
 
         if 'solver' in options:
@@ -1897,7 +1882,7 @@ class Plan(object):
             self.F_tn = self.F_tn.reshape((self.N_t, self.N_n))
             MAGI_n = np.sum(self.F_tn, axis=0) + np.array(x[self.C['e']:self.C['F']])
 
-        self.M_n = tx.mediCosts(self.yobs, self.horizons, MAGI_n, self.gamma_n[:-1], self.N_n)
+        self.M_n = tx.mediCosts(self.yobs, self.horizons, MAGI_n, self.prevMAGI, self.gamma_n[:-1], self.N_n)
 
         return None
 

{owlplanner-2025.1.28 → owlplanner-2025.2}/src/owlplanner/tax2025.py

@@ -69,7 +69,7 @@ extra65Deduction_2025 = np.array([2000, 1600])
 ##############################################################################
 
 
-def mediCosts(yobs, horizons, magi, gamma_n, Nn):
+def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
     """
     Compute Medicare costs directly.
     """
@@ -79,14 +79,14 @@ def mediCosts(yobs, horizons, magi, gamma_n, Nn):
     for n in range(Nn):
         for i in range(Ni):
             if thisyear + n - yobs[i] >= 65 and n < horizons[i]:
-                # The standard Medicare part B premium
+                # Start with the (indexed) basic Medicare part B premium.
                 costs[n] += gamma_n[n] * irmaaFees_2025[0]
                 if n < 2:
-                    nn = n
+                    mymagi = prevmagi[n]
                 else:
-                    nn = 2
+                    mymagi = magi[n - 2]
                 for q in range(1, 6):
-                    if magi[n - nn] > gamma_n[n] * irmaaBrackets_2025[Ni - 1][q]:
+                    if mymagi > gamma_n[n] * irmaaBrackets_2025[Ni - 1][q]:
                         costs[n] += gamma_n[n] * irmaaFees_2025[q]
 
     return costs

owlplanner-2025.2/src/owlplanner/version.py

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

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/Case_Worksheets.py

@@ -14,12 +14,11 @@ else:
     else:
         owb.showWorkbook()
         st.divider()
-        # if not owb.isCaseUnsolved():
         if kz.caseHasPlan():
             download2 = st.download_button(
                 label="Download data as an Excel workbook...",
                 data=owb.saveWorkbook(),
                 file_name='Workbook_'+kz.getKey('name')+'.xlsx',
                 mime='application/vnd.ms-excel',
-                disabled=owb.isCaseUnsolved()
+                disabled=kz.isCaseUnsolved()
             )

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/Documentation.py

@@ -249,6 +249,9 @@ the column `RothX` found in the
 
 Calculations of Medicare and IRMAA can be turned on or off. This will typically speed up
 the calculations by a factor of 2 to 3, which can be useful when running Monte Carlo simulations.
+If the age of individuals makes them eligible for Medicare within the next two years,
+additional cells will appear for entering the Modified Adjusted Gross Income (MAGI) for past years.
+These numbers are needed to calculate the Income-Related Monthly Adjusted Amounts (IRMAA).
 
 The time profile of the net spending amount
 can be selected to either be *flat* or follow a *smile* shape.

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/Optimization_Parameters.py

@@ -24,6 +24,7 @@ if ret is None or kz.caseHasNoPlan():
 else:
     kz.runOncePerCase(initProfile)
 
+    st.write('##### Objective')
     col1, col2 = st.columns(2, gap='large', vertical_alignment='top')
     with col1:
         choices = ['Net spending', 'Bequest']
@@ -41,6 +42,7 @@ else:
             ret = kz.getNum("Desired annual net spending (\\$k)", 'netSpending', help=helpmsg)
 
     st.divider()
+    st.write('##### Roth Conversions')
     col1, col2 = st.columns(2, gap='large', vertical_alignment='top')
     with col1:
         iname0 = kz.getKey('iname0')
@@ -49,7 +51,6 @@ else:
         fromFile = kz.getKey('readRothX')
         kz.initKey('maxRothConversion', 50)
         ret = kz.getNum("Maximum Roth conversion (\\$k)", 'maxRothConversion', disabled=fromFile, help=helpmsg)
-        # caseHasNoContributions = (kz.getKey('stTimeLists') is None)
         ret = kz.getToggle('Convert as in wages and contributions tables', 'readRothX')
 
     with col2:
@@ -62,21 +63,33 @@ else:
                               "noRothConversions", help=helpmsg)
 
     st.divider()
+    st.write('##### Medicare')
     kz.initKey('withMedicare', True)
     col1, col2 = st.columns(2, gap='large', vertical_alignment='top')
     with col1:
         helpmsg = "Do or do not perform additional Medicare and IRMAA calculations."
         ret = kz.getToggle('Medicare and IRMAA calculations', 'withMedicare', help=helpmsg)
     with col2:
-        if owb.hasMOSEK():
-            choices = ['HiGHS', 'MOSEK']
-            kz.initKey('solver', choices[0])
-            ret = kz.getRadio('Solver', choices, 'solver')
+        if kz.getKey('withMedicare'):
+            helpmsg = "MAGI in nominal $k for that previous year."
+            years = owb.backYearsMAGI()
+            for ii in range(2):
+                kz.initKey('MAGI'+str(ii), 0)
+                if years[ii] > 0:
+                    ret = kz.getNum(f"MAGI for year {years[ii]} ($k)", 'MAGI'+str(ii), help=helpmsg)
+
+    if owb.hasMOSEK():
+        st.divider()
+        st.write('##### Solver')
+        choices = ['HiGHS', 'MOSEK']
+        kz.initKey('solver', choices[0])
+        ret = kz.getRadio('Linear programming solver', choices, 'solver')
 
     st.divider()
+    st.write('##### Spending Profile')
     col1, col2, col3 = st.columns(3, gap='medium', vertical_alignment='top')
     with col1:
-        ret = kz.getRadio("Spending profile", profileChoices, 'spendingProfile', callback=owb.setProfile)
+        ret = kz.getRadio("Type of profile", profileChoices, 'spendingProfile', callback=owb.setProfile)
     with col2:
         if kz.getKey('status') == 'married':
             helpmsg = 'Percentage of spending required for the surviving spouse.'

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/Rates_Selection.py

@@ -198,17 +198,17 @@ else:
         kz.initKey('divRate', 2)
         helpmsg = 'Average annual dividend return rate on stock portfolio.'
         ret = kz.getNum('Dividends return rate (%)', 'divRate', max_value=100., format='%.2f',
-                        help=helpmsg, callback=owb.setDividendRate, step=1.)
+                        help=helpmsg, step=1.)
 
     st.write('#### Income taxes')
     col1, col2 = st.columns(2, gap='large', vertical_alignment='top')
     with col1:
         kz.initKey('gainTx', 15)
         ret = kz.getNum('Long-term capital gains tax rate (%)', 'gainTx', max_value=100.,
-                        callback=owb.setLongTermCapitalTaxRate, step=1.)
+                        step=1.)
 
     with col2:
         kz.initKey('heirsTx', 30)
         helpmsg = 'Marginal tax rate that heirs would have to pay on inherited tax-deferred balance.'
         ret = kz.getNum('Heirs marginal tax rate (%)', 'heirsTx', max_value=100., help=helpmsg,
-                        callback=owb.setHeirsTaxRate, step=1.)
+                        step=1.)

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/owlbridge.py

@@ -59,67 +59,25 @@ def _checkPlan(func):
     return wrapper
 
 
-def getFixedIncome(ni, what):
-    amounts = []
-    ages = []
-    for i in range(ni):
-        amounts.append(kz.getKey(what+'Amt'+str(i)))
-        ages.append(kz.getKey(what+'Age'+str(i)))
-
-    return amounts, ages
-
-
-def getAccountBalances(ni):
-    bal = [[], [], []]
-    accounts = ['txbl', 'txDef', 'txFree']
-    for j, acc in enumerate(accounts):
-        for i in range(ni):
-            bal[j].append(kz.getKey(acc+str(i)))
-
-    return bal
-
-
-def getSolveParameters():
-    maximize = kz.getKey('objective')
-    if maximize is None:
-        return None
-    if 'spending' in maximize:
-        objective = 'maxSpending'
-    else:
-        objective = 'maxBequest'
-
-    options = {}
-    optList = ['netSpending', 'maxRothConversion', 'noRothConversions',
-               'withMedicare', 'bequest', 'solver']
-    for opt in optList:
-        val = kz.getKey(opt)
-        if val is not None:
-            options[opt] = val
-
-    if kz.getKey('readRothX'):
-        options['maxRothConversion'] = 'file'
-
-    return objective, options
-
-
+# _checkPlan
 def prepareRun(plan):
     ni = 2 if kz.getKey('status') == 'married' else 1
 
-    bal = getAccountBalances(ni)
+    bal = kz.getAccountBalances(ni)
     try:
         plan.setAccountBalances(taxable=bal[0], taxDeferred=bal[1], taxFree=bal[2])
     except Exception as e:
         st.error('Setting account balances failed: %s' % e)
         return
 
-    amounts, ages = getFixedIncome(ni, 'p')
+    amounts, ages = kz.getFixedIncome(ni, 'p')
     try:
         plan.setPension(amounts, ages)
     except Exception as e:
         st.error('Failed setting pensions: %s' % e)
         return
 
-    amounts, ages = getFixedIncome(ni, 'ss')
+    amounts, ages = kz.getFixedIncome(ni, 'ss')
     try:
         plan.setSocialSecurity(amounts, ages)
     except Exception as e:
@@ -141,26 +99,19 @@ def prepareRun(plan):
             st.error('Failed setting beneficiary fractions: %s' % e)
             return
 
+    plan.setHeirsTaxRate(kz.getKey('heirsTx'))
+    plan.setLongTermCapitalTaxRate(kz.getKey('gainTx'))
+    plan.setDividendRate(kz.getKey('divRate'))
+
     setRates()
     setContributions()
 
 
-def isCaseUnsolved():
-    if kz.getKey('plan') is None:
-        return True
-    return kz.getKey('caseStatus') != 'solved'
-
-
-@_checkPlan
-def caseStatus(plan):
-    return plan.caseStatus
-
-
 @_checkPlan
 def runPlan(plan):
     prepareRun(plan)
 
-    objective, options = getSolveParameters()
+    objective, options = kz.getSolveParameters()
     try:
         plan.solve(objective, options=options)
     except Exception as e:
@@ -183,7 +134,7 @@ def runHistorical(plan):
     hyfrm = kz.getKey('hyfrm')
     hyto = kz.getKey('hyto')
 
-    objective, options = getSolveParameters()
+    objective, options = kz.getSolveParameters()
     try:
         mybar = progress.Progress(None)
         fig, summary = plan.runHistoricalRange(objective, options, hyfrm, hyto, figure=True, progcall=mybar)
@@ -207,7 +158,7 @@ def runMC(plan):
 
     N = kz.getKey('MC_cases')
 
-    objective, options = getSolveParameters()
+    objective, options = kz.getSolveParameters()
     try:
         mybar = progress.Progress(None)
         fig, summary = plan.runMC(objective, options, N, figure=True, progcall=mybar)
@@ -386,66 +337,20 @@ def resetContributions(plan):
 def setAllocationRatios(plan):
     if kz.getKey('allocType') == 'individual':
         try:
-            generic = getIndividualAllocationRatios()
+            generic = kz.getIndividualAllocationRatios()
             plan.setAllocationRatios('individual', generic=generic)
         except Exception as e:
             st.error('Setting asset allocations failed: %s' % e)
             return
     elif kz.getKey('allocType') == 'account':
         try:
-            acc = getAccountAllocationRatios()
+            acc = kz.getAccountAllocationRatios()
             plan.setAllocationRatios('account', taxable=acc[0], taxDeferred=acc[1], taxFree=acc[2])
         except Exception as e:
             st.error('Setting asset allocations failed: %s' % e)
             return
 
 
-def getIndividualAllocationRatios():
-    generic = []
-    initial = []
-    final = []
-    for k1 in range(4):
-        initial.append(int(kz.getKey('j3_init%'+str(k1)+'_0')))
-        final.append(int(kz.getKey('j3_fin%'+str(k1)+'_0')))
-    gen0 = [initial, final]
-    generic = [gen0]
-
-    if kz.getKey('status') == 'married':
-        initial = []
-        final = []
-        for k1 in range(4):
-            initial.append(int(kz.getKey('j3_init%'+str(k1)+'_1')))
-            final.append(int(kz.getKey('j3_fin%'+str(k1)+'_1')))
-        gen1 = [initial, final]
-        generic.append(gen1)
-
-    return generic
-
-
-def getAccountAllocationRatios():
-    accounts = [[], [], []]
-    for j1 in range(3):
-        initial = []
-        final = []
-        for k1 in range(4):
-            initial.append(int(kz.getKey(f'j{j1}_init%'+str(k1)+'_0')))
-            final.append(int(kz.getKey(f'j{j1}_fin%'+str(k1)+'_0')))
-        tmp = [initial, final]
-        accounts[j1].append(tmp)
-
-    if kz.getKey('status') == 'married':
-        for j1 in range(3):
-            initial = []
-            final = []
-            for k1 in range(4):
-                initial.append(int(kz.getKey(f'j{j1}_init%'+str(k1)+'_1')))
-                final.append(int(kz.getKey(f'j{j1}_fin%'+str(k1)+'_1')))
-            tmp = [initial, final]
-            accounts[j1].append(tmp)
-
-    return accounts
-
-
 @_checkPlan
 def plotSingleResults(plan):
     c = 0
@@ -510,24 +415,6 @@ def setProfile(plan, key, pull=True):
     plan.setSpendingProfile(profile, survivor, dip, increase, delay)
 
 
-@_checkPlan
-def setHeirsTaxRate(plan, key):
-    val = kz.setpull(key)
-    plan.setHeirsTaxRate(val)
-
-
-@_checkPlan
-def setLongTermCapitalTaxRate(plan, key):
-    val = kz.setpull(key)
-    plan.setLongTermCapitalTaxRate(val)
-
-
-@_checkPlan
-def setDividendRate(plan, key):
-    val = kz.setpull(key)
-    plan.setDividendRate(val)
-
-
 @_checkPlan
 def setDefaultPlots(plan, key):
     val = kz.storepull(key)
@@ -612,7 +499,7 @@ def saveContributions(plan):
 @_checkPlan
 def saveCaseFile(plan):
     stringBuffer = StringIO()
-    if getSolveParameters() is None:
+    if kz.getSolveParameters() is None:
         return ''
     plan.saveConfig(stringBuffer)
     encoded_data = stringBuffer.getvalue().encode('utf-8')
@@ -635,23 +522,7 @@ def createCaseFromFile(file):
 
     return name, mydic
 
-    # keynames = ['name', 'status', 'plan', 'summary', 'logs', 'startDate',
-    #            'timeList', 'plots', 'interpMethod', 'interpCenter', 'interpWidth',
-    #            'objective', 'withMedicare', 'bequest', 'netSpending',
-    #            'noRothConversions', 'maxRothConversion',
-    #            'rateType', 'fixedType', 'varyingType', 'yfrm', 'yto',
-    #            'divRate', 'heirsTx', 'gainTx', 'spendingProfile', 'survivor',
-    #            'surplusFraction', ]
-    # keynamesJ = ['benf', ]
-    # keynamesK = ['fxRate', 'mean', 'stdev']
-    # keynamesI = ['iname', 'yob', 'life', 'txbl', 'txDef', 'txFree',
-    #             'ssAge', 'ssAmt', 'pAge', 'pAmt', 'df',
-    #             'jX_init%0_', 'jX_init%1_', 'jX_init%2_', 'jX_init%3_',
-    #             'jX_fin%0_', 'jX_fin%1_', 'jX_fin%2_', 'jX_fin%3_']
-    # keynames6 = ['corr']
-
-
-# @_checkPlan
+
 def genDic(plan):
     accName = ['txbl', 'txDef', 'txFree']
     dic = {}
@@ -726,6 +597,10 @@ def genDic(plan):
         if key in optionKeys:
             dic[key] = plan.solverOptions[key]
 
+    if 'previousMAGIs' in optionKeys:
+        dic['MAGI0'] = plan.solverOptions['previousMAGIs'][0]
+        dic['MAGI1'] = plan.solverOptions['previousMAGIs'][1]
+
     if plan.objective == 'maxSpending':
         dic['objective'] = 'Net spending'
     else:
@@ -740,21 +615,21 @@ def genDic(plan):
 
     # Initialize in both cases.
     for k1 in range(plan.N_k):
-        dic['fxRate'+str(k1)] = 100*plan.rateValues[k1]
+        dic['fxRate'+str(k1)] = 100 * plan.rateValues[k1]
 
     if plan.rateMethod in ['historical average', 'histochastic', 'historical']:
         dic['yfrm'] = plan.rateFrm
         dic['yto'] = plan.rateTo
     else:
         dic['yfrm'] = FROM
-        # Rates avalability are trailing by 1 or 2 years.
-        dic['yto'] = date.today().year - 2
+        # Rates availability are trailing by 1 year.
+        dic['yto'] = date.today().year - 1
 
     if plan.rateMethod in ['stochastic', 'histochastic']:
         qq = 1
         for k1 in range(plan.N_k):
-            dic['mean'+str(k1)] = 100*plan.rateValues[k1]
-            dic['stdev'+str(k1)] = 100*plan.rateStdev[k1]
+            dic['mean'+str(k1)] = 100 * plan.rateValues[k1]
+            dic['stdev'+str(k1)] = 100 * plan.rateStdev[k1]
             for k2 in range(k1+1, plan.N_k):
                 dic['corr'+str(qq)] = plan.rateCorr[k1, k2]
                 qq += 1
@@ -762,8 +637,17 @@ def genDic(plan):
     return plan._name, dic
 
 
-def clone(plan, newname, logstreams=None):
-    return owl.clone(plan, newname, logstreams=logstreams)
+@_checkPlan
+def backYearsMAGI(plan):
+    thisyear = date.today().year
+    backyears = [0, 0]
+    for i in range(plan.N_i):
+        if thisyear - plan.yobs[i] >= 65:
+            backyears[0] = thisyear - 2
+        elif thisyear - plan.yobs[i] >= 64:
+            backyears[1] = thisyear - 1
+
+    return backyears
 
 
 def version():

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/requirements.txt

@@ -7,4 +7,4 @@ scipy
 streamlit
 toml
 # --extra-index-url https://test.pypi.org/simple
-owlplanner >= 2025.1.25
+owlplanner >= 2025.02

{owlplanner-2025.1.28 → owlplanner-2025.2}/ui/sskeys.py

@@ -98,10 +98,9 @@ def updateContributions():
 
 
 def switchToCase(key):
-    import owlbridge as owb
     # Catch case where switch happens while editing W&W tables.
     if getGlobalKey('currentPageName') == 'Wages And Contributions':
-        owb.updateContributions()
+        updateContributions()
     ss.currentCase = ss['_'+key]
 
 
@@ -110,6 +109,12 @@ def isIncomplete():
             or (getKey('status') == 'married' and getKey('iname1') in [None, '']))
 
 
+def isCaseUnsolved():
+    if caseHasNoPlan():
+        return True
+    return getKey('caseStatus') != 'solved'
+
+
 def caseHasNoPlan():
     return getKey('plan') is None
 
@@ -214,7 +219,7 @@ def createNewCase(case):
         st.error("Case name '%s' already exists." % casename)
         return
 
-    ss.cases[casename] = {'name': casename, 'caseStatus': '', 'summary': '', 'logs': None}
+    ss.cases[casename] = {'name': casename, 'caseStatus': 'unknown', 'summary': '', 'logs': None}
     setCurrentCase(ss._newcase)
 
 
@@ -301,6 +306,109 @@ def getDict(key=ss.currentCase):
     return ss.cases[key]
 
 
+def getAccountBalances(ni):
+    bal = [[], [], []]
+    accounts = ['txbl', 'txDef', 'txFree']
+    for j, acc in enumerate(accounts):
+        for i in range(ni):
+            bal[j].append(getKey(acc+str(i)))
+
+    return bal
+
+
+def getSolveParameters():
+    maximize = getKey('objective')
+    if maximize is None:
+        return None
+    if 'spending' in maximize:
+        objective = 'maxSpending'
+    else:
+        objective = 'maxBequest'
+
+    options = {}
+    optList = ['netSpending', 'maxRothConversion', 'noRothConversions',
+               'withMedicare', 'bequest', 'solver']
+    for opt in optList:
+        val = getKey(opt)
+        if val is not None:
+            options[opt] = val
+
+    if getKey('readRothX'):
+        options['maxRothConversion'] = 'file'
+
+    previousMAGIs = getPreviousMAGIs()
+    if previousMAGIs[0] > 0 or previousMAGIs[1] > 0:
+        options['previousMAGIs'] = previousMAGIs
+
+    return objective, options
+
+
+def getIndividualAllocationRatios():
+    generic = []
+    initial = []
+    final = []
+    for k1 in range(4):
+        initial.append(int(getKey('j3_init%'+str(k1)+'_0')))
+        final.append(int(getKey('j3_fin%'+str(k1)+'_0')))
+    gen0 = [initial, final]
+    generic = [gen0]
+
+    if getKey('status') == 'married':
+        initial = []
+        final = []
+        for k1 in range(4):
+            initial.append(int(getKey('j3_init%'+str(k1)+'_1')))
+            final.append(int(getKey('j3_fin%'+str(k1)+'_1')))
+        gen1 = [initial, final]
+        generic.append(gen1)
+
+    return generic
+
+
+def getAccountAllocationRatios():
+    accounts = [[], [], []]
+    for j1 in range(3):
+        initial = []
+        final = []
+        for k1 in range(4):
+            initial.append(int(getKey(f'j{j1}_init%'+str(k1)+'_0')))
+            final.append(int(getKey(f'j{j1}_fin%'+str(k1)+'_0')))
+        tmp = [initial, final]
+        accounts[j1].append(tmp)
+
+    if getKey('status') == 'married':
+        for j1 in range(3):
+            initial = []
+            final = []
+            for k1 in range(4):
+                initial.append(int(getKey(f'j{j1}_init%'+str(k1)+'_1')))
+                final.append(int(getKey(f'j{j1}_fin%'+str(k1)+'_1')))
+            tmp = [initial, final]
+            accounts[j1].append(tmp)
+
+    return accounts
+
+
+def getPreviousMAGIs():
+    backMAGIs = [0, 0]
+    for ii in range(2):
+        val = getKey('MAGI'+str(ii))
+        if val:
+            backMAGIs[ii] = val
+
+    return backMAGIs
+
+
+def getFixedIncome(ni, what):
+    amounts = []
+    ages = []
+    for i in range(ni):
+        amounts.append(getKey(what+'Amt'+str(i)))
+        ages.append(getKey(what+'Age'+str(i)))
+
+    return amounts, ages
+
+
 def getIntNum(text, nkey, disabled=False, callback=setpull, step=1, help=None, min_value=0, max_value=None):
     return st.number_input(text,
                            value=int(getKey(nkey)),
@@ -333,11 +441,11 @@ def getText(text, nkey, disabled=False, callback=setpull, placeholder=None):
                          placeholder=placeholder)
 
 
-def getRadio(text, choices, nkey, callback=setpull, help=None):
+def getRadio(text, choices, nkey, callback=setpull, disabled=False, help=None):
     return st.radio(text, choices,
                     index=choices.index(getKey(nkey)),
                     on_change=callback, args=[nkey], key='_'+nkey,
-                    horizontal=True, help=help)
+                    disabled=disabled, horizontal=True, help=help)
 
 
 def getToggle(text, nkey, callback=setpull, disabled=False, help=None):
@@ -350,6 +458,7 @@ def orangeDivider():
 
 
 def caseHeader(txt):
-    st.html('<div style="text-align: right;color: orange;font-style: italic;">%s</div>' % currentCaseName())
+    # st.html('<div style="text-align: right;color: orange;font-style: italic;">%s</div>' % currentCaseName())
+    st.html('<div style="text-align: left;color: orange;font-style: italic;">%s</div>' % currentCaseName())
     st.write('## ' + txt)
     orangeDivider()

owlplanner-2025.1.28/src/owlplanner/version.py

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