owlplanner 2025.3.11__tar.gz → 2025.3.13__tar.gz

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/.devcontainer/devcontainer.json

@@ -1,33 +1,33 @@
-{
-  "name": "Python 3",
-  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
-  "customizations": {
-    "codespaces": {
-      "openFiles": [
-        "README.md",
-        "ui/main.py"
-      ]
-    },
-    "vscode": {
-      "settings": {},
-      "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance"
-      ]
-    }
-  },
-  "updateContentCommand": "[ -f packages.txt ] && sudo apt update && sudo apt upgrade -y && sudo xargs apt install -y <packages.txt; [ -f requirements.txt ] && pip3 install --user -r requirements.txt; pip3 install --user streamlit; echo '✅ Packages installed and Requirements met'",
-  "postAttachCommand": {
-    "server": "streamlit run ui/main.py --server.enableCORS false --server.enableXsrfProtection false"
-  },
-  "portsAttributes": {
-    "8501": {
-      "label": "Application",
-      "onAutoForward": "openPreview"
-    }
-  },
-  "forwardPorts": [
-    8501
-  ]
+{
+  "name": "Python 3",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+  "customizations": {
+    "codespaces": {
+      "openFiles": [
+        "README.md",
+        "ui/main.py"
+      ]
+    },
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "ms-python.python",
+        "ms-python.vscode-pylance"
+      ]
+    }
+  },
+  "updateContentCommand": "[ -f packages.txt ] && sudo apt update && sudo apt upgrade -y && sudo xargs apt install -y <packages.txt; [ -f requirements.txt ] && pip3 install --user -r requirements.txt; pip3 install --user streamlit; echo '✅ Packages installed and Requirements met'",
+  "postAttachCommand": {
+    "server": "streamlit run ui/main.py --server.enableCORS false --server.enableXsrfProtection false"
+  },
+  "portsAttributes": {
+    "8501": {
+      "label": "Application",
+      "onAutoForward": "openPreview"
+    }
+  },
+  "forwardPorts": [
+    8501
+  ]
 }

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/PKG-INFO

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

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

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/src/owlplanner/plan.py

@@ -34,7 +34,7 @@ from owlplanner import logging
 from owlplanner import progress
 
 
-# This makes all graphs appear have the same height.
+# This makes all graphs to have the same height.
 plt.rcParams.update({'figure.autolayout': True})
 
 
@@ -2094,33 +2094,33 @@ class Plan(object):
         totIncome = np.sum(self.g_n, axis=0)
         totIncomeNow = np.sum(self.g_n / self.gamma_n[:-1], axis=0)
         dic["Total net spending"] = f"{u.d(totIncomeNow)}"
-        dic["- Total net spending (nominal)"] = f"{u.d(totIncome)}"
+        dic["[Total net spending]"] = f"{u.d(totIncome)}"
 
         totRoth = np.sum(self.x_in, axis=(0, 1))
         totRothNow = np.sum(np.sum(self.x_in, axis=0) / self.gamma_n[:-1], axis=0)
         dic["Total Roth conversions"] = f"{u.d(totRothNow)}"
-        dic["- Total Roth conversions (nominal)"] = f"{u.d(totRoth)}"
+        dic["[Total Roth conversions]"] = f"{u.d(totRoth)}"
 
         taxPaid = np.sum(self.T_n, axis=0)
         taxPaidNow = np.sum(self.T_n / self.gamma_n[:-1], axis=0)
         dic["Total income tax paid on ordinary income"] = f"{u.d(taxPaidNow)}"
-        dic["- Total income tax paid on ordinary income (nominal)"] = f"{u.d(taxPaid)}"
+        dic["[Total income tax paid on ordinary income]"] = f"{u.d(taxPaid)}"
         for t in range(self.N_t):
             taxPaid = np.sum(self.T_tn[t], axis=0)
             taxPaidNow = np.sum(self.T_tn[t] / self.gamma_n[:-1], axis=0)
             tname = tx.taxBracketNames[t]
             dic[f"-- Subtotal in tax bracket {tname}"] = f"{u.d(taxPaidNow)}"
-            dic[f"--- Subtotal in tax bracket {tname} (nominal)"] = f"{u.d(taxPaid)}"
+            dic[f"-- [Subtotal in tax bracket {tname}]"] = f"{u.d(taxPaid)}"
 
         taxPaid = np.sum(self.U_n, axis=0)
         taxPaidNow = np.sum(self.U_n / self.gamma_n[:-1], axis=0)
         dic["Total tax paid on gains and dividends"] = f"{u.d(taxPaidNow)}"
-        dic["- Total tax paid on gains and dividends (nominal)"] = f"{u.d(taxPaid)}"
+        dic["[Total tax paid on gains and dividends]"] = f"{u.d(taxPaid)}"
 
         taxPaid = np.sum(self.M_n, axis=0)
         taxPaidNow = np.sum(self.M_n / self.gamma_n[:-1], axis=0)
         dic["Total Medicare premiums paid"] = f"{u.d(taxPaidNow)}"
-        dic["- Total Medicare premiums paid (nominal)"] = f"{u.d(taxPaid)}"
+        dic["[Total Medicare premiums paid]"] = f"{u.d(taxPaid)}"
 
         if self.N_i == 2 and self.n_d < self.N_n:
             p_j = self.partialEstate_j * (1 - self.phi_j)
@@ -2135,24 +2135,24 @@ class Plan(object):
             iname_s = self.inames[self.i_s]
             iname_d = self.inames[self.i_d]
             dic[f"Sum of spousal transfer to {iname_s} in year {ynx}"] = (f"{u.d(totSpousalNow)}")
-            dic[f"- Sum of spousal transfer to {iname_s} in year {ynx} (nominal)"] = (
+            dic[f"[Sum of spousal transfer to {iname_s} in year {ynx}]"] = (
                 f"{u.d(totSpousal)}")
-            dic[f"-- Spousal transfer to {iname_s} in year {ynx} - taxable (nominal)"] = (
+            dic[f"-- [Spousal transfer to {iname_s} in year {ynx} - taxable]"] = (
                 f"{u.d(q_j[0])}")
-            dic[f"-- Spousal transfer to {iname_s} in year {ynx} - tax-def (nominal)"] = (
+            dic[f"-- [Spousal transfer to {iname_s} in year {ynx} - tax-def]"] = (
                 f"{u.d(q_j[1])}")
-            dic[f"-- Spousal transfer to {iname_s} in year {ynx} - tax-free (nominal)"] = (
+            dic[f"-- [Spousal transfer to {iname_s} in year {ynx} - tax-free]"] = (
                 f"{u.d(q_j[2])}")
 
             dic[f"Sum of post-tax non-spousal bequests from {iname_d} in year {ynx}"] = (
                 f"{u.d(totOthersNow)}")
-            dic[f"- Sum of post-tax non-spousal bequests from {iname_d} in year {ynx} (nominal)"] = (
+            dic[f"[Sum of post-tax non-spousal bequests from {iname_d} in year {ynx}]"] = (
                 f"{u.d(totOthers)}")
-            dic[f"-- Post-tax non-spousal bequests from {iname_d} in year {ynx} - taxable (nominal)"] = (
+            dic[f"-- [Post-tax non-spousal bequests from {iname_d} in year {ynx} - taxable]"] = (
                 f"{u.d(p_j[0])}")
-            dic[f"-- Post-tax non-spousal bequests from {iname_d} in year {ynx} - tax-def (nominal)"] = (
+            dic[f"-- [Post-tax non-spousal bequests from {iname_d} in year {ynx} - tax-def]"] = (
                 f"{u.d(p_j[1])}")
-            dic[f"-- Post-tax non-spousal bequests from {iname_d} in year {ynx} - tax-free (nominal)"] = (
+            dic[f"-- [Post-tax non-spousal bequests from {iname_d} in year {ynx} - tax-free]"] = (
                 f"{u.d(p_j[2])}")
 
         estate = np.sum(self.b_ijn[:, :, self.N_n], axis=0)
@@ -2161,10 +2161,10 @@ class Plan(object):
         totEstate = np.sum(estate)
         totEstateNow = totEstate / self.gamma_n[-1]
         dic[f"Total estate value at the end of {lastyear}"] = (f"{u.d(totEstateNow)}")
-        dic[f"- Total estate value at the end of {lastyear} (nominal)"] = (f"{u.d(totEstate)}")
-        dic[f"-- Post-tax account value at the end of {lastyear} - taxable (nominal)"] = (f"{u.d(estate[0])}")
-        dic[f"-- Post-tax account value at the end of {lastyear} - tax-def (nominal)"] = (f"{u.d(estate[1])}")
-        dic[f"-- Post-tax account value at the end of {lastyear} - tax-free (nominal)"] = (f"{u.d(estate[2])}")
+        dic[f"[Total estate value at the end of {lastyear}]"] = (f"{u.d(totEstate)}")
+        dic[f"-- [Post-tax account value at the end of {lastyear} - taxable]"] = (f"{u.d(estate[0])}")
+        dic[f"-- [Post-tax account value at the end of {lastyear} - tax-def]"] = (f"{u.d(estate[1])}")
+        dic[f"-- [Post-tax account value at the end of {lastyear} - tax-free]"] = (f"{u.d(estate[2])}")
 
         dic["Plan starting date"] = str(self.startDate)
         dic[f"Cumulative inflation factor from start date to end of {lastyear}"] = (f"{self.gamma_n[-1]:.2f}")

owlplanner-2025.3.13/src/owlplanner/version.py

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

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/About_Owl.py

@@ -8,7 +8,7 @@ st.write("## About Owl 🦉")
 kz.orangeDivider()
 
 st.write(f"This is Owl version {owb.version()} running on Streamlit {st.__version__}.")
-st.snow()
+# st.balloons()
 
 st.write(
     """

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/Documentation.py

@@ -53,6 +53,13 @@ reported as yearly values. These include wages, income, rates, social security,
 Dollar values are typically entered in thousands, unless in tables, where they
 are entered and reported in unit dollars.
 
+If you are accessing Owl through the Chrome browser,
+the performance manager might be configured to disable hidden or inactive tabs.
+This will cause your Owl session to inadvertently reset, and losing the state of the calculator.
+To avoid this, configure Chrome to keep the page active using
+`More Tools` -> `Performance` -> `Always keep these sites active` and
+add the site *owlplanner.streamlit.app*.
+
 There are four sections in the user interface:
 **Case Setup**, **Single Scenario**, **Multiple Scenarios**, and **Resources**.
 The sections below follow the same logical order.

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/Output_Files.py

@@ -18,8 +18,9 @@ else:
         df = kz.compareSummaries()
         if df is not None:
             st.write("#### Synopsis")
-            st.dataframe(df[1:], use_container_width=True)
-            st.caption("Values are in today's \\$ unless marked otherwise.")
+            styledDf = df[1:].style.map(kz.colorBySign)
+            st.dataframe(styledDf, use_container_width=True)
+            st.caption("Values with [legend] are nominal, otherwise in today's \\$.")
             st.download_button(
                 "Download synopsis", data=df[1:].to_string(), file_name=f"Synopsis_{caseName}.txt",
                 mime="text/plain;charset=UTF-8"

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/Rates_Selection.py

@@ -228,5 +228,5 @@ else:
 
     with col3:
         kz.initKey("yTCJA", 2026)
-        helpmsg = "Year at which the Tax Cut And Job Act tax rates are speculated to expire."
+        helpmsg = "Year at which the Tax Cut And Job Act tax rates are speculated to be expired."
         ret = kz.getIntNum("TCJA expiration year", "yTCJA", help=helpmsg)

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/requirements.txt

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

{owlplanner-2025.3.11 → owlplanner-2025.3.13}/ui/sskeys.py

@@ -313,6 +313,12 @@ def getAccountBalances(ni):
     return bal
 
 
+def colorBySign(val):
+    color = "green" if "\u2191" in val else "red" if "\u2193" in val else None
+
+    return f"color:{color};" if color else ""
+
+
 def compareSummaries():
     df = getKey("summaryDf")
     if df is None:
@@ -504,7 +510,6 @@ def orangeDivider():
 
 
 def titleBar(txt, choices=None):
-    # st.html(f"<div style='text-align: left;color: orange;font-style: italic;'>{currentCaseName()}</div>")
     if choices is None:
         choices = onlyCaseNames()
         helpmsg = "Select an existing case."

owlplanner-2025.3.11/src/owlplanner/version.py

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