Introduce symbol conversion utilities and integrate into services

- Add `to_kis_symbol`, `to_yahoo_symbol`, and `to_db_symbol` in `symbol.py` for consistent handling of symbol formats across external APIs.
- Update KIS services to use `to_kis_symbol` for API requests, ensuring accurate symbol formatting.
- Integrate `to_db_symbol` into KIS trading and holdings services to standardize symbol comparisons.
- Adapt Yahoo Finance fetch functions to utilize `to_yahoo_symbol` for ticker formatting.
- Ensure robust symbol normalization in tasks and automate conversions where necessary.

Author: robin-watcha

app/core/symbol.py

@@ -0,0 +1,31 @@
+"""
+해외주식 심볼 변환 유틸리티
+
+DB 기준 형식: `.` (예: BRK.B)
+- Yahoo Finance: `-` (예: BRK-B)
+- KIS API: `/` (예: BRK/B)
+"""
+
+
+def to_kis_symbol(symbol: str) -> str:
+    """DB 심볼(.)을 KIS API 형식(/)으로 변환
+
+    예: BRK.B -> BRK/B
+    """
+    return symbol.replace(".", "/")
+
+
+def to_yahoo_symbol(symbol: str) -> str:
+    """DB 심볼(.)을 Yahoo Finance 형식(-)으로 변환
+
+    예: BRK.B -> BRK-B
+    """
+    return symbol.replace(".", "-")
+
+
+def to_db_symbol(symbol: str) -> str:
+    """외부 심볼을 DB 형식(.)으로 정규화
+
+    예: BRK-B -> BRK.B, BRK/B -> BRK.B
+    """
+    return symbol.replace("-", ".").replace("/", ".")

app/services/kis.py

@@ -9,6 +9,7 @@
 from pandas import DataFrame
 
 from app.core.config import settings
+from app.core.symbol import to_kis_symbol
 from app.services.redis_token_manager import redis_token_manager
 
 BASE = "https://openapi.koreainvestment.com:9443"
@@ -856,7 +857,7 @@ async def inquire_overseas_daily_price(
             params = {
                 "AUTH": "",
                 "EXCD": excd,  # 거래소코드 (3자리)
-                "SYMB": symbol,  # 심볼
+                "SYMB": to_kis_symbol(symbol),  # 심볼 (DB형식 . -> KIS형식 /)
                 "GUBN": "0",  # 0:일, 1:주, 2:월
                 "BYMD": bymd,  # 조회기준일자
                 "MODP": "1",  # 0:수정주가 미반영, 1:수정주가 반영
@@ -960,7 +961,7 @@ async def inquire_overseas_price(
         params = {
             "AUTH": "",
             "EXCD": excd,  # 거래소코드 (3자리)
-            "SYMB": symbol,
+            "SYMB": to_kis_symbol(symbol),  # 심볼 (DB형식 . -> KIS형식 /)
         }
 
         async with httpx.AsyncClient(timeout=5) as cli:
@@ -1069,7 +1070,7 @@ async def fetch_overseas_fundamental_info(
         params = {
             "AUTH": "",
             "EXCD": excd,  # 거래소코드 (3자리)
-            "SYMB": symbol,
+            "SYMB": to_kis_symbol(symbol),  # 심볼 (DB형식 . -> KIS형식 /)
         }
 
         async with httpx.AsyncClient(timeout=5) as cli:
@@ -1134,7 +1135,7 @@ async def inquire_overseas_minute_chart(
         params = {
             "AUTH": "",
             "EXCD": excd,  # 거래소코드 (3자리)
-            "SYMB": symbol,
+            "SYMB": to_kis_symbol(symbol),  # 심볼 (DB형식 . -> KIS형식 /)
             "NMIN": "1",  # 1분봉
             "PINC": "1",  # 1:주가, 2:대비
             "NEXT": "",  # 연속조회
@@ -1525,7 +1526,7 @@ async def inquire_overseas_buyable_amount(
             "ACNT_PRDT_CD": acnt_prdt_cd,
             "OVRS_EXCG_CD": excd,  # 해외거래소코드 (3자리)
             "OVRS_ORD_UNPR": str(price),  # 해외주문단가 (0: 시장가)
-            "ITEM_CD": symbol,  # 종목코드
+            "ITEM_CD": to_kis_symbol(symbol),  # 종목코드 (DB형식 . -> KIS형식 /)
         }
 
         logging.info(f"해외주식 매수가능금액 조회 - symbol: {symbol}, exchange: {excd}, price: {price}")
@@ -1623,7 +1624,7 @@ async def order_overseas_stock(
             "CANO": cano,
             "ACNT_PRDT_CD": acnt_prdt_cd,
             "OVRS_EXCG_CD": excd,  # 해외거래소코드 (3자리)
-            "PDNO": symbol,  # 상품번호(종목코드)
+            "PDNO": to_kis_symbol(symbol),  # 상품번호(종목코드) (DB형식 . -> KIS형식 /)
             "ORD_DVSN": ord_dvsn,  # 주문구분 (00:지정가, 01:시장가)
             "ORD_QTY": str(quantity),  # 주문수량
             "OVRS_ORD_UNPR": str(price),  # 해외주문단가 (시장가일 경우 0)
@@ -1888,7 +1889,7 @@ async def cancel_overseas_order(
             "CANO": cano,
             "ACNT_PRDT_CD": acnt_prdt_cd,
             "OVRS_EXCG_CD": exchange_code,  # 해외거래소코드
-            "PDNO": symbol,  # 상품번호(종목코드)
+            "PDNO": to_kis_symbol(symbol),  # 상품번호(종목코드) (DB형식 . -> KIS형식 /)
             "ORGN_ODNO": order_number,  # 원주문번호
             "RVSE_CNCL_DVSN_CD": "02",  # 정정취소구분코드 (01:정정, 02:취소)
             "ORD_QTY": str(quantity),  # 주문수량

app/services/kis_holdings_service.py

@@ -3,6 +3,7 @@
 """
 import logging
 
+from app.core.symbol import to_db_symbol
 from app.models.manual_holdings import MarketType
 from app.services.kis import KISClient
 
@@ -13,7 +14,7 @@ async def get_kis_holding_for_ticker(
     kis_client: KISClient, ticker: str, market_type: MarketType
 ) -> dict[str, float]:
     """Fetch KIS holding info for a single ticker."""
-    normalized_ticker = ticker.upper()
+    normalized_ticker = to_db_symbol(ticker.upper())
     default = {"quantity": 0, "avg_price": 0.0, "current_price": 0.0}
 
     try:
@@ -29,7 +30,8 @@ async def get_kis_holding_for_ticker(
         else:
             stocks = await kis_client.fetch_overseas_stocks()
             for stock in stocks:
-                if stock.get("ovrs_pdno") == normalized_ticker:
+                # KIS API 응답의 심볼도 정규화하여 비교
+                if to_db_symbol(stock.get("ovrs_pdno", "")) == normalized_ticker:
                     return {
                         "quantity": int(float(stock.get("ovrs_cblc_qty", 0))),
                         "avg_price": float(stock.get("pchs_avg_pric", 0)),

app/services/kis_trading_service.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 from typing import Dict, Any, List, Optional, Tuple
+from app.core.symbol import to_db_symbol
 from app.services.kis import KISClient
 from app.models.analysis import StockAnalysisResult
 from app.core.config import settings
@@ -452,7 +453,9 @@ async def process_kis_overseas_sell_orders_with_analysis(
 
         # KIS 계좌의 실제 주문가능수량 조회 (토스 등 수동 잔고 제외)
         my_stocks = await kis_client.fetch_my_overseas_stocks()
-        target_stock = next((s for s in my_stocks if s.get('ovrs_pdno') == symbol), None)
+        # 심볼 형식 정규화하여 비교
+        normalized_symbol = to_db_symbol(symbol)
+        target_stock = next((s for s in my_stocks if to_db_symbol(s.get('ovrs_pdno', '')) == normalized_symbol), None)
         if target_stock:
             # ord_psbl_qty가 있으면 사용, 없으면 ovrs_cblc_qty 사용
             actual_qty = int(float(target_stock.get('ord_psbl_qty', target_stock.get('ovrs_cblc_qty', 0))))

app/services/yahoo.py

@@ -4,6 +4,8 @@
 import pandas as pd
 import yfinance as yf
 
+from app.core.symbol import to_yahoo_symbol
+
 
 def _flatten_cols(df: pd.DataFrame) -> pd.DataFrame:
     """('open','NVDA') → open  처럼 1단 컬럼으로 변환"""
@@ -16,10 +18,11 @@ def _flatten_cols(df: pd.DataFrame) -> pd.DataFrame:
 
 async def fetch_ohlcv(ticker: str, days: int = 100) -> pd.DataFrame:
     """최근 days개(최대 100) 일봉 OHLCV DataFrame 반환"""
+    yahoo_ticker = to_yahoo_symbol(ticker)  # DB형식 . -> Yahoo형식 -
     end = datetime.now(timezone.utc).date()
     start = end - timedelta(days=days * 2)  # 휴일 감안 넉넉히
     df = yf.download(
-        ticker, start=start, end=end, interval="1d", progress=False, auto_adjust=False
+        yahoo_ticker, start=start, end=end, interval="1d", progress=False, auto_adjust=False
     )
     df = _flatten_cols(df).reset_index(names="date")  # ← 여기만 변경
     df = (
@@ -35,9 +38,10 @@ async def fetch_ohlcv(ticker: str, days: int = 100) -> pd.DataFrame:
 
 async def fetch_price(ticker: str) -> pd.DataFrame:
     """미국 장중 현재가(15분 지연) 1행 DF – yfinance fast_info"""
-    info = yf.Ticker(ticker).fast_info
+    yahoo_ticker = to_yahoo_symbol(ticker)  # DB형식 . -> Yahoo형식 -
+    info = yf.Ticker(yahoo_ticker).fast_info
     row = {
-        "code": ticker,
+        "code": ticker,  # DB 형식 유지
         "date": datetime.now(timezone.utc).date(),
         "time": datetime.now(timezone.utc).time(),
         "open": getattr(info, "open", 0.0),
@@ -55,7 +59,8 @@ async def fetch_fundamental_info(ticker: str) -> dict:
     yf.Ticker(ticker).info에서 PER, PBR, EPS, BPS, 배당수익률 등
     주요 펀더멘털 지표를 가져와 딕셔너리로 반환합니다.
     """
-    info = yf.Ticker(ticker).info
+    yahoo_ticker = to_yahoo_symbol(ticker)  # DB형식 . -> Yahoo형식 -
+    info = yf.Ticker(yahoo_ticker).info
 
     fundamental_data = {
         "PER": info.get("trailingPE"),

app/tasks/kis.py

@@ -6,6 +6,7 @@
 from celery import shared_task
 
 from app.analysis.service_analyzers import KISAnalyzer
+from app.core.symbol import to_db_symbol
 from app.monitoring.trade_notifier import get_trade_notifier
 from app.monitoring.error_reporter import get_error_reporter
 from app.services.kis import KISClient
@@ -824,8 +825,10 @@ async def _run() -> dict:
         kis = KISClient()
         try:
             my_stocks = await kis.fetch_my_overseas_stocks()
-            target_stock = next((s for s in my_stocks if s['ovrs_pdno'] == symbol), None)
-            
+            # 심볼 형식 정규화하여 비교
+            normalized_symbol = to_db_symbol(symbol)
+            target_stock = next((s for s in my_stocks if to_db_symbol(s.get('ovrs_pdno', '')) == normalized_symbol), None)
+
             if target_stock:
                 avg_price = float(target_stock['pchs_avg_pric'])
                 current_price = float(target_stock['now_pric2'])
@@ -835,7 +838,7 @@ async def _run() -> dict:
                     avg_price = 0.0  # 신규 매수이므로 평단 없음
                 except Exception as price_error:
                     return {'success': False, 'message': f'현재가 조회 실패: {price_error}'}
-            
+
             res = await process_kis_overseas_buy_orders_with_analysis(kis, symbol, current_price, avg_price)
             return res
         except Exception as e:
@@ -851,8 +854,10 @@ async def _run() -> dict:
         kis = KISClient()
         try:
             my_stocks = await kis.fetch_my_overseas_stocks()
-            target_stock = next((s for s in my_stocks if s['ovrs_pdno'] == symbol), None)
-            
+            # 심볼 형식 정규화하여 비교
+            normalized_symbol = to_db_symbol(symbol)
+            target_stock = next((s for s in my_stocks if to_db_symbol(s.get('ovrs_pdno', '')) == normalized_symbol), None)
+
             if not target_stock:
                 return {'success': False, 'message': '보유 중인 주식이 아닙니다.'}
 
@@ -1230,10 +1235,11 @@ async def _cancel_overseas_pending_orders(
     # sll_buy_dvsn_cd: 01=매도, 02=매수
     target_code = "02" if order_type == "buy" else "01"
 
-    # 해당 종목의 주문만 필터링 (필드명 대소문자 모두 확인)
+    # 해당 종목의 주문만 필터링 (필드명 대소문자 모두 확인, 심볼 형식 정규화)
+    normalized_symbol = to_db_symbol(symbol)
     target_orders = [
         order for order in all_open_orders
-        if (order.get('pdno') or order.get('PDNO')) == symbol
+        if to_db_symbol(order.get('pdno') or order.get('PDNO') or '') == normalized_symbol
         and (order.get('sll_buy_dvsn_cd') or order.get('SLL_BUY_DVSN_CD')) == target_code
     ]
 
@@ -1297,8 +1303,8 @@ async def _run() -> dict:
             # 3. 수동 잔고 종목을 KIS 형식으로 변환하여 병합
             for holding in manual_holdings:
                 ticker = holding.ticker
-                # KIS에 이미 있는 종목은 건너뛰기
-                if any(s.get('ovrs_pdno') == ticker for s in my_stocks):
+                # KIS에 이미 있는 종목은 건너뛰기 (심볼 형식 정규화하여 비교)
+                if any(to_db_symbol(s.get('ovrs_pdno', '')) == ticker for s in my_stocks):
                     continue
 
                 # 수동 잔고 종목을 my_stocks에 추가 (KIS 형식으로 변환)