Upload 16 files

app.py

@@ -1,87 +1,128 @@
 import gradio as gr
-from interface.rebalancing_interface import examples, rebalancing_inputs, output as rebalancing_output, update_output as rebalancing_update_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.rebalancing_interface import (
+    portfolio_rebalancing_inputs, examples, main_currency, holdings, 
+    cash_amount, cash_ratio, output as rebalancing_output, 
+    update_output as rebalancing_update_output
+)
+from interface.share_price_trend_interface import (
+    share_price_trend_inputs, stock_codes, period, 
+    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, old_price, old_quantity, 
+    new_price, new_quantity, 
+    output as dollar_cost_averaging_output, 
+    update_output as dollar_cost_averaging_update_output
+)
 from interface.retirement_planning_interface import (
-    current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, annual_increase_in_monthly_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
+    retirement_planning_inputs, current_age, retirement_age, 
+    life_expectancy, monthly_income_required, inflation_rate, 
+    current_investment, monthly_investment, 
+    annual_increase_in_monthly_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
 
+# Helper function to add buttons
+def add_buttons(inputs, update_fn, output):
+    clear_button = gr.ClearButton(value="Clear")
+    clear_button.click(
+        fn=lambda: [None] * len(inputs),
+        inputs=[],
+        outputs=inputs
+    )
+    
+    submit_button = gr.Button(value="Run", variant="primary")
+    submit_button.click(
+        fn=update_fn,
+        inputs=inputs,
+        outputs=output
+    )
+    return clear_button, submit_button
+
 with gr.Blocks(css='style.css') as demo:
     with gr.Column(elem_id="col-container"):
         with gr.Tabs():
             with gr.TabItem("RE-BALANCING"):
-                with gr.Row():  # Use Row to place inputs and output side by side
-                    with gr.Column():  # Column for inputs
-                        for input_component in rebalancing_inputs:
-                            input_component.render()
-                        # Add the ClearButton below the inputs
-                        clear_button = gr.ClearButton(value="Clear")
-                        clear_button.click(
-                            fn=lambda: [None] * len(rebalancing_inputs),
-                            inputs=[],
-                            outputs=rebalancing_inputs
-                        )
-                                
-                        # Add the Submit Button below the ClearButton
-                        submit_button = gr.Button(value="Run", variant="primary")
-                        submit_button.click(
-                            fn=rebalancing_update_output,
-                            inputs=rebalancing_inputs,
-                            outputs=rebalancing_output
+                with gr.Row():
+                    with gr.Column():
+                        holdings.render()
+                        with gr.Row():        
+                            main_currency.render()
+                            cash_amount.render()
+                            cash_ratio.render()
+                        
+                        # Add buttons and handlers
+                        clear_button, submit_button = add_buttons(
+                            portfolio_rebalancing_inputs,
+                            rebalancing_update_output,
+                            rebalancing_output
                         )
-                    with gr.Column():  # Column for output
+
+                    with gr.Column():
                         rebalancing_output.render()
-                
-                # Add examples
+
                 gr.Examples(
                     examples=examples,
                     cache_examples=False,
-                    inputs=rebalancing_inputs
+                    inputs=portfolio_rebalancing_inputs
                 )
-            with gr.TabItem("SHARE PRICE TREND"):
-                with gr.Row():  # Use Row to place inputs and output side by side
-                    with gr.Column():  # Column for inputs
-                        for input_component in share_price_trend_inputs:
-                            input_component.render()
-                        # Add the ClearButton below the inputs
-                        clear_button = gr.ClearButton(value="Clear")
-                        clear_button.click(
-                            fn=lambda: [None] * len(share_price_trend_inputs),
-                            inputs=[],
-                            outputs=share_price_trend_inputs
-                        )
+                for input_component in portfolio_rebalancing_inputs:
+                    input_component.change(
+                        fn=rebalancing_update_output,
+                        inputs=portfolio_rebalancing_inputs,
+                        outputs=rebalancing_output
+                    )
                                 
-                        # Add the Submit Button below the ClearButton
-                        submit_button = gr.Button(value="Run", variant="primary")
-                        submit_button.click(
-                            fn=share_price_trend_update_output,
-                            inputs=share_price_trend_inputs,
-                            outputs=share_price_trend_output
+            with gr.TabItem("SHARE PRICE TREND"):
+                with gr.Row():
+                    with gr.Column():
+                        stock_codes.render()
+                        period.render()
+
+                        # Add buttons and handlers
+                        clear_button, submit_button = add_buttons(
+                            share_price_trend_inputs,
+                            share_price_trend_update_output,
+                            share_price_trend_output
                         )
-                    with gr.Column():  # Column for output
+
+                    with gr.Column():
                         share_price_trend_output.render()
-                
+
+                for input_component in share_price_trend_inputs:
+                    input_component.change(
+                        fn=share_price_trend_update_output,
+                        inputs=share_price_trend_inputs,
+                        outputs=share_price_trend_output
+                    )
+                                
             with gr.TabItem("DOLLAR-COST AVERAGING"):
-                with gr.Row():  # Use Row to place inputs and output side by side
-                    with gr.Column():  # Column for inputs
-                        dollar_cost_averaging_markdown1.render()
-                        old_price.render()
-                        old_quantity.render()
-                        dollar_cost_averaging_markdown2.render()
-                        new_price.render()
-                        new_quantity.render()
-                        # Add the ClearButton below the inputs
-                        clear_button = gr.ClearButton(value="Clear")
-                        clear_button.click(
-                            fn=lambda: [None] * len(dollar_cost_averaging_inputs),
-                            inputs=[],
-                            outputs=dollar_cost_averaging_inputs
+                with gr.Row():
+                    with gr.Column():
+                        with gr.Accordion("FIRST PURCHASE", open=True):
+                            with gr.Row():
+                                old_price.render()
+                                old_quantity.render()
+                        with gr.Accordion("SECOND PURCHASE", open=True):
+                            with gr.Row():
+                                new_price.render()
+                                new_quantity.render()
+
+                        # Add buttons and handlers
+                        clear_button, submit_button = add_buttons(
+                            dollar_cost_averaging_inputs,
+                            dollar_cost_averaging_update_output,
+                            dollar_cost_averaging_output
                         )
-                    with gr.Column():  # Column for output
+                    
+                    with gr.Column():
                         dollar_cost_averaging_output.render()
 
-                # Add change event handlers for cost averaging inputs
                 for input_component in dollar_cost_averaging_inputs:
                     input_component.change(
                         fn=dollar_cost_averaging_update_output,
@@ -90,65 +131,44 @@ 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
-
-                        gr.Markdown("### Profile")
-                        with gr.Row():
-                            current_age.render()
-                            retirement_age.render()
-                            life_expectancy.render()
-                            monthly_income_required.render()
-                            inflation_rate.render()         
-
-                        gr.Markdown("### Savings")
-                        with gr.Row():
-                            current_investment.render()
-                            monthly_investment.render()
-                            annual_increase_in_monthly_investment.render()  # 추가된 입력
-                            reinvest_dividends.render()
+                with gr.Row():
+                    with gr.Column():
+                        with gr.Accordion("PROFILE", open=True):
+                            with gr.Row():
+                                current_age.render()
+                                retirement_age.render()
+                                life_expectancy.render()
+                                monthly_income_required.render()
+                                inflation_rate.render()
                         
-                        gr.Markdown("### Growth")
-                        with gr.Row():
-                            pre_retirement_roi.render()
-                            pre_retirement_dividend_yield.render()
-                            # retirement_markdown.render()
-                            post_retirement_roi.render()
-                            post_retirement_dividend_yield.render()
+                        with gr.Accordion("SAVINGS", open=True):
+                            with gr.Row():
+                                current_investment.render()
+                                monthly_investment.render()
+                                annual_increase_in_monthly_investment.render()
+                                reinvest_dividends.render()
+                        
+                        with gr.Accordion("GROWTH", open=True):
+                            with gr.Row():
+                                pre_retirement_roi.render()
+                                pre_retirement_dividend_yield.render()
+                                post_retirement_roi.render()
+                                post_retirement_dividend_yield.render()
+
+                        # Add buttons and handlers
+                        clear_button, submit_button = add_buttons(
+                            retirement_planning_inputs,
+                            retirement_update_output,
+                            retirement_output
+                        )
 
-                    
-                        # # 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, annual_increase_in_monthly_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, annual_increase_in_monthly_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, annual_increase_in_monthly_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, annual_increase_in_monthly_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
-                ]:
+                for input_component in retirement_planning_inputs:
                     input_component.change(
                         fn=retirement_update_output,
-                        inputs=[
-                            current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, annual_increase_in_monthly_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
-                        ],
+                        inputs=retirement_planning_inputs,
                         outputs=retirement_output
                     )
                     

interface/rebalancing_interface.py

@@ -11,27 +11,36 @@ currency_codes = get_currency_codes()
 examples = [
     ["KRW", "458730 KRW 580 8,\n368590 KRW 80 2", 507977, 0],
     ["KRW", "SCHD USD 500 8,\nQQQ USD 200 2", 0, 15]
-    ]
-
-rebalancing_inputs = [
-    gr.Dropdown(label="Main Currency", choices=currency_codes, value="KRW", info="Assets converted to main currency."),    
-    gr.Textbox(label="Holdings", lines=2, info="Format: [ ticker currency quantity weight, ... ]", placeholder="e.g., SCHD USD 500 8, QQQ USD 200 2"),
-    gr.Number(label="Cash", value="", info="MAIN CURRENCY CASH"),
-    gr.Slider(label="Cash Ratio (%)", minimum=0, maximum=100, step=1)
 ]
 
+# Define Gradio components
+main_currency = gr.Dropdown(
+    label="Main Currency",
+    choices=currency_codes,
+    value="KRW",
+    info="Assets converted to main currency."
+)
+holdings = gr.Textbox(
+    label="Holdings",
+    lines=2,
+    info="Format: [ ticker currency quantity weight, ... ]",
+    placeholder="e.g., SCHD USD 500 8, QQQ USD 200 2"
+)
+cash_amount = gr.Number(
+    label="Cash",
+    value="",
+    info="MAIN CURRENCY CASH"
+)
+cash_ratio = gr.Slider(
+    label="Cash Ratio (%)",
+    minimum=0,
+    maximum=100,
+    step=1
+)
+
+portfolio_rebalancing_inputs = [main_currency, holdings, cash_amount, cash_ratio]
 output = gr.HTML()
 
 # Define the update function
 def update_output(main_currency, holdings, cash_amount, cash_ratio):
     return rebalancing_interface_fn(main_currency, holdings, cash_amount, cash_ratio)
-
-# portfolio_rebalancing_interface = gr.Interface(
-#     fn=portfolio_rebalancing_interface_fn,
-#     inputs=portfolio_inputs,
-#     outputs=gr.HTML(),
-#     examples=examples,
-#     cache_examples=False,
-#     live=False
-# )
-

interface/retirement_planning_interface.py

@@ -26,6 +26,7 @@ pre_retirement_dividend_yield = gr.Number(label="Expected Dividend Yield (Pre-re
 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)
 
+retirement_planning_inputs = [current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, current_investment, monthly_investment, annual_increase_in_monthly_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield]
 output = gr.HTML()
 
 # Define the update function

interface/share_price_trend_interface.py

@@ -2,26 +2,28 @@ import gradio as gr
 from modules.utils import load_css
 from modules.share_price_trend import share_price_trend
 
-# Define the interface for the Compare tab
+# Define the function that processes the inputs and returns the result
 def share_price_trend_interface_fn(stock_codes, period):
     result = share_price_trend(stock_codes, period)
     css = load_css()
     return css + result
 
-share_price_trend_inputs = [
-    gr.Textbox(label="Stock Codes", info="Enter stock codes separated by comma.", placeholder="e.g., AAPL,GOOGL,MSFT", value="SCHD,QQQ"),
-    gr.Number(label="input # of days below", value="90")
-]
+# Define Gradio components for inputs
+stock_codes = gr.Textbox(
+    label="Stock Codes",
+    info="Enter stock codes separated by comma.",
+    placeholder="e.g., AAPL,GOOGL,MSFT",
+    value="SCHD,QQQ"
+)
+period = gr.Number(
+    label="Number of Days",
+    value=90
+)
 
-output=gr.HTML()
+# Define output component
+share_price_trend_inputs = [stock_codes, period]
+output = gr.HTML()
 
 # Define the update function
 def update_output(stock_codes, period):
     return share_price_trend_interface_fn(stock_codes, period)
-
-# compare_stock_prices_interface = gr.Interface(
-#     fn=compare_stock_prices_interface_fn,
-#     inputs=compare_inputs,
-#     outputs=gr.HTML(),
-#     live=False
-# )

style.css

@@ -13,8 +13,8 @@
 #col-container {
     margin: 0 auto;
     max-width: 100%;
-    font-family: 'Montserrat', 'ui-sans-serif', 'system-ui', 'sans-serif';
-    /* text-transform: uppercase; 모든 텍스트를 대문자로 변환합니다 */
+    font-family: 'Patrick Hand', 'ui-sans-serif', 'system-ui', 'sans-serif';
+    text-transform: uppercase;
 
 }