owlplanner 2025.3.27__tar.gz → 2025.3.30__tar.gz

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/PKG-INFO

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

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

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/src/owlplanner/plan.py

@@ -1197,7 +1197,8 @@ 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))
-            A.addNewRow({_q1(Cg, 0): 1}, spLo * spending, spHi * spending)
+            # 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.
         for i in range(Ni):
@@ -1370,7 +1371,7 @@ class Plan(object):
         # Now build a solver-neutral objective vector.
         c = abc.Objective(self.nvars)
         if objective == "maxSpending":
-            # c.setElem(_q1(Cg, 0, Nn), -1)
+            # c.setElem(_q1(Cg, 0, Nn), -1) # Only OK in implemention without slack.
             for n in range(Nn):
                 c.setElem(_q1(Cg, n, Nn), -1/self.gamma_n[n])
         elif objective == "maxBequest":

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/src/owlplanner/tax2025.py

@@ -36,7 +36,7 @@ rates_nonTCJA = np.array([0.10, 0.15, 0.25, 0.28, 0.33, 0.35, 0.396])
 taxBrackets_TCJA = np.array(
     [
         [11925, 48475, 103350, 197300, 250525, 626350, 9999999],
-        [23850, 96950, 206700, 394600, 501050, 751700, 9999999],
+        [23850, 96950, 206700, 394600, 501050, 751600, 9999999],
     ]
 )
 

owlplanner-2025.3.30/src/owlplanner/version.py

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

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/ui/About_Owl.py

@@ -41,12 +41,10 @@ or directly by [email](mailto://martin.d.lacasse@gmail.com).
 
 #### :orange[Privacy]
 - This app does not store or forward any information. All data entered is lost
-after a session is closed. However, you can choose to download selected data to your own
-computer before closing the session.
-Source code is publicly available and can be inspected in the repository.
+after a session is closed. You can choose to download selected part of your
+own data to your computer before closing the session.
 
-#### :orange[Disclaimers]
-- I am not a financial planner. You make your own decisions.
-- This program comes with no guarantee. Use at your own risk.
+#### :orange[Disclaimer]
+- This program is provided for educational purposes and comes with no guarantee. Use at your own risk.
 """
 )

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/ui/Documentation.py

@@ -291,6 +291,14 @@ and a time delay, in years from today, before the non-flat behavior starts to ac
 Values default to 15%, 12%, and 0 year respectively, but they are fully configurable
 for experimentation and to fit your anticipated lifestyle.
 
+A slack variable can also be adjusted. This variable allows the net spending to deviate from
+the desired profile in order to maximize the objective. This is provided mostly for educational purpose
+as maximizing the total net spending will involve leaving the savings invested for as long as possible,
+and therefore this will favor smaller spending early in the plan and larger towards the end.
+This tension between maximizing a dollar amount and the utility of money then becomes evident.
+While the health of the individuals and therefore the utility of money is higher at the beginning
+of retirement, maximizing the total spending or bequest will pull in an opposite direction.
+
 For married couples, the survivor's
 net spending percentage is also configurable. A value of 60% is typically used.
 The selected profile multiplies

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/ui/requirements.txt

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

{owlplanner-2025.3.27 → owlplanner-2025.3.30}/ui/sskeys.py

@@ -510,8 +510,8 @@ def getToggle(text, nkey, callback=setpull, disabled=False, help=None):
     )
 
 
-def divider(color):
-    st.html("<style> hr {border-color: %s;}</style><hr>" % color)
+def divider(color, width="auto"):
+    st.html("<style> hr {border-color: %s;width: %s}</style><hr>" % (color, width))
 
 
 def getColors():
@@ -545,7 +545,7 @@ def titleBar(txt, choices=None):
         /* background-color: %s; */
         color: %s;
         top: 2.875rem;
-        z-index: 999;
+        z-index: 100;
     }
 </style>""" % (bc, fc), unsafe_allow_html=True
     )
@@ -565,5 +565,6 @@ def titleBar(txt, choices=None):
                 args=[nkey],
             )
 
-        divider("white")
+        divider("white", "99%")
+
     return ret

owlplanner-2025.3.27/src/owlplanner/version.py

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