Upload 16 files

interface/rebalancing_interface.py

@@ -1,7 +1,6 @@
 import gradio as gr
 from modules.rebalancing import rebalancing_tool
 from modules.utils import currency_codes, current_time
-from datetime import datetime
 
 examples = [
     ["KRW", "458730 KRW 580 [8],\n368590 KRW 80 [2],", 507977],
@@ -15,7 +14,7 @@ main_currency = gr.Dropdown(
     value="KRW",
     # info="Assets converted to main currency"
 )
-title = gr.Markdown(f"""<h2 style='margin: 5px'>Re-Balancing Analysis | Your Portfolio Holdings as of {current_time}</h2>""")
+title_setup = gr.Markdown(f"""<h3 class='h3_title'>Portfolio Holdings</h3>""")
 holdings = gr.Textbox(
     label="Portfolio [Ratio]",
     lines=1,
@@ -23,20 +22,19 @@ holdings = gr.Textbox(
     placeholder="Format: Ticker Currency Quantity [Target_Weight], ...",
     value="SCHD USD 7 [3], 458730 KRW 580 [4], 368590 KRW 80 [1],"
 )
-title_cash = gr.Markdown("<h3 class='h3_title'>Cash</h3>")
+title_cash = gr.Markdown("<h3 class='h3_title'>Contribution or withdrawal</h3>")
 cash_amount = gr.Number(
-    label="Contribution or withdrawal amount",
+    label="amount",
     value=507977
 )
 allow_sales = gr.Checkbox(
-    label="Allow Sales",
     value=True,
-    info="If checked, the table below will display both buy and sell transactions. If unchecked, only buy transactions will be shown."
+    label="If checked, the table below will display both buy and sell transactions. If unchecked, only buy transactions will be shown."
 )
 
 input = [main_currency, holdings, cash_amount, allow_sales]
 output = gr.HTML()
-component_rows = [[holdings], [cash_amount, main_currency], allow_sales]
+component_rows = [title_setup, main_currency, holdings, title_cash, cash_amount, allow_sales]
 
 # Define the update function
 def update_output(*args):

modules/rebalancing.py

@@ -1,12 +1,8 @@
-import requests
-import pytz
 import math
-import pandas as pd
 import FinanceDataReader as fdr
 import yfinance as yf
-from datetime import datetime
 from concurrent.futures import ThreadPoolExecutor
-from modules.utils import load_css, get_currency_symbol, format_quantity, plot_treemap, current_time
+from modules.utils import load_css, get_currency_symbol, format_quantity, plot_treemap
 
 def parse_input(holdings, cash_amount):
     try:
@@ -24,7 +20,7 @@ def parse_input(holdings, cash_amount):
                 if target_ratio_expr.strip() == '[]':
                     target_ratio = 0
                 else:
-                    target_ratio = float(target_ratio_expr.strip('[]').replace(' ', ''))
+                    target_ratio = float(eval(target_ratio_expr.strip('[]').replace(' ', '')))
                 
                 # 수량을 정수로 내림 처리
                 quantity = math.floor(quantity)