Upload 16 files

interface/dollar_cost_averaging_interface.py

@@ -7,11 +7,11 @@ examples = [
 # Define the inputs
 title = gr.Markdown("<h2 style='margin: 5px'>Dollar Cost Averaging Calculator</h2>")
 first_purchase = gr.Markdown("<h3 class='h3_title'>FIRST PURCHASE</h3>")
-old_price = gr.Textbox(label="Old Price", value=7850)
-old_quantity = gr.Textbox(label="Quantity", value=70)
+old_price = gr.Number(label="Old Price", value=18150)
+old_quantity = gr.Number(label="Quantity", value=95)
 second_purchase = gr.Markdown("<h3 class='h3_title'>SECOND PURCHASE</h3>")
-new_price = gr.Textbox(label="New Price", value=6700)
-new_quantity = gr.Textbox(label="Quantity", value=70)
+new_price = gr.Number(label="New Price", value=17705)
+new_quantity = gr.Number(label="Quantity", value=0)
 
 input = [old_price, old_quantity, new_price, new_quantity]
 output = gr.HTML()

interface/retirement_planning_interface.py

@@ -28,8 +28,8 @@ post_retirement_dividend_yield = gr.Number(label="Dividend Yield (Post-retiremen
 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 = [
-    current_age, retirement_age, life_expectancy,[monthly_income_required, inflation_rate],
-    current_investment, monthly_investment, annual_increase_in_monthly_investment, [reinvest_dividends],
+    [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]
 ]
 

modules/dollar_cost_averaging.py

@@ -49,16 +49,16 @@ def dollar_cost_averaging(old_avg_price, old_quantity, new_price, new_quantity):
         emoji_return = ""
 
     if new_return > 0:
-        new_return_class = f"<span style='color: #4caf50; font-weight: bold;'>{new_return:+,.2f}%</span>"
+        new_return_class = f"<span style='color: #4caf50;'>{new_return:+,.2f}%</span>"
     elif new_return < 0:
-        new_return_class = f"<span style='color: #f44336; font-weight: bold;'>{new_return:,.2f}%</span>"
+        new_return_class = f"<span style='color: #f44336;'>{new_return:,.2f}%</span>"
     else:
         new_return_class = f"<span><strong>0</strong></span>"
 
     if old_return > 0:
-        old_return_class = f"<span style='color: #4caf50; font-weight: bold;'>{old_return:+,.2f}%</span>"
+        old_return_class = f"<span style='color: #4caf50;'>{old_return:+,.2f}%</span>"
     elif old_return < 0:
-        old_return_class = f"<span style='color: #f44336; font-weight: bold;'>{old_return:,.2f}%</span>"
+        old_return_class = f"<span style='color: #f44336;'>{old_return:,.2f}%</span>"
     else:
         old_return_class = f"<span><strong>0</strong></span>"
 
@@ -67,28 +67,30 @@ def dollar_cost_averaging(old_avg_price, old_quantity, new_price, 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;">{emoji_return}</div>
-                <div style="font-size: 1.5rem;">
-                    {old_return_class} ➜ {new_return_class}
+                <!-- 이전 수익률 표시 -->
+                <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='font-size: 1rem;'>{old_return_class}</span>
                 </div>
                 <hr style="margin: 1.5rem 0;">
             </div>
-        </div>
-        <div>
+        </div>    
+            <div>
             <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; font-weight: bold; color: #1c75bc;">
-                    <span style='color: #1678fb'>{new_avg_price:,.0f}</span>
+                <div style="font-size: 1.5rem; color: #1c75bc;">
+                    <span style='color: #1678fb; font-weight: bold;'>{new_avg_price:,.0f}</span>
+                    <span style='font-size: 1rem;'>{new_return_class}</span>
                 </div>
                 <hr style="margin: 1.5rem 0;">
             </div>
-        </div>
+        </div>    
         <div>
             <div style="margin-bottom: 1.5rem;">
                 <!-- 추가 투자 금액 표시 -->
-                <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Transaction</div>
+                <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>
                 </div>

modules/rebalancing.py

@@ -117,38 +117,7 @@ def generate_portfolio_info(portfolio, total_value, main_currency):
         {currunt_weights_chart}    
     </div>
     """
-        # <br>        
-        # <div class='table-container wrap-text'>
-        #     <table>
-        #         <thead>
-        #             <tr><th>Stock Code</th><th>Current Weight (%)</th><th>Current Value</th></tr>
-        #         </thead>
-        #         <tbody>
-        #             {''.join(
-        #                 f"<tr><td>{stock_code.upper()}</td><td>{details['weight'] * 100:.1f}%</td><td>{currency_symbol}{format_value(details['value'])}</td></tr>"
-        #                 for stock_code, details in holdings_totals.items()
-        #             )}
-        #         </tbody>
-        #     </table>
-        # </div>
-    
-        # <br>        
-        # <h3>Your Portfolio by Currency</h3>
-        # {currency_weights_chart}
-        # <br>
-        # <div class='table-container wrap-text'>
-        #     <table>
-        #         <thead>
-        #             <tr><th>Currency</th><th>Total Weight (%)</th><th>Total Value</th></tr>
-        #         </thead>
-        #         <tbody>
-        #             {''.join(
-        #                 f"<tr><td>{currency.upper()}</td><td>{details['weight']* 100:.1f}%</td><td>{currency_symbol}{format_value(details['value'])}</td></tr>"
-        #                 for currency, details in currency_totals.items()
-        #             )}
-        #         </tbody>
-        #     </table>
-        # </div>
+
     return portfolio_info
 
 def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_currency, cash_amount, allow_selling):