owlplanner 2025.1.29__tar.gz → 2025.2__tar.gz

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

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

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

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

@@ -397,16 +397,6 @@ class Plan(object):
 
         return None
 
-    def setPreviousMAGI(self, magi, units='k'):
-        """
-        Set MAGI for two previous years to the plan. Values are in nominal $k.
-        """
-        assert len(magi) == 2, "MAGI must have two values."
-        fac = u.getUnits(units)
-        u.rescale(magi, fac)
-        self.mylog.vprint('Setting previous years MAGI to:', [u.d(magi[i]) for i in range(2)])
-        self.prevMAGI = np.array(magi)
-
     def rename(self, newname):
         """
         Override name of the plan. Plan name is used
@@ -1619,6 +1609,7 @@ class Plan(object):
             'noRothConversions',
             'withMedicare',
             'solver',
+            'previousMAGIs',
         ]
         # We will modify options if required.
         if options is None:
@@ -1647,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:

owlplanner-2025.2/src/owlplanner/version.py

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

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

@@ -252,7 +252,6 @@ the calculations by a factor of 2 to 3, which can be useful when running Monte C
 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).
-Note that these values are not included in the *case* parameter file when saving.
 
 The time profile of the net spending amount
 can be selected to either be *flat* or follow a *smile* shape.

{owlplanner-2025.1.29 → 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,8 +63,9 @@ else:
                               "noRothConversions", help=helpmsg)
 
     st.divider()
+    st.write('##### Medicare')
     kz.initKey('withMedicare', True)
-    col1, col2, col3 = st.columns(3, gap='large', vertical_alignment='top')
+    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)
@@ -75,16 +77,19 @@ else:
                 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)
-    with col3:
-        if owb.hasMOSEK():
-            choices = ['HiGHS', 'MOSEK']
-            kz.initKey('solver', choices[0])
-            ret = kz.getRadio('Solver', choices, 'solver')
+
+    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.29 → owlplanner-2025.2}/ui/owlbridge.py

@@ -84,14 +84,6 @@ def prepareRun(plan):
         st.error('Failed setting social security: %s' % e)
         return
 
-    previousMAGI = kz.getPreviousMAGI()
-    if previousMAGI[0] > 0 or previousMAGI[1] > 0:
-        try:
-            plan.setPreviousMAGI(previousMAGI)
-        except Exception as e:
-            st.error('Failed setting previous MAGI: %s' % e)
-            return
-
     if ni == 2:
         benfrac = [kz.getKey('benf0'), kz.getKey('benf1'), kz.getKey('benf2')]
         try:
@@ -605,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:
@@ -619,7 +615,7 @@ 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
@@ -632,8 +628,8 @@ def genDic(plan):
     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

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

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

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

@@ -336,6 +336,10 @@ def getSolveParameters():
     if getKey('readRothX'):
         options['maxRothConversion'] = 'file'
 
+    previousMAGIs = getPreviousMAGIs()
+    if previousMAGIs[0] > 0 or previousMAGIs[1] > 0:
+        options['previousMAGIs'] = previousMAGIs
+
     return objective, options
 
 
@@ -385,14 +389,14 @@ def getAccountAllocationRatios():
     return accounts
 
 
-def getPreviousMAGI():
-    backMAGI = [0, 0]
+def getPreviousMAGIs():
+    backMAGIs = [0, 0]
     for ii in range(2):
         val = getKey('MAGI'+str(ii))
         if val:
-            backMAGI[ii] = val
+            backMAGIs[ii] = val
 
-    return backMAGI
+    return backMAGIs
 
 
 def getFixedIncome(ni, what):
@@ -437,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):
@@ -454,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.29/src/owlplanner/version.py

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