Upload app.py

app.py

@@ -24,8 +24,8 @@ class StockCodeNotFoundError(Exception):
 class CurrencyConversionError(Exception):
     pass
 
-def parse_input(text, cash_amount, cash_ratio):
-    logger.info(f"Parsing input: {text} with cash amount: {cash_amount} and cash ratio: {cash_ratio}")
+def parse_input(text, cash_amount_expr, cash_ratio):
+    logger.info(f"Parsing input: {text} with cash amount expression: {cash_amount_expr} and cash ratio: {cash_ratio}")
     try:
         lines = text.strip().split(',')
         stock_inputs = []
@@ -42,6 +42,11 @@ def parse_input(text, cash_amount, cash_ratio):
             else:
                 raise ValueError("Invalid input format.")
 
+        if cash_amount_expr.strip():
+            cash_amount = math.floor(eval(cash_amount_expr.replace(' ', '')))
+        else:
+            cash_amount = 0
+
         krw_cash = {'amount': cash_amount, 'target_weight': cash_ratio / 100.0}
 
         cash_ratio = krw_cash['target_weight']
@@ -168,10 +173,9 @@ def get_portfolio_rebalancing_info(portfolio, target_weights, krw_cash):
     logger.info("Portfolio rebalancing information calculated")
     return result_message
 
-def rebalance_portfolio(input_text, cash_amount, cash_ratio):
+def rebalance_portfolio(input_text, cash_amount_expr, cash_ratio):
     try:
-        cash_amount = int(cash_amount)
-        stock_inputs, krw_cash = parse_input(input_text, cash_amount, cash_ratio)
+        stock_inputs, krw_cash = parse_input(input_text, cash_amount_expr, cash_ratio)
         portfolio, target_weights, krw_cash = build_portfolio(stock_inputs, krw_cash)
         result_message = get_portfolio_rebalancing_info(portfolio, target_weights, krw_cash)
         return result_message
@@ -187,29 +191,7 @@ interface = gr.Interface(
         gr.Slider(minimum=0, maximum=100, step=1, value=33, label="현금 비율 (%)")
     ],
     outputs="text",
-    title=f"Re-Balancing Analysis | Your Portfolio Holdings as of {current_date}",
-    # description=(
-    #     "기본 통화: KRW\n\n"
-    #     "리밸런싱은 1주 단위로 계산됩니다.\n\n"
-    #     "포트폴리오 데이터를 다음 형식으로 입력하세요:\n" 
-    #     "  - 주식의 경우: 통화 티커 보유수량 목표비중\n"
-    #     "  - 추가 투자금을 입력하세요\n"
-    #     "  - 슬라이더를 사용하여 목표현금비율 (%)을 입력하세요\n\n"
-    #     "  - 여러 종목을 쉼표로 구분하여 입력할 수 있습니다.\n"
-    #     "  - 수량과 비중에 대해 사칙 연산을 사용할 수 있습니다.\n\n"
-    #     "예시:\n"
-    #     "  - usd schd 545 8, usd qqq 22 2\n\n"
-    #     "  - 보유주식: SCHD 545주, QQQ 22주\n"
-    #     "  - 목표비중: SCHD:QQQ = 8:2\n\n"        
-    #     "사칙 연산 예시:\n"
-    #     "  - krw 458730 530+50 8/2, krw 368590 79*2 2+1\n\n"
-    #     "출력 형식:\n\n"
-    #     "  - 종목코드 @현재가\n\n"
-    #     "  - 평가금액 [현재비중%]\n\n"
-    #     "  - [목표비중%] 신규수량\n\n"
-    #     "  - 전체 평가금액"
-    # )
-
+    title=f"Re-Balancing Analysis | Your Portfolio Holdings as of {current_date}"
 )
 
 if __name__ == "__main__":