Compare commits
19 Commits
fix/137-ru
...
feature/is
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7834b89f10 | ||
| e0d6c9f81d | |||
|
|
2e550f8b58 | ||
| c76e2dfed5 | |||
|
|
24fa22e77b | ||
| cd1579058c | |||
| 45b48fa7cd | |||
|
|
3952a5337b | ||
|
|
ccc97ebaa9 | ||
|
|
3a54db8948 | ||
|
|
96e2ad4f1f | ||
| c5a8982122 | |||
|
|
f7289606fc | ||
| 0c5c90201f | |||
|
|
b484f0daff | ||
|
|
1288181e39 | ||
|
|
b625f41621 | ||
| 77d3ba967c | |||
| 44339c52d7 |
@@ -165,3 +165,104 @@
|
|||||||
**효과:**
|
**효과:**
|
||||||
- 국내/해외 스캐너 기준이 변동성 중심으로 일관화
|
- 국내/해외 스캐너 기준이 변동성 중심으로 일관화
|
||||||
- 고변동 구간에서 자동 익스포저 축소, 저변동 구간에서 과소진입 완화
|
- 고변동 구간에서 자동 익스포저 축소, 저변동 구간에서 과소진입 완화
|
||||||
|
|
||||||
|
## 2026-02-18
|
||||||
|
|
||||||
|
### KIS 해외 랭킹 API 404 에러 수정
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- KIS 해외주식 랭킹 API(`fetch_overseas_rankings`)가 모든 거래소에서 HTTP 404를 반환
|
||||||
|
- Smart Scanner가 해외 시장 후보 종목을 찾지 못해 거래가 전혀 실행되지 않음
|
||||||
|
|
||||||
|
**근본 원인:**
|
||||||
|
- TR_ID, API 경로, 거래소 코드가 모두 KIS 공식 문서와 불일치
|
||||||
|
|
||||||
|
**구현 결과:**
|
||||||
|
- `src/config.py`: TR_ID/Path 기본값을 KIS 공식 스펙으로 수정
|
||||||
|
- `src/broker/overseas.py`: 랭킹 API 전용 거래소 코드 매핑 추가 (NASD→NAS, NYSE→NYS, AMEX→AMS), 올바른 API 파라미터 사용
|
||||||
|
- `tests/test_overseas_broker.py`: 19개 단위 테스트 추가
|
||||||
|
|
||||||
|
**효과:**
|
||||||
|
- 해외 시장 랭킹 스캔이 정상 동작하여 Smart Scanner가 후보 종목 탐지 가능
|
||||||
|
|
||||||
|
### Gemini prompt_override 미적용 버그 수정
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- `run_overnight` 실행 시 모든 시장에서 Playbook 생성 실패 (`JSONDecodeError`)
|
||||||
|
- defensive playbook으로 폴백되어 모든 종목이 HOLD 처리
|
||||||
|
|
||||||
|
**근본 원인:**
|
||||||
|
- `pre_market_planner.py`가 `market_data["prompt_override"]`에 Playbook 전용 프롬프트를 넣어 `gemini.decide()` 호출
|
||||||
|
- `gemini_client.py`의 `decide()` 메서드가 `prompt_override` 키를 전혀 확인하지 않고 항상 일반 트레이드 결정 프롬프트 생성
|
||||||
|
- Gemini가 Playbook JSON 대신 일반 트레이드 결정을 반환하여 파싱 실패
|
||||||
|
|
||||||
|
**구현 결과:**
|
||||||
|
- `src/brain/gemini_client.py`: `decide()` 메서드에서 `prompt_override` 우선 사용 로직 추가
|
||||||
|
- `tests/test_brain.py`: 3개 테스트 추가 (override 전달, optimization 우회, 미지정 시 기존 동작 유지)
|
||||||
|
|
||||||
|
**이슈/PR:** #143
|
||||||
|
|
||||||
|
### 미국장 거래 미실행 근본 원인 분석 및 수정 (자율 실행 세션)
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- 사용자 요청: "미국장 열면 프로그램 돌려서 거래 한 번도 못 한 거 꼭 원인 찾아서 해결해줘"
|
||||||
|
- 프로그램을 미국장 개장(9:30 AM EST) 전부터 실행하여 실시간 로그를 분석
|
||||||
|
|
||||||
|
**발견된 근본 원인 #1: Defensive Playbook — BUY 조건 없음**
|
||||||
|
|
||||||
|
- Gemini free tier (20 RPD) 소진 → `generate_playbook()` 실패 → `_defensive_playbook()` 폴백
|
||||||
|
- Defensive playbook은 `price_change_pct_below: -3.0 → SELL` 조건만 존재, BUY 조건 없음
|
||||||
|
- ScenarioEngine이 항상 HOLD 반환 → 거래 0건
|
||||||
|
|
||||||
|
**수정 #1 (PR #146, Issue #145):**
|
||||||
|
- `src/strategy/pre_market_planner.py`: `_smart_fallback_playbook()` 메서드 추가
|
||||||
|
- 스캐너 signal 기반 BUY 조건 생성: `momentum → volume_ratio_above`, `oversold → rsi_below`
|
||||||
|
- 기존 defensive stop-loss SELL 조건 유지
|
||||||
|
- Gemini 실패 시 defensive → smart fallback으로 전환
|
||||||
|
- 테스트 10개 추가
|
||||||
|
|
||||||
|
**발견된 근본 원인 #2: 가격 API 거래소 코드 불일치 + VTS 잔고 API 오류**
|
||||||
|
|
||||||
|
실제 로그:
|
||||||
|
```
|
||||||
|
Scenario matched for MRNX: BUY (confidence=80) ✓
|
||||||
|
Decision for EWUS (NYSE American): BUY (confidence=80) ✓
|
||||||
|
Skip BUY APLZ (NYSE American): no affordable quantity (cash=0.00, price=0.00) ✗
|
||||||
|
```
|
||||||
|
|
||||||
|
- `get_overseas_price()`: `NASD`/`NYSE`/`AMEX` 전송 → API가 `NAS`/`NYS`/`AMS` 기대 → 빈 응답 → `price=0`
|
||||||
|
- `VTTS3012R` 잔고 API: "ERROR : INPUT INVALID_CHECK_ACNO" → `total_cash=0`
|
||||||
|
- 결과: `_determine_order_quantity()` 가 0 반환 → 주문 건너뜀
|
||||||
|
|
||||||
|
**수정 #2 (PR #148, Issue #147):**
|
||||||
|
- `src/broker/overseas.py`: `_PRICE_EXCHANGE_MAP = _RANKING_EXCHANGE_MAP` 추가, 가격 API에 매핑 적용
|
||||||
|
- `src/config.py`: `PAPER_OVERSEAS_CASH: float = Field(default=50000.0)` — paper 모드 시뮬레이션 잔고
|
||||||
|
- `src/main.py`: 잔고 0일 때 PAPER_OVERSEAS_CASH 폴백, 가격 0일 때 candidate.price 폴백
|
||||||
|
- 테스트 8개 추가
|
||||||
|
|
||||||
|
**효과:**
|
||||||
|
- BUY 결정 → 실제 주문 전송까지의 파이프라인이 완전히 동작
|
||||||
|
- Paper 모드에서 KIS VTS 해외 잔고 API 오류에 관계없이 시뮬레이션 거래 가능
|
||||||
|
|
||||||
|
**이슈/PR:** #145, #146, #147, #148
|
||||||
|
|
||||||
|
### 해외주식 시장가 주문 거부 수정 (Fix #3, 연속 발견)
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- Fix #147 적용 후 주문 전송 시작 → KIS VTS가 거부: "지정가만 가능한 상품입니다"
|
||||||
|
|
||||||
|
**근본 원인:**
|
||||||
|
- `trading_cycle()`, `run_daily_session()` 양쪽에서 `send_overseas_order(price=0.0)` 하드코딩
|
||||||
|
- `price=0` → `ORD_DVSN="01"` (시장가) 전송 → KIS VTS 거부
|
||||||
|
- Fix #147에서 이미 `current_price`를 올바르게 계산했으나 주문 시 미사용
|
||||||
|
|
||||||
|
**구현 결과:**
|
||||||
|
- `src/main.py`: 두 곳에서 `price=0.0` → `price=current_price`/`price=stock_data["current_price"]`
|
||||||
|
- `tests/test_main.py`: 회귀 테스트 `test_overseas_buy_order_uses_limit_price` 추가
|
||||||
|
|
||||||
|
**최종 확인 로그:**
|
||||||
|
```
|
||||||
|
Order result: 모의투자 매수주문이 완료 되었습니다. ✓
|
||||||
|
```
|
||||||
|
|
||||||
|
**이슈/PR:** #149, #150
|
||||||
|
|||||||
@@ -410,8 +410,10 @@ class GeminiClient:
|
|||||||
cached=True,
|
cached=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Build optimized prompt
|
# Build prompt (prompt_override takes priority for callers like pre_market_planner)
|
||||||
if self._enable_optimization:
|
if "prompt_override" in market_data:
|
||||||
|
prompt = market_data["prompt_override"]
|
||||||
|
elif self._enable_optimization:
|
||||||
prompt = self._optimizer.build_compressed_prompt(market_data)
|
prompt = self._optimizer.build_compressed_prompt(market_data)
|
||||||
else:
|
else:
|
||||||
prompt = await self.build_prompt(market_data, news_sentiment)
|
prompt = await self.build_prompt(market_data, news_sentiment)
|
||||||
|
|||||||
@@ -20,6 +20,39 @@ _KIS_VTS_HOST = "openapivts.koreainvestment.com"
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def kr_tick_unit(price: float) -> int:
|
||||||
|
"""Return KRX tick size for the given price level.
|
||||||
|
|
||||||
|
KRX price tick rules (domestic stocks):
|
||||||
|
price < 2,000 → 1원
|
||||||
|
2,000 ≤ price < 5,000 → 5원
|
||||||
|
5,000 ≤ price < 20,000 → 10원
|
||||||
|
20,000 ≤ price < 50,000 → 50원
|
||||||
|
50,000 ≤ price < 200,000 → 100원
|
||||||
|
200,000 ≤ price < 500,000 → 500원
|
||||||
|
500,000 ≤ price → 1,000원
|
||||||
|
"""
|
||||||
|
if price < 2_000:
|
||||||
|
return 1
|
||||||
|
if price < 5_000:
|
||||||
|
return 5
|
||||||
|
if price < 20_000:
|
||||||
|
return 10
|
||||||
|
if price < 50_000:
|
||||||
|
return 50
|
||||||
|
if price < 200_000:
|
||||||
|
return 100
|
||||||
|
if price < 500_000:
|
||||||
|
return 500
|
||||||
|
return 1_000
|
||||||
|
|
||||||
|
|
||||||
|
def kr_round_down(price: float) -> int:
|
||||||
|
"""Round *down* price to the nearest KRX tick unit."""
|
||||||
|
tick = kr_tick_unit(price)
|
||||||
|
return int(price // tick * tick)
|
||||||
|
|
||||||
|
|
||||||
class LeakyBucket:
|
class LeakyBucket:
|
||||||
"""Simple leaky-bucket rate limiter for async code."""
|
"""Simple leaky-bucket rate limiter for async code."""
|
||||||
|
|
||||||
@@ -198,6 +231,55 @@ class KISBroker:
|
|||||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
raise ConnectionError(f"Network error fetching orderbook: {exc}") from exc
|
raise ConnectionError(f"Network error fetching orderbook: {exc}") from exc
|
||||||
|
|
||||||
|
async def get_current_price(
|
||||||
|
self, stock_code: str
|
||||||
|
) -> tuple[float, float, float]:
|
||||||
|
"""Fetch current price data for a domestic stock.
|
||||||
|
|
||||||
|
Uses the ``inquire-price`` API (FHKST01010100), which works in both
|
||||||
|
real and VTS environments and returns the actual last-traded price.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
(current_price, prdy_ctrt, frgn_ntby_qty)
|
||||||
|
- current_price: Last traded price in KRW.
|
||||||
|
- prdy_ctrt: Day change rate (%).
|
||||||
|
- frgn_ntby_qty: Foreigner net buy quantity.
|
||||||
|
"""
|
||||||
|
await self._rate_limiter.acquire()
|
||||||
|
session = self._get_session()
|
||||||
|
|
||||||
|
headers = await self._auth_headers("FHKST01010100")
|
||||||
|
params = {
|
||||||
|
"FID_COND_MRKT_DIV_CODE": "J",
|
||||||
|
"FID_INPUT_ISCD": stock_code,
|
||||||
|
}
|
||||||
|
url = f"{self._base_url}/uapi/domestic-stock/v1/quotations/inquire-price"
|
||||||
|
|
||||||
|
def _f(val: str | None) -> float:
|
||||||
|
try:
|
||||||
|
return float(val or "0")
|
||||||
|
except ValueError:
|
||||||
|
return 0.0
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with session.get(url, headers=headers, params=params) as resp:
|
||||||
|
if resp.status != 200:
|
||||||
|
text = await resp.text()
|
||||||
|
raise ConnectionError(
|
||||||
|
f"get_current_price failed ({resp.status}): {text}"
|
||||||
|
)
|
||||||
|
data = await resp.json()
|
||||||
|
out = data.get("output", {})
|
||||||
|
return (
|
||||||
|
_f(out.get("stck_prpr")),
|
||||||
|
_f(out.get("prdy_ctrt")),
|
||||||
|
_f(out.get("frgn_ntby_qty")),
|
||||||
|
)
|
||||||
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
|
raise ConnectionError(
|
||||||
|
f"Network error fetching current price: {exc}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
async def get_balance(self) -> dict[str, Any]:
|
async def get_balance(self) -> dict[str, Any]:
|
||||||
"""Fetch current account balance and holdings."""
|
"""Fetch current account balance and holdings."""
|
||||||
await self._rate_limiter.acquire()
|
await self._rate_limiter.acquire()
|
||||||
@@ -249,13 +331,23 @@ class KISBroker:
|
|||||||
session = self._get_session()
|
session = self._get_session()
|
||||||
|
|
||||||
tr_id = "VTTC0802U" if order_type == "BUY" else "VTTC0801U"
|
tr_id = "VTTC0802U" if order_type == "BUY" else "VTTC0801U"
|
||||||
|
|
||||||
|
# KRX requires limit orders to be rounded down to the tick unit.
|
||||||
|
# ORD_DVSN: "00"=지정가, "01"=시장가
|
||||||
|
if price > 0:
|
||||||
|
ord_dvsn = "00" # 지정가
|
||||||
|
ord_price = kr_round_down(price)
|
||||||
|
else:
|
||||||
|
ord_dvsn = "01" # 시장가
|
||||||
|
ord_price = 0
|
||||||
|
|
||||||
body = {
|
body = {
|
||||||
"CANO": self._account_no,
|
"CANO": self._account_no,
|
||||||
"ACNT_PRDT_CD": self._product_cd,
|
"ACNT_PRDT_CD": self._product_cd,
|
||||||
"PDNO": stock_code,
|
"PDNO": stock_code,
|
||||||
"ORD_DVSN": "01" if price > 0 else "06", # 01=지정가, 06=시장가
|
"ORD_DVSN": ord_dvsn,
|
||||||
"ORD_QTY": str(quantity),
|
"ORD_QTY": str(quantity),
|
||||||
"ORD_UNPR": str(price),
|
"ORD_UNPR": str(ord_price),
|
||||||
}
|
}
|
||||||
|
|
||||||
hash_key = await self._get_hash_key(body)
|
hash_key = await self._get_hash_key(body)
|
||||||
@@ -304,26 +396,46 @@ class KISBroker:
|
|||||||
await self._rate_limiter.acquire()
|
await self._rate_limiter.acquire()
|
||||||
session = self._get_session()
|
session = self._get_session()
|
||||||
|
|
||||||
# TR_ID for volume ranking
|
if ranking_type == "volume":
|
||||||
tr_id = "FHPST01710000" if ranking_type == "volume" else "FHPST01710100"
|
# 거래량순위: FHPST01710000 / /quotations/volume-rank
|
||||||
|
tr_id = "FHPST01710000"
|
||||||
|
url = f"{self._base_url}/uapi/domestic-stock/v1/quotations/volume-rank"
|
||||||
|
params: dict[str, str] = {
|
||||||
|
"FID_COND_MRKT_DIV_CODE": "J",
|
||||||
|
"FID_COND_SCR_DIV_CODE": "20171",
|
||||||
|
"FID_INPUT_ISCD": "0000",
|
||||||
|
"FID_DIV_CLS_CODE": "0",
|
||||||
|
"FID_BLNG_CLS_CODE": "0",
|
||||||
|
"FID_TRGT_CLS_CODE": "111111111",
|
||||||
|
"FID_TRGT_EXLS_CLS_CODE": "0000000000",
|
||||||
|
"FID_INPUT_PRICE_1": "0",
|
||||||
|
"FID_INPUT_PRICE_2": "0",
|
||||||
|
"FID_VOL_CNT": "0",
|
||||||
|
"FID_INPUT_DATE_1": "",
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
# 등락률순위: FHPST01700000 / /ranking/fluctuation (소문자 파라미터)
|
||||||
|
tr_id = "FHPST01700000"
|
||||||
|
url = f"{self._base_url}/uapi/domestic-stock/v1/ranking/fluctuation"
|
||||||
|
params = {
|
||||||
|
"fid_cond_mrkt_div_code": "J",
|
||||||
|
"fid_cond_scr_div_code": "20170",
|
||||||
|
"fid_input_iscd": "0000",
|
||||||
|
"fid_rank_sort_cls_code": "0000",
|
||||||
|
"fid_input_cnt_1": str(limit),
|
||||||
|
"fid_prc_cls_code": "0",
|
||||||
|
"fid_input_price_1": "0",
|
||||||
|
"fid_input_price_2": "0",
|
||||||
|
"fid_vol_cnt": "0",
|
||||||
|
"fid_trgt_cls_code": "0",
|
||||||
|
"fid_trgt_exls_cls_code": "0",
|
||||||
|
"fid_div_cls_code": "0",
|
||||||
|
"fid_rsfl_rate1": "0",
|
||||||
|
"fid_rsfl_rate2": "0",
|
||||||
|
}
|
||||||
|
|
||||||
headers = await self._auth_headers(tr_id)
|
headers = await self._auth_headers(tr_id)
|
||||||
|
|
||||||
params = {
|
|
||||||
"FID_COND_MRKT_DIV_CODE": "J", # Stock/ETF/ETN
|
|
||||||
"FID_COND_SCR_DIV_CODE": "20001", # Volume surge
|
|
||||||
"FID_INPUT_ISCD": "0000", # All stocks
|
|
||||||
"FID_DIV_CLS_CODE": "0", # All types
|
|
||||||
"FID_BLNG_CLS_CODE": "0",
|
|
||||||
"FID_TRGT_CLS_CODE": "111111111",
|
|
||||||
"FID_TRGT_EXLS_CLS_CODE": "000000",
|
|
||||||
"FID_INPUT_PRICE_1": "0",
|
|
||||||
"FID_INPUT_PRICE_2": "0",
|
|
||||||
"FID_VOL_CNT": "0",
|
|
||||||
"FID_INPUT_DATE_1": "",
|
|
||||||
}
|
|
||||||
|
|
||||||
url = f"{self._base_url}/uapi/domestic-stock/v1/quotations/volume-rank"
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
async with session.get(url, headers=headers, params=params) as resp:
|
async with session.get(url, headers=headers, params=params) as resp:
|
||||||
if resp.status != 200:
|
if resp.status != 200:
|
||||||
|
|||||||
@@ -12,6 +12,24 @@ from src.broker.kis_api import KISBroker
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
# Ranking API uses different exchange codes than order/quote APIs.
|
||||||
|
_RANKING_EXCHANGE_MAP: dict[str, str] = {
|
||||||
|
"NASD": "NAS",
|
||||||
|
"NYSE": "NYS",
|
||||||
|
"AMEX": "AMS",
|
||||||
|
"SEHK": "HKS",
|
||||||
|
"SHAA": "SHS",
|
||||||
|
"SZAA": "SZS",
|
||||||
|
"HSX": "HSX",
|
||||||
|
"HNX": "HNX",
|
||||||
|
"TSE": "TSE",
|
||||||
|
}
|
||||||
|
|
||||||
|
# Price inquiry API (HHDFS00000300) uses the same short exchange codes as rankings.
|
||||||
|
# NASD → NAS, NYSE → NYS, AMEX → AMS (confirmed: AMEX returns empty, AMS returns price).
|
||||||
|
_PRICE_EXCHANGE_MAP: dict[str, str] = _RANKING_EXCHANGE_MAP
|
||||||
|
|
||||||
|
|
||||||
class OverseasBroker:
|
class OverseasBroker:
|
||||||
"""KIS Overseas Stock API wrapper that reuses KISBroker infrastructure."""
|
"""KIS Overseas Stock API wrapper that reuses KISBroker infrastructure."""
|
||||||
|
|
||||||
@@ -44,9 +62,11 @@ class OverseasBroker:
|
|||||||
session = self._broker._get_session()
|
session = self._broker._get_session()
|
||||||
|
|
||||||
headers = await self._broker._auth_headers("HHDFS00000300")
|
headers = await self._broker._auth_headers("HHDFS00000300")
|
||||||
|
# Map internal exchange codes to the short form expected by the price API.
|
||||||
|
price_excd = _PRICE_EXCHANGE_MAP.get(exchange_code, exchange_code)
|
||||||
params = {
|
params = {
|
||||||
"AUTH": "",
|
"AUTH": "",
|
||||||
"EXCD": exchange_code,
|
"EXCD": price_excd,
|
||||||
"SYMB": stock_code,
|
"SYMB": stock_code,
|
||||||
}
|
}
|
||||||
url = f"{self._broker._base_url}/uapi/overseas-price/v1/quotations/price"
|
url = f"{self._broker._base_url}/uapi/overseas-price/v1/quotations/price"
|
||||||
@@ -70,7 +90,7 @@ class OverseasBroker:
|
|||||||
ranking_type: str = "fluctuation",
|
ranking_type: str = "fluctuation",
|
||||||
limit: int = 30,
|
limit: int = 30,
|
||||||
) -> list[dict[str, Any]]:
|
) -> list[dict[str, Any]]:
|
||||||
"""Fetch overseas rankings (price change or volume amount).
|
"""Fetch overseas rankings (price change or volume surge).
|
||||||
|
|
||||||
Ranking API specs may differ by account/product. Endpoint paths and
|
Ranking API specs may differ by account/product. Endpoint paths and
|
||||||
TR_IDs are configurable via settings and can be overridden in .env.
|
TR_IDs are configurable via settings and can be overridden in .env.
|
||||||
@@ -81,66 +101,63 @@ class OverseasBroker:
|
|||||||
await self._broker._rate_limiter.acquire()
|
await self._broker._rate_limiter.acquire()
|
||||||
session = self._broker._get_session()
|
session = self._broker._get_session()
|
||||||
|
|
||||||
|
ranking_excd = _RANKING_EXCHANGE_MAP.get(exchange_code, exchange_code)
|
||||||
|
|
||||||
if ranking_type == "volume":
|
if ranking_type == "volume":
|
||||||
configured_tr_id = self._broker._settings.OVERSEAS_RANKING_VOLUME_TR_ID
|
tr_id = self._broker._settings.OVERSEAS_RANKING_VOLUME_TR_ID
|
||||||
configured_path = self._broker._settings.OVERSEAS_RANKING_VOLUME_PATH
|
path = self._broker._settings.OVERSEAS_RANKING_VOLUME_PATH
|
||||||
default_tr_id = "HHDFS76200200"
|
params: dict[str, str] = {
|
||||||
default_path = "/uapi/overseas-price/v1/quotations/inquire-volume-rank"
|
"AUTH": "",
|
||||||
|
"EXCD": ranking_excd,
|
||||||
|
"MIXN": "0",
|
||||||
|
"VOL_RANG": "0",
|
||||||
|
}
|
||||||
else:
|
else:
|
||||||
configured_tr_id = self._broker._settings.OVERSEAS_RANKING_FLUCT_TR_ID
|
tr_id = self._broker._settings.OVERSEAS_RANKING_FLUCT_TR_ID
|
||||||
configured_path = self._broker._settings.OVERSEAS_RANKING_FLUCT_PATH
|
path = self._broker._settings.OVERSEAS_RANKING_FLUCT_PATH
|
||||||
default_tr_id = "HHDFS76200100"
|
params = {
|
||||||
default_path = "/uapi/overseas-price/v1/quotations/inquire-updown-rank"
|
"AUTH": "",
|
||||||
|
"EXCD": ranking_excd,
|
||||||
|
"NDAY": "0",
|
||||||
|
"GUBN": "1",
|
||||||
|
"VOL_RANG": "0",
|
||||||
|
}
|
||||||
|
|
||||||
endpoint_specs: list[tuple[str, str]] = [(configured_tr_id, configured_path)]
|
headers = await self._broker._auth_headers(tr_id)
|
||||||
if (configured_tr_id, configured_path) != (default_tr_id, default_path):
|
url = f"{self._broker._base_url}{path}"
|
||||||
endpoint_specs.append((default_tr_id, default_path))
|
|
||||||
|
|
||||||
# Try common param variants used by KIS overseas quotation APIs.
|
try:
|
||||||
param_variants = [
|
async with session.get(url, headers=headers, params=params) as resp:
|
||||||
{"AUTH": "", "EXCD": exchange_code, "NREC": str(max(limit, 30))},
|
if resp.status != 200:
|
||||||
{"AUTH": "", "OVRS_EXCG_CD": exchange_code, "NREC": str(max(limit, 30))},
|
text = await resp.text()
|
||||||
{"AUTH": "", "EXCD": exchange_code},
|
if resp.status == 404:
|
||||||
{"AUTH": "", "OVRS_EXCG_CD": exchange_code},
|
logger.warning(
|
||||||
]
|
"Overseas ranking endpoint unavailable (404) for %s/%s; "
|
||||||
|
"using symbol fallback scan",
|
||||||
|
exchange_code,
|
||||||
|
ranking_type,
|
||||||
|
)
|
||||||
|
return []
|
||||||
|
raise ConnectionError(
|
||||||
|
f"fetch_overseas_rankings failed ({resp.status}): {text}"
|
||||||
|
)
|
||||||
|
|
||||||
last_error: str | None = None
|
data = await resp.json()
|
||||||
saw_http_404 = False
|
rows = self._extract_ranking_rows(data)
|
||||||
for tr_id, path in endpoint_specs:
|
if rows:
|
||||||
headers = await self._broker._auth_headers(tr_id)
|
return rows[:limit]
|
||||||
url = f"{self._broker._base_url}{path}"
|
|
||||||
for params in param_variants:
|
|
||||||
try:
|
|
||||||
async with session.get(url, headers=headers, params=params) as resp:
|
|
||||||
text = await resp.text()
|
|
||||||
if resp.status != 200:
|
|
||||||
last_error = f"HTTP {resp.status}: {text}"
|
|
||||||
if resp.status == 404:
|
|
||||||
saw_http_404 = True
|
|
||||||
continue
|
|
||||||
|
|
||||||
data = await resp.json()
|
logger.debug(
|
||||||
rows = self._extract_ranking_rows(data)
|
"Overseas ranking returned empty for %s/%s (keys=%s)",
|
||||||
if rows:
|
exchange_code,
|
||||||
return rows[:limit]
|
ranking_type,
|
||||||
|
list(data.keys()),
|
||||||
# keep trying another param variant if response has no usable rows
|
)
|
||||||
last_error = f"empty output (keys={list(data.keys())})"
|
return []
|
||||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
last_error = str(exc)
|
raise ConnectionError(
|
||||||
continue
|
f"Network error fetching overseas rankings: {exc}"
|
||||||
|
) from exc
|
||||||
if saw_http_404:
|
|
||||||
logger.warning(
|
|
||||||
"Overseas ranking endpoint unavailable (404) for %s/%s; using symbol fallback scan",
|
|
||||||
exchange_code,
|
|
||||||
ranking_type,
|
|
||||||
)
|
|
||||||
return []
|
|
||||||
|
|
||||||
raise ConnectionError(
|
|
||||||
f"fetch_overseas_rankings failed for {exchange_code}/{ranking_type}: {last_error}"
|
|
||||||
)
|
|
||||||
|
|
||||||
async def get_overseas_balance(self, exchange_code: str) -> dict[str, Any]:
|
async def get_overseas_balance(self, exchange_code: str) -> dict[str, Any]:
|
||||||
"""
|
"""
|
||||||
@@ -240,14 +257,27 @@ class OverseasBroker:
|
|||||||
f"send_overseas_order failed ({resp.status}): {text}"
|
f"send_overseas_order failed ({resp.status}): {text}"
|
||||||
)
|
)
|
||||||
data = await resp.json()
|
data = await resp.json()
|
||||||
logger.info(
|
rt_cd = data.get("rt_cd", "")
|
||||||
"Overseas order submitted",
|
msg1 = data.get("msg1", "")
|
||||||
extra={
|
if rt_cd == "0":
|
||||||
"exchange": exchange_code,
|
logger.info(
|
||||||
"stock_code": stock_code,
|
"Overseas order submitted",
|
||||||
"action": order_type,
|
extra={
|
||||||
},
|
"exchange": exchange_code,
|
||||||
)
|
"stock_code": stock_code,
|
||||||
|
"action": order_type,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.warning(
|
||||||
|
"Overseas order rejected (rt_cd=%s): %s [%s %s %s qty=%d]",
|
||||||
|
rt_cd,
|
||||||
|
msg1,
|
||||||
|
order_type,
|
||||||
|
stock_code,
|
||||||
|
exchange_code,
|
||||||
|
quantity,
|
||||||
|
)
|
||||||
return data
|
return data
|
||||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
raise ConnectionError(
|
raise ConnectionError(
|
||||||
|
|||||||
@@ -55,6 +55,11 @@ class Settings(BaseSettings):
|
|||||||
# Trading mode
|
# Trading mode
|
||||||
MODE: str = Field(default="paper", pattern="^(paper|live)$")
|
MODE: str = Field(default="paper", pattern="^(paper|live)$")
|
||||||
|
|
||||||
|
# Simulated USD cash for VTS (paper) overseas trading.
|
||||||
|
# KIS VTS overseas balance API returns errors for most accounts.
|
||||||
|
# This value is used as a fallback when the balance API returns 0 in paper mode.
|
||||||
|
PAPER_OVERSEAS_CASH: float = Field(default=50000.0, ge=0.0)
|
||||||
|
|
||||||
# Trading frequency mode (daily = batch API calls, realtime = per-stock calls)
|
# Trading frequency mode (daily = batch API calls, realtime = per-stock calls)
|
||||||
TRADE_MODE: str = Field(default="daily", pattern="^(daily|realtime)$")
|
TRADE_MODE: str = Field(default="daily", pattern="^(daily|realtime)$")
|
||||||
DAILY_SESSIONS: int = Field(default=4, ge=1, le=10)
|
DAILY_SESSIONS: int = Field(default=4, ge=1, le=10)
|
||||||
@@ -91,13 +96,13 @@ class Settings(BaseSettings):
|
|||||||
# Overseas ranking API (KIS endpoint/TR_ID may vary by account/product)
|
# Overseas ranking API (KIS endpoint/TR_ID may vary by account/product)
|
||||||
# Override these from .env if your account uses different specs.
|
# Override these from .env if your account uses different specs.
|
||||||
OVERSEAS_RANKING_ENABLED: bool = True
|
OVERSEAS_RANKING_ENABLED: bool = True
|
||||||
OVERSEAS_RANKING_FLUCT_TR_ID: str = "HHDFS76200100"
|
OVERSEAS_RANKING_FLUCT_TR_ID: str = "HHDFS76290000"
|
||||||
OVERSEAS_RANKING_VOLUME_TR_ID: str = "HHDFS76200200"
|
OVERSEAS_RANKING_VOLUME_TR_ID: str = "HHDFS76270000"
|
||||||
OVERSEAS_RANKING_FLUCT_PATH: str = (
|
OVERSEAS_RANKING_FLUCT_PATH: str = (
|
||||||
"/uapi/overseas-price/v1/quotations/inquire-updown-rank"
|
"/uapi/overseas-stock/v1/ranking/updown-rate"
|
||||||
)
|
)
|
||||||
OVERSEAS_RANKING_VOLUME_PATH: str = (
|
OVERSEAS_RANKING_VOLUME_PATH: str = (
|
||||||
"/uapi/overseas-price/v1/quotations/inquire-volume-rank"
|
"/uapi/overseas-stock/v1/ranking/volume-surge"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Dashboard (optional)
|
# Dashboard (optional)
|
||||||
|
|||||||
179
src/main.py
179
src/main.py
@@ -204,7 +204,9 @@ async def trading_cycle(
|
|||||||
|
|
||||||
# 1. Fetch market data
|
# 1. Fetch market data
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
orderbook = await broker.get_orderbook(stock_code)
|
current_price, price_change_pct, foreigner_net = await broker.get_current_price(
|
||||||
|
stock_code
|
||||||
|
)
|
||||||
balance_data = await broker.get_balance()
|
balance_data = await broker.get_balance()
|
||||||
|
|
||||||
output2 = balance_data.get("output2", [{}])
|
output2 = balance_data.get("output2", [{}])
|
||||||
@@ -215,10 +217,6 @@ async def trading_cycle(
|
|||||||
else "0"
|
else "0"
|
||||||
)
|
)
|
||||||
purchase_total = safe_float(output2[0].get("pchs_amt_smtl_amt", "0")) if output2 else 0
|
purchase_total = safe_float(output2[0].get("pchs_amt_smtl_amt", "0")) if output2 else 0
|
||||||
|
|
||||||
current_price = safe_float(orderbook.get("output1", {}).get("stck_prpr", "0"))
|
|
||||||
foreigner_net = safe_float(orderbook.get("output1", {}).get("frgn_ntby_qty", "0"))
|
|
||||||
price_change_pct = safe_float(orderbook.get("output1", {}).get("prdy_ctrt", "0"))
|
|
||||||
else:
|
else:
|
||||||
# Overseas market
|
# Overseas market
|
||||||
price_data = await overseas_broker.get_overseas_price(
|
price_data = await overseas_broker.get_overseas_price(
|
||||||
@@ -239,10 +237,43 @@ async def trading_cycle(
|
|||||||
total_cash = safe_float(balance_info.get("frcr_dncl_amt_2", "0") or "0")
|
total_cash = safe_float(balance_info.get("frcr_dncl_amt_2", "0") or "0")
|
||||||
purchase_total = safe_float(balance_info.get("frcr_buy_amt_smtl", "0") or "0")
|
purchase_total = safe_float(balance_info.get("frcr_buy_amt_smtl", "0") or "0")
|
||||||
|
|
||||||
|
# Paper mode fallback: VTS overseas balance API often fails for many accounts.
|
||||||
|
if total_cash <= 0 and settings and settings.PAPER_OVERSEAS_CASH > 0:
|
||||||
|
logger.debug(
|
||||||
|
"Overseas cash balance is 0 for %s; using paper fallback %.2f USD",
|
||||||
|
market.exchange_code,
|
||||||
|
settings.PAPER_OVERSEAS_CASH,
|
||||||
|
)
|
||||||
|
total_cash = settings.PAPER_OVERSEAS_CASH
|
||||||
|
|
||||||
current_price = safe_float(price_data.get("output", {}).get("last", "0"))
|
current_price = safe_float(price_data.get("output", {}).get("last", "0"))
|
||||||
|
# Fallback: if price API returns 0, use scanner candidate price
|
||||||
|
if current_price <= 0:
|
||||||
|
market_candidates_lookup = scan_candidates.get(market.code, {})
|
||||||
|
cand_lookup = market_candidates_lookup.get(stock_code)
|
||||||
|
if cand_lookup and cand_lookup.price > 0:
|
||||||
|
logger.debug(
|
||||||
|
"Price API returned 0 for %s; using scanner candidate price %.4f",
|
||||||
|
stock_code,
|
||||||
|
cand_lookup.price,
|
||||||
|
)
|
||||||
|
current_price = cand_lookup.price
|
||||||
foreigner_net = 0.0 # Not available for overseas
|
foreigner_net = 0.0 # Not available for overseas
|
||||||
price_change_pct = safe_float(price_data.get("output", {}).get("rate", "0"))
|
price_change_pct = safe_float(price_data.get("output", {}).get("rate", "0"))
|
||||||
|
|
||||||
|
# Price API may return 0/empty for certain VTS exchange codes.
|
||||||
|
# Fall back to the scanner candidate's price so order sizing still works.
|
||||||
|
if current_price <= 0:
|
||||||
|
market_candidates_lookup = scan_candidates.get(market.code, {})
|
||||||
|
cand_lookup = market_candidates_lookup.get(stock_code)
|
||||||
|
if cand_lookup and cand_lookup.price > 0:
|
||||||
|
current_price = cand_lookup.price
|
||||||
|
logger.debug(
|
||||||
|
"Price API returned 0 for %s; using scanner price %.4f",
|
||||||
|
stock_code,
|
||||||
|
current_price,
|
||||||
|
)
|
||||||
|
|
||||||
# Calculate daily P&L %
|
# Calculate daily P&L %
|
||||||
pnl_pct = (
|
pnl_pct = (
|
||||||
((total_eval - purchase_total) / purchase_total * 100)
|
((total_eval - purchase_total) / purchase_total * 100)
|
||||||
@@ -474,6 +505,7 @@ async def trading_cycle(
|
|||||||
raise # Re-raise to prevent trade
|
raise # Re-raise to prevent trade
|
||||||
|
|
||||||
# 5. Send order
|
# 5. Send order
|
||||||
|
order_succeeded = True
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
result = await broker.send_order(
|
result = await broker.send_order(
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
@@ -482,29 +514,48 @@ async def trading_cycle(
|
|||||||
price=0, # market order
|
price=0, # market order
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
# For overseas orders:
|
||||||
|
# - KIS VTS only accepts limit orders (지정가만 가능)
|
||||||
|
# - BUY: use 0.5% premium over last price to improve fill probability
|
||||||
|
# (ask price is typically slightly above last, and VTS won't fill below ask)
|
||||||
|
# - SELL: use last price as the limit
|
||||||
|
if decision.action == "BUY":
|
||||||
|
order_price = round(current_price * 1.005, 4)
|
||||||
|
else:
|
||||||
|
order_price = current_price
|
||||||
result = await overseas_broker.send_overseas_order(
|
result = await overseas_broker.send_overseas_order(
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
order_type=decision.action,
|
order_type=decision.action,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
price=0.0, # market order
|
price=order_price, # limit order — KIS VTS rejects market orders
|
||||||
)
|
)
|
||||||
|
# Check if KIS rejected the order (rt_cd != "0")
|
||||||
|
if result.get("rt_cd", "") != "0":
|
||||||
|
order_succeeded = False
|
||||||
|
logger.warning(
|
||||||
|
"Overseas order not accepted for %s: rt_cd=%s msg=%s",
|
||||||
|
stock_code,
|
||||||
|
result.get("rt_cd"),
|
||||||
|
result.get("msg1"),
|
||||||
|
)
|
||||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||||
|
|
||||||
# 5.5. Notify trade execution
|
# 5.5. Notify trade execution (only on success)
|
||||||
try:
|
if order_succeeded:
|
||||||
await telegram.notify_trade_execution(
|
try:
|
||||||
stock_code=stock_code,
|
await telegram.notify_trade_execution(
|
||||||
market=market.name,
|
stock_code=stock_code,
|
||||||
action=decision.action,
|
market=market.name,
|
||||||
quantity=quantity,
|
action=decision.action,
|
||||||
price=current_price,
|
quantity=quantity,
|
||||||
confidence=decision.confidence,
|
price=current_price,
|
||||||
)
|
confidence=decision.confidence,
|
||||||
except Exception as exc:
|
)
|
||||||
logger.warning("Telegram notification failed: %s", exc)
|
except Exception as exc:
|
||||||
|
logger.warning("Telegram notification failed: %s", exc)
|
||||||
|
|
||||||
if decision.action == "SELL":
|
if decision.action == "SELL" and order_succeeded:
|
||||||
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
||||||
if buy_trade and buy_trade.get("price") is not None:
|
if buy_trade and buy_trade.get("price") is not None:
|
||||||
buy_price = float(buy_trade["price"])
|
buy_price = float(buy_trade["price"])
|
||||||
@@ -516,7 +567,9 @@ async def trading_cycle(
|
|||||||
accuracy=1 if trade_pnl > 0 else 0,
|
accuracy=1 if trade_pnl > 0 else 0,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 6. Log trade with selection context
|
# 6. Log trade with selection context (skip if order was rejected)
|
||||||
|
if decision.action in ("BUY", "SELL") and not order_succeeded:
|
||||||
|
return
|
||||||
selection_context = None
|
selection_context = None
|
||||||
if stock_code in market_candidates:
|
if stock_code in market_candidates:
|
||||||
candidate = market_candidates[stock_code]
|
candidate = market_candidates[stock_code]
|
||||||
@@ -671,15 +724,8 @@ async def run_daily_session(
|
|||||||
for stock_code in watchlist:
|
for stock_code in watchlist:
|
||||||
try:
|
try:
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
orderbook = await broker.get_orderbook(stock_code)
|
current_price, price_change_pct, foreigner_net = (
|
||||||
current_price = safe_float(
|
await broker.get_current_price(stock_code)
|
||||||
orderbook.get("output1", {}).get("stck_prpr", "0")
|
|
||||||
)
|
|
||||||
foreigner_net = safe_float(
|
|
||||||
orderbook.get("output1", {}).get("frgn_ntby_qty", "0")
|
|
||||||
)
|
|
||||||
price_change_pct = safe_float(
|
|
||||||
orderbook.get("output1", {}).get("prdy_ctrt", "0")
|
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
price_data = await overseas_broker.get_overseas_price(
|
price_data = await overseas_broker.get_overseas_price(
|
||||||
@@ -688,10 +734,30 @@ async def run_daily_session(
|
|||||||
current_price = safe_float(
|
current_price = safe_float(
|
||||||
price_data.get("output", {}).get("last", "0")
|
price_data.get("output", {}).get("last", "0")
|
||||||
)
|
)
|
||||||
|
# Fallback: if price API returns 0, use scanner candidate price
|
||||||
|
if current_price <= 0:
|
||||||
|
cand_lookup = candidate_map.get(stock_code)
|
||||||
|
if cand_lookup and cand_lookup.price > 0:
|
||||||
|
logger.debug(
|
||||||
|
"Price API returned 0 for %s; using scanner candidate price %.4f",
|
||||||
|
stock_code,
|
||||||
|
cand_lookup.price,
|
||||||
|
)
|
||||||
|
current_price = cand_lookup.price
|
||||||
foreigner_net = 0.0
|
foreigner_net = 0.0
|
||||||
price_change_pct = safe_float(
|
price_change_pct = safe_float(
|
||||||
price_data.get("output", {}).get("rate", "0")
|
price_data.get("output", {}).get("rate", "0")
|
||||||
)
|
)
|
||||||
|
# Fall back to scanner candidate price if API returns 0.
|
||||||
|
if current_price <= 0:
|
||||||
|
cand_lookup = candidate_map.get(stock_code)
|
||||||
|
if cand_lookup and cand_lookup.price > 0:
|
||||||
|
current_price = cand_lookup.price
|
||||||
|
logger.debug(
|
||||||
|
"Price API returned 0 for %s; using scanner price %.4f",
|
||||||
|
stock_code,
|
||||||
|
current_price,
|
||||||
|
)
|
||||||
|
|
||||||
stock_data: dict[str, Any] = {
|
stock_data: dict[str, Any] = {
|
||||||
"stock_code": stock_code,
|
"stock_code": stock_code,
|
||||||
@@ -742,6 +808,13 @@ async def run_daily_session(
|
|||||||
purchase_total = safe_float(
|
purchase_total = safe_float(
|
||||||
balance_info.get("frcr_buy_amt_smtl", "0") or "0"
|
balance_info.get("frcr_buy_amt_smtl", "0") or "0"
|
||||||
)
|
)
|
||||||
|
# Paper mode fallback: VTS overseas balance API often fails for many accounts.
|
||||||
|
if total_cash <= 0 and settings.PAPER_OVERSEAS_CASH > 0:
|
||||||
|
total_cash = settings.PAPER_OVERSEAS_CASH
|
||||||
|
|
||||||
|
# VTS overseas balance API often returns 0; use paper fallback.
|
||||||
|
if total_cash <= 0 and settings.PAPER_OVERSEAS_CASH > 0:
|
||||||
|
total_cash = settings.PAPER_OVERSEAS_CASH
|
||||||
|
|
||||||
# Calculate daily P&L %
|
# Calculate daily P&L %
|
||||||
pnl_pct = (
|
pnl_pct = (
|
||||||
@@ -816,6 +889,7 @@ async def run_daily_session(
|
|||||||
quantity = 0
|
quantity = 0
|
||||||
trade_price = stock_data["current_price"]
|
trade_price = stock_data["current_price"]
|
||||||
trade_pnl = 0.0
|
trade_pnl = 0.0
|
||||||
|
order_succeeded = True
|
||||||
if decision.action in ("BUY", "SELL"):
|
if decision.action in ("BUY", "SELL"):
|
||||||
quantity = _determine_order_quantity(
|
quantity = _determine_order_quantity(
|
||||||
action=decision.action,
|
action=decision.action,
|
||||||
@@ -868,6 +942,7 @@ async def run_daily_session(
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
# Send order
|
# Send order
|
||||||
|
order_succeeded = True
|
||||||
try:
|
try:
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
result = await broker.send_order(
|
result = await broker.send_order(
|
||||||
@@ -877,34 +952,48 @@ async def run_daily_session(
|
|||||||
price=0, # market order
|
price=0, # market order
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
# KIS VTS only accepts limit orders; use 0.5% premium for BUY
|
||||||
|
if decision.action == "BUY":
|
||||||
|
order_price = round(stock_data["current_price"] * 1.005, 4)
|
||||||
|
else:
|
||||||
|
order_price = stock_data["current_price"]
|
||||||
result = await overseas_broker.send_overseas_order(
|
result = await overseas_broker.send_overseas_order(
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
order_type=decision.action,
|
order_type=decision.action,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
price=0.0, # market order
|
price=order_price, # limit order
|
||||||
)
|
)
|
||||||
|
if result.get("rt_cd", "") != "0":
|
||||||
|
order_succeeded = False
|
||||||
|
logger.warning(
|
||||||
|
"Overseas order not accepted for %s: rt_cd=%s msg=%s",
|
||||||
|
stock_code,
|
||||||
|
result.get("rt_cd"),
|
||||||
|
result.get("msg1"),
|
||||||
|
)
|
||||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||||
|
|
||||||
# Notify trade execution
|
# Notify trade execution (only on success)
|
||||||
try:
|
if order_succeeded:
|
||||||
await telegram.notify_trade_execution(
|
try:
|
||||||
stock_code=stock_code,
|
await telegram.notify_trade_execution(
|
||||||
market=market.name,
|
stock_code=stock_code,
|
||||||
action=decision.action,
|
market=market.name,
|
||||||
quantity=quantity,
|
action=decision.action,
|
||||||
price=stock_data["current_price"],
|
quantity=quantity,
|
||||||
confidence=decision.confidence,
|
price=stock_data["current_price"],
|
||||||
)
|
confidence=decision.confidence,
|
||||||
except Exception as exc:
|
)
|
||||||
logger.warning("Telegram notification failed: %s", exc)
|
except Exception as exc:
|
||||||
|
logger.warning("Telegram notification failed: %s", exc)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error(
|
logger.error(
|
||||||
"Order execution failed for %s: %s", stock_code, exc
|
"Order execution failed for %s: %s", stock_code, exc
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if decision.action == "SELL":
|
if decision.action == "SELL" and order_succeeded:
|
||||||
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
||||||
if buy_trade and buy_trade.get("price") is not None:
|
if buy_trade and buy_trade.get("price") is not None:
|
||||||
buy_price = float(buy_trade["price"])
|
buy_price = float(buy_trade["price"])
|
||||||
@@ -916,7 +1005,9 @@ async def run_daily_session(
|
|||||||
accuracy=1 if trade_pnl > 0 else 0,
|
accuracy=1 if trade_pnl > 0 else 0,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Log trade
|
# Log trade (skip if order was rejected by API)
|
||||||
|
if decision.action in ("BUY", "SELL") and not order_succeeded:
|
||||||
|
continue
|
||||||
log_trade(
|
log_trade(
|
||||||
conn=db_conn,
|
conn=db_conn,
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
"""Pre-market planner — generates DayPlaybook via Gemini before market open.
|
"""Pre-market planner — generates DayPlaybook via Gemini before market open.
|
||||||
|
|
||||||
One Gemini API call per market per day. Candidates come from SmartVolatilityScanner.
|
One Gemini API call per market per day. Candidates come from SmartVolatilityScanner.
|
||||||
On failure, returns a defensive playbook (all HOLD, no trades).
|
On failure, returns a smart rule-based fallback playbook that uses scanner signals
|
||||||
|
(momentum/oversold) to generate BUY conditions, avoiding the all-HOLD problem.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
@@ -134,7 +135,7 @@ class PreMarketPlanner:
|
|||||||
except Exception:
|
except Exception:
|
||||||
logger.exception("Playbook generation failed for %s", market)
|
logger.exception("Playbook generation failed for %s", market)
|
||||||
if self._settings.DEFENSIVE_PLAYBOOK_ON_FAILURE:
|
if self._settings.DEFENSIVE_PLAYBOOK_ON_FAILURE:
|
||||||
return self._defensive_playbook(today, market, candidates)
|
return self._smart_fallback_playbook(today, market, candidates, self._settings)
|
||||||
return self._empty_playbook(today, market)
|
return self._empty_playbook(today, market)
|
||||||
|
|
||||||
def build_cross_market_context(
|
def build_cross_market_context(
|
||||||
@@ -470,3 +471,99 @@ class PreMarketPlanner:
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _smart_fallback_playbook(
|
||||||
|
today: date,
|
||||||
|
market: str,
|
||||||
|
candidates: list[ScanCandidate],
|
||||||
|
settings: Settings,
|
||||||
|
) -> DayPlaybook:
|
||||||
|
"""Rule-based fallback playbook when Gemini is unavailable.
|
||||||
|
|
||||||
|
Uses scanner signals (RSI, volume_ratio) to generate meaningful BUY
|
||||||
|
conditions instead of the all-SELL defensive playbook. Candidates are
|
||||||
|
already pre-qualified by SmartVolatilityScanner, so we trust their
|
||||||
|
signals and build actionable scenarios from them.
|
||||||
|
|
||||||
|
Scenario logic per candidate:
|
||||||
|
- momentum signal: BUY when volume_ratio exceeds scanner threshold
|
||||||
|
- oversold signal: BUY when RSI is below oversold threshold
|
||||||
|
- always: SELL stop-loss at -3.0% as guard
|
||||||
|
"""
|
||||||
|
stock_playbooks = []
|
||||||
|
for c in candidates:
|
||||||
|
scenarios: list[StockScenario] = []
|
||||||
|
|
||||||
|
if c.signal == "momentum":
|
||||||
|
scenarios.append(
|
||||||
|
StockScenario(
|
||||||
|
condition=StockCondition(
|
||||||
|
volume_ratio_above=settings.VOL_MULTIPLIER,
|
||||||
|
),
|
||||||
|
action=ScenarioAction.BUY,
|
||||||
|
confidence=80,
|
||||||
|
allocation_pct=10.0,
|
||||||
|
stop_loss_pct=-3.0,
|
||||||
|
take_profit_pct=5.0,
|
||||||
|
rationale=(
|
||||||
|
f"Rule-based BUY: momentum signal, "
|
||||||
|
f"volume={c.volume_ratio:.1f}x (fallback planner)"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
elif c.signal == "oversold":
|
||||||
|
scenarios.append(
|
||||||
|
StockScenario(
|
||||||
|
condition=StockCondition(
|
||||||
|
rsi_below=settings.RSI_OVERSOLD_THRESHOLD,
|
||||||
|
),
|
||||||
|
action=ScenarioAction.BUY,
|
||||||
|
confidence=80,
|
||||||
|
allocation_pct=10.0,
|
||||||
|
stop_loss_pct=-3.0,
|
||||||
|
take_profit_pct=5.0,
|
||||||
|
rationale=(
|
||||||
|
f"Rule-based BUY: oversold signal, "
|
||||||
|
f"RSI={c.rsi:.0f} (fallback planner)"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Always add stop-loss guard
|
||||||
|
scenarios.append(
|
||||||
|
StockScenario(
|
||||||
|
condition=StockCondition(price_change_pct_below=-3.0),
|
||||||
|
action=ScenarioAction.SELL,
|
||||||
|
confidence=90,
|
||||||
|
stop_loss_pct=-3.0,
|
||||||
|
rationale="Rule-based stop-loss (fallback planner)",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
stock_playbooks.append(
|
||||||
|
StockPlaybook(
|
||||||
|
stock_code=c.stock_code,
|
||||||
|
scenarios=scenarios,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"Smart fallback playbook for %s: %d stocks with rule-based BUY/SELL conditions",
|
||||||
|
market,
|
||||||
|
len(stock_playbooks),
|
||||||
|
)
|
||||||
|
return DayPlaybook(
|
||||||
|
date=today,
|
||||||
|
market=market,
|
||||||
|
market_outlook=MarketOutlook.NEUTRAL,
|
||||||
|
default_action=ScenarioAction.HOLD,
|
||||||
|
stock_playbooks=stock_playbooks,
|
||||||
|
global_rules=[
|
||||||
|
GlobalRule(
|
||||||
|
condition="portfolio_pnl_pct < -2.0",
|
||||||
|
action=ScenarioAction.REDUCE_ALL,
|
||||||
|
rationale="Defensive: reduce on loss threshold",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
from src.brain.gemini_client import GeminiClient
|
from src.brain.gemini_client import GeminiClient
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -270,3 +274,97 @@ class TestBatchDecisionParsing:
|
|||||||
|
|
||||||
assert decisions["AAPL"].action == "HOLD"
|
assert decisions["AAPL"].action == "HOLD"
|
||||||
assert decisions["AAPL"].confidence == 0
|
assert decisions["AAPL"].confidence == 0
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Prompt Override (used by pre_market_planner)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestPromptOverride:
|
||||||
|
"""decide() must use prompt_override when present in market_data."""
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_prompt_override_is_sent_to_gemini(self, settings):
|
||||||
|
"""When prompt_override is in market_data, it should be used as the prompt."""
|
||||||
|
client = GeminiClient(settings)
|
||||||
|
|
||||||
|
custom_prompt = "You are a playbook generator. Return JSON with scenarios."
|
||||||
|
|
||||||
|
mock_response = MagicMock()
|
||||||
|
mock_response.text = '{"action": "HOLD", "confidence": 50, "rationale": "test"}'
|
||||||
|
|
||||||
|
with patch.object(
|
||||||
|
client._client.aio.models,
|
||||||
|
"generate_content",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
return_value=mock_response,
|
||||||
|
) as mock_generate:
|
||||||
|
market_data = {
|
||||||
|
"stock_code": "PLANNER",
|
||||||
|
"current_price": 0,
|
||||||
|
"prompt_override": custom_prompt,
|
||||||
|
}
|
||||||
|
await client.decide(market_data)
|
||||||
|
|
||||||
|
# Verify the custom prompt was sent, not a built prompt
|
||||||
|
mock_generate.assert_called_once()
|
||||||
|
actual_prompt = mock_generate.call_args[1].get(
|
||||||
|
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
||||||
|
)
|
||||||
|
assert actual_prompt == custom_prompt
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_prompt_override_skips_optimization(self, settings):
|
||||||
|
"""prompt_override should bypass prompt optimization."""
|
||||||
|
client = GeminiClient(settings)
|
||||||
|
client._enable_optimization = True
|
||||||
|
|
||||||
|
custom_prompt = "Custom playbook prompt"
|
||||||
|
|
||||||
|
mock_response = MagicMock()
|
||||||
|
mock_response.text = '{"action": "HOLD", "confidence": 50, "rationale": "ok"}'
|
||||||
|
|
||||||
|
with patch.object(
|
||||||
|
client._client.aio.models,
|
||||||
|
"generate_content",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
return_value=mock_response,
|
||||||
|
) as mock_generate:
|
||||||
|
market_data = {
|
||||||
|
"stock_code": "PLANNER",
|
||||||
|
"current_price": 0,
|
||||||
|
"prompt_override": custom_prompt,
|
||||||
|
}
|
||||||
|
await client.decide(market_data)
|
||||||
|
|
||||||
|
actual_prompt = mock_generate.call_args[1].get(
|
||||||
|
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
||||||
|
)
|
||||||
|
assert actual_prompt == custom_prompt
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_without_prompt_override_uses_build_prompt(self, settings):
|
||||||
|
"""Without prompt_override, decide() should use build_prompt as before."""
|
||||||
|
client = GeminiClient(settings)
|
||||||
|
|
||||||
|
mock_response = MagicMock()
|
||||||
|
mock_response.text = '{"action": "HOLD", "confidence": 50, "rationale": "ok"}'
|
||||||
|
|
||||||
|
with patch.object(
|
||||||
|
client._client.aio.models,
|
||||||
|
"generate_content",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
return_value=mock_response,
|
||||||
|
) as mock_generate:
|
||||||
|
market_data = {
|
||||||
|
"stock_code": "005930",
|
||||||
|
"current_price": 72000,
|
||||||
|
}
|
||||||
|
await client.decide(market_data)
|
||||||
|
|
||||||
|
actual_prompt = mock_generate.call_args[1].get(
|
||||||
|
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
||||||
|
)
|
||||||
|
# Should contain stock code from build_prompt, not be a custom override
|
||||||
|
assert "005930" in actual_prompt
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
from unittest.mock import AsyncMock, patch
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
@@ -90,12 +90,12 @@ class TestTokenManagement:
|
|||||||
await broker.close()
|
await broker.close()
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_token_refresh_cooldown_prevents_rapid_retries(self, settings):
|
async def test_token_refresh_cooldown_waits_then_retries(self, settings):
|
||||||
"""Token refresh should enforce cooldown after failure (issue #54)."""
|
"""Token refresh should wait out cooldown then retry (issue #54)."""
|
||||||
broker = KISBroker(settings)
|
broker = KISBroker(settings)
|
||||||
broker._refresh_cooldown = 2.0 # Short cooldown for testing
|
broker._refresh_cooldown = 0.1 # Short cooldown for testing
|
||||||
|
|
||||||
# First refresh attempt fails with 403 (EGW00133)
|
# All attempts fail with 403 (EGW00133)
|
||||||
mock_resp_403 = AsyncMock()
|
mock_resp_403 = AsyncMock()
|
||||||
mock_resp_403.status = 403
|
mock_resp_403.status = 403
|
||||||
mock_resp_403.text = AsyncMock(
|
mock_resp_403.text = AsyncMock(
|
||||||
@@ -109,8 +109,8 @@ class TestTokenManagement:
|
|||||||
with pytest.raises(ConnectionError, match="Token refresh failed"):
|
with pytest.raises(ConnectionError, match="Token refresh failed"):
|
||||||
await broker._ensure_token()
|
await broker._ensure_token()
|
||||||
|
|
||||||
# Second attempt within cooldown should fail with cooldown error
|
# Second attempt within cooldown should wait then retry (and still get 403)
|
||||||
with pytest.raises(ConnectionError, match="Token refresh on cooldown"):
|
with pytest.raises(ConnectionError, match="Token refresh failed"):
|
||||||
await broker._ensure_token()
|
await broker._ensure_token()
|
||||||
|
|
||||||
await broker.close()
|
await broker.close()
|
||||||
@@ -296,3 +296,280 @@ class TestHashKey:
|
|||||||
mock_acquire.assert_called_once()
|
mock_acquire.assert_called_once()
|
||||||
|
|
||||||
await broker.close()
|
await broker.close()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# fetch_market_rankings — TR_ID, path, params (issue #155)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def _make_ranking_mock(items: list[dict]) -> AsyncMock:
|
||||||
|
"""Build a mock HTTP response returning ranking items."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": items})
|
||||||
|
mock_resp.__aenter__ = AsyncMock(return_value=mock_resp)
|
||||||
|
mock_resp.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
return mock_resp
|
||||||
|
|
||||||
|
|
||||||
|
class TestFetchMarketRankings:
|
||||||
|
"""Verify correct TR_ID, API path, and params per ranking_type (issue #155)."""
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def broker(self, settings) -> KISBroker:
|
||||||
|
b = KISBroker(settings)
|
||||||
|
b._access_token = "tok"
|
||||||
|
b._token_expires_at = float("inf")
|
||||||
|
b._rate_limiter.acquire = AsyncMock()
|
||||||
|
return b
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_volume_uses_correct_tr_id_and_path(self, broker: KISBroker) -> None:
|
||||||
|
mock_resp = _make_ranking_mock([])
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp) as mock_get:
|
||||||
|
await broker.fetch_market_rankings(ranking_type="volume")
|
||||||
|
|
||||||
|
call_kwargs = mock_get.call_args
|
||||||
|
url = call_kwargs[0][0] if call_kwargs[0] else call_kwargs[1].get("url", "")
|
||||||
|
headers = call_kwargs[1].get("headers", {})
|
||||||
|
params = call_kwargs[1].get("params", {})
|
||||||
|
|
||||||
|
assert "volume-rank" in url
|
||||||
|
assert headers.get("tr_id") == "FHPST01710000"
|
||||||
|
assert params.get("FID_COND_SCR_DIV_CODE") == "20171"
|
||||||
|
assert params.get("FID_TRGT_EXLS_CLS_CODE") == "0000000000"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_fluctuation_uses_correct_tr_id_and_path(self, broker: KISBroker) -> None:
|
||||||
|
mock_resp = _make_ranking_mock([])
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp) as mock_get:
|
||||||
|
await broker.fetch_market_rankings(ranking_type="fluctuation")
|
||||||
|
|
||||||
|
call_kwargs = mock_get.call_args
|
||||||
|
url = call_kwargs[0][0] if call_kwargs[0] else call_kwargs[1].get("url", "")
|
||||||
|
headers = call_kwargs[1].get("headers", {})
|
||||||
|
params = call_kwargs[1].get("params", {})
|
||||||
|
|
||||||
|
assert "ranking/fluctuation" in url
|
||||||
|
assert headers.get("tr_id") == "FHPST01700000"
|
||||||
|
assert params.get("fid_cond_scr_div_code") == "20170"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_volume_returns_parsed_rows(self, broker: KISBroker) -> None:
|
||||||
|
items = [
|
||||||
|
{
|
||||||
|
"mksc_shrn_iscd": "005930",
|
||||||
|
"hts_kor_isnm": "삼성전자",
|
||||||
|
"stck_prpr": "75000",
|
||||||
|
"acml_vol": "10000000",
|
||||||
|
"prdy_ctrt": "2.5",
|
||||||
|
"vol_inrt": "150",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
mock_resp = _make_ranking_mock(items)
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp):
|
||||||
|
result = await broker.fetch_market_rankings(ranking_type="volume")
|
||||||
|
|
||||||
|
assert len(result) == 1
|
||||||
|
assert result[0]["stock_code"] == "005930"
|
||||||
|
assert result[0]["price"] == 75000.0
|
||||||
|
assert result[0]["change_rate"] == 2.5
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# KRX tick unit / round-down helpers (issue #157)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
from src.broker.kis_api import kr_tick_unit, kr_round_down # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
class TestKrTickUnit:
|
||||||
|
"""kr_tick_unit and kr_round_down must implement KRX price tick rules."""
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"price, expected_tick",
|
||||||
|
[
|
||||||
|
(1999, 1),
|
||||||
|
(2000, 5),
|
||||||
|
(4999, 5),
|
||||||
|
(5000, 10),
|
||||||
|
(19999, 10),
|
||||||
|
(20000, 50),
|
||||||
|
(49999, 50),
|
||||||
|
(50000, 100),
|
||||||
|
(199999, 100),
|
||||||
|
(200000, 500),
|
||||||
|
(499999, 500),
|
||||||
|
(500000, 1000),
|
||||||
|
(1000000, 1000),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_tick_unit_boundaries(self, price: int, expected_tick: int) -> None:
|
||||||
|
assert kr_tick_unit(price) == expected_tick
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"price, expected_rounded",
|
||||||
|
[
|
||||||
|
(188150, 188100), # 100원 단위, 50원 잔여 → 내림
|
||||||
|
(188100, 188100), # 이미 정렬됨
|
||||||
|
(75050, 75000), # 100원 단위, 50원 잔여 → 내림
|
||||||
|
(49950, 49950), # 50원 단위 정렬됨
|
||||||
|
(49960, 49950), # 50원 단위, 10원 잔여 → 내림
|
||||||
|
(1999, 1999), # 1원 단위 → 그대로
|
||||||
|
(5003, 5000), # 10원 단위, 3원 잔여 → 내림
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_round_down_to_tick(self, price: int, expected_rounded: int) -> None:
|
||||||
|
assert kr_round_down(price) == expected_rounded
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# get_current_price (issue #157)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetCurrentPrice:
|
||||||
|
"""get_current_price must use inquire-price API and return (price, change, foreigner)."""
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def broker(self, settings) -> KISBroker:
|
||||||
|
b = KISBroker(settings)
|
||||||
|
b._access_token = "tok"
|
||||||
|
b._token_expires_at = float("inf")
|
||||||
|
b._rate_limiter.acquire = AsyncMock()
|
||||||
|
return b
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_returns_correct_fields(self, broker: KISBroker) -> None:
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(
|
||||||
|
return_value={
|
||||||
|
"rt_cd": "0",
|
||||||
|
"output": {
|
||||||
|
"stck_prpr": "188600",
|
||||||
|
"prdy_ctrt": "3.97",
|
||||||
|
"frgn_ntby_qty": "12345",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
mock_resp.__aenter__ = AsyncMock(return_value=mock_resp)
|
||||||
|
mock_resp.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp) as mock_get:
|
||||||
|
price, change_pct, foreigner = await broker.get_current_price("005930")
|
||||||
|
|
||||||
|
assert price == 188600.0
|
||||||
|
assert change_pct == 3.97
|
||||||
|
assert foreigner == 12345.0
|
||||||
|
|
||||||
|
call_kwargs = mock_get.call_args
|
||||||
|
url = call_kwargs[0][0] if call_kwargs[0] else call_kwargs[1].get("url", "")
|
||||||
|
headers = call_kwargs[1].get("headers", {})
|
||||||
|
assert "inquire-price" in url
|
||||||
|
assert headers.get("tr_id") == "FHKST01010100"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_http_error_raises_connection_error(self, broker: KISBroker) -> None:
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 500
|
||||||
|
mock_resp.text = AsyncMock(return_value="Internal Server Error")
|
||||||
|
mock_resp.__aenter__ = AsyncMock(return_value=mock_resp)
|
||||||
|
mock_resp.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp):
|
||||||
|
with pytest.raises(ConnectionError, match="get_current_price failed"):
|
||||||
|
await broker.get_current_price("005930")
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# send_order tick rounding and ORD_DVSN (issue #157)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestSendOrderTickRounding:
|
||||||
|
"""send_order must apply KRX tick rounding and correct ORD_DVSN codes."""
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def broker(self, settings) -> KISBroker:
|
||||||
|
b = KISBroker(settings)
|
||||||
|
b._access_token = "tok"
|
||||||
|
b._token_expires_at = float("inf")
|
||||||
|
b._rate_limiter.acquire = AsyncMock()
|
||||||
|
return b
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_limit_order_rounds_down_to_tick(self, broker: KISBroker) -> None:
|
||||||
|
"""Price 188150 (not on 100-won tick) must be rounded to 188100."""
|
||||||
|
mock_hash = AsyncMock()
|
||||||
|
mock_hash.status = 200
|
||||||
|
mock_hash.json = AsyncMock(return_value={"HASH": "h"})
|
||||||
|
mock_hash.__aenter__ = AsyncMock(return_value=mock_hash)
|
||||||
|
mock_hash.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_order = AsyncMock()
|
||||||
|
mock_order.status = 200
|
||||||
|
mock_order.json = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
mock_order.__aenter__ = AsyncMock(return_value=mock_order)
|
||||||
|
mock_order.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.send_order("005930", "BUY", 1, price=188150)
|
||||||
|
|
||||||
|
order_call = mock_post.call_args_list[1]
|
||||||
|
body = order_call[1].get("json", {})
|
||||||
|
assert body["ORD_UNPR"] == "188100" # rounded down
|
||||||
|
assert body["ORD_DVSN"] == "00" # 지정가
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_limit_order_ord_dvsn_is_00(self, broker: KISBroker) -> None:
|
||||||
|
"""send_order with price>0 must use ORD_DVSN='00' (지정가)."""
|
||||||
|
mock_hash = AsyncMock()
|
||||||
|
mock_hash.status = 200
|
||||||
|
mock_hash.json = AsyncMock(return_value={"HASH": "h"})
|
||||||
|
mock_hash.__aenter__ = AsyncMock(return_value=mock_hash)
|
||||||
|
mock_hash.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_order = AsyncMock()
|
||||||
|
mock_order.status = 200
|
||||||
|
mock_order.json = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
mock_order.__aenter__ = AsyncMock(return_value=mock_order)
|
||||||
|
mock_order.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.send_order("005930", "BUY", 1, price=50000)
|
||||||
|
|
||||||
|
order_call = mock_post.call_args_list[1]
|
||||||
|
body = order_call[1].get("json", {})
|
||||||
|
assert body["ORD_DVSN"] == "00"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_market_order_ord_dvsn_is_01(self, broker: KISBroker) -> None:
|
||||||
|
"""send_order with price=0 must use ORD_DVSN='01' (시장가)."""
|
||||||
|
mock_hash = AsyncMock()
|
||||||
|
mock_hash.status = 200
|
||||||
|
mock_hash.json = AsyncMock(return_value={"HASH": "h"})
|
||||||
|
mock_hash.__aenter__ = AsyncMock(return_value=mock_hash)
|
||||||
|
mock_hash.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_order = AsyncMock()
|
||||||
|
mock_order.status = 200
|
||||||
|
mock_order.json = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
mock_order.__aenter__ = AsyncMock(return_value=mock_order)
|
||||||
|
mock_order.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.send_order("005930", "SELL", 1, price=0)
|
||||||
|
|
||||||
|
order_call = mock_post.call_args_list[1]
|
||||||
|
body = order_call[1].get("json", {})
|
||||||
|
assert body["ORD_DVSN"] == "01"
|
||||||
|
assert body["ORD_UNPR"] == "0"
|
||||||
|
|||||||
@@ -111,15 +111,7 @@ class TestTradingCycleTelegramIntegration:
|
|||||||
def mock_broker(self) -> MagicMock:
|
def mock_broker(self) -> MagicMock:
|
||||||
"""Create mock broker."""
|
"""Create mock broker."""
|
||||||
broker = MagicMock()
|
broker = MagicMock()
|
||||||
broker.get_orderbook = AsyncMock(
|
broker.get_current_price = AsyncMock(return_value=(50000.0, 1.23, 100.0))
|
||||||
return_value={
|
|
||||||
"output1": {
|
|
||||||
"stck_prpr": "50000",
|
|
||||||
"frgn_ntby_qty": "100",
|
|
||||||
"prdy_ctrt": "1.23",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
broker.get_balance = AsyncMock(
|
broker.get_balance = AsyncMock(
|
||||||
return_value={
|
return_value={
|
||||||
"output2": [
|
"output2": [
|
||||||
@@ -738,6 +730,83 @@ class TestOverseasBalanceParsing:
|
|||||||
# Verify price API was called
|
# Verify price API was called
|
||||||
mock_overseas_broker_with_empty_price.get_overseas_price.assert_called_once()
|
mock_overseas_broker_with_empty_price.get_overseas_price.assert_called_once()
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_overseas_broker_with_buy_scenario(self) -> MagicMock:
|
||||||
|
"""Create mock overseas broker that returns a valid price for BUY orders."""
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_overseas_price = AsyncMock(
|
||||||
|
return_value={"output": {"last": "182.50"}}
|
||||||
|
)
|
||||||
|
broker.get_overseas_balance = AsyncMock(
|
||||||
|
return_value={
|
||||||
|
"output2": [
|
||||||
|
{
|
||||||
|
"frcr_evlu_tota": "100000.00",
|
||||||
|
"frcr_dncl_amt_2": "50000.00",
|
||||||
|
"frcr_buy_amt_smtl": "50000.00",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
|
||||||
|
return broker
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_scenario_engine_buy(self) -> MagicMock:
|
||||||
|
"""Create mock scenario engine that returns BUY."""
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=_make_buy_match("AAPL"))
|
||||||
|
return engine
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_overseas_buy_order_uses_limit_price(
|
||||||
|
self,
|
||||||
|
mock_domestic_broker: MagicMock,
|
||||||
|
mock_overseas_broker_with_buy_scenario: MagicMock,
|
||||||
|
mock_scenario_engine_buy: MagicMock,
|
||||||
|
mock_playbook: DayPlaybook,
|
||||||
|
mock_risk: MagicMock,
|
||||||
|
mock_db: MagicMock,
|
||||||
|
mock_decision_logger: MagicMock,
|
||||||
|
mock_context_store: MagicMock,
|
||||||
|
mock_criticality_assessor: MagicMock,
|
||||||
|
mock_telegram: MagicMock,
|
||||||
|
mock_overseas_market: MagicMock,
|
||||||
|
) -> None:
|
||||||
|
"""Overseas BUY order must use current_price (limit), not 0 (market).
|
||||||
|
|
||||||
|
KIS VTS rejects market orders for overseas paper trading.
|
||||||
|
Regression test for issue #149.
|
||||||
|
"""
|
||||||
|
mock_telegram.notify_trade_execution = AsyncMock()
|
||||||
|
|
||||||
|
with patch("src.main.log_trade"):
|
||||||
|
await trading_cycle(
|
||||||
|
broker=mock_domestic_broker,
|
||||||
|
overseas_broker=mock_overseas_broker_with_buy_scenario,
|
||||||
|
scenario_engine=mock_scenario_engine_buy,
|
||||||
|
playbook=mock_playbook,
|
||||||
|
risk=mock_risk,
|
||||||
|
db_conn=mock_db,
|
||||||
|
decision_logger=mock_decision_logger,
|
||||||
|
context_store=mock_context_store,
|
||||||
|
criticality_assessor=mock_criticality_assessor,
|
||||||
|
telegram=mock_telegram,
|
||||||
|
market=mock_overseas_market,
|
||||||
|
stock_code="AAPL",
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify limit order was sent with actual price + 0.5% premium (issue #151), not 0.0
|
||||||
|
mock_overseas_broker_with_buy_scenario.send_overseas_order.assert_called_once()
|
||||||
|
call_kwargs = mock_overseas_broker_with_buy_scenario.send_overseas_order.call_args
|
||||||
|
sent_price = call_kwargs[1].get("price") or call_kwargs[0][4]
|
||||||
|
expected_price = round(182.5 * 1.005, 4) # 0.5% premium for BUY limit orders
|
||||||
|
assert sent_price == expected_price, (
|
||||||
|
f"Expected limit price {expected_price} (182.5 * 1.005) but got {sent_price}. "
|
||||||
|
"KIS VTS only accepts limit orders; BUY uses 0.5% premium to improve fill rate."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestScenarioEngineIntegration:
|
class TestScenarioEngineIntegration:
|
||||||
"""Test scenario engine integration in trading_cycle."""
|
"""Test scenario engine integration in trading_cycle."""
|
||||||
@@ -746,11 +815,7 @@ class TestScenarioEngineIntegration:
|
|||||||
def mock_broker(self) -> MagicMock:
|
def mock_broker(self) -> MagicMock:
|
||||||
"""Create mock broker with standard domestic data."""
|
"""Create mock broker with standard domestic data."""
|
||||||
broker = MagicMock()
|
broker = MagicMock()
|
||||||
broker.get_orderbook = AsyncMock(
|
broker.get_current_price = AsyncMock(return_value=(50000.0, 2.50, 100.0))
|
||||||
return_value={
|
|
||||||
"output1": {"stck_prpr": "50000", "frgn_ntby_qty": "100", "prdy_ctrt": "2.50"}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
broker.get_balance = AsyncMock(
|
broker.get_balance = AsyncMock(
|
||||||
return_value={
|
return_value={
|
||||||
"output2": [
|
"output2": [
|
||||||
@@ -1172,9 +1237,7 @@ async def test_sell_updates_original_buy_decision_outcome() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
broker = MagicMock()
|
broker = MagicMock()
|
||||||
broker.get_orderbook = AsyncMock(
|
broker.get_current_price = AsyncMock(return_value=(120.0, 0.0, 0.0))
|
||||||
return_value={"output1": {"stck_prpr": "120", "frgn_ntby_qty": "0"}}
|
|
||||||
)
|
|
||||||
broker.get_balance = AsyncMock(
|
broker.get_balance = AsyncMock(
|
||||||
return_value={
|
return_value={
|
||||||
"output2": [
|
"output2": [
|
||||||
@@ -1264,9 +1327,7 @@ async def test_hold_overridden_to_sell_when_stop_loss_triggered() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
broker = MagicMock()
|
broker = MagicMock()
|
||||||
broker.get_orderbook = AsyncMock(
|
broker.get_current_price = AsyncMock(return_value=(95.0, -5.0, 0.0))
|
||||||
return_value={"output1": {"stck_prpr": "95", "frgn_ntby_qty": "0", "prdy_ctrt": "-5.0"}}
|
|
||||||
)
|
|
||||||
broker.get_balance = AsyncMock(
|
broker.get_balance = AsyncMock(
|
||||||
return_value={
|
return_value={
|
||||||
"output2": [
|
"output2": [
|
||||||
|
|||||||
643
tests/test_overseas_broker.py
Normal file
643
tests/test_overseas_broker.py
Normal file
@@ -0,0 +1,643 @@
|
|||||||
|
"""Tests for OverseasBroker — rankings, price, balance, order, and helpers."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from unittest.mock import AsyncMock, MagicMock
|
||||||
|
|
||||||
|
import aiohttp
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from src.broker.kis_api import KISBroker
|
||||||
|
from src.broker.overseas import OverseasBroker, _PRICE_EXCHANGE_MAP, _RANKING_EXCHANGE_MAP
|
||||||
|
from src.config import Settings
|
||||||
|
|
||||||
|
|
||||||
|
def _make_async_cm(mock_resp: AsyncMock) -> MagicMock:
|
||||||
|
"""Create an async context manager that returns mock_resp on __aenter__."""
|
||||||
|
cm = MagicMock()
|
||||||
|
cm.__aenter__ = AsyncMock(return_value=mock_resp)
|
||||||
|
cm.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
return cm
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_settings() -> Settings:
|
||||||
|
"""Provide mock settings with correct default TR_IDs/paths."""
|
||||||
|
return Settings(
|
||||||
|
KIS_APP_KEY="test_key",
|
||||||
|
KIS_APP_SECRET="test_secret",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="test_gemini_key",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_broker(mock_settings: Settings) -> KISBroker:
|
||||||
|
"""Provide a mock KIS broker."""
|
||||||
|
broker = KISBroker(mock_settings)
|
||||||
|
broker.get_orderbook = AsyncMock() # type: ignore[method-assign]
|
||||||
|
return broker
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def overseas_broker(mock_broker: KISBroker) -> OverseasBroker:
|
||||||
|
"""Provide an OverseasBroker wrapping a mock KISBroker."""
|
||||||
|
return OverseasBroker(mock_broker)
|
||||||
|
|
||||||
|
|
||||||
|
def _setup_broker_mocks(overseas_broker: OverseasBroker, mock_session: MagicMock) -> None:
|
||||||
|
"""Wire up common broker mocks."""
|
||||||
|
overseas_broker._broker._rate_limiter.acquire = AsyncMock()
|
||||||
|
overseas_broker._broker._get_session = MagicMock(return_value=mock_session)
|
||||||
|
overseas_broker._broker._auth_headers = AsyncMock(return_value={})
|
||||||
|
|
||||||
|
|
||||||
|
class TestRankingExchangeMap:
|
||||||
|
"""Test exchange code mapping for ranking API."""
|
||||||
|
|
||||||
|
def test_nasd_maps_to_nas(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP["NASD"] == "NAS"
|
||||||
|
|
||||||
|
def test_nyse_maps_to_nys(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP["NYSE"] == "NYS"
|
||||||
|
|
||||||
|
def test_amex_maps_to_ams(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP["AMEX"] == "AMS"
|
||||||
|
|
||||||
|
def test_sehk_maps_to_hks(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP["SEHK"] == "HKS"
|
||||||
|
|
||||||
|
def test_unmapped_exchange_passes_through(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP.get("UNKNOWN", "UNKNOWN") == "UNKNOWN"
|
||||||
|
|
||||||
|
def test_tse_unchanged(self) -> None:
|
||||||
|
assert _RANKING_EXCHANGE_MAP["TSE"] == "TSE"
|
||||||
|
|
||||||
|
|
||||||
|
class TestConfigDefaults:
|
||||||
|
"""Test that config defaults match KIS official API specs."""
|
||||||
|
|
||||||
|
def test_fluct_tr_id(self, mock_settings: Settings) -> None:
|
||||||
|
assert mock_settings.OVERSEAS_RANKING_FLUCT_TR_ID == "HHDFS76290000"
|
||||||
|
|
||||||
|
def test_volume_tr_id(self, mock_settings: Settings) -> None:
|
||||||
|
assert mock_settings.OVERSEAS_RANKING_VOLUME_TR_ID == "HHDFS76270000"
|
||||||
|
|
||||||
|
def test_fluct_path(self, mock_settings: Settings) -> None:
|
||||||
|
assert mock_settings.OVERSEAS_RANKING_FLUCT_PATH == "/uapi/overseas-stock/v1/ranking/updown-rate"
|
||||||
|
|
||||||
|
def test_volume_path(self, mock_settings: Settings) -> None:
|
||||||
|
assert mock_settings.OVERSEAS_RANKING_VOLUME_PATH == "/uapi/overseas-stock/v1/ranking/volume-surge"
|
||||||
|
|
||||||
|
|
||||||
|
class TestFetchOverseasRankings:
|
||||||
|
"""Test fetch_overseas_rankings method."""
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_fluctuation_uses_correct_params(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Fluctuation ranking should use HHDFS76290000, updown-rate path, and correct params."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(
|
||||||
|
return_value={"output": [{"symb": "AAPL", "name": "Apple"}]}
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._auth_headers = AsyncMock(
|
||||||
|
return_value={"authorization": "Bearer test"}
|
||||||
|
)
|
||||||
|
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("NASD", "fluctuation")
|
||||||
|
|
||||||
|
assert len(result) == 1
|
||||||
|
assert result[0]["symb"] == "AAPL"
|
||||||
|
|
||||||
|
call_args = mock_session.get.call_args
|
||||||
|
url = call_args[0][0]
|
||||||
|
params = call_args[1]["params"]
|
||||||
|
|
||||||
|
assert "/uapi/overseas-stock/v1/ranking/updown-rate" in url
|
||||||
|
assert params["EXCD"] == "NAS"
|
||||||
|
assert params["NDAY"] == "0"
|
||||||
|
assert params["GUBN"] == "1"
|
||||||
|
assert params["VOL_RANG"] == "0"
|
||||||
|
|
||||||
|
overseas_broker._broker._auth_headers.assert_called_with("HHDFS76290000")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_volume_uses_correct_params(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Volume ranking should use HHDFS76270000, volume-surge path, and correct params."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(
|
||||||
|
return_value={"output": [{"symb": "TSLA", "name": "Tesla"}]}
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._auth_headers = AsyncMock(
|
||||||
|
return_value={"authorization": "Bearer test"}
|
||||||
|
)
|
||||||
|
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("NYSE", "volume")
|
||||||
|
|
||||||
|
assert len(result) == 1
|
||||||
|
|
||||||
|
call_args = mock_session.get.call_args
|
||||||
|
url = call_args[0][0]
|
||||||
|
params = call_args[1]["params"]
|
||||||
|
|
||||||
|
assert "/uapi/overseas-stock/v1/ranking/volume-surge" in url
|
||||||
|
assert params["EXCD"] == "NYS"
|
||||||
|
assert params["MIXN"] == "0"
|
||||||
|
assert params["VOL_RANG"] == "0"
|
||||||
|
assert "NDAY" not in params
|
||||||
|
assert "GUBN" not in params
|
||||||
|
|
||||||
|
overseas_broker._broker._auth_headers.assert_called_with("HHDFS76270000")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_404_returns_empty_list(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""HTTP 404 should return empty list (fallback) instead of raising."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 404
|
||||||
|
mock_resp.text = AsyncMock(return_value="Not Found")
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("AMEX", "fluctuation")
|
||||||
|
assert result == []
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_non_404_error_raises(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Non-404 HTTP errors should raise ConnectionError."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 500
|
||||||
|
mock_resp.text = AsyncMock(return_value="Internal Server Error")
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="500"):
|
||||||
|
await overseas_broker.fetch_overseas_rankings("NASD")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_empty_response_returns_empty(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Empty output in response should return empty list."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": []})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("NASD")
|
||||||
|
assert result == []
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_ranking_disabled_returns_empty(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""When OVERSEAS_RANKING_ENABLED=False, should return empty immediately."""
|
||||||
|
overseas_broker._broker._settings.OVERSEAS_RANKING_ENABLED = False
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("NASD")
|
||||||
|
assert result == []
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_limit_truncates_results(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Results should be truncated to the specified limit."""
|
||||||
|
rows = [{"symb": f"SYM{i}"} for i in range(20)]
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": rows})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.fetch_overseas_rankings("NASD", limit=5)
|
||||||
|
assert len(result) == 5
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_network_error_raises(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""Network errors should raise ConnectionError."""
|
||||||
|
cm = MagicMock()
|
||||||
|
cm.__aenter__ = AsyncMock(side_effect=aiohttp.ClientError("timeout"))
|
||||||
|
cm.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=cm)
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="Network error"):
|
||||||
|
await overseas_broker.fetch_overseas_rankings("NASD")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_exchange_code_mapping_applied(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""All major exchanges should use mapped codes in API params."""
|
||||||
|
for original, mapped in [("NASD", "NAS"), ("NYSE", "NYS"), ("AMEX", "AMS")]:
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": [{"symb": "X"}]})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
await overseas_broker.fetch_overseas_rankings(original)
|
||||||
|
|
||||||
|
call_params = mock_session.get.call_args[1]["params"]
|
||||||
|
assert call_params["EXCD"] == mapped, f"{original} should map to {mapped}"
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetOverseasPrice:
|
||||||
|
"""Test get_overseas_price method."""
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_success(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Successful price fetch returns JSON data."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": {"last": "150.00"}})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._auth_headers = AsyncMock(return_value={"authorization": "Bearer t"})
|
||||||
|
|
||||||
|
result = await overseas_broker.get_overseas_price("NASD", "AAPL")
|
||||||
|
assert result["output"]["last"] == "150.00"
|
||||||
|
|
||||||
|
call_args = mock_session.get.call_args
|
||||||
|
params = call_args[1]["params"]
|
||||||
|
assert params["EXCD"] == "NAS" # NASD → NAS via _PRICE_EXCHANGE_MAP
|
||||||
|
assert params["SYMB"] == "AAPL"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_http_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Non-200 response should raise ConnectionError."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 400
|
||||||
|
mock_resp.text = AsyncMock(return_value="Bad Request")
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="get_overseas_price failed"):
|
||||||
|
await overseas_broker.get_overseas_price("NASD", "AAPL")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_network_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Network error should raise ConnectionError."""
|
||||||
|
cm = MagicMock()
|
||||||
|
cm.__aenter__ = AsyncMock(side_effect=aiohttp.ClientError("conn refused"))
|
||||||
|
cm.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=cm)
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="Network error"):
|
||||||
|
await overseas_broker.get_overseas_price("NASD", "AAPL")
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetOverseasBalance:
|
||||||
|
"""Test get_overseas_balance method."""
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_success(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Successful balance fetch returns JSON data."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output1": [{"pdno": "AAPL"}]})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.get_overseas_balance("NASD")
|
||||||
|
assert result["output1"][0]["pdno"] == "AAPL"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_http_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Non-200 should raise ConnectionError."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 500
|
||||||
|
mock_resp.text = AsyncMock(return_value="Server Error")
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="get_overseas_balance failed"):
|
||||||
|
await overseas_broker.get_overseas_balance("NASD")
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_network_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Network error should raise ConnectionError."""
|
||||||
|
cm = MagicMock()
|
||||||
|
cm.__aenter__ = AsyncMock(side_effect=TimeoutError("timeout"))
|
||||||
|
cm.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=cm)
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="Network error"):
|
||||||
|
await overseas_broker.get_overseas_balance("NYSE")
|
||||||
|
|
||||||
|
|
||||||
|
class TestSendOverseasOrder:
|
||||||
|
"""Test send_overseas_order method."""
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_buy_market_order(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Market buy order should use VTTT1002U and ORD_DVSN=01."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._get_hash_key = AsyncMock(return_value="hashval")
|
||||||
|
|
||||||
|
result = await overseas_broker.send_overseas_order("NASD", "AAPL", "BUY", 10)
|
||||||
|
assert result["rt_cd"] == "0"
|
||||||
|
|
||||||
|
# Verify BUY TR_ID
|
||||||
|
overseas_broker._broker._auth_headers.assert_called_with("VTTT1002U")
|
||||||
|
|
||||||
|
call_args = mock_session.post.call_args
|
||||||
|
body = call_args[1]["json"]
|
||||||
|
assert body["ORD_DVSN"] == "01" # market order
|
||||||
|
assert body["OVRS_ORD_UNPR"] == "0"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_sell_limit_order(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Limit sell order should use VTTT1006U and ORD_DVSN=00."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._get_hash_key = AsyncMock(return_value="hashval")
|
||||||
|
|
||||||
|
result = await overseas_broker.send_overseas_order("NYSE", "MSFT", "SELL", 5, price=350.0)
|
||||||
|
assert result["rt_cd"] == "0"
|
||||||
|
|
||||||
|
overseas_broker._broker._auth_headers.assert_called_with("VTTT1006U")
|
||||||
|
|
||||||
|
call_args = mock_session.post.call_args
|
||||||
|
body = call_args[1]["json"]
|
||||||
|
assert body["ORD_DVSN"] == "00" # limit order
|
||||||
|
assert body["OVRS_ORD_UNPR"] == "350.0"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_order_http_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Non-200 should raise ConnectionError."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 400
|
||||||
|
mock_resp.text = AsyncMock(return_value="Bad Request")
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._get_hash_key = AsyncMock(return_value="hashval")
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="send_overseas_order failed"):
|
||||||
|
await overseas_broker.send_overseas_order("NASD", "AAPL", "BUY", 1)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_order_network_error_raises(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
"""Network error should raise ConnectionError."""
|
||||||
|
cm = MagicMock()
|
||||||
|
cm.__aenter__ = AsyncMock(side_effect=aiohttp.ClientError("conn reset"))
|
||||||
|
cm.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=cm)
|
||||||
|
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
overseas_broker._broker._get_hash_key = AsyncMock(return_value="hashval")
|
||||||
|
|
||||||
|
with pytest.raises(ConnectionError, match="Network error"):
|
||||||
|
await overseas_broker.send_overseas_order("NASD", "TSLA", "SELL", 2)
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetCurrencyCode:
|
||||||
|
"""Test _get_currency_code mapping."""
|
||||||
|
|
||||||
|
def test_us_exchanges(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("NASD") == "USD"
|
||||||
|
assert overseas_broker._get_currency_code("NYSE") == "USD"
|
||||||
|
assert overseas_broker._get_currency_code("AMEX") == "USD"
|
||||||
|
|
||||||
|
def test_japan(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("TSE") == "JPY"
|
||||||
|
|
||||||
|
def test_hong_kong(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("SEHK") == "HKD"
|
||||||
|
|
||||||
|
def test_china(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("SHAA") == "CNY"
|
||||||
|
assert overseas_broker._get_currency_code("SZAA") == "CNY"
|
||||||
|
|
||||||
|
def test_vietnam(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("HNX") == "VND"
|
||||||
|
assert overseas_broker._get_currency_code("HSX") == "VND"
|
||||||
|
|
||||||
|
def test_unknown_defaults_usd(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._get_currency_code("UNKNOWN") == "USD"
|
||||||
|
|
||||||
|
|
||||||
|
class TestExtractRankingRows:
|
||||||
|
"""Test _extract_ranking_rows helper."""
|
||||||
|
|
||||||
|
def test_output_key(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
data = {"output": [{"a": 1}, {"b": 2}]}
|
||||||
|
assert overseas_broker._extract_ranking_rows(data) == [{"a": 1}, {"b": 2}]
|
||||||
|
|
||||||
|
def test_output1_key(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
data = {"output1": [{"c": 3}]}
|
||||||
|
assert overseas_broker._extract_ranking_rows(data) == [{"c": 3}]
|
||||||
|
|
||||||
|
def test_output2_key(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
data = {"output2": [{"d": 4}]}
|
||||||
|
assert overseas_broker._extract_ranking_rows(data) == [{"d": 4}]
|
||||||
|
|
||||||
|
def test_no_list_returns_empty(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
data = {"output": "not a list"}
|
||||||
|
assert overseas_broker._extract_ranking_rows(data) == []
|
||||||
|
|
||||||
|
def test_empty_data(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
assert overseas_broker._extract_ranking_rows({}) == []
|
||||||
|
|
||||||
|
def test_filters_non_dict_rows(self, overseas_broker: OverseasBroker) -> None:
|
||||||
|
data = {"output": [{"a": 1}, "invalid", {"b": 2}]}
|
||||||
|
assert overseas_broker._extract_ranking_rows(data) == [{"a": 1}, {"b": 2}]
|
||||||
|
|
||||||
|
|
||||||
|
class TestPriceExchangeMap:
|
||||||
|
"""Test _PRICE_EXCHANGE_MAP is applied in get_overseas_price (issue #151)."""
|
||||||
|
|
||||||
|
def test_price_map_equals_ranking_map(self) -> None:
|
||||||
|
assert _PRICE_EXCHANGE_MAP is _RANKING_EXCHANGE_MAP
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("original,expected", [
|
||||||
|
("NASD", "NAS"),
|
||||||
|
("NYSE", "NYS"),
|
||||||
|
("AMEX", "AMS"),
|
||||||
|
])
|
||||||
|
def test_us_exchange_code_mapping(self, original: str, expected: str) -> None:
|
||||||
|
assert _PRICE_EXCHANGE_MAP[original] == expected
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_get_overseas_price_sends_mapped_code(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""NASD → NAS must be sent to HHDFS00000300."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": {"last": "200.00"}})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.get = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
_setup_broker_mocks(overseas_broker, mock_session)
|
||||||
|
|
||||||
|
await overseas_broker.get_overseas_price("NASD", "AAPL")
|
||||||
|
|
||||||
|
params = mock_session.get.call_args[1]["params"]
|
||||||
|
assert params["EXCD"] == "NAS"
|
||||||
|
|
||||||
|
|
||||||
|
class TestOrderRtCdCheck:
|
||||||
|
"""Test that send_overseas_order checks rt_cd and logs accordingly (issue #151)."""
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def overseas_broker(self, mock_settings: Settings) -> OverseasBroker:
|
||||||
|
broker = MagicMock(spec=KISBroker)
|
||||||
|
broker._settings = mock_settings
|
||||||
|
broker._account_no = "12345678"
|
||||||
|
broker._product_cd = "01"
|
||||||
|
broker._base_url = "https://openapivts.koreainvestment.com:9443"
|
||||||
|
broker._rate_limiter = AsyncMock()
|
||||||
|
broker._rate_limiter.acquire = AsyncMock()
|
||||||
|
broker._auth_headers = AsyncMock(return_value={"authorization": "Bearer t"})
|
||||||
|
broker._get_hash_key = AsyncMock(return_value="hashval")
|
||||||
|
return OverseasBroker(broker)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_success_rt_cd_returns_data(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""rt_cd='0' → order accepted, data returned."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"rt_cd": "0", "msg1": "완료"})
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
overseas_broker._broker._get_session = MagicMock(return_value=mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.send_overseas_order("NASD", "AAPL", "BUY", 10, price=150.0)
|
||||||
|
assert result["rt_cd"] == "0"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_error_rt_cd_returns_data_with_msg(
|
||||||
|
self, overseas_broker: OverseasBroker
|
||||||
|
) -> None:
|
||||||
|
"""rt_cd != '0' → order rejected, data still returned (caller checks rt_cd)."""
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(
|
||||||
|
return_value={"rt_cd": "1", "msg1": "주문가능금액이 부족합니다."}
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_session = MagicMock()
|
||||||
|
mock_session.post = MagicMock(return_value=_make_async_cm(mock_resp))
|
||||||
|
overseas_broker._broker._get_session = MagicMock(return_value=mock_session)
|
||||||
|
|
||||||
|
result = await overseas_broker.send_overseas_order("NASD", "AAPL", "BUY", 10, price=150.0)
|
||||||
|
assert result["rt_cd"] == "1"
|
||||||
|
assert "부족" in result["msg1"]
|
||||||
|
|
||||||
|
|
||||||
|
class TestPaperOverseasCash:
|
||||||
|
"""Test PAPER_OVERSEAS_CASH config setting (issue #151)."""
|
||||||
|
|
||||||
|
def test_default_value(self) -> None:
|
||||||
|
settings = Settings(
|
||||||
|
KIS_APP_KEY="k",
|
||||||
|
KIS_APP_SECRET="s",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="g",
|
||||||
|
)
|
||||||
|
assert settings.PAPER_OVERSEAS_CASH == 50000.0
|
||||||
|
|
||||||
|
def test_env_override(self) -> None:
|
||||||
|
import os
|
||||||
|
os.environ["PAPER_OVERSEAS_CASH"] = "25000"
|
||||||
|
settings = Settings(
|
||||||
|
KIS_APP_KEY="k",
|
||||||
|
KIS_APP_SECRET="s",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="g",
|
||||||
|
)
|
||||||
|
assert settings.PAPER_OVERSEAS_CASH == 25000.0
|
||||||
|
del os.environ["PAPER_OVERSEAS_CASH"]
|
||||||
|
|
||||||
|
def test_zero_disables_fallback(self) -> None:
|
||||||
|
import os
|
||||||
|
os.environ["PAPER_OVERSEAS_CASH"] = "0"
|
||||||
|
settings = Settings(
|
||||||
|
KIS_APP_KEY="k",
|
||||||
|
KIS_APP_SECRET="s",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="g",
|
||||||
|
)
|
||||||
|
assert settings.PAPER_OVERSEAS_CASH == 0.0
|
||||||
|
del os.environ["PAPER_OVERSEAS_CASH"]
|
||||||
@@ -164,18 +164,23 @@ class TestGeneratePlaybook:
|
|||||||
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_gemini_failure_returns_defensive(self) -> None:
|
async def test_gemini_failure_returns_smart_fallback(self) -> None:
|
||||||
planner = _make_planner()
|
planner = _make_planner()
|
||||||
planner._gemini.decide = AsyncMock(side_effect=RuntimeError("API timeout"))
|
planner._gemini.decide = AsyncMock(side_effect=RuntimeError("API timeout"))
|
||||||
|
# oversold candidate (signal="oversold", rsi=28.5)
|
||||||
candidates = [_candidate()]
|
candidates = [_candidate()]
|
||||||
|
|
||||||
pb = await planner.generate_playbook("KR", candidates, today=date(2026, 2, 8))
|
pb = await planner.generate_playbook("KR", candidates, today=date(2026, 2, 8))
|
||||||
|
|
||||||
assert pb.default_action == ScenarioAction.HOLD
|
assert pb.default_action == ScenarioAction.HOLD
|
||||||
assert pb.market_outlook == MarketOutlook.NEUTRAL_TO_BEARISH
|
# Smart fallback uses NEUTRAL outlook (not NEUTRAL_TO_BEARISH)
|
||||||
|
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||||
assert pb.stock_count == 1
|
assert pb.stock_count == 1
|
||||||
# Defensive playbook has stop-loss scenarios
|
# Oversold candidate → first scenario is BUY, second is SELL stop-loss
|
||||||
assert pb.stock_playbooks[0].scenarios[0].action == ScenarioAction.SELL
|
scenarios = pb.stock_playbooks[0].scenarios
|
||||||
|
assert scenarios[0].action == ScenarioAction.BUY
|
||||||
|
assert scenarios[0].condition.rsi_below == 30
|
||||||
|
assert scenarios[1].action == ScenarioAction.SELL
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_gemini_failure_empty_when_defensive_disabled(self) -> None:
|
async def test_gemini_failure_empty_when_defensive_disabled(self) -> None:
|
||||||
@@ -657,3 +662,171 @@ class TestDefensivePlaybook:
|
|||||||
assert pb.stock_count == 0
|
assert pb.stock_count == 0
|
||||||
assert pb.market == "US"
|
assert pb.market == "US"
|
||||||
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Smart fallback playbook
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestSmartFallbackPlaybook:
|
||||||
|
"""Tests for _smart_fallback_playbook — rule-based BUY/SELL on Gemini failure."""
|
||||||
|
|
||||||
|
def _make_settings(self) -> Settings:
|
||||||
|
return Settings(
|
||||||
|
KIS_APP_KEY="test",
|
||||||
|
KIS_APP_SECRET="test",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="test",
|
||||||
|
RSI_OVERSOLD_THRESHOLD=30,
|
||||||
|
VOL_MULTIPLIER=2.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_momentum_candidate_gets_buy_on_volume(self) -> None:
|
||||||
|
candidates = [
|
||||||
|
_candidate(code="CHOW", signal="momentum", volume_ratio=13.64, rsi=100.0)
|
||||||
|
]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert pb.stock_count == 1
|
||||||
|
sp = pb.stock_playbooks[0]
|
||||||
|
assert sp.stock_code == "CHOW"
|
||||||
|
# First scenario: BUY with volume_ratio_above
|
||||||
|
buy_sc = sp.scenarios[0]
|
||||||
|
assert buy_sc.action == ScenarioAction.BUY
|
||||||
|
assert buy_sc.condition.volume_ratio_above == 2.0
|
||||||
|
assert buy_sc.condition.rsi_below is None
|
||||||
|
assert buy_sc.confidence == 80
|
||||||
|
# Second scenario: stop-loss SELL
|
||||||
|
sell_sc = sp.scenarios[1]
|
||||||
|
assert sell_sc.action == ScenarioAction.SELL
|
||||||
|
assert sell_sc.condition.price_change_pct_below == -3.0
|
||||||
|
|
||||||
|
def test_oversold_candidate_gets_buy_on_rsi(self) -> None:
|
||||||
|
candidates = [
|
||||||
|
_candidate(code="005930", signal="oversold", rsi=22.0, volume_ratio=3.5)
|
||||||
|
]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "KR", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
sp = pb.stock_playbooks[0]
|
||||||
|
buy_sc = sp.scenarios[0]
|
||||||
|
assert buy_sc.action == ScenarioAction.BUY
|
||||||
|
assert buy_sc.condition.rsi_below == 30
|
||||||
|
assert buy_sc.condition.volume_ratio_above is None
|
||||||
|
|
||||||
|
def test_all_candidates_have_stop_loss_sell(self) -> None:
|
||||||
|
candidates = [
|
||||||
|
_candidate(code="AAA", signal="momentum", volume_ratio=5.0),
|
||||||
|
_candidate(code="BBB", signal="oversold", rsi=25.0),
|
||||||
|
]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_NASDAQ", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert pb.stock_count == 2
|
||||||
|
for sp in pb.stock_playbooks:
|
||||||
|
sell_scenarios = [s for s in sp.scenarios if s.action == ScenarioAction.SELL]
|
||||||
|
assert len(sell_scenarios) == 1
|
||||||
|
assert sell_scenarios[0].condition.price_change_pct_below == -3.0
|
||||||
|
assert sell_scenarios[0].condition.price_change_pct_below == -3.0
|
||||||
|
|
||||||
|
def test_market_outlook_is_neutral(self) -> None:
|
||||||
|
candidates = [_candidate(signal="momentum", volume_ratio=5.0)]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||||
|
|
||||||
|
def test_default_action_is_hold(self) -> None:
|
||||||
|
candidates = [_candidate(signal="momentum", volume_ratio=5.0)]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert pb.default_action == ScenarioAction.HOLD
|
||||||
|
|
||||||
|
def test_has_global_reduce_all_rule(self) -> None:
|
||||||
|
candidates = [_candidate(signal="momentum", volume_ratio=5.0)]
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert len(pb.global_rules) == 1
|
||||||
|
rule = pb.global_rules[0]
|
||||||
|
assert rule.action == ScenarioAction.REDUCE_ALL
|
||||||
|
assert "portfolio_pnl_pct" in rule.condition
|
||||||
|
|
||||||
|
def test_empty_candidates_returns_empty_playbook(self) -> None:
|
||||||
|
settings = self._make_settings()
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", [], settings
|
||||||
|
)
|
||||||
|
|
||||||
|
assert pb.stock_count == 0
|
||||||
|
|
||||||
|
def test_vol_multiplier_applied_from_settings(self) -> None:
|
||||||
|
"""VOL_MULTIPLIER=3.0 should set volume_ratio_above=3.0 for momentum."""
|
||||||
|
candidates = [_candidate(signal="momentum", volume_ratio=5.0)]
|
||||||
|
settings = self._make_settings()
|
||||||
|
settings = settings.model_copy(update={"VOL_MULTIPLIER": 3.0})
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "US_AMEX", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
buy_sc = pb.stock_playbooks[0].scenarios[0]
|
||||||
|
assert buy_sc.condition.volume_ratio_above == 3.0
|
||||||
|
|
||||||
|
def test_rsi_oversold_threshold_applied_from_settings(self) -> None:
|
||||||
|
"""RSI_OVERSOLD_THRESHOLD=25 should set rsi_below=25 for oversold."""
|
||||||
|
candidates = [_candidate(signal="oversold", rsi=22.0)]
|
||||||
|
settings = self._make_settings()
|
||||||
|
settings = settings.model_copy(update={"RSI_OVERSOLD_THRESHOLD": 25})
|
||||||
|
|
||||||
|
pb = PreMarketPlanner._smart_fallback_playbook(
|
||||||
|
date(2026, 2, 17), "KR", candidates, settings
|
||||||
|
)
|
||||||
|
|
||||||
|
buy_sc = pb.stock_playbooks[0].scenarios[0]
|
||||||
|
assert buy_sc.condition.rsi_below == 25
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_generate_playbook_uses_smart_fallback_on_gemini_error(self) -> None:
|
||||||
|
"""generate_playbook() should use smart fallback (not defensive) on API failure."""
|
||||||
|
planner = _make_planner()
|
||||||
|
planner._gemini.decide = AsyncMock(side_effect=ConnectionError("429 quota exceeded"))
|
||||||
|
# momentum candidate
|
||||||
|
candidates = [
|
||||||
|
_candidate(code="CHOW", signal="momentum", volume_ratio=13.64, rsi=100.0)
|
||||||
|
]
|
||||||
|
|
||||||
|
pb = await planner.generate_playbook(
|
||||||
|
"US_AMEX", candidates, today=date(2026, 2, 18)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Should NOT be all-SELL defensive; should have BUY for momentum
|
||||||
|
assert pb.stock_count == 1
|
||||||
|
buy_scenarios = [
|
||||||
|
s for s in pb.stock_playbooks[0].scenarios
|
||||||
|
if s.action == ScenarioAction.BUY
|
||||||
|
]
|
||||||
|
assert len(buy_scenarios) == 1
|
||||||
|
assert buy_scenarios[0].condition.volume_ratio_above == 2.0 # VOL_MULTIPLIER default
|
||||||
|
|||||||
Reference in New Issue
Block a user