Upload 16 files

app.py

@@ -3,9 +3,7 @@ from interface.rebalancing_interface import examples, rebalancing_inputs, output
 from interface.share_price_trend_interface import share_price_trend_inputs, output as share_price_trend_output, update_output as share_price_trend_update_output
 from interface.dollar_cost_averaging_interface import dollar_cost_averaging_inputs, output as dollar_cost_averaging_output, update_output as dollar_cost_averaging_update_output, markdown1 as dollar_cost_averaging_markdown1, old_price, old_quantity, markdown2 as dollar_cost_averaging_markdown2, new_price, new_quantity
 from interface.retirement_planning_interface import (
-    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-    current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 입력 변수
-    pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends, post_retirement_roi, post_retirement_dividend_yield, output as retirement_output, update_output as retirement_update_output
+    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield, output as retirement_output, update_output as retirement_update_output
 )
 from interface.about_interface import render as render_about_tab
 
@@ -94,47 +92,63 @@ with gr.Blocks(css='style.css') as demo:
             with gr.TabItem("RETIREMENT PLANNING"):
                 with gr.Row():  # Use Row to place inputs and output side by side
                     with gr.Column():  # Column for inputs
-                        current_age.render()
-                        retirement_age.render()
-                        life_expectancy.render()
-                        monthly_income_required.render()
-                        inflation_rate.render()                        
-                        current_investment.render()
-                        monthly_investment.render()
-                        monthly_increase_in_investment.render()  # 추가된 입력
-                        pre_retirement_roi.render()
-                        pre_retirement_dividend_yield.render()
-                        reinvest_dividends.render()
-                        post_retirement_roi.render()
-                        post_retirement_dividend_yield.render()
-                        # Add the ClearButton below the inputs
-                        clear_button = gr.ClearButton(value="Clear")
-                        clear_button.click(
-                            fn=lambda: [None] * len([
-                                current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-                                current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 입력
-                                pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends, post_retirement_roi, post_retirement_dividend_yield
-                            ]),
-                            inputs=[],
-                            outputs=[
-                                current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-                                current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 입력
-                                pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends, post_retirement_roi, post_retirement_dividend_yield
-                            ]
-                        )
-                    with gr.Column():  # Column for output
+
+                        gr.Markdown("### Personal Information")
+                        with gr.Row():
+                            
+                            current_age.render()
+                            retirement_age.render()
+                            life_expectancy.render()
+                            monthly_income_required.render()
+                            inflation_rate.render()         
+
+                        gr.Markdown("### Investment Information")
+                        with gr.Row():
+                            current_investment.render()
+                            monthly_investment.render()
+                            monthly_increase_in_investment.render()  # 추가된 입력
+                            reinvest_dividends.render()
+                        
+                        gr.Markdown("### Investment Returns")
+                        with gr.Row():
+                            pre_retirement_roi.render()
+                            pre_retirement_dividend_yield.render()
+                            # retirement_markdown.render()
+                            post_retirement_roi.render()
+                            post_retirement_dividend_yield.render()
+
+                    
+                        # # Add the ClearButton below the inputs
+                        # clear_button = gr.ClearButton(value="Clear")
+                        # clear_button.click(
+                        #     fn=lambda: [None] * len([
+                        #         current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
+                        #     ]),
+                        #     inputs=[],
+                        #     outputs=[
+                        #         current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
+                        #     ]
+                        # )
+                        # # Add the Submit Button below the ClearButton
+                        # submit_button = gr.Button(value="Run", variant="primary")
+                        # submit_button.click(
+                        #     fn=retirement_update_output,
+                        #         inputs=[
+                        #         current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
+                        #     ],
+                        #     outputs=retirement_output
+                        # )                            
+                    with gr.Column():
                         retirement_output.render()
 
                 # Add change event handlers for retirement planning inputs
                 for input_component in [
-                    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 입력
-                    pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends, post_retirement_roi, post_retirement_dividend_yield
+                    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
                 ]:
                     input_component.change(
                         fn=retirement_update_output,
                         inputs=[
-                            current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 입력
-                            pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends, post_retirement_roi, post_retirement_dividend_yield
+                            current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
                         ],
                         outputs=retirement_output
                     )

interface/retirement_planning_interface.py

@@ -3,16 +3,10 @@ from modules.utils import load_css
 from modules.retirement_planning import retirement_planning
 
 def retirement_planning_interface_fn(
-    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-    current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 인자
-    pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends,
-    post_retirement_roi, post_retirement_dividend_yield
+    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
 ):
     result = retirement_planning(
-        current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-        current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 인자
-        pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends,
-        post_retirement_roi, post_retirement_dividend_yield
+        current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
     )
     css = load_css()
     return css + result
@@ -21,17 +15,14 @@ def retirement_planning_interface_fn(
 current_age = gr.Slider(label="Current Age (15-60 Years)", value=15, minimum=15, maximum=60, step=1)
 retirement_age = gr.Slider(label="Retirement Age (Upto 70 Years)", value=55, minimum=15, maximum=70, step=1)
 life_expectancy = gr.Slider(label="Life Expectancy (Upto 100 Years)", value=80, minimum=30, maximum=100, step=1)
-monthly_income_required = gr.Number(label="Monthly Income Required In Retirement Years (Current Purchasing Power)", value=2000000)
+monthly_income_required = gr.Number(label="Monthly Income Required In Retirement Years (CPP)", value=2000000)
 inflation_rate = gr.Number(label="Expected Inflation Rate (%)", value=3)
 current_investment = gr.Number(label="Current Investment", value=10000000)
 monthly_investment = gr.Number(label="Monthly Investment", value=500000)
 monthly_increase_in_investment = gr.Number(label="Monthly Increase in Investment", value=0)  # 추가된 입력
+reinvest_dividends = gr.Checkbox(label="Reinvest Dividends", value=True)
 pre_retirement_roi = gr.Number(label="Expected Return On Investment (Pre-retirement) (%)", value=8)
 pre_retirement_dividend_yield = gr.Number(label="Expected Dividend Yield (Pre-retirement) (%)", value=3.3)
-reinvest_dividends = gr.Checkbox(label="Reinvest Dividends", value=True)
-
-# 은퇴 후 입력
-markdown = gr.Markdown("### Post-retirement")
 post_retirement_roi = gr.Number(label="Expected Return On Investment (Post-retirement) (%)", value=8)
 post_retirement_dividend_yield = gr.Number(label="Expected Dividend Yield (Post-retirement) (%)", value=3.3)
 
@@ -39,14 +30,8 @@ output = gr.HTML()
 
 # Define the update function
 def update_output(
-    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-    current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 인자
-    pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends,
-    post_retirement_roi, post_retirement_dividend_yield
+    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
 ):
     return retirement_planning_interface_fn(
-        current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate,
-        current_investment, monthly_investment, monthly_increase_in_investment,  # 추가된 인자
-        pre_retirement_roi, pre_retirement_dividend_yield, reinvest_dividends,
-        post_retirement_roi, post_retirement_dividend_yield
+        current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, monthly_increase_in_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
     )

modules/retirement_planning.py

@@ -15,9 +15,9 @@ def retirement_planning(
     current_investment=None, 
     monthly_investment=None, 
     monthly_increase_in_investment=None,  # 추가된 입력
+    reinvest_dividends=None, 
     pre_retirement_roi=None, 
     pre_retirement_dividend_yield=None, 
-    reinvest_dividends=None, 
     post_retirement_roi=None, 
     post_retirement_dividend_yield=None
 ):