Upload 16 files

app.py

@@ -105,7 +105,7 @@ def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows):
                 render_components(component_rows)
                 clear_buttons(inputs)
                 submit_buttons(inputs, update_fn, outputs)
-            with gr.Column(scale=2):
+            with gr.Column(scale=3):
                 outputs.render()
         with gr.Accordion("👀 Examples", open=False):            
             gr.Examples(examples=examples, cache_examples=False, inputs=inputs)

interface/dollar_cost_averaging_interface.py

@@ -2,20 +2,20 @@ import gradio as gr
 from modules.dollar_cost_averaging import dollar_cost_averaging
 
 examples = [
-    ["AAPL", 200, 9000, 560, 20000]
+    [200, 90, 100, 200]
 ]
 
 # Define the inputs
-stock_code = gr.Textbox(label="Stock Code", value="368590")
 first_purchase = gr.Markdown("<h3 class='h3_title'>FIRST PURCHASE</h3>")
 old_price = gr.Number(label="Old Price", value=18153)
 old_quantity = gr.Number(label="Quantity", value=122)
 second_purchase = gr.Markdown("<h3 class='h3_title'>SECOND PURCHASE</h3>")
+new_price = gr.Textbox(label="New Price", value="15000")
 new_quantity = gr.Number(label="Quantity", value=1)
 
-input = [stock_code, old_price, old_quantity, new_quantity]
+input = [old_price, old_quantity, new_price, new_quantity]
 output = gr.HTML()
-component_rows = [stock_code, first_purchase, old_price, old_quantity, second_purchase, new_quantity]
+component_rows = [first_purchase, old_price, old_quantity, second_purchase, new_price, new_quantity]
 
 # Define the update function
 def update_output(*args):

interface/retirement_planning_interface.py

@@ -27,9 +27,9 @@ post_retirement_dividend_yield = gr.Number(label="Dividend Yield (Post-retiremen
 input = [current_age, retirement_age, life_expectancy, monthly_income_required, inflation_rate, initial_investment, monthly_contribution, annual_increase_in_monthly_contribution, reinvest_dividends, pre_retirement_dividend_growth, post_retirement_dividend_growth, pre_retirement_dividend_yield, post_retirement_dividend_yield]
 output = gr.HTML()
 component_rows = [
-    title_1, [current_age, retirement_age, life_expectancy],[monthly_income_required, inflation_rate],
-    title_2, [initial_investment, monthly_contribution, annual_increase_in_monthly_contribution], [reinvest_dividends],
-    title_3, [pre_retirement_dividend_growth, post_retirement_dividend_growth], [pre_retirement_dividend_yield, post_retirement_dividend_yield]
+    [current_age, retirement_age, life_expectancy],[monthly_income_required, inflation_rate],
+    [initial_investment, monthly_contribution, annual_increase_in_monthly_contribution], [reinvest_dividends],
+    [pre_retirement_dividend_growth, post_retirement_dividend_growth], [pre_retirement_dividend_yield, post_retirement_dividend_yield]
 ]
 
 # Define the update function

modules/dollar_cost_averaging.py

@@ -2,20 +2,20 @@ import yfinance as yf
 import FinanceDataReader as fdr
 from modules.utils import load_css
 
-def get_stock_price(stock_code):
-    try:
-        # 한국 주식 코드가 숫자만 있는지 확인 (한국 주식은 보통 숫자 코드)
-        if stock_code.isdigit():
-            df = fdr.DataReader(stock_code)
-            return df['Close'].iloc[-1]
-        else:
-            # 한국 외 주식은 yfinance로 조회
-            stock = yf.Ticker(stock_code)
-            df = stock.history(period="1d")
-            return df['Close'].iloc[-1]
-    except Exception as e:
-        # 에러 발생 시 0.0으로 설정하고, 오류 메시지를 반환
-        return None
+# def get_stock_price(stock_code):
+#     try:
+#         # 한국 주식 코드가 숫자만 있는지 확인 (한국 주식은 보통 숫자 코드)
+#         if stock_code.isdigit():
+#             df = fdr.DataReader(stock_code)
+#             return df['Close'].iloc[-1]
+#         else:
+#             # 한국 외 주식은 yfinance로 조회
+#             stock = yf.Ticker(stock_code)
+#             df = stock.history(period="1d")
+#             return df['Close'].iloc[-1]
+#     except Exception as e:
+#         # 에러 발생 시 0.0으로 설정하고, 오류 메시지를 반환
+#         return None
 
 def calculate_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     old_avg_price = float(old_avg_price) if old_avg_price else 0.0
@@ -36,15 +36,15 @@ def calculate_dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_
 
     return new_avg_price, total_quantity, total_investment, new_return, additional_investment, old_return
 
-def dollar_cost_averaging(stock_code, old_avg_price, old_quantity, new_quantity):
+def dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
     css = load_css()
     
     # 주식 가격 가져오기
-    new_price = get_stock_price(stock_code)
+    # new_price = get_stock_price(stock_code)
     
-    new_price = float(new_price) if new_price else 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
+    new_price = float(new_price) if new_price else 0.0
     new_quantity = float(new_quantity) if new_quantity else 0.0
 
     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)
@@ -52,9 +52,9 @@ def dollar_cost_averaging(stock_code, old_avg_price, old_quantity, new_quantity)
     emoji_return = ""
     new_return_class = ""
     old_return_class = ""
-    if new_return > old_return:
+    if new_price < old_avg_price:
         emoji_return = "💧"
-    elif new_return < old_return:
+    elif new_price > old_avg_price:
         emoji_return = "🔥"
     else:
         emoji_return = ""
@@ -77,18 +77,14 @@ def dollar_cost_averaging(stock_code, old_avg_price, old_quantity, new_quantity)
     <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;">New Price</div>
-                <div style="font-size: 1.5rem; color: #1c75bc;">
-                    <span style='color: #1678fb; font-weight: bold;'>{new_price:,}</span>
-                </div>
-                <hr style="margin: 1.5rem 0;">
+                <div style="font-size: 2.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">{emoji_return}</div>
             </div>
         </div>    
         <div>
             <div style="margin-bottom: 1.5rem;">
                 <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Old Price</div>
                 <div style="font-size: 1.5rem; color: #1c75bc;">
-                    <span style='color: #1678fb; font-weight: bold;'>{old_avg_price:,.0f}</span>
+                    <span style='color: #1678fb; font-weight: bold;'>{old_avg_price:,.2f}</span>
                     <span style='font-size: 1rem;'>{old_return_class}</span>
                 </div>
                 <hr style="margin: 1.5rem 0;">
@@ -98,7 +94,7 @@ def dollar_cost_averaging(stock_code, old_avg_price, old_quantity, new_quantity)
             <div style="margin-bottom: 1.5rem;">
                 <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Average Price</div>
                 <div style="font-size: 1.5rem; color: #1c75bc;">
-                    <span style='color: #1678fb; font-weight: bold;'>{new_avg_price:,.0f}</span>
+                    <span style='color: #1678fb; font-weight: bold;'>{new_avg_price:,.2f}</span>
                     <span style='font-size: 1rem;'>{new_return_class}</span>
                 </div>
                 <hr style="margin: 1.5rem 0;">
@@ -108,7 +104,7 @@ def dollar_cost_averaging(stock_code, old_avg_price, old_quantity, new_quantity)
             <div style="margin-bottom: 1.5rem;">
                 <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Additional Investment</div>
                 <div style="font-size: 1.5rem; font-weight: bold; color: #1c75bc;">
-                    <span style='color: #1678fb'>{additional_investment:,.0f}</span>
+                    <span style='color: #1678fb'>{additional_investment:,.2f}</span>
                 </div>
                 <hr style="margin: 1.5rem 0;">
             </div>

modules/rebalancing.py

@@ -192,17 +192,9 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
 
     # HTML 생성
     rebalancing_analysis = css + f"""
-    <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;">Re-Balancing Analysis | Your Portfolio Holdings as of {current_time}</div>
-                    <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{currency_symbol}{format_value(sum(adj['new_value'] for adj in adjustments))}</span>
-                (After Trades)
-                <hr style="margin: 1.5rem 0;">
-                <br>
-            </div>        
-        </div>    
-        <div class='table-container wrap-text'>
+    <div>
+
+        <div class='table-container'>
             <table>
                 <thead>
                     <tr>

modules/retirement_planning.py

@@ -229,22 +229,16 @@ def retirement_planning(
     # HTML 결과 생성
     result_html = css + f"""
     <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;">Total Shortfall</div>
-                    <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>       
             <div style="margin-bottom: 1.5rem;">
                 <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Needs Overview</div>
                 <iframe src="data:text/html;base64,{svg_base64}" style="width: 100%; height: 400px; border: none;"></iframe>
-                <hr style="margin: 1.5rem 0;">
             </div>
         </div>
     </div>
     <div style="margin-bottom: 2rem;"></div>
     <div style="display: flex; align-items: center; justify-content: space-between;">
-        <h3>Retirement Plan Overview</h3>
+        <h3>Retirement Plan Overview (Total Shortfall :<span style='font-weight: bold; color: #1678fb'>{abs(negative_differences_sum):,.0f}</span>)</h3>
         <a href="data:text/csv;base64,{csv_base64}" download="retirement_planning.csv" style="padding: 10px 20px; border: 1px solid; border-radius: 5px; background-color: #1678fb; color: white; text-decoration: none;">Download CSV</a>
     </div>
     """ + table_html + """

style.css

@@ -64,6 +64,9 @@ body {
     margin: 0 auto;
     max-width: 100%;
     font-family: 'Quicksand', 'ui-sans-serif', 'system-ui', 'sans-serif';    
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    white-space: normal;
 }
 
 .h3_title {
@@ -86,9 +89,11 @@ body {
 }
 
 .wrap-text {
-    word-wrap: break-word;
-    overflow-wrap: break-word;
-    white-space: normal;
+    margin: auto; /* 가운데 정렬 */
+    padding: 20px;
+    border: 1px solid #e5e5e5; /* 얇은 테두리 */
+    border-radius: 10px; /* 모서리 둥글게 */
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); /* 그림자 */
 }
 
 .buy-sell {