Upload 16 files

app.py

@@ -1,186 +1,69 @@
 import gradio as gr
 from interface.rebalancing_interface import (
-    main_currency, holdings, cash_amount, cash_ratio, 
     input as rebalancing_inputs, 
     output as rebalancing_output,     
+    update_output as rebalancing_update_output,
     examples as rebalancing_examples, 
-    update_output as rebalancing_update_output
+    component_rows as rebalancing_component_rows
 )
 from interface.share_price_trend_interface import (
-    stock_codes, period, 
     input as share_price_trend_inputs, 
     output as share_price_trend_output, 
+    update_output as share_price_trend_update_output,
     examples as share_price_trend_examples, 
-    update_output as share_price_trend_update_output
+    component_rows as share_price_trend_component_rows
 )
 from interface.dollar_cost_averaging_interface import (
-    old_price, old_quantity, new_price, new_quantity, 
     input as dollar_cost_averaging_inputs, 
     output as dollar_cost_averaging_output, 
-    examples as dollar_cost_averaging_examples, 
-    update_output as dollar_cost_averaging_update_output
+    update_output as dollar_cost_averaging_update_output,
+    examples as dollar_cost_averaging_examples,
+    component_rows as dollar_cost_averaging_component_rows
 )
 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, 
     input as retirement_planning_inputs, 
-    output as retirement_output,
+    output as retirement_planning_output,
+    update_output as retirement_update_output,
     examples as retirement_planning_examples,  
-    update_output as retirement_update_output
+    component_rows as retirement_planning_component_rows,    
 )
 from interface.about_interface import render_about_tab
-from modules.utils import clear_buttons, submit_buttons
+from modules.utils import create_tab
+
+tabs_configuration = [
+    ("RE-BALANCING", rebalancing_inputs, rebalancing_output, rebalancing_update_output, rebalancing_examples, rebalancing_component_rows),
+    ("SHARE PRICE TREND", share_price_trend_inputs, share_price_trend_output, share_price_trend_update_output, share_price_trend_examples, share_price_trend_component_rows),
+    ("DOLLAR-COST AVERAGING", dollar_cost_averaging_inputs, dollar_cost_averaging_output, dollar_cost_averaging_update_output, dollar_cost_averaging_examples, dollar_cost_averaging_component_rows),
+    ("RETIREMENT PLANNING", retirement_planning_inputs, retirement_planning_output, retirement_update_output, retirement_planning_examples, retirement_planning_component_rows),
+]
+
+def initial_load(*args):
+    idx = 0
+    rebalancing_results = rebalancing_update_output(*args[idx:idx+len(rebalancing_inputs)])
+    idx += len(rebalancing_inputs)
+    share_price_trend_results = share_price_trend_update_output(*args[idx:idx+len(share_price_trend_inputs)])
+    idx += len(share_price_trend_inputs)
+    dollar_cost_averaging_results = dollar_cost_averaging_update_output(*args[idx:idx+len(dollar_cost_averaging_inputs)])
+    idx += len(dollar_cost_averaging_inputs)
+    retirement_results = retirement_update_output(*args[idx:])
+    
+    return (rebalancing_results, share_price_trend_results, dollar_cost_averaging_results, retirement_results)
 
 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():
-                    with gr.Column():
-                        with gr.Row():        
-                            main_currency.render()
-                            
-                        with gr.Row():        
-                            holdings.render()
-                        with gr.Row():        
-                            cash_amount.render()
-                            cash_ratio.render()
-                        
-                        # Add buttons and handlers
-                        clear_button = clear_buttons(
-                            rebalancing_inputs,
-                            rebalancing_update_output,
-                            rebalancing_output
-                        )
-                        submit_button = submit_buttons(
-                            rebalancing_inputs,
-                            rebalancing_update_output,
-                            rebalancing_output
-                        )
-                        gr.Examples(
-                            examples=rebalancing_examples,
-                            cache_examples=False,
-                            inputs=rebalancing_inputs
-                        )
-                    with gr.Column():
-                        rebalancing_output.render()
-
-                # for input_component in rebalancing_inputs:
-                #     input_component.change(
-                #         fn=rebalancing_update_output,
-                #         inputs=rebalancing_inputs,
-                #         outputs=rebalancing_output
-                #     )
-                                
-            with gr.TabItem("SHARE PRICE TREND"):
-                with gr.Row():
-                    with gr.Column():
-                        with gr.Row():        
-                            stock_codes.render()
-                        with gr.Row():        
-                            period.render()
-
-                        # Add buttons and handlers
-                        submit_button = submit_buttons(
-                            share_price_trend_inputs,
-                            share_price_trend_update_output,
-                            share_price_trend_output
-                        )
-                        gr.Examples(
-                            examples=share_price_trend_examples,
-                            cache_examples=False,
-                            inputs=share_price_trend_inputs
-                        )
-                    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():
-                    with gr.Column():
-                        # gr.Markdown("FIRST PURCHASE")
-                        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
-                        # submit_button = submit_buttons(
-                        #     dollar_cost_averaging_inputs,
-                        #     dollar_cost_averaging_update_output,
-                        #     dollar_cost_averaging_output
-                        # )
-                        gr.Examples(
-                            examples=dollar_cost_averaging_examples,
-                            cache_examples=False,
-                            inputs=dollar_cost_averaging_inputs
-                        )
-                    with gr.Column():
-                        dollar_cost_averaging_output.render()
-
-                for input_component in dollar_cost_averaging_inputs:
-                    input_component.change(
-                        fn=dollar_cost_averaging_update_output,
-                        inputs=dollar_cost_averaging_inputs,
-                        outputs=dollar_cost_averaging_output
-                    )
-                
-            with gr.TabItem("RETIREMENT PLANNING"):
-                with gr.Row():
-                    with gr.Column():
-                        with gr.Accordion("PROFILE", open=True):
-                            with gr.Row():
-                                current_age.render()
-                                retirement_age.render()
-                                life_expectancy.render()
-                            with gr.Row():
-                                monthly_income_required.render()
-                                inflation_rate.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()
-                            with gr.Row():
-                                post_retirement_roi.render()
-                                post_retirement_dividend_yield.render()
-
-                        # Add buttons and handlers
-                        # submit_button = submit_buttons(
-                        #     retirement_planning_inputs,
-                        #     retirement_update_output,
-                        #     retirement_output
-                        # )
-                        gr.Examples(
-                            examples=retirement_planning_examples,
-                            cache_examples=False,
-                            inputs=retirement_planning_inputs
-                        )
-                    with gr.Column():
-                        retirement_output.render()
-
-                for input_component in retirement_planning_inputs:
-                    input_component.change(
-                        fn=retirement_update_output,
-                        inputs=retirement_planning_inputs,
-                        outputs=retirement_output
-                    )
-                    
+            for tab in tabs_configuration:
+                create_tab(*tab)
             render_about_tab()
 
+    demo.load(
+        initial_load, 
+        inputs=rebalancing_inputs + share_price_trend_inputs + dollar_cost_averaging_inputs + retirement_planning_inputs,
+        outputs=[
+            rebalancing_output,
+            share_price_trend_output,
+            dollar_cost_averaging_output,
+            retirement_planning_output
+        ]
+    )
 demo.launch(share=True)

interface/dollar_cost_averaging_interface.py

@@ -1,24 +1,22 @@
 import gradio as gr
-from modules.dollar_cost_averaging import gradio_dollar_cost_averaging, load_css
-
-def dollar_cost_averaging_interface_fn(old_avg_price, old_quantity, new_price, new_quantity):
-    result = gradio_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity)
-    css = load_css()
-    return css + result
+from modules.dollar_cost_averaging import dollar_cost_averaging
 
 examples = [
     [7857, 7000, 5708, 7000],
     [1000, 9000, 560, 20000]
 ]
 # Define the inputs
+first_purchase = gr.Markdown("<h3 class='input_title'>FIRST PURCHASE</h3>")
 old_price = gr.Textbox(label="Old Price", value="")
 old_quantity = gr.Textbox(label="Quantity", value="")
+second_purchase = gr.Markdown("<h3 class='input_title'>SECOND PURCHASE</h3>")
 new_price = gr.Textbox(label="New Price", value="")
 new_quantity = gr.Textbox(label="Quantity", value="")
 
 input = [old_price, old_quantity, new_price, new_quantity]
 output = gr.HTML()
+component_rows= [first_purchase, old_price, old_quantity, second_purchase, new_price, new_quantity]
 
 # Define the update function
-def update_output(old_avg_price, old_quantity, new_price, new_quantity):
-    return dollar_cost_averaging_interface_fn(old_avg_price, old_quantity, new_price, new_quantity)
+def update_output(*args):
+    return dollar_cost_averaging(*args)

interface/rebalancing_interface.py

@@ -1,13 +1,7 @@
 import gradio as gr
-from modules.rebalancing import rebalancing_tool, load_css
-from modules.utils import get_currency_codes
+from modules.rebalancing import rebalancing_tool
+from modules.utils import currency_codes
 
-def rebalancing_interface_fn(main_currency, holdings, cash_amount, cash_ratio):
-    result = rebalancing_tool(main_currency, holdings, cash_amount, cash_ratio)
-    css = load_css()
-    return css + result
-
-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]
@@ -20,15 +14,17 @@ main_currency = gr.Dropdown(
     value="KRW",
     # info="Assets converted to main currency."
 )
+title_pf = gr.Markdown("""<h3 class='input_title'>Your Portfolio Holdings</h3>""")
 holdings = gr.Textbox(
     label="Holdings",
     lines=2,
     # info="Format: [ ticker currency quantity weight, ... ]",
-    placeholder="e.g., SCHD USD 500 8, QQQ USD 200 2"
+    placeholder="e.g., SCHD USD 500 8, QQQ USD 200 2",
+    value="458730 KRW 580 8,\n368590 KRW 80 2"
 )
 cash_amount = gr.Number(
     label="Cash",
-    value="",
+    value=507977,
     # info="MAIN CURRENCY CASH"
 )
 cash_ratio = gr.Slider(
@@ -40,7 +36,8 @@ cash_ratio = gr.Slider(
 
 input = [main_currency, holdings, cash_amount, cash_ratio]
 output = gr.HTML()
+component_rows = [[main_currency], title_pf, [holdings], cash_amount, cash_ratio]
 
 # 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)
+def update_output(*args):
+    return rebalancing_tool(*args)

interface/retirement_planning_interface.py

@@ -1,45 +1,40 @@
 import gradio as gr
-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, annual_increase_in_monthly_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, annual_increase_in_monthly_investment, reinvest_dividends, pre_retirement_roi, pre_retirement_dividend_yield, post_retirement_roi, post_retirement_dividend_yield
-    )
-    css = load_css()
-    return css + result
-
 # Define examples for retirement planning
 examples = [
-    [38, 55, 85, 2000000, 3.0, 10000000, 500000, 50000, True, 8, 3.3, 8, 3.3],
-    [15, 45, 90, 3000000, 3.0, 15000000, 700000, 70000, False, 8.0, 3.0, 7.0, 3.0],
-    [50, 55, 95, 3000000, 4.0, 1000000000, 0, 0, True, 6.0, 3.5, 5.5, 3.2]
+    [38, 55, 85, 2000000, 3.0, 10000000, 500000, 50000, True, 8, 8, 3.3, 3.3],
+    [15, 45, 90, 3000000, 3.0, 15000000, 700000, 70000, False, 8.0, 7, 3.0, 3.0],
+    [50, 55, 95, 3000000, 4.0, 1000000000, 0, 0, True, 6.0, 5.5, 3.5, 3.2]
 ]
 
 # Define the input components
+title_profile = gr.Markdown("<h3 class='input_title'>PROFILE</h3>")
 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)
+title_savings = gr.Markdown("<h3 class='input_title'>SAVINGS</h3>")
 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)
 annual_increase_in_monthly_investment = gr.Number(label="Annual Increase in Monthly Investment", value=0)  # 추가된 입력
 reinvest_dividends = gr.Checkbox(label="Reinvest Dividends", value=True)
+title_growth = gr.Markdown("<h3 class='input_title'>GROWTH</h3>")
 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)
 post_retirement_roi = gr.Number(label="Expected Return On Investment (Post-retirement) (%)", value=8)
+pre_retirement_dividend_yield = gr.Number(label="Expected Dividend Yield (Pre-retirement) (%)", value=3.3)
 post_retirement_dividend_yield = gr.Number(label="Expected Dividend Yield (Post-retirement) (%)", value=3.3)
 
-input = [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]
+input = [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, post_retirement_roi, pre_retirement_dividend_yield, post_retirement_dividend_yield]
 output = gr.HTML()
+component_rows = [
+    title_profile, [current_age, retirement_age, life_expectancy],[monthly_income_required, inflation_rate],
+    title_savings, [current_investment, monthly_investment, annual_increase_in_monthly_investment], [reinvest_dividends],
+    title_growth, [pre_retirement_roi, post_retirement_roi], [pre_retirement_dividend_yield, post_retirement_dividend_yield]
+]
 
 # Define the update function
-def update_output(
-    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
-):
-    return retirement_planning_interface_fn(
-        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
-    )
+def update_output(*args):
+    return retirement_planning(*args)
+

interface/share_price_trend_interface.py

@@ -1,13 +1,6 @@
 import gradio as gr
-from modules.utils import load_css
 from modules.share_price_trend import share_price_trend
 
-# 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
-
 examples = [
     ["AAPL,GOOGL,MSFT", 90],
     ["SCHD,QQQ", 365]
@@ -20,15 +13,17 @@ stock_codes = gr.Textbox(
     placeholder="e.g., AAPL,GOOGL,MSFT",
     value="SCHD,QQQ"
 )
-period = gr.Number(
+period = gr.Slider(
     label="Number of Days",
-    value=90
+    value=90,
+    maximum=3650
 )
 
 # Define output component
 input = [stock_codes, period]
 output = gr.HTML()
+component_rows = [[stock_codes], [period]]
 
 # Define the update function
-def update_output(stock_codes, period):
-    return share_price_trend_interface_fn(stock_codes, period)
+def update_output(*args):
+    return share_price_trend(*args)

modules/dollar_cost_averaging.py

@@ -1,6 +1,6 @@
 from modules.utils import load_css
 
-def dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
+def calculate_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     # 입력값을 숫자로 변환 (각 입력값이 None일 경우 0.0으로 설정)
     old_avg_price = float(old_avg_price) if old_avg_price else 0.0
     old_quantity = float(old_quantity) if old_quantity else 0.0
@@ -25,7 +25,7 @@ def dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     # 새 평균 가격, 총 수량, 총 투자 금액, 새로운 수익률, 추가 투자 금액, 이전 수익률 반환
     return new_avg_price, total_quantity, total_investment, new_return, additional_investment, old_return
 
-def gradio_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
+def dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     css = load_css()
 
     # 입력값을 숫자로 변환
@@ -35,7 +35,7 @@ def gradio_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_qua
     new_quantity = float(new_quantity) if new_quantity else 0.0
 
     # 평균 가격, 총 수량, 총 투자 금액, 수익률 및 추가 투자 금액 계산
-    new_avg_price, total_quantity, total_investment, new_return, additional_investment, old_return = dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity)
+    new_avg_price, total_quantity, total_investment, new_return, additional_investment, old_return = calculate_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity)
 
     # 수익률에 따른 클래스 설정
     new_return_class = ""
@@ -56,7 +56,7 @@ def gradio_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_qua
 
     # HTML 결과 생성
     result_html = css + f"""
-    <div class="wrap-text" style="box-shadow: 0 0.25rem 0.5rem rgba(0, 0, 0, 0.1); border-radius: 0.5rem; padding: 3rem; position: relative; width: 100%; padding: 1.5rem;">
+    <div class="wrap-text">
         <div>
             <div style="margin-bottom: 1.5rem;">
                 <!-- 이전 수익률 표시 -->

modules/rebalancing.py

@@ -10,52 +10,64 @@ from modules.utils import load_css, get_currency_symbol, format_quantity
 
 # 주어진 입력을 구문 분석하여 주식 보유량, 현금 금액 및 현금 비율을 계산하는 함수
 def parse_input(holdings, cash_amount, cash_ratio):
-    lines = holdings.strip().split(',')
-    stock_inputs = []
-    total_target_weight = 0
-    
-    for line in lines:
-        parts = line.split()
-        if len(parts) == 4:
-            stock_code, currency_code, quantity_expr, target_weight_expr = parts
-            quantity = math.floor(eval(quantity_expr.replace(' ', '')))
-            target_weight = eval(target_weight_expr.replace(' ', ''))
-            target_ratio = (1 - cash_ratio / 100) * target_weight
-            stock_inputs.append((currency_code, stock_code, quantity, target_weight, target_ratio))
-            total_target_weight += target_weight
-
-    cash_amount = math.floor(cash_amount) if cash_amount else 0
-    main_currency_cash_inputs = {'amount': cash_amount, 'target_weight': cash_ratio / 100.0}
-
-    stock_total_weight = total_target_weight
-
-    for i in range(len(stock_inputs)):
-        stock_inputs[i] = (stock_inputs[i][0], stock_inputs[i][1], stock_inputs[i][2], stock_inputs[i][3], (1 - main_currency_cash_inputs['target_weight']) * stock_inputs[i][3] / stock_total_weight)
-
-    return stock_inputs, main_currency_cash_inputs
+    try:
+        lines = holdings.strip().split(',')
+        stock_inputs = []
+        total_target_weight = 0
+        
+        for line in lines:
+            parts = line.split()
+            if len(parts) == 4:
+                stock_code, currency_code, quantity_expr, target_weight_expr = parts
+                quantity = math.floor(eval(quantity_expr.replace(' ', '')))
+                target_weight = eval(target_weight_expr.replace(' ', ''))
+                target_ratio = (1 - cash_ratio / 100) * target_weight
+                stock_inputs.append((currency_code, stock_code, quantity, target_weight, target_ratio))
+                total_target_weight += target_weight
+
+        cash_amount = math.floor(cash_amount) if cash_amount else 0
+        main_currency_cash_inputs = {'amount': cash_amount, 'target_weight': cash_ratio / 100.0}
+
+        stock_total_weight = total_target_weight
+
+        for i in range(len(stock_inputs)):
+            stock_inputs[i] = (stock_inputs[i][0], stock_inputs[i][1], stock_inputs[i][2], stock_inputs[i][3], (1 - main_currency_cash_inputs['target_weight']) * stock_inputs[i][3] / stock_total_weight)
+
+        return stock_inputs, main_currency_cash_inputs
+    except Exception as e:
+        raise ValueError(f"Input parsing error: {e}")
 
 # 주어진 통화 코드와 메인 통화 간의 환율을 가져오는 함수
 def get_portfolio_exchange_rate(currency_code, main_currency):
-    if currency_code.lower() == main_currency.lower():
-        return 1.0
-    
-    ticker = f"{currency_code.upper()}{main_currency.upper()}=X"
-    data = yf.download(ticker, period='1d', progress=False)  # progress=False 추가
-    if not data.empty:
-        return data['Close'].iloc[0]
-    else:
-        raise ValueError("Failed to retrieve exchange rate data.")
+    try:
+        if currency_code.lower() == main_currency.lower():
+            return 1.0
+        
+        ticker = f"{currency_code.upper()}{main_currency.upper()}=X"
+        data = yf.download(ticker, period='1d', progress=False)
+        if not data.empty:
+            return data['Close'].iloc[0]
+        else:
+            raise ValueError("Failed to retrieve exchange rate data.")
+    except Exception as e:
+        raise ValueError(f"Exchange rate retrieval error: {e}")
 
 # 주어진 주식 코드와 통화 코드에 대해 환율을 반영한 주식 가격을 가져오는 함수
 def get_portfolio_exchange_reflected_stock_price(stock_code, currency_code, main_currency):
-    new_price = get_portfolio_current_stock_price(stock_code)
-    exchange_rate = get_portfolio_exchange_rate(currency_code, main_currency)
-    return math.floor(new_price * exchange_rate)
+    try:
+        new_price = get_portfolio_current_stock_price(stock_code)
+        exchange_rate = get_portfolio_exchange_rate(currency_code, main_currency)
+        return math.floor(new_price * exchange_rate)
+    except Exception as e:
+        raise ValueError(f"Exchange reflected stock price error: {e}")
 
 # 주어진 주식 코드의 현재 주식 가격을 가져오는 함수
 def get_portfolio_current_stock_price(stock_code):
-    df = fdr.DataReader(stock_code)
-    return df['Close'].iloc[-1]
+    try:
+        df = fdr.DataReader(stock_code)
+        return df['Close'].iloc[-1]
+    except Exception as e:
+        raise ValueError(f"Current stock price retrieval error: {e}")
 
 # 주어진 주식 입력 및 현금 입력을 바탕으로 포트폴리오를 구축하는 함수
 def build_portfolio(stock_inputs, main_currency_cash_inputs, main_currency):
@@ -86,16 +98,12 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash
 
     # 포트폴리오 정보 생���
     portfolio_info = css + f"""
-        <div class="wrap-text" style="box-shadow: 0 0.25rem 0.5rem rgba(0, 0, 0, 0.1); border-radius: 0.5rem; padding: 3rem; position: relative; width: 100%; padding: 1.5rem;">
+        <div class="wrap-text">
             <div>
-                <div style="margin-bottom: 1.5rem;">
-                    <!-- 전체 평가금액 표시 -->
-                    <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Market Value</div>
-                        <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{currency_symbol}{total_value:,.0f}</span>
-                        As of {current_time} 
-                </div>
+                <!-- 전체 평가금액 표시 -->
+                <span style='font-size: 2rem; font-weight: bold; color: #1678fb; letter-spacing: 1px;'>{currency_symbol}{total_value:,.0f}</span>
+                As of {current_time} 
             </div>
-        </div>
         """
 
     # 현재 비율 및 가치를 계산
@@ -106,8 +114,6 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash
     current_weights['CASH'] = (main_currency_cash_inputs['amount'] / total_value) * 100
     current_values['CASH'] = main_currency_cash_inputs['amount']
 
-    # 현재 비율을 기준으로 주식을 내림차순으로 정렬
-    # sorted_stocks = sorted(current_weights.items(), key=lambda x: x[1], reverse=True)
     sorted_stocks = current_weights.items()
 
     # 현재 보유량 및 가치 섹션 표시
@@ -163,10 +169,8 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash
         currency_totals[currency]['weight'] += current_value / total_value
 
     currency_totals['CASH'] = {'amount': main_currency_cash_inputs['amount'], 'weight': main_currency_cash_inputs['amount'] / total_value}
-    # sorted_currencies = sorted(currency_totals.items(), key=lambda x: x[1]['weight'], reverse=True)
     sorted_currencies = currency_totals.items()
 
-
     # 통화별 요약 테이블 생성
     currency_table = "<h3>Your Portfolio by Currency</h3><div class='table-container wrap-text'><table>"
     currency_table += "<thead><tr><th>Currency</th><th>Total Weight (%)</th><th>Total Value</th></tr></thead><tbody>"
@@ -225,7 +229,7 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash
             f"</tr>"
         )
 
-    result_message += "</tbody></table></div>"
+    result_message += "</tbody></table></div>        </div>"
     
     return result_message
 
@@ -237,4 +241,4 @@ def rebalancing_tool(main_currency, holdings, cash_amount, cash_ratio):
         result = get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash_inputs, main_currency)
         return result
     except Exception as e:
-        return str(e)
+        return f"An error occurred: {e}"

modules/retirement_planning.py

@@ -3,7 +3,6 @@ import csv
 from io import StringIO
 import matplotlib.pyplot as plt
 import io
-
 from modules.utils import load_css
 
 def retirement_planning(
@@ -17,8 +16,8 @@ def retirement_planning(
     annual_increase_in_monthly_investment=None,  # 추가된 입력
     reinvest_dividends=None, 
     pre_retirement_roi=None, 
-    pre_retirement_dividend_yield=None, 
     post_retirement_roi=None, 
+    pre_retirement_dividend_yield=None, 
     post_retirement_dividend_yield=None
 ):
     # NoneType일 때 0으로 처리
@@ -135,15 +134,14 @@ def retirement_planning(
     plt.close(fig)
     svg_data = svg_output.getvalue()
     svg_base64 = base64.b64encode(svg_data.encode('utf-8')).decode('utf-8')
+    
+    graph_html = f'<h3 style="margin-bottom: 0.5rem;">Retirement Planning: Income vs. Dividends</h3>'
 
     # 은퇴 계획에 대한 HTML 결과 생성
     result_html = css + f"""
-    <div class="wrap-text" style="box-shadow: 0 0.25rem 0.5rem rgba(0, 0, 0, 0.1); border-radius: 0.5rem; padding: 3rem; position: relative; width: 100%; padding: 1.5rem;">
+    <div class="wrap-text">
         <div>
-            <div style="margin-bottom: 1.5rem;">
-                <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;"></div>
-                <img src="data:image/svg+xml;base64,{svg_base64}" alt="Retirement Plan Graph" style="width: 100%; height: auto;"/>
-            </div>  
+            
             <div style="margin-bottom: 1.5rem;">
                 <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Income Required Immediately After Retirement</div>
                     <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{annual_income_required_at_retirement:,.0f}</span>
@@ -167,7 +165,11 @@ def retirement_planning(
                     <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{abs(negative_differences_sum):,.0f}</span>
                 <hr style="margin: 1.5rem 0;">
             </div>
-            
+            <div style="margin-bottom: 1.5rem;">
+                <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;"></div>
+                {graph_html}
+                <img src="data:image/svg+xml;base64,{svg_base64}" alt="Retirement Plan Graph" style="width: 100%; height: auto;"/>
+            </div>  
         </div>
     </div>
     <div style="margin-bottom: 2rem;"></div>

modules/share_price_trend.py

@@ -10,6 +10,9 @@ def get_stock_prices(stock_code, days):
         end_date = pd.to_datetime('today')
         start_date = pd.date_range(end=end_date, periods=days, freq='B')[0]
         df = df[(df.index >= start_date) & (df.index <= end_date)]
+        if df.empty:
+            print(f"No data available for {stock_code}")
+            return None
         return df['Close']
     except Exception as e:
         print(f"Failed to fetch data for {stock_code}: {e}")
@@ -28,19 +31,29 @@ def share_price_trend(stock_codes, days):
             except Exception as e:
                 print(f"Failed to fetch data for {stock_code}: {e}")
 
+    if not stock_prices:
+        return "<p>No data available for the provided stock codes.</p>"
+
     plt.switch_backend('agg')
-    plt.style.use('tableau-colorblind10')  # 테마 변경
+    plt.style.use('tableau-colorblind10')
 
     fig, ax = plt.subplots(figsize=(8, 4.5))
     for stock_code, prices in stock_prices.items():
         relative_prices = prices / prices.iloc[0]
         ax.plot(prices.index, relative_prices, label=stock_code.upper())
-    
+
+    # Remove the axes and ticks
     ax.spines['top'].set_visible(False)
     ax.spines['right'].set_visible(False)
+    ax.spines['left'].set_visible(False)
+    ax.spines['bottom'].set_visible(False)
+    
+    ax.xaxis.set_visible(False)
+    ax.yaxis.set_visible(False)
+    
+    # Add grid for better readability
+    ax.grid(True, which='both', linestyle='--', linewidth=0.5)
     
-    ax.set_xlabel('Date')
-    ax.set_ylabel('Relative Price (Normalized to 1)')
     ax.legend()
     plt.tight_layout()
 
@@ -81,7 +94,6 @@ def share_price_trend(stock_codes, days):
     </style>
     </svg>''')
 
-    # Replace line color with gradient, add shadow filter, and apply animation
     svg_data = svg_data.replace('stroke="#1f77b4"', 'stroke="url(#grad1)" filter="url(#dropshadow)"')
 
     html_table = "<h3>Stock Prices Data</h3><div class='table-container'><table>"
@@ -90,11 +102,17 @@ def share_price_trend(stock_codes, days):
         html_table += f"<th>{stock_code.upper()}</th>"
     html_table += "</tr></thead><tbody>"
 
-    dates = stock_prices[list(stock_prices.keys())[0]].index[::-1]
-    for date in dates:
+    # Create a date range with only business days
+    all_dates = pd.date_range(start=min(df.index.min() for df in stock_prices.values()), end=pd.to_datetime('today'), freq='B')
+
+    for date in all_dates:
         html_table += f"<tr><td>{date.strftime('%Y-%m-%d')}</td>"
         for stock_code in stock_prices.keys():
-            html_table += f"<td>{stock_prices[stock_code][date]:,.2f}</td>"
+            price = stock_prices[stock_code].get(date, None)
+            if price is not None:
+                html_table += f"<td>{price:,.2f}</td>"
+            else:
+                html_table += "<td>N/A</td>"
         html_table += "</tr>"
 
     html_table += "</tbody></table></div>"
@@ -102,8 +120,8 @@ def share_price_trend(stock_codes, days):
     graph_html = f'<h3>Relative Stock Prices Over the Last {days} Days</h3>{svg_data}'
     return graph_html + html_table
 
-# 예시 사용 방법
+# Example usage
 # stock_codes = "AAPL,MSFT,GOOGL"
 # days = 30
-# result = compare_stock_prices(stock_codes, days)
+# result = share_price_trend(stock_codes, days)
 # print(result)

modules/utils.py

@@ -35,8 +35,10 @@ def get_currency_symbol(currency_code):
 def get_currency_codes():
     return list(currency_symbols.keys())
 
+currency_codes = get_currency_codes()
+
 # Helper function to add buttons
-def clear_buttons(inputs, update_fn, output):
+def clear_buttons(inputs):
     clear_button = gr.ClearButton(value="Clear")
     clear_button.click(
         fn=lambda: [None] * len(inputs),
@@ -53,3 +55,32 @@ def submit_buttons(inputs, update_fn, output):
         outputs=output
     )
     return submit_button
+
+def on_change(inputs, update_ouutput, outputs):
+    for input_component in inputs:
+        input_component.change(
+            fn=update_ouutput,
+            inputs=inputs,
+            outputs=outputs
+        )
+
+def render_components(component_rows):
+    for row in component_rows:
+        if isinstance(row, list):
+            with gr.Row():
+                for component in row:
+                    component.render()
+        else:
+            row.render()
+
+def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows):
+    with gr.TabItem(tab_name):
+        with gr.Row():
+            with gr.Column(elem_classes="input"):
+                render_components(component_rows)
+                # clear_buttons(inputs)
+                # submit_buttons(inputs, update_fn, outputs)
+                gr.Examples(examples=examples, cache_examples=False, inputs=inputs)
+            with gr.Column():
+                outputs.render()
+        on_change(inputs, update_fn, outputs)

style.css

@@ -20,6 +20,13 @@
 
 }
 
+.input_title {
+    padding: .75rem;
+    font-weight: 700;
+    border-bottom: 1px solid rgb(229, 231, 235);
+    /* box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); */
+}
+
 .code {
     font-family: 'IBM Plex Mono', 'ui-monospace', 'Consolas', 'monospace';
 }