Upload 16 files

interface/rebalancing_interface.py

@@ -3,8 +3,7 @@ from modules.rebalancing import rebalancing_tool
 from modules.utils import currency_codes, current_time
 
 examples = [
-    ["KRW", "458730 KRW 580 [8],\n368590 KRW 80 [2],", 507977],
-    ["KRW", "SCHD USD 500 [8],\nQQQ USD 200 [2],\n458730 KRW 580 [8],\n368590 KRW 80 [2],", 10000000]
+    ["KRW", "458730 KRW 596 [8],\n368590 KRW 95 [2],", 0],
 ]
 
 # Define Gradio components
@@ -20,12 +19,12 @@ holdings = gr.Textbox(
     lines=2,
     # info="Format: Ticker Currency Quantity [Target_Weight], ...",
     placeholder="Format: Ticker Currency Quantity [Target_Ratio], ...",
-    value="SCHD USD 8.160864 [3], \n458730 KRW 580 [4], \n368590 KRW 80 [1],"
+    value="AAPL USD 500 [20], \nMSFT USD 300 [15], \nGOOGL USD 400 [10], \nAMZN USD 50 [5], \nTSLA USD 200 [10], \nNVDA USD 250 [10], \nNFLX USD 150 [10], \nQQQ USD 450 [5], \nADBE USD 100 [10], \nPYPL USD 50 [5]"
 )
 title_cash = gr.Markdown("<h3 class='h3_title'>Contribution or withdrawal</h3>")
 cash_amount = gr.Number(
     label="Contribution or withdrawal amount",
-    value=507977
+    value=6693188
 )
 allow_sales = gr.Checkbox(
     value=True,

modules/rebalancing.py

@@ -82,56 +82,43 @@ def build_portfolio(stock_inputs, main_currency):
 
     return portfolio, target_ratios, total_value
 
-# def generate_portfolio_info(portfolio, total_value, main_currency):
-#     css = load_css()
-#     currency_symbol = get_currency_symbol(main_currency)
+def generate_portfolio_info(portfolio, total_value, main_currency):
+    css = load_css()
+    currency_symbol = get_currency_symbol(main_currency)
     
-#     # 보유 종목별 총액을 계산합니다.
-#     holdings_totals = {
-#         stock_code: {
-#             'value': stock['price'] * stock['quantity'],
-#             'weight': (stock['price'] * stock['quantity'] / total_value)
-#         }
-#         for stock_code, stock in portfolio.items()
-#     }
+    # 보유 종목별 총액을 계산합니다.
+    holdings_totals = {
+        stock_code: {
+            'value': stock['price'] * stock['quantity'],
+            'weight': (stock['price'] * stock['quantity'] / total_value)
+        }
+        for stock_code, stock in portfolio.items()
+    }
     
-#     # 통화별 총액을 계산합니다.
-#     currency_totals = defaultdict(lambda: {'value': 0, 'weight': 0})
-#     for stock in portfolio.values():
-#         currency = stock['currency']
-#         value = stock['price'] * stock['quantity']
-#         currency_totals[currency]['value'] += value
-#         currency_totals[currency]['weight'] += value / total_value
+    # 통화별 총액을 계산합니다.
+    currency_totals = defaultdict(lambda: {'value': 0, 'weight': 0})
+    for stock in portfolio.values():
+        currency = stock['currency']
+        value = stock['price'] * stock['quantity']
+        currency_totals[currency]['value'] += value
+        currency_totals[currency]['weight'] += value / total_value
 
-#     # 현재 비중을 사용하여 포트폴리오 트리맵 차트를 생성합니다.
-#     currunt_weights = {stock_code: details['weight'] for stock_code, details in holdings_totals.items()}
-#     currunt_weights_chart = plot_donut_chart(currunt_weights)
+    # 현재 비중을 사용하여 포트폴리오 트리맵 차트를 생성합니다.
+    currunt_weights = {stock_code: details['weight'] for stock_code, details in holdings_totals.items()}
+    currunt_weights_chart = plot_donut_chart(currunt_weights)
     
-#     currency_weights = {currency: details['weight'] for currency, details in currency_totals.items()}
-#     currency_weights_chart = plot_donut_chart(currency_weights)
+    currency_weights = {currency: details['weight'] for currency, details in currency_totals.items()}
+    currency_weights_chart = plot_donut_chart(currency_weights)
 
-#     # HTML 생성
-#     portfolio_info = css + f"""
-#     <div class="wrap-text">
-#         <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>
-#         <br>        
-#     </div>
-#     """
+    # HTML 생성
+    portfolio_info = css + f"""
+    <div class="wrap-text">
+        <h3>Your Portfolio Holdings</h3>
+        {currunt_weights_chart}    
+        <br>        
+    </div>
+    """
+        # <br>        
         # <div class='table-container wrap-text'>
         #     <table>
         #         <thead>
@@ -145,8 +132,25 @@ def build_portfolio(stock_inputs, main_currency):
         #         </tbody>
         #     </table>
         # </div>
-        # <br>    
-    # return portfolio_info
+    
+        # <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):
     css = load_css()
@@ -210,26 +214,12 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
             'new_value_pct': new_value / new_total_value
         })
 
-    # # 신규 통화별 총액을 계산합니다.
-    # currency_new_totals = defaultdict(lambda: {'new_value': 0, 'new_value_pct': 0})
-    # for adj in adjustments:
-    #     currency = adj['currency']
-    #     value = adj['new_value']
-    #     currency_new_totals[currency]['new_value'] += value
-    #     currency_new_totals[currency]['new_value_pct'] += value / new_total_value
-
-    # # currency_new_totals를 new_value에 따라 내림차순으로 정렬합니다.
-    # sorted_currency_new_totals = sorted(currency_new_totals.items(), key=lambda item: item[1]['new_value'], reverse=True)
-
-    # # 신규 도넛 차트를 생성합니다.
-    # currency_new_weights_chart = plot_donut_chart({currency: details['new_value_pct'] for currency, details in sorted_currency_new_totals})
-
     # HTML 생성
     rebalancing_analysis = css + f"""
     <div class="wrap-text">
         <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>
+            <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)
         </div>
         <div class='table-container wrap-text'>
@@ -251,7 +241,7 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
                         <th>Trade Amount - {main_currency} {currency_symbol}</th>
                         <th>Current Price per Share - {main_currency} {currency_symbol}</th>
                         <th>Estimated # of Shares to Buy or Sell</th>
-                        <th>Quantity</th>
+                        <th>Shares Before and After</th>
                         <th class="header-bg-after">Total Value - {main_currency} {currency_symbol}</th>
                         <th class="header-bg-after">% Asset Allocation</th>
                     </tr>
@@ -293,32 +283,16 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
         
     </div>
     """
-        # <h3>Your Portfolio by Currency (After Trades)</h3>
-        # {currency_new_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['new_value_pct'] * 100:.1f}%</td><td>{currency_symbol}{format_value(details['new_value'])}</td></tr>"
-        #                 for currency, details in sorted_currency_new_totals
-        #             )}
-        #         </tbody>
-        #     </table>
-        # </div>
-        # <br>        
+
     return rebalancing_analysis
 
 def rebalancing_tool(main_currency, holdings, cash_amount, allow_selling):
     try:
         stock_inputs, cash_amount = parse_input(holdings, cash_amount)
         portfolio, target_ratios, total_value = build_portfolio(stock_inputs, main_currency)
-        # portfolio_info = generate_portfolio_info(portfolio, total_value, main_currency)
+        portfolio_info = generate_portfolio_info(portfolio, total_value, main_currency)
         rebalancing_analysis = generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_currency, cash_amount, allow_selling)
 
-        return rebalancing_analysis
+        return portfolio_info + rebalancing_analysis
     except Exception as e:
         return f"<p style='color: red;'>An error occurred: {e}</p>"

modules/utils.py

@@ -98,7 +98,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)
-                # gr.Examples(examples=examples, cache_examples=False, inputs=inputs)
+                gr.Examples(examples=examples, cache_examples=False, inputs=inputs)
             with gr.Column():
                 outputs.render()
         on_change(inputs, update_fn, outputs)