owlplanner 2025.3.30__py3-none-any.whl → 2025.4.2__py3-none-any.whl

owlplanner/config.py

@@ -12,6 +12,7 @@ Disclaimer: This program comes with no guarantee. Use at your own risk.
 import toml as toml
 from io import StringIO, BytesIO
 import numpy as np
+from datetime import date
 import os
 
 from owlplanner import plan
@@ -302,6 +303,11 @@ def readConfig(file, *, verbose=True, logstreams=None, readContributions=True):
     if name != "None" and name not in p.inames:
         raise ValueError(f"Unknown name {name} for noRothConversions.")
 
+    # Rebase startRothConversions on year change.
+    thisyear = date.today().year
+    year = p.solverOptions.get("startRothConversions", thisyear)
+    diconf["Solver Options"]["startRothConversions"] = max(year, thisyear)
+
     # Results.
     p.setDefaultPlots(diconf["Results"]["Default plots"])
 

owlplanner/plan.py

@@ -1122,16 +1122,17 @@ class Plan(object):
             B.set0_Ub(_q1(Ce, n, Nn), self.sigmaBar_n[n])
 
         # Roth conversions equalities/inequalities.
-        if "maxRothConversion" in options:
-            if options["maxRothConversion"] == "file":
-                # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
-                for i in range(Ni):
-                    for n in range(self.horizons[i]):
-                        rhs = self.myRothX_in[i][n]
-                        B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
-            else:
+        # This condition supercedes everything else.
+        if "maxRothConversion" in options and options["maxRothConversion"] == "file":
+            # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
+            for i in range(Ni):
+                for n in range(self.horizons[i]):
+                    rhs = self.myRothX_in[i][n]
+                    B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
+        else:
+            if "maxRothConversion" in options:
                 rhsopt = options["maxRothConversion"]
-                assert isinstance(rhsopt, (int, float)), "Specified maxConversion is not a number."
+                assert isinstance(rhsopt, (int, float)), "Specified maxRothConversion is not a number."
                 rhsopt *= units
                 if rhsopt < 0:
                     # self.mylog.vprint('Unlimited Roth conversions (<0)')
@@ -1143,16 +1144,28 @@ class Plan(object):
                             #  Should we adjust Roth conversion cap with inflation?
                             B.set0_Ub(_q2(Cx, i, n, Ni, Nn), rhsopt)
 
-        # Process noRothConversions option. Also valid when N_i == 1, why not?
-        if "noRothConversions" in options and options["noRothConversions"] != "None":
-            rhsopt = options["noRothConversions"]
-            try:
-                i_x = self.inames.index(rhsopt)
-            except ValueError:
-                raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
+            # Process startRothConversions option.
+            if "startRothConversions" in options:
+                rhsopt = options["startRothConversions"]
+                assert isinstance(rhsopt, (int, float)), "Specified startRothConversions is not a number."
+                thisyear = date.today().year
+                yearn = max(rhsopt - thisyear, 0)
 
-            for n in range(Nn):
-                B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
+                for i in range(Ni):
+                    nstart = min(yearn, self.horizons[i])
+                    for n in range(0, nstart):
+                        B.set0_Ub(_q2(Cx, i, n, Ni, Nn), zero)
+
+            # Process noRothConversions option. Also valid when N_i == 1, why not?
+            if "noRothConversions" in options and options["noRothConversions"] != "None":
+                rhsopt = options["noRothConversions"]
+                try:
+                    i_x = self.inames.index(rhsopt)
+                except ValueError:
+                    raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
+
+                for n in range(Nn):
+                    B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
 
         # Impose withdrawal limits on taxable and tax-exempt accounts.
         for i in range(Ni):
@@ -1197,7 +1210,7 @@ class Plan(object):
             # Account for time elapsed in the current year.
             spending *= units * self.yearFracLeft
             # self.mylog.vprint('Maximizing bequest with desired net spending of:', u.d(spending))
-            # To allow slack in first year, Cg can be made Nn+1 and store basis in g[Nn]. 
+            # To allow slack in first year, Cg can be made Nn+1 and store basis in g[Nn].
             A.addNewRow({_q1(Cg, 0, Nn): 1}, spending, spending)
 
         # Set initial balances through constraints.
@@ -1616,16 +1629,17 @@ class Plan(object):
         knownObjectives = ["maxBequest", "maxSpending"]
         knownSolvers = ["HiGHS", "MOSEK"]
         knownOptions = [
-            "units",
-            "maxRothConversion",
-            "netSpending",
-            "spendingSlack",
             "bequest",
             "bigM",
+            "maxRothConversion",
+            "netSpending",
             "noRothConversions",
-            "withMedicare",
-            "solver",
             "previousMAGIs",
+            "solver",
+            "spendingSlack",
+            "startRothConversions",
+            "units",
+            "withMedicare",
         ]
         # We will modify options if required.
         if options is None:

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.03.30"
+__version__ = "2025.04.02"

{owlplanner-2025.3.30.dist-info → owlplanner-2025.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.3.30
+Version: 2025.4.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.3.30.dist-info → owlplanner-2025.4.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 owlplanner/__init__.py,sha256=QqrdT0Qks20osBTg7h0vJHAxpP9lL7DA99xb0nYbtw4,254
 owlplanner/abcapi.py,sha256=LbzW_KcNy0IeHp42MUHwGu_H67B2h_e1_vu-c2ACTkQ,6646
-owlplanner/config.py,sha256=uJ6jZ9Rx2CB2P5cFRscsUCXOW6uml7I4pta2ozjW0uo,12263
+owlplanner/config.py,sha256=F6GS3n02VeFX0GCVeM4J7Ra0in4N632W6TZIXk7Yj2w,12519
 owlplanner/logging.py,sha256=tYMw04O-XYSzjTj36fmKJGLcE1VkK6k6oJNeqtKXzuc,2530
-owlplanner/plan.py,sha256=Y3CDTI4T9hXJ3Epn64eox3n__yY5QdB6uk3lkj5oAsk,116953
+owlplanner/plan.py,sha256=obzXmEJhtkIhmTFOR02Q6g1deigUkFnufyv54EqvD5o,117672
 owlplanner/progress.py,sha256=8jlCvvtgDI89zXVNMBg1-lnEyhpPvKQS2X5oAIpoOVQ,384
 owlplanner/rates.py,sha256=gJaoe-gJqWCQV5qVLlHp-Yn9TSJs-PJzeTbOwMCbqWs,15682
 owlplanner/tax2025.py,sha256=HEXfL0HfwUvZOQRjivXO2jFeoVZ5m_yk_hoMiVi-hR0,7745
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=fEQSK7uDPSbqsQ3DPZ39_7pwhTGTqWEEoeAsff3bjKU,28
+owlplanner/version.py,sha256=TElp9wm8J0rr4k4sU8OgxW2Rf9Zy8iAW808A6RDo1lE,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.3.30.dist-info/METADATA,sha256=_8LSN7_z0_80_0IL37XAcDRRDKCm42qtcJtaQ3J9qK4,53801
-owlplanner-2025.3.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.3.30.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.3.30.dist-info/RECORD,,
+owlplanner-2025.4.2.dist-info/METADATA,sha256=Ro0E2vypz99zMe7EBwOTgJRnoHnEWB9yIt004agJKrA,53800
+owlplanner-2025.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.4.2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.4.2.dist-info/RECORD,,