Upload 16 files

app.py

@@ -1,48 +1,34 @@
 import gradio as gr
 from interface.rebalancing_interface import (
-    portfolio_rebalancing_inputs, examples, main_currency, holdings, 
-    cash_amount, cash_ratio, output as rebalancing_output, 
+    main_currency, holdings, cash_amount, cash_ratio, 
+    input as rebalancing_inputs, 
+    output as rebalancing_output,     
+    examples as rebalancing_examples, 
     update_output as rebalancing_update_output
 )
 from interface.share_price_trend_interface import (
-    share_price_trend_inputs, stock_codes, period, 
+    stock_codes, period, 
+    input as share_price_trend_inputs, 
     output as share_price_trend_output, 
+    examples as share_price_trend_examples, 
     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, 
+    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
 )
 from interface.retirement_planning_interface import (
-    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, 
+    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,
+    examples as retirement_planning_examples,  
     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
+from interface.about_interface import render_about_tab
+from modules.utils import clear_buttons, submit_buttons
 
 with gr.Blocks(css='style.css') as demo:
     with gr.Column(elem_id="col-container"):
@@ -50,76 +36,93 @@ with gr.Blocks(css='style.css') as demo:
             with gr.TabItem("RE-BALANCING"):
                 with gr.Row():
                     with gr.Column():
-                        holdings.render()
                         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, submit_button = add_buttons(
-                            portfolio_rebalancing_inputs,
+                        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()
 
-                gr.Examples(
-                    examples=examples,
-                    cache_examples=False,
-                    inputs=portfolio_rebalancing_inputs
-                )
-                for input_component in portfolio_rebalancing_inputs:
-                    input_component.change(
-                        fn=rebalancing_update_output,
-                        inputs=portfolio_rebalancing_inputs,
-                        outputs=rebalancing_output
-                    )
+                # 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():
-                        stock_codes.render()
-                        period.render()
+                        with gr.Row():        
+                            stock_codes.render()
+                        with gr.Row():        
+                            period.render()
 
                         # Add buttons and handlers
-                        clear_button, submit_button = add_buttons(
+                        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
-                    )
+                # 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():
-                        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()
+                        # 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
-                        clear_button, submit_button = add_buttons(
-                            dollar_cost_averaging_inputs,
-                            dollar_cost_averaging_update_output,
-                            dollar_cost_averaging_output
+                        # 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()
 
@@ -138,6 +141,7 @@ with gr.Blocks(css='style.css') as demo:
                                 current_age.render()
                                 retirement_age.render()
                                 life_expectancy.render()
+                            with gr.Row():
                                 monthly_income_required.render()
                                 inflation_rate.render()
                         
@@ -152,16 +156,21 @@ with gr.Blocks(css='style.css') as demo:
                             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
-                        clear_button, submit_button = add_buttons(
-                            retirement_planning_inputs,
-                            retirement_update_output,
-                            retirement_output
+                        # 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()
 

interface/about_interface.py

@@ -1,6 +1,6 @@
 import gradio as gr
 
-def render():    
+def render_about_tab():    
     with gr.TabItem("💡 HINT"):
         
         def create_tool_section(tool_name, korean_description, english_description):

interface/dollar_cost_averaging_interface.py

@@ -6,15 +6,17 @@ def dollar_cost_averaging_interface_fn(old_avg_price, old_quantity, new_price, n
     css = load_css()
     return css + result
 
+examples = [
+    [7857, 7000, 5708, 7000],
+    [1000, 9000, 560, 20000]
+]
 # Define the inputs
-markdown1 = gr.Markdown("### First Purchase")
 old_price = gr.Textbox(label="Old Price", value="")
 old_quantity = gr.Textbox(label="Quantity", value="")
-markdown2 = gr.Markdown("### Second Purchase")
 new_price = gr.Textbox(label="New Price", value="")
 new_quantity = gr.Textbox(label="Quantity", value="")
 
-dollar_cost_averaging_inputs = [old_price, old_quantity, new_price, new_quantity]
+input = [old_price, old_quantity, new_price, new_quantity]
 output = gr.HTML()
 
 # Define the update function

interface/rebalancing_interface.py

@@ -18,18 +18,18 @@ main_currency = gr.Dropdown(
     label="Main Currency",
     choices=currency_codes,
     value="KRW",
-    info="Assets converted to main currency."
+    # info="Assets converted to main currency."
 )
 holdings = gr.Textbox(
     label="Holdings",
     lines=2,
-    info="Format: [ ticker currency quantity weight, ... ]",
+    # 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"
+    # info="MAIN CURRENCY CASH"
 )
 cash_ratio = gr.Slider(
     label="Cash Ratio (%)",
@@ -38,7 +38,7 @@ cash_ratio = gr.Slider(
     step=1
 )
 
-portfolio_rebalancing_inputs = [main_currency, holdings, cash_amount, cash_ratio]
+input = [main_currency, holdings, cash_amount, cash_ratio]
 output = gr.HTML()
 
 # Define the update function

interface/retirement_planning_interface.py

@@ -11,6 +11,13 @@ def retirement_planning_interface_fn(
     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]
+]
+
 # Define the input components
 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)
@@ -26,7 +33,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]
+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]
 output = gr.HTML()
 
 # Define the update function

interface/share_price_trend_interface.py

@@ -8,10 +8,15 @@ def share_price_trend_interface_fn(stock_codes, period):
     css = load_css()
     return css + result
 
+examples = [
+    ["AAPL,GOOGL,MSFT", 90],
+    ["SCHD,QQQ", 365]
+]
+
 # Define Gradio components for inputs
 stock_codes = gr.Textbox(
     label="Stock Codes",
-    info="Enter stock codes separated by comma.",
+    # info="Enter stock codes separated by comma.",
     placeholder="e.g., AAPL,GOOGL,MSFT",
     value="SCHD,QQQ"
 )
@@ -21,7 +26,7 @@ period = gr.Number(
 )
 
 # Define output component
-share_price_trend_inputs = [stock_codes, period]
+input = [stock_codes, period]
 output = gr.HTML()
 
 # Define the update function

modules/rebalancing.py

@@ -93,7 +93,6 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, main_currency_cash
                     <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} 
-                    <hr style="margin: 1.5rem 0;">
                 </div>
             </div>
         </div>

modules/utils.py

@@ -1,5 +1,6 @@
 import ssl
 import logging
+import gradio as gr
 
 # 로그 설정
 #logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -33,3 +34,22 @@ def get_currency_symbol(currency_code):
 
 def get_currency_codes():
     return list(currency_symbols.keys())
+
+# Helper function to add buttons
+def clear_buttons(inputs, update_fn, output):
+    clear_button = gr.ClearButton(value="Clear")
+    clear_button.click(
+        fn=lambda: [None] * len(inputs),
+        inputs=[],
+        outputs=inputs
+    )
+    return clear_button
+
+def submit_buttons(inputs, update_fn, output):    
+    submit_button = gr.Button(value="Run", variant="primary")
+    submit_button.click(
+        fn=update_fn,
+        inputs=inputs,
+        outputs=output
+    )
+    return submit_button

style.css

@@ -9,6 +9,8 @@
 @import url('https://fonts.googleapis.com/css2?family=Patrick+Hand&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Baloo+Bhai+2:wght@400;700&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Poor+Story&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600&display=swap");
+
 
 #col-container {
     margin: 0 auto;
@@ -187,9 +189,11 @@
 .table-container tr:hover td {
     background: #e7f9ef;
     color: #000;
+    text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
+    cursor: pointer;    
     /* border: 1px solid #4caf50;
-    transform: scale(1.02);
-    transition: all 0.3s ease; */
+    transform: scale(1.02);*/
+    transition: all 0.3s ease; 
 }
 
 /* 어두운 테마 적용 */
@@ -222,10 +226,3 @@
         transition: all 0.3s ease; */
     }
 }
-
-/* 추가적인 마우스오버 효과 */
-/* .table-container tr:hover td {
-    text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
-    cursor: pointer;
-} */
-