Upload 17 files

app.py

@@ -66,4 +66,4 @@ with gr.Blocks(css='style.css') as demo:
             retirement_planning_output
         ]
     )
-demo.launch()
+demo.launch(share=True)

modules/rebalancing.py

@@ -160,6 +160,8 @@ def generate_rebalancing_analysis(portfolio, target_weights, total_value, main_c
 
     # 전체 리밸런싱 후 새 포트폴리오 가치를 기반으로 비율 계산
     total_new_stock_value = sum(adj[7] for adj in adjustments)
+
+    # 신규 상태 차트
     new_weights = {stock_code: (new_value / total_new_stock_value) * 100 for _, _, _, _, _, stock_code, _, new_value, _, _, _, _, _ in adjustments}
     new_chart = plot_treemap(new_weights)
 
@@ -168,7 +170,7 @@ def generate_rebalancing_analysis(portfolio, target_weights, total_value, main_c
         new_value_pct = (new_value / total_new_stock_value) * 100
         adjustments[i] = (difference, current_value, target_weight, current_value_pct, trade_quantity, stock_code, price, new_value, trade_value, old_quantity, new_quantity, target_ratio, new_value_pct, currency)
 
-    cash_balance = new_total_value - total_new_stock_value  # cash_balance 계산 추가
+    cash_balance = new_total_value - total_new_stock_value
 
     # 리밸런싱 분석 테이블 생성
     result_message = f"""
@@ -181,7 +183,7 @@ def generate_rebalancing_analysis(portfolio, target_weights, total_value, main_c
             <span style='font-size: 1.5rem; font-weight: bold; color: #1678fb'>{currency_symbol}{format_quantity(cash_balance)}</span>
             cash balance
             <hr style="margin: 1.5rem 0;">
-            <h3>Target Portfolio Allocation</h3>{new_chart}            
+            <h3>Adjusted Portfolio Allocation</h3>{new_chart}            
         </div>
     </div>
     <br>
@@ -200,7 +202,7 @@ def generate_rebalancing_analysis(portfolio, target_weights, total_value, main_c
 
         current_value_pct_str = f"{current_value_pct:.1f}%"
         target_weight_str = f"<span class='highlight-edit'>{target_weight}</span>"
-        target_ratio_str = f"<span class='highlight-edit'>{target_ratio * 100:.1f}%</span>"
+        target_ratio_str = f"{target_ratio * 100:.1f}%"
         trade_value_str = f"<span class='highlight-sky'>{format_quantity(trade_value)}</span>" if trade_value != 0 else ''
         price_str = f"{currency_symbol}{price:,.0f}"         
         trade_quantity_str = f"<span class='highlight-sky'>{format_quantity(trade_quantity)}</span>" if trade_value != 0 else ''

modules/utils.py

@@ -94,7 +94,7 @@ from io import BytesIO
 import base64
 
 def plot_treemap(data, color_map='viridis'):
-    labels = list(data.keys())
+    labels = [label.upper() for label in data.keys()]  # 라벨을 대문자로 변환
     sizes = list(data.values())
     
     # 색상 맵을 설정
@@ -113,11 +113,11 @@ def plot_treemap(data, color_map='viridis'):
 
     # 범례 생성
     handles = [plt.Line2D([0], [0], marker='s', color='w', label=f'{label} ({size:.1f})',
-                         markersize=15, markerfacecolor=color)
+                         markersize=50, markerfacecolor=color)
                for label, size, color in zip(labels, sizes, colors)]
     
     # 범례 추가, 제목 제거, 글자 크기를 키우고 범례 박스를 조정
-    ax.legend(handles=handles, loc='upper left', bbox_to_anchor=(1, 1), fontsize='14', frameon=False)
+    ax.legend(handles=handles, loc='upper left', bbox_to_anchor=(1, 1), fontsize='35', frameon=False)
     
     ax.set_xlim(0, 100)
     ax.set_ylim(0, 100)

style.css

@@ -10,12 +10,25 @@
 @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");
-
-
+@import url('https://fonts.googleapis.com/css2?family=Patrick+Hand+SC&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Luckiest+Guy&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=League+Spartan:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Edu+AU+VIC+WA+NT+Hand&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Jost:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap');
+
+@font-face {
+    font-family: 'Gilroy';
+    src: url('Gilroy-Regular.otf') format('opentype');
+    font-weight: 400; /* Regular weight */
+    font-style: normal;
+  }
+  
 #col-container {
     margin: 0 auto;
     max-width: 100%;
-    font-family: 'Patrick Hand', 'ui-sans-serif', 'system-ui', 'sans-serif';
+    font-family: 'Gilroy', 'Quicksand', 'ui-sans-serif', 'system-ui', 'sans-serif';
     text-transform: uppercase;
 
 }