ss oasdi revenues slider and functionality

app.py

@@ -23,6 +23,7 @@ data = data[[
     "Total Revenues",
     "Debt Balance",
     "Revenues ex SS OASDI",
+    "SS OASDI Revenues",
     "Average Rate on Federal Debt", 
     "GDP", 
     "Net Interest"
@@ -36,17 +37,24 @@ print(data)
 # %%
 baseline_interest_rate = 3.64
 #baseline_revenues = 15928.73
-baseline_cagr_revenues = 4.1
-total_revenues_2024 = data.loc[2024, "Total Revenues"]
-total_revenues_2055_bl = data.loc[2055, "Total Revenues"]
+baseline_cagr_revenues = 4.44
+total_revenues_2024 = data.loc[2024, "Revenues ex SS OASDI"]
+total_revenues_2055_bl = data.loc[2055, "Revenues ex SS OASDI"]
 
-def plot_interest_coverage(interest_rate, cagr_revenues):
+baseline_cagr_ssoasdi_revenues = 3.62
+ssoasdi_revenues_2024 = data.loc[2024, "SS OASDI Revenues"]
+ssoasdi_revenues_2055_bl = data.loc[2055, "SS OASDI Revenues"]
+
+def plot_interest_coverage(interest_rate, cagr_revenues, cagr_ssoasdi_revenues):
 
     # calculate the yearly increase in the interest rate based on the projected interest rate in 2054
     interest_rate_yearly_increase = (interest_rate - baseline_interest_rate) / (2055 - 2025) / 100
     # calculate the yearly increase in revenues based on the annual growth rate through 2055
     total_revenues_2055 = total_revenues_2024 * ((1 + (cagr_revenues / 100)) ** (2055 - 2024))
     revenues_yearly_increase = (total_revenues_2055 - total_revenues_2055_bl) / (2055 - 2025)
+    # calculate the yearly increase in ss oasdi revenues based on the annual growth rate through 2055
+    ssoasdi_revenues_2055 = ssoasdi_revenues_2024 * ((1 + (cagr_ssoasdi_revenues / 100)) ** (2055 - 2024))
+    ssoasdi_revenues_yearly_increase = (ssoasdi_revenues_2055 - ssoasdi_revenues_2055_bl) / (2055 - 2025)
 
     # add a baseline net interest / revenues column
     data["Net Interest / Revenues (Baseline)"] = data["Net Interest"] / data["Total Revenues"]
@@ -55,7 +63,7 @@ def plot_interest_coverage(interest_rate, cagr_revenues):
     data["Net Interest / Revenues ex SS OASDI (Baseline)"] = data["Net Interest"] / data["Revenues ex SS OASDI"]
 
     # add a baseline SS OASDI revenues column
-    data["SS OASDI Revenues"] = data["Total Revenues"] - data["Revenues ex SS OASDI"]
+    # data["SS OASDI Revenues"] = data["Total Revenues"] - data["Revenues ex SS OASDI"]
 
     # add a projected average rate on federal debt column
     data["Average Rate on Federal Debt (Projected)"] = np.where(
@@ -63,19 +71,28 @@ def plot_interest_coverage(interest_rate, cagr_revenues):
         data["Average Rate on Federal Debt"], 
         data["Average Rate on Federal Debt"] + (interest_rate_yearly_increase * (data.index.astype(int) - 2024)))
     
-    # add a projected revenues column
-    data["Total Revenues (Projected)"] = np.where(
-        data.index.astype(int) < 2025, 
-        data["Total Revenues"], 
-        data["Total Revenues"] + (revenues_yearly_increase * (data.index.astype(int) - 2024)))
-    
-    print(data.loc[2055, "Total Revenues (Projected)"])
-    
     # add a projected revenues ex SS OASDI column
     data["Revenues ex SS OASDI (Projected)"] = np.where(
         data.index.astype(int) < 2025, 
         data["Revenues ex SS OASDI"], 
-        data["Total Revenues (Projected)"] - data["SS OASDI Revenues"])
+        data["Revenues ex SS OASDI"] + (revenues_yearly_increase * (data.index.astype(int) - 2024)))
+    
+    # add a projected SS OASDI revenues column
+    data["SS OASDI Revenues (Projected)"] = np.where(
+        data.index.astype(int) < 2025, 
+        data["SS OASDI Revenues"], 
+        data["SS OASDI Revenues"] + (ssoasdi_revenues_yearly_increase * (data.index.astype(int) - 2024)))
+    
+    # add a projected revenues column
+    #data["Total Revenues (Projected)"] = np.where(
+        #data.index.astype(int) < 2025, 
+        #data["Total Revenues"], 
+        #data["Total Revenues"] + (revenues_yearly_increase * (data.index.astype(int) - 2024)))
+        
+    # add a projected revenues column
+    data["Total Revenues (Projected)"] = data["Revenues ex SS OASDI (Projected)"] + data["SS OASDI Revenues (Projected)"]
+    
+    print(data.loc[2055, "Total Revenues (Projected)"])
     
     # add a projected interest / revenues column
     data["Net Interest / Revenues (Projected)"] = np.where(
@@ -177,6 +194,9 @@ interest_rate_upperbound = 10
 cagr_revenues_lower_bound = 0
 cagr_revenues_upper_bound = 8
 
+cagr_ssoasdi_revenues_lower_bound = 0
+cagr_ssoasdi_revenues_upper_bound = 8
+
 with gr.Blocks() as interface:
     # Create the image output
     graph = gr.Image(type="filepath", label = "Graph", value = plot_interest_coverage(baseline_interest_rate, baseline_cagr_revenues))
@@ -199,6 +219,15 @@ with gr.Blocks() as interface:
         label = "Compound Annual Growth Rate of Revenues through 2055"
     )
 
+    # Create the slider input below the image for projected revenues
+    cagr_ssoasdi_revenues_slider = gr.Slider(
+        cagr_ssoasdi_revenues_lower_bound, 
+        cagr_ssoasdi_revenues_upper_bound, 
+        step = 0.01,
+        value = baseline_cagr_ssoasdi_revenues, 
+        label = "Compound Annual Growth Rate of Revenues through 2055"
+    )
+
     gr.Markdown('<p style="font-size:11px;">Source: : CBO March 2025, The Long-Term Budget Outlook: 2025 to 2055, author\'s ' \
     'calculations from Supplemental Table 1. Scenario of higher interest rate and revenues '
     'is author\'s calculations. Historical Social Security OASDI payroll tax revenue from Table 4-3 of the ' \
@@ -208,14 +237,21 @@ with gr.Blocks() as interface:
     # Set up an action that updates the graph when the interest rate slider value changes 
     interest_rate_slider.change(
         plot_interest_coverage, 
-        inputs = [interest_rate_slider, cagr_revenues_slider], 
+        inputs = [interest_rate_slider, cagr_revenues_slider, cagr_ssoasdi_revenues_slider], 
         outputs = graph
     )
 
     # Set up an action that updates the graph when the revenues slider value changes
     cagr_revenues_slider.change(
         plot_interest_coverage, 
-        inputs = [interest_rate_slider, cagr_revenues_slider], 
+        inputs = [interest_rate_slider, cagr_revenues_slider, cagr_ssoasdi_revenues_slider], 
+        outputs = graph
+    )
+
+    # Set up an action that updates the graph when the ssoasdi revenues slider value changes
+    cagr_ssoasdi_revenues_slider.change(
+        plot_interest_coverage, 
+        inputs = [interest_rate_slider, cagr_revenues_slider, cagr_ssoasdi_revenues_slider], 
         outputs = graph
     )