Upload 16 files

modules/rebalancing.py

@@ -2,7 +2,7 @@ import math
 import FinanceDataReader as fdr
 import yfinance as yf
 from concurrent.futures import ThreadPoolExecutor
-from modules.utils import load_css, get_currency_symbol, format_quantity, plot_treemap, format_value
+from modules.utils import load_css, get_currency_symbol, format_quantity, plot_donut_chart, format_value, current_time
 from collections import defaultdict
 
 def parse_input(holdings, cash_amount):
@@ -105,49 +105,16 @@ def generate_portfolio_info(portfolio, total_value, main_currency):
 
     # 현재 비중을 사용하여 포트폴리오 트리맵 차트를 생성합니다.
     currunt_weights = {stock_code: details['weight'] for stock_code, details in holdings_totals.items()}
-    current_chart = plot_treemap(currunt_weights)
+    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)
+
     # HTML 생성
     portfolio_info = 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;">Your Current Portfolio</div>
-                <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{currency_symbol}{format_value(total_value)}</span> (Before Trades)
-                <hr style="margin: 1.5rem 0;">
-                {current_chart}
-            </div>
-        </div>
-        <br>
         <h3>Your Portfolio Holdings</h3>
-        <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>
-        <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>
+        {currunt_weights_chart}
         <br>
     </div>
     """
@@ -216,43 +183,58 @@ def generate_rebalancing_analysis(portfolio, target_ratios, total_value, main_cu
             'new_value_pct': new_value / new_total_value
         })
 
-    # 신규 비중을 사용하여 포트폴리오 트리맵 차트를 생성합니다.
-    new_weights = {adj['stock_code']: adj['new_value'] / new_total_value for adj in adjustments}
-    new_chart = plot_treemap(new_weights)
-
     # HTML 생성
     rebalancing_analysis = css + f"""
     <div class="wrap-text">
+        <hr style="margin: 1.5rem 0;">
         <div style="margin-bottom: 1.5rem;">
-            <div style="font-size: 1.5rem; margin-top: 1.5rem; margin-bottom: 1.5rem;">Your Adjusted Portfolio</div>
+            <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(new_total_value)}</span>
             (After Trades)
-            <hr style="margin: 1.5rem 0;">
-            {new_chart}
         </div>
-        <br>
-        <h3>Trades to Re-Balance Your Portfolio</h3>
         <div class='table-container wrap-text'>
             <table>
                 <thead>
+                    <tr>
+                        <th colspan="1"></th>
+                        <th colspan="2" class="header-bg-before">Your Current Portfolio (Before Trades)</th>
+                        <th colspan="6" style='text-align: center'>Trades to Re-Balance Your Portfolio</th>
+                        <th colspan="3" class="header-bg-after">Your Adjusted Portfolio (After Trades)</th>
+                    </tr>
                     <tr>
                         <th>Stock Code</th>
-                        <th>Current Weight (%)</th>
+                        <th class="header-bg-before">Current Value - {main_currency} {currency_symbol}</th>
+                        <th class="header-bg-before">Current Weight (%)</th>
                         <th>Target Ratio</th>
                         <th>Target Weight (%)</th>
                         <th>Buy or Sell?</th>
                         <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 of Units</th>
-                        <th>Total Value - {main_currency} {currency_symbol}</th>
-                        <th>% Asset Allocation</th>
+                        <th class="header-bg-after">Quantity of Units</th>
+                        <th class="header-bg-after">Total Value - {main_currency} {currency_symbol}</th>
+                        <th class="header-bg-after">% Asset Allocation</th>
+                    </tr>
+                    <tr style="font-weight: bold;">
+                        <td>Total</td>
+                        <td>{format_value(sum(adj['current_value'] for adj in adjustments))}</td>
+                        <td>{sum(adj['current_value'] for adj in adjustments) / total_value * 100:.1f}%</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>{format_value(sum(adj['trade_value'] for adj in adjustments))}</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>{format_value(sum(adj['new_value'] for adj in adjustments))}</td>
+                        <td>{sum(adj['new_value'] for adj in adjustments) / new_total_value * 100:.1f}%</td>
                     </tr>
                 </thead>
                 <tbody>
                     {''.join(
                         f"<tr>"
-                        f"<td>{adj['stock_code'].upper()}</td>"
+                        f"<td><span class='highlight-edit'>{adj['stock_code'].upper()}</span></td>"
+                        f"<td>{format_value(adj['current_value'])}</td>"
                         f"<td>{adj['current_value_pct'] * 100:.1f}%</td>"
                         f"<td><span class='highlight-edit'>{adj['target_ratio']}</span></td>"
                         f"<td>{adj['target_weight'] * 100:.1f}%</td>"

modules/utils.py

@@ -21,17 +21,23 @@ def load_css():
 
 
 def format_quantity(quantity):
+    # 아주 작은 값을 0으로 처리
+    if abs(quantity) < 1e-5:  # 임계값을 조정하여 더 적절한 값을 설정할 수 있습니다.
+        quantity = 0    
     if quantity < 0:
         return f"({-quantity:,.1f})"
     else:
         return f"{quantity:,.1f}"
 
 def format_value(value):
+    # 아주 작은 값을 0으로 처리
+    if abs(value) < 1e-5:  # 임계값을 조정하여 더 적절한 값을 설정할 수 있습니다.
+        value = 0
     if value < 0:
         return f"({-value:,.0f})"
     else:
         return f"{value:,.0f}"
-    
+
 currency_symbols = {
     "KRW": "₩",
     "USD": "$",
@@ -98,7 +104,7 @@ def create_tab(tab_name, inputs, outputs, update_fn, examples, component_rows):
         on_change(inputs, update_fn, outputs)
 
 import matplotlib.pyplot as plt
-import squarify
+import numpy as np
 from io import BytesIO
 import base64
 from matplotlib import font_manager
@@ -106,16 +112,15 @@ from matplotlib import font_manager
 # Global dictionary to store color mapping
 color_map_storage = {}
 
-def get_color_for_label(label, color_map, num_labels):
-    """Retrieve or generate color for the given label."""
-    if label not in color_map_storage:
+def get_color_for_label(index, color_map, num_labels):
+    """Retrieve or generate color for the given index."""
+    if index not in color_map_storage:
         cmap = plt.get_cmap(color_map)
-        # Generate a color based on label index
-        index = len(color_map_storage) % num_labels
-        color_map_storage[label] = cmap(index / (num_labels - 1))
-    return color_map_storage[label]
+        # Generate a color based on index (inverse of the index for color intensity)
+        color_map_storage[index] = cmap(1 - index / (num_labels - 1))
+    return color_map_storage[index]
 
-def plot_treemap(data, color_map='Set3', font_path='Quicksand-Regular.ttf', legend_fontsize=30):
+def plot_donut_chart(data, color_map='Blues', font_path='Quicksand-Regular.ttf', legend_fontsize=30):
     # 데이터 필터링: 비중이 0이 아닌 항목만 추출
     filtered_data = {k: v for k, v in data.items() if v > 0}
     
@@ -125,44 +130,39 @@ def plot_treemap(data, color_map='Set3', font_path='Quicksand-Regular.ttf', lege
     # 비중에 따라 데이터를 정렬
     sorted_data = sorted(filtered_data.items(), key=lambda item: item[1], reverse=True)
     labels, sizes = zip(*sorted_data)
-
-    # 라벨을 대문자로 변환
-    labels = [label.upper() for label in labels]
-    sizes = list(sizes)
     
-    # 폰트 설정
-    font_properties = font_manager.FontProperties(fname=font_path, size=legend_fontsize)
-
     # 색상 맵을 설정
     num_labels = len(labels)
+    
+    # 원형 차트의 색상 리스트 생성
+    colors = [get_color_for_label(i, color_map, num_labels) for i in range(num_labels)]
 
-    if len(labels) == 1:
-        # 항목이 하나일 때, 전체 사각형을 그립니다.
-        rectangles = [{'x': 0, 'y': 0, 'dx': 100, 'dy': 100}]
-        colors = [get_color_for_label(labels[0], color_map, num_labels)]  # 색상 하나로 채우기
-    else:
-        norm_sizes = squarify.normalize_sizes(sizes, 100, 100)
-        rectangles = squarify.squarify(norm_sizes, x=0, y=0, dx=100, dy=100)
-        colors = [get_color_for_label(label, color_map, num_labels) for label in labels]
-
-    # 트리맵 시각화
+    # 도넛 차트 시각화
     fig, ax = plt.subplots(figsize=(12, 8), dpi=300)  # figsize와 dpi를 설정하여 해상도 높이기
-    for rect, color in zip(rectangles, colors):
-        x, y, dx, dy = rect['x'], rect['y'], rect['dx'], rect['dy']
-        ax.add_patch(plt.Rectangle((x, y), dx, dy, color=color, alpha=0.7))
-
+    wedges, _ = ax.pie(
+        sizes,
+        colors=colors,
+        labels=[None]*num_labels,  # 라벨을 없애기
+        autopct=None,              # 값 표시를 없애기
+        startangle=-90,            # 12시 방향부터 시작
+        pctdistance=0.85,
+        wedgeprops=dict(width=0.4, edgecolor='w')  # 도넛 차트
+    )
+    
+    # y축 뒤집기
+    ax.invert_yaxis()
+    
     # 범례 생성
-    handles = [plt.Line2D([0], [0], marker='s', color='w', label=f'{label} {size * 100:.1f}%',
-                         markersize=45, markerfacecolor=get_color_for_label(label, color_map, num_labels))
-               for label, size in zip(labels, sizes)]
+    handles = [plt.Line2D([0], [0], marker='o', color='w', label=f'{label} {size * 100:.1f}%',
+                         markersize=15, markerfacecolor=get_color_for_label(i, color_map, num_labels))
+               for i, (label, size) in enumerate(zip(labels, sizes))]
     
     # 범례 추가, 제목 제거, 글자 크기를 키우고 범례 박스를 조정
     ax.legend(handles=handles, loc='upper left', bbox_to_anchor=(1, 1), 
-              prop=font_properties, frameon=False)
+              prop=font_manager.FontProperties(fname=font_path, size=legend_fontsize), frameon=False)
     
-    ax.set_xlim(0, 100)
-    ax.set_ylim(0, 100)
-    ax.axis('off')  # 축을 숨깁니다.
+    # 축을 숨깁니다.
+    ax.axis('off')
     
     # SVG로 저장
     buf = BytesIO()

style.css

@@ -169,13 +169,23 @@
     /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */
 }
 
+.header-bg-before {
+    background-color: #e7f9ef !important; /* 원하는 색상으로 변경 */
+    color: #000; /* 텍스트 색상 */
+}
+
+.header-bg-after {
+    background-color: #d9d2e9 !important;/* 원하는 색상으로 변경 */
+    color: #000; /* 텍스트 색상 */
+}
+
 .table-container table {
     width: 100%;
     border-collapse: collapse;
 }
 
 .table-container th, .table-container td {
-    border: 1px hidden #ddd;
+    border: 1px solid #ddd;
     padding: 8px;
     text-align: left;
     background-color: var(--background-color-light);
@@ -214,12 +224,15 @@
 /* 어두운 테마 적용 */
 @media (prefers-color-scheme: dark) {
     .table-container {
-        border: 1px hidden #444;
+        border: 1px solid #444;
+    }
+    .header-bg-before,
+    .header-bg-after {
+        color: #000 !important;        
     }
-
     .table-container th,
     .table-container td {
-        border: 1px hidden #444;
+        border: 1px solid #444;
         background: #333;
         color: #ccc;
     }