Compare commits
1 Commits
feature/is
...
fix/137-ru
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7de9aa894 |
29
docs/issues/ISSUE-2026-02-17-no-trades-zero-candidates.md
Normal file
29
docs/issues/ISSUE-2026-02-17-no-trades-zero-candidates.md
Normal file
@@ -0,0 +1,29 @@
|
||||
# Issue: Realtime 모드에서 거래가 지속적으로 0건
|
||||
|
||||
## Summary
|
||||
`realtime` 실행 중 주문 단계까지 진입하지 못하고, 스캐너 단계에서 후보가 0건으로 반복 종료된다.
|
||||
|
||||
## Observed
|
||||
- 로그에서 반복적으로 `Smart Scanner: No candidates ... — no trades` 출력
|
||||
- 해외 시장에서 `Overseas ranking endpoint unavailable (404)` 다수 발생
|
||||
- fallback 심볼 스캔도 `0 candidates`로 종료
|
||||
- `data/trade_logs.db` 기준 최근 구간에 `BUY/SELL` 없음
|
||||
|
||||
## Impact
|
||||
- 매매 전략 품질과 무관하게 주문 경로가 실행되지 않아 실질 거래 불가
|
||||
- 장애 원인을 로그만으로 즉시 분해하기 어려움
|
||||
|
||||
## Root-Cause Hypothesis
|
||||
- 스캐너 필터(가격/변동성) 단계에서 대부분 탈락
|
||||
- 해외 랭킹 API 불가 시 입력 유니버스가 빈 상태가 되어 후보 생성 실패
|
||||
- 기존 로그는 최종 결과(0 candidates)만 보여 원인별 분해가 어려움
|
||||
|
||||
## Acceptance Criteria
|
||||
- 스캔 1회마다 탈락 사유가 구조화되어 로그에 남아야 함
|
||||
- 국내/해외(랭킹/폴백) 경로 모두 동일한 진단 지표를 제공해야 함
|
||||
- 운영자가 로그만 보고 `왜 0 candidates인지`를 즉시 판단 가능해야 함
|
||||
|
||||
## Scope
|
||||
- 이번 이슈는 **진단 가능성 개선(Observability)** 에 한정
|
||||
- 후보 생성 전략 변경(기본 유니버스 강제 추가 등)은 별도 이슈로 분리
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
# PR: Smart Scanner 진단 로그 추가 (0 candidates 원인 분해)
|
||||
|
||||
## Linked Issue
|
||||
- `docs/issues/ISSUE-2026-02-17-no-trades-zero-candidates.md`
|
||||
|
||||
## What Changed
|
||||
- `src/analysis/smart_scanner.py`에 스캔 진단 카운터 추가
|
||||
- 국내 스캔 진단 로그 추가
|
||||
- 해외 랭킹 스캔 진단 로그 추가
|
||||
- 해외 fallback 심볼 스캔 진단 로그 추가
|
||||
|
||||
## Diagnostics Keys
|
||||
- `total_rows`
|
||||
- `missing_code`
|
||||
- `invalid_price`
|
||||
- `low_volatility`
|
||||
- `connection_error` (해당 경로에서만)
|
||||
- `unexpected_error` (해당 경로에서만)
|
||||
- `qualified`
|
||||
|
||||
## Expected Log Examples
|
||||
- `Domestic scan diagnostics: {...}`
|
||||
- `Overseas ranking scan diagnostics for US_NASDAQ: {...}`
|
||||
- `Overseas fallback scan diagnostics for US_NYSE: {...}`
|
||||
|
||||
## Out of Scope
|
||||
- 해외 랭킹 404 시 기본 심볼 유니버스 강제 주입
|
||||
- 국내 경로 fallback 정책 변경
|
||||
|
||||
## Validation
|
||||
- `.venv/bin/python -m py_compile src/analysis/smart_scanner.py`
|
||||
|
||||
@@ -165,104 +165,3 @@
|
||||
**효과:**
|
||||
- 국내/해외 스캐너 기준이 변동성 중심으로 일관화
|
||||
- 고변동 구간에서 자동 익스포저 축소, 저변동 구간에서 과소진입 완화
|
||||
|
||||
## 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
|
||||
|
||||
@@ -128,6 +128,16 @@ class SmartVolatilityScanner:
|
||||
if not fluct_rows:
|
||||
return []
|
||||
|
||||
diagnostics: dict[str, int | float] = {
|
||||
"total_rows": len(fluct_rows),
|
||||
"missing_code": 0,
|
||||
"invalid_price": 0,
|
||||
"low_volatility": 0,
|
||||
"connection_error": 0,
|
||||
"unexpected_error": 0,
|
||||
"qualified": 0,
|
||||
}
|
||||
|
||||
volume_rank_bonus: dict[str, float] = {}
|
||||
for idx, row in enumerate(volume_rows):
|
||||
code = _extract_stock_code(row)
|
||||
@@ -139,6 +149,7 @@ class SmartVolatilityScanner:
|
||||
for stock in fluct_rows:
|
||||
stock_code = _extract_stock_code(stock)
|
||||
if not stock_code:
|
||||
diagnostics["missing_code"] += 1
|
||||
continue
|
||||
|
||||
try:
|
||||
@@ -168,7 +179,11 @@ class SmartVolatilityScanner:
|
||||
volume_ratio = max(volume_ratio, volume / prev_day_volume)
|
||||
|
||||
volatility_pct = max(abs(change_rate), intraday_range_pct)
|
||||
if price <= 0 or volatility_pct < 0.8:
|
||||
if price <= 0:
|
||||
diagnostics["invalid_price"] += 1
|
||||
continue
|
||||
if volatility_pct < 0.8:
|
||||
diagnostics["low_volatility"] += 1
|
||||
continue
|
||||
|
||||
volatility_score = min(volatility_pct / 10.0, 1.0) * 85.0
|
||||
@@ -189,14 +204,22 @@ class SmartVolatilityScanner:
|
||||
score=score,
|
||||
)
|
||||
)
|
||||
diagnostics["qualified"] += 1
|
||||
|
||||
except ConnectionError as exc:
|
||||
diagnostics["connection_error"] += 1
|
||||
logger.warning("Failed to analyze %s: %s", stock_code, exc)
|
||||
continue
|
||||
except Exception as exc:
|
||||
diagnostics["unexpected_error"] += 1
|
||||
logger.error("Unexpected error analyzing %s: %s", stock_code, exc)
|
||||
continue
|
||||
|
||||
logger.info(
|
||||
"Domestic scan diagnostics: %s (volatility_threshold=0.8, top_n=%d)",
|
||||
diagnostics,
|
||||
self.top_n,
|
||||
)
|
||||
logger.info("Domestic ranking scan found %d candidates", len(candidates))
|
||||
candidates.sort(key=lambda c: c.score, reverse=True)
|
||||
return candidates[: self.top_n]
|
||||
@@ -242,6 +265,14 @@ class SmartVolatilityScanner:
|
||||
if not fluct_rows:
|
||||
return []
|
||||
|
||||
diagnostics: dict[str, int | float] = {
|
||||
"total_rows": len(fluct_rows),
|
||||
"missing_code": 0,
|
||||
"invalid_price": 0,
|
||||
"low_volatility": 0,
|
||||
"qualified": 0,
|
||||
}
|
||||
|
||||
volume_rank_bonus: dict[str, float] = {}
|
||||
try:
|
||||
volume_rows = await self.overseas_broker.fetch_overseas_rankings(
|
||||
@@ -266,6 +297,7 @@ class SmartVolatilityScanner:
|
||||
for row in fluct_rows:
|
||||
stock_code = _extract_stock_code(row)
|
||||
if not stock_code:
|
||||
diagnostics["missing_code"] += 1
|
||||
continue
|
||||
|
||||
price = _extract_last_price(row)
|
||||
@@ -275,7 +307,11 @@ class SmartVolatilityScanner:
|
||||
volatility_pct = max(abs(change_rate), intraday_range_pct)
|
||||
|
||||
# Volatility-first filter (not simple gainers/value ranking).
|
||||
if price <= 0 or volatility_pct < 0.8:
|
||||
if price <= 0:
|
||||
diagnostics["invalid_price"] += 1
|
||||
continue
|
||||
if volatility_pct < 0.8:
|
||||
diagnostics["low_volatility"] += 1
|
||||
continue
|
||||
|
||||
volatility_score = min(volatility_pct / 10.0, 1.0) * 85.0
|
||||
@@ -295,7 +331,14 @@ class SmartVolatilityScanner:
|
||||
score=score,
|
||||
)
|
||||
)
|
||||
diagnostics["qualified"] += 1
|
||||
|
||||
logger.info(
|
||||
"Overseas ranking scan diagnostics for %s: %s (volatility_threshold=0.8, top_n=%d)",
|
||||
market.code,
|
||||
diagnostics,
|
||||
self.top_n,
|
||||
)
|
||||
if candidates:
|
||||
logger.info(
|
||||
"Overseas ranking scan found %d candidates for %s",
|
||||
@@ -320,6 +363,14 @@ class SmartVolatilityScanner:
|
||||
len(symbols),
|
||||
market.name,
|
||||
)
|
||||
diagnostics: dict[str, int | float] = {
|
||||
"total_rows": len(symbols),
|
||||
"invalid_price": 0,
|
||||
"low_volatility": 0,
|
||||
"connection_error": 0,
|
||||
"unexpected_error": 0,
|
||||
"qualified": 0,
|
||||
}
|
||||
candidates: list[ScanCandidate] = []
|
||||
for stock_code in symbols:
|
||||
try:
|
||||
@@ -333,7 +384,11 @@ class SmartVolatilityScanner:
|
||||
intraday_range_pct = _extract_intraday_range_pct(output, price)
|
||||
volatility_pct = max(abs(change_rate), intraday_range_pct)
|
||||
|
||||
if price <= 0 or volatility_pct < 0.8:
|
||||
if price <= 0:
|
||||
diagnostics["invalid_price"] += 1
|
||||
continue
|
||||
if volatility_pct < 0.8:
|
||||
diagnostics["low_volatility"] += 1
|
||||
continue
|
||||
|
||||
score = min(volatility_pct / 10.0, 1.0) * 100.0
|
||||
@@ -351,10 +406,19 @@ class SmartVolatilityScanner:
|
||||
score=score,
|
||||
)
|
||||
)
|
||||
diagnostics["qualified"] += 1
|
||||
except ConnectionError as exc:
|
||||
diagnostics["connection_error"] += 1
|
||||
logger.warning("Failed to analyze overseas %s: %s", stock_code, exc)
|
||||
except Exception as exc:
|
||||
diagnostics["unexpected_error"] += 1
|
||||
logger.error("Unexpected error analyzing overseas %s: %s", stock_code, exc)
|
||||
logger.info(
|
||||
"Overseas fallback scan diagnostics for %s: %s (volatility_threshold=0.8, top_n=%d)",
|
||||
market.code,
|
||||
diagnostics,
|
||||
self.top_n,
|
||||
)
|
||||
logger.info(
|
||||
"Overseas symbol fallback scan found %d candidates for %s",
|
||||
len(candidates),
|
||||
|
||||
@@ -410,10 +410,8 @@ class GeminiClient:
|
||||
cached=True,
|
||||
)
|
||||
|
||||
# Build prompt (prompt_override takes priority for callers like pre_market_planner)
|
||||
if "prompt_override" in market_data:
|
||||
prompt = market_data["prompt_override"]
|
||||
elif self._enable_optimization:
|
||||
# Build optimized prompt
|
||||
if self._enable_optimization:
|
||||
prompt = self._optimizer.build_compressed_prompt(market_data)
|
||||
else:
|
||||
prompt = await self.build_prompt(market_data, news_sentiment)
|
||||
|
||||
@@ -20,39 +20,6 @@ _KIS_VTS_HOST = "openapivts.koreainvestment.com"
|
||||
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:
|
||||
"""Simple leaky-bucket rate limiter for async code."""
|
||||
|
||||
@@ -231,55 +198,6 @@ class KISBroker:
|
||||
except (TimeoutError, aiohttp.ClientError) as 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]:
|
||||
"""Fetch current account balance and holdings."""
|
||||
await self._rate_limiter.acquire()
|
||||
@@ -331,23 +249,13 @@ class KISBroker:
|
||||
session = self._get_session()
|
||||
|
||||
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 = {
|
||||
"CANO": self._account_no,
|
||||
"ACNT_PRDT_CD": self._product_cd,
|
||||
"PDNO": stock_code,
|
||||
"ORD_DVSN": ord_dvsn,
|
||||
"ORD_DVSN": "01" if price > 0 else "06", # 01=지정가, 06=시장가
|
||||
"ORD_QTY": str(quantity),
|
||||
"ORD_UNPR": str(ord_price),
|
||||
"ORD_UNPR": str(price),
|
||||
}
|
||||
|
||||
hash_key = await self._get_hash_key(body)
|
||||
@@ -396,45 +304,25 @@ class KISBroker:
|
||||
await self._rate_limiter.acquire()
|
||||
session = self._get_session()
|
||||
|
||||
if ranking_type == "volume":
|
||||
# 거래량순위: 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",
|
||||
# TR_ID for volume ranking
|
||||
tr_id = "FHPST01710000" if ranking_type == "volume" else "FHPST01710100"
|
||||
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": "0000000000",
|
||||
"FID_TRGT_EXLS_CLS_CODE": "000000",
|
||||
"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)
|
||||
url = f"{self._base_url}/uapi/domestic-stock/v1/quotations/volume-rank"
|
||||
|
||||
try:
|
||||
async with session.get(url, headers=headers, params=params) as resp:
|
||||
|
||||
@@ -12,24 +12,6 @@ from src.broker.kis_api import KISBroker
|
||||
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:
|
||||
"""KIS Overseas Stock API wrapper that reuses KISBroker infrastructure."""
|
||||
|
||||
@@ -62,11 +44,9 @@ class OverseasBroker:
|
||||
session = self._broker._get_session()
|
||||
|
||||
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 = {
|
||||
"AUTH": "",
|
||||
"EXCD": price_excd,
|
||||
"EXCD": exchange_code,
|
||||
"SYMB": stock_code,
|
||||
}
|
||||
url = f"{self._broker._base_url}/uapi/overseas-price/v1/quotations/price"
|
||||
@@ -90,7 +70,7 @@ class OverseasBroker:
|
||||
ranking_type: str = "fluctuation",
|
||||
limit: int = 30,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Fetch overseas rankings (price change or volume surge).
|
||||
"""Fetch overseas rankings (price change or volume amount).
|
||||
|
||||
Ranking API specs may differ by account/product. Endpoint paths and
|
||||
TR_IDs are configurable via settings and can be overridden in .env.
|
||||
@@ -101,63 +81,66 @@ class OverseasBroker:
|
||||
await self._broker._rate_limiter.acquire()
|
||||
session = self._broker._get_session()
|
||||
|
||||
ranking_excd = _RANKING_EXCHANGE_MAP.get(exchange_code, exchange_code)
|
||||
|
||||
if ranking_type == "volume":
|
||||
tr_id = self._broker._settings.OVERSEAS_RANKING_VOLUME_TR_ID
|
||||
path = self._broker._settings.OVERSEAS_RANKING_VOLUME_PATH
|
||||
params: dict[str, str] = {
|
||||
"AUTH": "",
|
||||
"EXCD": ranking_excd,
|
||||
"MIXN": "0",
|
||||
"VOL_RANG": "0",
|
||||
}
|
||||
configured_tr_id = self._broker._settings.OVERSEAS_RANKING_VOLUME_TR_ID
|
||||
configured_path = self._broker._settings.OVERSEAS_RANKING_VOLUME_PATH
|
||||
default_tr_id = "HHDFS76200200"
|
||||
default_path = "/uapi/overseas-price/v1/quotations/inquire-volume-rank"
|
||||
else:
|
||||
tr_id = self._broker._settings.OVERSEAS_RANKING_FLUCT_TR_ID
|
||||
path = self._broker._settings.OVERSEAS_RANKING_FLUCT_PATH
|
||||
params = {
|
||||
"AUTH": "",
|
||||
"EXCD": ranking_excd,
|
||||
"NDAY": "0",
|
||||
"GUBN": "1",
|
||||
"VOL_RANG": "0",
|
||||
}
|
||||
configured_tr_id = self._broker._settings.OVERSEAS_RANKING_FLUCT_TR_ID
|
||||
configured_path = self._broker._settings.OVERSEAS_RANKING_FLUCT_PATH
|
||||
default_tr_id = "HHDFS76200100"
|
||||
default_path = "/uapi/overseas-price/v1/quotations/inquire-updown-rank"
|
||||
|
||||
endpoint_specs: list[tuple[str, str]] = [(configured_tr_id, configured_path)]
|
||||
if (configured_tr_id, configured_path) != (default_tr_id, default_path):
|
||||
endpoint_specs.append((default_tr_id, default_path))
|
||||
|
||||
# Try common param variants used by KIS overseas quotation APIs.
|
||||
param_variants = [
|
||||
{"AUTH": "", "EXCD": exchange_code, "NREC": str(max(limit, 30))},
|
||||
{"AUTH": "", "OVRS_EXCG_CD": exchange_code, "NREC": str(max(limit, 30))},
|
||||
{"AUTH": "", "EXCD": exchange_code},
|
||||
{"AUTH": "", "OVRS_EXCG_CD": exchange_code},
|
||||
]
|
||||
|
||||
last_error: str | None = None
|
||||
saw_http_404 = False
|
||||
for tr_id, path in endpoint_specs:
|
||||
headers = await self._broker._auth_headers(tr_id)
|
||||
url = f"{self._broker._base_url}{path}"
|
||||
|
||||
for params in param_variants:
|
||||
try:
|
||||
async with session.get(url, headers=headers, params=params) as resp:
|
||||
if resp.status != 200:
|
||||
text = await resp.text()
|
||||
if resp.status != 200:
|
||||
last_error = f"HTTP {resp.status}: {text}"
|
||||
if resp.status == 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 ({resp.status}): {text}"
|
||||
)
|
||||
saw_http_404 = True
|
||||
continue
|
||||
|
||||
data = await resp.json()
|
||||
rows = self._extract_ranking_rows(data)
|
||||
if rows:
|
||||
return rows[:limit]
|
||||
|
||||
logger.debug(
|
||||
"Overseas ranking returned empty for %s/%s (keys=%s)",
|
||||
# keep trying another param variant if response has no usable rows
|
||||
last_error = f"empty output (keys={list(data.keys())})"
|
||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||
last_error = str(exc)
|
||||
continue
|
||||
|
||||
if saw_http_404:
|
||||
logger.warning(
|
||||
"Overseas ranking endpoint unavailable (404) for %s/%s; using symbol fallback scan",
|
||||
exchange_code,
|
||||
ranking_type,
|
||||
list(data.keys()),
|
||||
)
|
||||
return []
|
||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||
|
||||
raise ConnectionError(
|
||||
f"Network error fetching overseas rankings: {exc}"
|
||||
) from exc
|
||||
f"fetch_overseas_rankings failed for {exchange_code}/{ranking_type}: {last_error}"
|
||||
)
|
||||
|
||||
async def get_overseas_balance(self, exchange_code: str) -> dict[str, Any]:
|
||||
"""
|
||||
@@ -257,9 +240,6 @@ class OverseasBroker:
|
||||
f"send_overseas_order failed ({resp.status}): {text}"
|
||||
)
|
||||
data = await resp.json()
|
||||
rt_cd = data.get("rt_cd", "")
|
||||
msg1 = data.get("msg1", "")
|
||||
if rt_cd == "0":
|
||||
logger.info(
|
||||
"Overseas order submitted",
|
||||
extra={
|
||||
@@ -268,16 +248,6 @@ class OverseasBroker:
|
||||
"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
|
||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||
raise ConnectionError(
|
||||
|
||||
@@ -55,11 +55,6 @@ class Settings(BaseSettings):
|
||||
# Trading mode
|
||||
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)
|
||||
TRADE_MODE: str = Field(default="daily", pattern="^(daily|realtime)$")
|
||||
DAILY_SESSIONS: int = Field(default=4, ge=1, le=10)
|
||||
@@ -96,13 +91,13 @@ class Settings(BaseSettings):
|
||||
# Overseas ranking API (KIS endpoint/TR_ID may vary by account/product)
|
||||
# Override these from .env if your account uses different specs.
|
||||
OVERSEAS_RANKING_ENABLED: bool = True
|
||||
OVERSEAS_RANKING_FLUCT_TR_ID: str = "HHDFS76290000"
|
||||
OVERSEAS_RANKING_VOLUME_TR_ID: str = "HHDFS76270000"
|
||||
OVERSEAS_RANKING_FLUCT_TR_ID: str = "HHDFS76200100"
|
||||
OVERSEAS_RANKING_VOLUME_TR_ID: str = "HHDFS76200200"
|
||||
OVERSEAS_RANKING_FLUCT_PATH: str = (
|
||||
"/uapi/overseas-stock/v1/ranking/updown-rate"
|
||||
"/uapi/overseas-price/v1/quotations/inquire-updown-rank"
|
||||
)
|
||||
OVERSEAS_RANKING_VOLUME_PATH: str = (
|
||||
"/uapi/overseas-stock/v1/ranking/volume-surge"
|
||||
"/uapi/overseas-price/v1/quotations/inquire-volume-rank"
|
||||
)
|
||||
|
||||
# Dashboard (optional)
|
||||
|
||||
@@ -259,50 +259,6 @@ def create_dashboard_app(db_path: str) -> FastAPI:
|
||||
)
|
||||
return {"market": market, "count": len(decisions), "decisions": decisions}
|
||||
|
||||
@app.get("/api/pnl/history")
|
||||
def get_pnl_history(
|
||||
days: int = Query(default=30, ge=1, le=365),
|
||||
market: str = Query("all"),
|
||||
) -> dict[str, Any]:
|
||||
"""Return daily P&L history for charting."""
|
||||
with _connect(db_path) as conn:
|
||||
if market == "all":
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT DATE(timestamp) AS date,
|
||||
SUM(pnl) AS daily_pnl,
|
||||
COUNT(*) AS trade_count
|
||||
FROM trades
|
||||
WHERE pnl IS NOT NULL
|
||||
AND DATE(timestamp) >= DATE('now', ?)
|
||||
GROUP BY DATE(timestamp)
|
||||
ORDER BY DATE(timestamp)
|
||||
""",
|
||||
(f"-{days} days",),
|
||||
).fetchall()
|
||||
else:
|
||||
rows = conn.execute(
|
||||
"""
|
||||
SELECT DATE(timestamp) AS date,
|
||||
SUM(pnl) AS daily_pnl,
|
||||
COUNT(*) AS trade_count
|
||||
FROM trades
|
||||
WHERE pnl IS NOT NULL
|
||||
AND market = ?
|
||||
AND DATE(timestamp) >= DATE('now', ?)
|
||||
GROUP BY DATE(timestamp)
|
||||
ORDER BY DATE(timestamp)
|
||||
""",
|
||||
(market, f"-{days} days"),
|
||||
).fetchall()
|
||||
return {
|
||||
"days": days,
|
||||
"market": market,
|
||||
"labels": [row["date"] for row in rows],
|
||||
"pnl": [round(float(row["daily_pnl"]), 2) for row in rows],
|
||||
"trades": [int(row["trade_count"]) for row in rows],
|
||||
}
|
||||
|
||||
@app.get("/api/scenarios/active")
|
||||
def get_active_scenarios(
|
||||
market: str = Query("US"),
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
<!doctype html>
|
||||
<html lang="ko">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>The Ouroboros Dashboard</title>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #0b1724;
|
||||
@@ -12,390 +11,51 @@
|
||||
--fg: #e6eef7;
|
||||
--muted: #9fb3c8;
|
||||
--accent: #3cb371;
|
||||
--red: #e05555;
|
||||
--border: #28455f;
|
||||
}
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
background: radial-gradient(circle at top left, #173b58, var(--bg));
|
||||
color: var(--fg);
|
||||
min-height: 100vh;
|
||||
font-size: 13px;
|
||||
}
|
||||
.wrap { max-width: 1100px; margin: 0 auto; padding: 20px 16px; }
|
||||
|
||||
/* Header */
|
||||
header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20px;
|
||||
padding-bottom: 12px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
.wrap {
|
||||
max-width: 900px;
|
||||
margin: 48px auto;
|
||||
padding: 0 16px;
|
||||
}
|
||||
header h1 { font-size: 18px; color: var(--accent); letter-spacing: 0.5px; }
|
||||
.header-right { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 12px; }
|
||||
.refresh-btn {
|
||||
background: none; border: 1px solid var(--border); color: var(--muted);
|
||||
padding: 4px 10px; border-radius: 6px; cursor: pointer; font-family: inherit;
|
||||
font-size: 12px; transition: border-color 0.2s;
|
||||
}
|
||||
.refresh-btn:hover { border-color: var(--accent); color: var(--accent); }
|
||||
|
||||
/* Summary cards */
|
||||
.cards { display: grid; grid-template-columns: repeat(4, 1fr); gap: 12px; margin-bottom: 20px; }
|
||||
@media (max-width: 700px) { .cards { grid-template-columns: repeat(2, 1fr); } }
|
||||
.card {
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
padding: 16px;
|
||||
background: color-mix(in oklab, var(--panel), black 12%);
|
||||
border: 1px solid #28455f;
|
||||
border-radius: 12px;
|
||||
padding: 20px;
|
||||
}
|
||||
.card-label { color: var(--muted); font-size: 11px; margin-bottom: 6px; text-transform: uppercase; letter-spacing: 0.5px; }
|
||||
.card-value { font-size: 22px; font-weight: 700; }
|
||||
.card-sub { color: var(--muted); font-size: 11px; margin-top: 4px; }
|
||||
.positive { color: var(--accent); }
|
||||
.negative { color: var(--red); }
|
||||
.neutral { color: var(--fg); }
|
||||
|
||||
/* Chart panel */
|
||||
.chart-panel {
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
padding: 16px;
|
||||
margin-bottom: 20px;
|
||||
h1 {
|
||||
margin-top: 0;
|
||||
}
|
||||
.panel-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 16px;
|
||||
code {
|
||||
color: var(--accent);
|
||||
}
|
||||
.panel-title { font-size: 13px; color: var(--muted); font-weight: 600; }
|
||||
.chart-container { position: relative; height: 180px; }
|
||||
.chart-error { color: var(--muted); text-align: center; padding: 40px 0; font-size: 12px; }
|
||||
|
||||
/* Days selector */
|
||||
.days-selector { display: flex; gap: 4px; }
|
||||
.day-btn {
|
||||
background: none; border: 1px solid var(--border); color: var(--muted);
|
||||
padding: 3px 8px; border-radius: 4px; cursor: pointer; font-family: inherit; font-size: 11px;
|
||||
li {
|
||||
margin: 6px 0;
|
||||
color: var(--muted);
|
||||
}
|
||||
.day-btn.active { border-color: var(--accent); color: var(--accent); background: rgba(60, 179, 113, 0.08); }
|
||||
|
||||
/* Decisions panel */
|
||||
.decisions-panel {
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
padding: 16px;
|
||||
}
|
||||
.market-tabs { display: flex; gap: 6px; flex-wrap: wrap; }
|
||||
.tab-btn {
|
||||
background: none; border: 1px solid var(--border); color: var(--muted);
|
||||
padding: 4px 10px; border-radius: 6px; cursor: pointer; font-family: inherit; font-size: 11px;
|
||||
}
|
||||
.tab-btn.active { border-color: var(--accent); color: var(--accent); background: rgba(60, 179, 113, 0.08); }
|
||||
.decisions-table { width: 100%; border-collapse: collapse; margin-top: 14px; }
|
||||
.decisions-table th {
|
||||
text-align: left; color: var(--muted); font-size: 11px; font-weight: 600;
|
||||
padding: 6px 8px; border-bottom: 1px solid var(--border); white-space: nowrap;
|
||||
}
|
||||
.decisions-table td {
|
||||
padding: 8px 8px; border-bottom: 1px solid rgba(40, 69, 95, 0.5);
|
||||
vertical-align: middle; white-space: nowrap;
|
||||
}
|
||||
.decisions-table tr:last-child td { border-bottom: none; }
|
||||
.decisions-table tr:hover td { background: rgba(255,255,255,0.02); }
|
||||
.badge {
|
||||
display: inline-block; padding: 2px 7px; border-radius: 4px;
|
||||
font-size: 11px; font-weight: 700; letter-spacing: 0.5px;
|
||||
}
|
||||
.badge-buy { background: rgba(60, 179, 113, 0.15); color: var(--accent); }
|
||||
.badge-sell { background: rgba(224, 85, 85, 0.15); color: var(--red); }
|
||||
.badge-hold { background: rgba(159, 179, 200, 0.12); color: var(--muted); }
|
||||
.conf-bar-wrap { display: flex; align-items: center; gap: 6px; min-width: 90px; }
|
||||
.conf-bar { flex: 1; height: 6px; background: rgba(255,255,255,0.08); border-radius: 3px; overflow: hidden; }
|
||||
.conf-fill { height: 100%; border-radius: 3px; background: var(--accent); transition: width 0.3s; }
|
||||
.conf-val { color: var(--muted); font-size: 11px; min-width: 26px; text-align: right; }
|
||||
.rationale-cell { max-width: 200px; overflow: hidden; text-overflow: ellipsis; color: var(--muted); }
|
||||
.empty-row td { text-align: center; color: var(--muted); padding: 24px; }
|
||||
|
||||
/* Spinner */
|
||||
.spinner { display: inline-block; width: 12px; height: 12px; border: 2px solid var(--border); border-top-color: var(--accent); border-radius: 50%; animation: spin 0.8s linear infinite; }
|
||||
@keyframes spin { to { transform: rotate(360deg); } }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrap">
|
||||
<!-- Header -->
|
||||
<header>
|
||||
<h1>🐍 The Ouroboros</h1>
|
||||
<div class="header-right">
|
||||
<span id="last-updated">--</span>
|
||||
<button class="refresh-btn" onclick="refreshAll()">↺ 새로고침</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<!-- Summary cards -->
|
||||
<div class="cards">
|
||||
<div class="card">
|
||||
<div class="card-label">오늘 거래</div>
|
||||
<div class="card-value neutral" id="card-trades">--</div>
|
||||
<div class="card-sub" id="card-trades-sub">거래 건수</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-label">오늘 P&L</div>
|
||||
<div class="card-value" id="card-pnl">--</div>
|
||||
<div class="card-sub" id="card-pnl-sub">실현 손익</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-label">승률</div>
|
||||
<div class="card-value neutral" id="card-winrate">--</div>
|
||||
<div class="card-sub">전체 누적</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-label">누적 거래</div>
|
||||
<div class="card-value neutral" id="card-total">--</div>
|
||||
<div class="card-sub">전체 기간</div>
|
||||
<h1>The Ouroboros Dashboard API</h1>
|
||||
<p>Use the following endpoints:</p>
|
||||
<ul>
|
||||
<li><code>/api/status</code></li>
|
||||
<li><code>/api/playbook/{date}?market=KR</code></li>
|
||||
<li><code>/api/scorecard/{date}?market=KR</code></li>
|
||||
<li><code>/api/performance?market=all</code></li>
|
||||
<li><code>/api/context/{layer}</code></li>
|
||||
<li><code>/api/decisions?market=KR</code></li>
|
||||
<li><code>/api/scenarios/active?market=US</code></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- P&L Chart -->
|
||||
<div class="chart-panel">
|
||||
<div class="panel-header">
|
||||
<span class="panel-title">P&L 추이</span>
|
||||
<div class="days-selector">
|
||||
<button class="day-btn active" data-days="7" onclick="selectDays(this)">7일</button>
|
||||
<button class="day-btn" data-days="30" onclick="selectDays(this)">30일</button>
|
||||
<button class="day-btn" data-days="90" onclick="selectDays(this)">90일</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="chart-container">
|
||||
<canvas id="pnl-chart"></canvas>
|
||||
<div class="chart-error" id="chart-error" style="display:none">데이터 없음</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Decisions log -->
|
||||
<div class="decisions-panel">
|
||||
<div class="panel-header">
|
||||
<span class="panel-title">최근 결정 로그</span>
|
||||
<div class="market-tabs" id="market-tabs">
|
||||
<button class="tab-btn active" data-market="KR" onclick="selectMarket(this)">KR</button>
|
||||
<button class="tab-btn" data-market="US_NASDAQ" onclick="selectMarket(this)">US_NASDAQ</button>
|
||||
<button class="tab-btn" data-market="US_NYSE" onclick="selectMarket(this)">US_NYSE</button>
|
||||
<button class="tab-btn" data-market="JP" onclick="selectMarket(this)">JP</button>
|
||||
<button class="tab-btn" data-market="HK" onclick="selectMarket(this)">HK</button>
|
||||
</div>
|
||||
</div>
|
||||
<table class="decisions-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>시각</th>
|
||||
<th>종목</th>
|
||||
<th>액션</th>
|
||||
<th>신뢰도</th>
|
||||
<th>사유</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="decisions-body">
|
||||
<tr class="empty-row"><td colspan="5"><span class="spinner"></span></td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let pnlChart = null;
|
||||
let currentDays = 7;
|
||||
let currentMarket = 'KR';
|
||||
|
||||
function fmt(dt) {
|
||||
try {
|
||||
const d = new Date(dt);
|
||||
return d.toLocaleTimeString('ko-KR', { hour: '2-digit', minute: '2-digit', hour12: false });
|
||||
} catch { return dt || '--'; }
|
||||
}
|
||||
|
||||
function fmtPnl(v) {
|
||||
if (v === null || v === undefined) return '--';
|
||||
const n = parseFloat(v);
|
||||
const cls = n > 0 ? 'positive' : n < 0 ? 'negative' : 'neutral';
|
||||
const sign = n > 0 ? '+' : '';
|
||||
return `<span class="${cls}">${sign}${n.toFixed(2)}</span>`;
|
||||
}
|
||||
|
||||
function badge(action) {
|
||||
const a = (action || '').toUpperCase();
|
||||
const cls = a === 'BUY' ? 'badge-buy' : a === 'SELL' ? 'badge-sell' : 'badge-hold';
|
||||
return `<span class="badge ${cls}">${a}</span>`;
|
||||
}
|
||||
|
||||
function confBar(conf) {
|
||||
const pct = Math.min(Math.max(conf || 0, 0), 100);
|
||||
return `<div class="conf-bar-wrap">
|
||||
<div class="conf-bar"><div class="conf-fill" style="width:${pct}%"></div></div>
|
||||
<span class="conf-val">${pct}</span>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
async function fetchStatus() {
|
||||
try {
|
||||
const r = await fetch('/api/status');
|
||||
if (!r.ok) return;
|
||||
const d = await r.json();
|
||||
const t = d.totals || {};
|
||||
document.getElementById('card-trades').textContent = t.trade_count ?? '--';
|
||||
const pnlEl = document.getElementById('card-pnl');
|
||||
const pnlV = t.total_pnl;
|
||||
if (pnlV !== undefined) {
|
||||
const n = parseFloat(pnlV);
|
||||
const sign = n > 0 ? '+' : '';
|
||||
pnlEl.textContent = `${sign}${n.toFixed(2)}`;
|
||||
pnlEl.className = `card-value ${n > 0 ? 'positive' : n < 0 ? 'negative' : 'neutral'}`;
|
||||
}
|
||||
document.getElementById('card-pnl-sub').textContent = `결정 ${t.decision_count ?? 0}건`;
|
||||
} catch {}
|
||||
}
|
||||
|
||||
async function fetchPerformance() {
|
||||
try {
|
||||
const r = await fetch('/api/performance?market=all');
|
||||
if (!r.ok) return;
|
||||
const d = await r.json();
|
||||
const c = d.combined || {};
|
||||
document.getElementById('card-winrate').textContent = c.win_rate !== undefined ? `${c.win_rate}%` : '--';
|
||||
document.getElementById('card-total').textContent = c.total_trades ?? '--';
|
||||
} catch {}
|
||||
}
|
||||
|
||||
async function fetchPnlHistory(days) {
|
||||
try {
|
||||
const r = await fetch(`/api/pnl/history?days=${days}`);
|
||||
if (!r.ok) throw new Error('fetch failed');
|
||||
const d = await r.json();
|
||||
renderChart(d);
|
||||
} catch {
|
||||
document.getElementById('chart-error').style.display = 'block';
|
||||
}
|
||||
}
|
||||
|
||||
function renderChart(data) {
|
||||
const errEl = document.getElementById('chart-error');
|
||||
if (!data.labels || data.labels.length === 0) {
|
||||
errEl.style.display = 'block';
|
||||
return;
|
||||
}
|
||||
errEl.style.display = 'none';
|
||||
|
||||
const colors = data.pnl.map(v => v >= 0 ? 'rgba(60,179,113,0.75)' : 'rgba(224,85,85,0.75)');
|
||||
const borderColors = data.pnl.map(v => v >= 0 ? '#3cb371' : '#e05555');
|
||||
|
||||
if (pnlChart) { pnlChart.destroy(); pnlChart = null; }
|
||||
const ctx = document.getElementById('pnl-chart').getContext('2d');
|
||||
pnlChart = new Chart(ctx, {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: data.labels,
|
||||
datasets: [{
|
||||
label: 'Daily P&L',
|
||||
data: data.pnl,
|
||||
backgroundColor: colors,
|
||||
borderColor: borderColors,
|
||||
borderWidth: 1,
|
||||
borderRadius: 3,
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
plugins: {
|
||||
legend: { display: false },
|
||||
tooltip: {
|
||||
callbacks: {
|
||||
label: ctx => {
|
||||
const v = ctx.parsed.y;
|
||||
const sign = v >= 0 ? '+' : '';
|
||||
const trades = data.trades[ctx.dataIndex];
|
||||
return [`P&L: ${sign}${v.toFixed(2)}`, `거래: ${trades}건`];
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
scales: {
|
||||
x: {
|
||||
ticks: { color: '#9fb3c8', font: { size: 10 }, maxRotation: 0 },
|
||||
grid: { color: 'rgba(40,69,95,0.4)' }
|
||||
},
|
||||
y: {
|
||||
ticks: { color: '#9fb3c8', font: { size: 10 } },
|
||||
grid: { color: 'rgba(40,69,95,0.4)' }
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function fetchDecisions(market) {
|
||||
const tbody = document.getElementById('decisions-body');
|
||||
tbody.innerHTML = '<tr class="empty-row"><td colspan="5"><span class="spinner"></span></td></tr>';
|
||||
try {
|
||||
const r = await fetch(`/api/decisions?market=${market}&limit=50`);
|
||||
if (!r.ok) throw new Error('fetch failed');
|
||||
const d = await r.json();
|
||||
if (!d.decisions || d.decisions.length === 0) {
|
||||
tbody.innerHTML = '<tr class="empty-row"><td colspan="5">결정 로그 없음</td></tr>';
|
||||
return;
|
||||
}
|
||||
tbody.innerHTML = d.decisions.map(dec => `
|
||||
<tr>
|
||||
<td>${fmt(dec.timestamp)}</td>
|
||||
<td>${dec.stock_code || '--'}</td>
|
||||
<td>${badge(dec.action)}</td>
|
||||
<td>${confBar(dec.confidence)}</td>
|
||||
<td class="rationale-cell" title="${(dec.rationale || '').replace(/"/g, '"')}">${dec.rationale || '--'}</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
} catch {
|
||||
tbody.innerHTML = '<tr class="empty-row"><td colspan="5">데이터 로드 실패</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
function selectDays(btn) {
|
||||
document.querySelectorAll('.day-btn').forEach(b => b.classList.remove('active'));
|
||||
btn.classList.add('active');
|
||||
currentDays = parseInt(btn.dataset.days, 10);
|
||||
fetchPnlHistory(currentDays);
|
||||
}
|
||||
|
||||
function selectMarket(btn) {
|
||||
document.querySelectorAll('.tab-btn').forEach(b => b.classList.remove('active'));
|
||||
btn.classList.add('active');
|
||||
currentMarket = btn.dataset.market;
|
||||
fetchDecisions(currentMarket);
|
||||
}
|
||||
|
||||
async function refreshAll() {
|
||||
document.getElementById('last-updated').textContent = '업데이트 중...';
|
||||
await Promise.all([
|
||||
fetchStatus(),
|
||||
fetchPerformance(),
|
||||
fetchPnlHistory(currentDays),
|
||||
fetchDecisions(currentMarket),
|
||||
]);
|
||||
const now = new Date();
|
||||
const timeStr = now.toLocaleTimeString('ko-KR', { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
|
||||
document.getElementById('last-updated').textContent = `마지막 업데이트: ${timeStr}`;
|
||||
}
|
||||
|
||||
// Initial load
|
||||
refreshAll();
|
||||
|
||||
// Auto-refresh every 30 seconds
|
||||
setInterval(refreshAll, 30000);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
135
src/main.py
135
src/main.py
@@ -204,9 +204,7 @@ async def trading_cycle(
|
||||
|
||||
# 1. Fetch market data
|
||||
if market.is_domestic:
|
||||
current_price, price_change_pct, foreigner_net = await broker.get_current_price(
|
||||
stock_code
|
||||
)
|
||||
orderbook = await broker.get_orderbook(stock_code)
|
||||
balance_data = await broker.get_balance()
|
||||
|
||||
output2 = balance_data.get("output2", [{}])
|
||||
@@ -217,6 +215,10 @@ async def trading_cycle(
|
||||
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:
|
||||
# Overseas market
|
||||
price_data = await overseas_broker.get_overseas_price(
|
||||
@@ -237,43 +239,10 @@ async def trading_cycle(
|
||||
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")
|
||||
|
||||
# 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"))
|
||||
# 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
|
||||
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 %
|
||||
pnl_pct = (
|
||||
((total_eval - purchase_total) / purchase_total * 100)
|
||||
@@ -505,7 +474,6 @@ async def trading_cycle(
|
||||
raise # Re-raise to prevent trade
|
||||
|
||||
# 5. Send order
|
||||
order_succeeded = True
|
||||
if market.is_domestic:
|
||||
result = await broker.send_order(
|
||||
stock_code=stock_code,
|
||||
@@ -514,35 +482,16 @@ async def trading_cycle(
|
||||
price=0, # market order
|
||||
)
|
||||
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(
|
||||
exchange_code=market.exchange_code,
|
||||
stock_code=stock_code,
|
||||
order_type=decision.action,
|
||||
quantity=quantity,
|
||||
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"),
|
||||
price=0.0, # market order
|
||||
)
|
||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||
|
||||
# 5.5. Notify trade execution (only on success)
|
||||
if order_succeeded:
|
||||
# 5.5. Notify trade execution
|
||||
try:
|
||||
await telegram.notify_trade_execution(
|
||||
stock_code=stock_code,
|
||||
@@ -555,7 +504,7 @@ async def trading_cycle(
|
||||
except Exception as exc:
|
||||
logger.warning("Telegram notification failed: %s", exc)
|
||||
|
||||
if decision.action == "SELL" and order_succeeded:
|
||||
if decision.action == "SELL":
|
||||
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
||||
if buy_trade and buy_trade.get("price") is not None:
|
||||
buy_price = float(buy_trade["price"])
|
||||
@@ -567,9 +516,7 @@ async def trading_cycle(
|
||||
accuracy=1 if trade_pnl > 0 else 0,
|
||||
)
|
||||
|
||||
# 6. Log trade with selection context (skip if order was rejected)
|
||||
if decision.action in ("BUY", "SELL") and not order_succeeded:
|
||||
return
|
||||
# 6. Log trade with selection context
|
||||
selection_context = None
|
||||
if stock_code in market_candidates:
|
||||
candidate = market_candidates[stock_code]
|
||||
@@ -724,8 +671,15 @@ async def run_daily_session(
|
||||
for stock_code in watchlist:
|
||||
try:
|
||||
if market.is_domestic:
|
||||
current_price, price_change_pct, foreigner_net = (
|
||||
await broker.get_current_price(stock_code)
|
||||
orderbook = await broker.get_orderbook(stock_code)
|
||||
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:
|
||||
price_data = await overseas_broker.get_overseas_price(
|
||||
@@ -734,30 +688,10 @@ async def run_daily_session(
|
||||
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:
|
||||
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
|
||||
price_change_pct = safe_float(
|
||||
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_code": stock_code,
|
||||
@@ -808,13 +742,6 @@ async def run_daily_session(
|
||||
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.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 %
|
||||
pnl_pct = (
|
||||
@@ -889,7 +816,6 @@ async def run_daily_session(
|
||||
quantity = 0
|
||||
trade_price = stock_data["current_price"]
|
||||
trade_pnl = 0.0
|
||||
order_succeeded = True
|
||||
if decision.action in ("BUY", "SELL"):
|
||||
quantity = _determine_order_quantity(
|
||||
action=decision.action,
|
||||
@@ -942,7 +868,6 @@ async def run_daily_session(
|
||||
raise
|
||||
|
||||
# Send order
|
||||
order_succeeded = True
|
||||
try:
|
||||
if market.is_domestic:
|
||||
result = await broker.send_order(
|
||||
@@ -952,30 +877,16 @@ async def run_daily_session(
|
||||
price=0, # market order
|
||||
)
|
||||
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(
|
||||
exchange_code=market.exchange_code,
|
||||
stock_code=stock_code,
|
||||
order_type=decision.action,
|
||||
quantity=quantity,
|
||||
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"),
|
||||
price=0.0, # market order
|
||||
)
|
||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||
|
||||
# Notify trade execution (only on success)
|
||||
if order_succeeded:
|
||||
# Notify trade execution
|
||||
try:
|
||||
await telegram.notify_trade_execution(
|
||||
stock_code=stock_code,
|
||||
@@ -993,7 +904,7 @@ async def run_daily_session(
|
||||
)
|
||||
continue
|
||||
|
||||
if decision.action == "SELL" and order_succeeded:
|
||||
if decision.action == "SELL":
|
||||
buy_trade = get_latest_buy_trade(db_conn, stock_code, market.code)
|
||||
if buy_trade and buy_trade.get("price") is not None:
|
||||
buy_price = float(buy_trade["price"])
|
||||
@@ -1005,9 +916,7 @@ async def run_daily_session(
|
||||
accuracy=1 if trade_pnl > 0 else 0,
|
||||
)
|
||||
|
||||
# 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,
|
||||
stock_code=stock_code,
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
"""Pre-market planner — generates DayPlaybook via Gemini before market open.
|
||||
|
||||
One Gemini API call per market per day. Candidates come from SmartVolatilityScanner.
|
||||
On failure, returns a smart rule-based fallback playbook that uses scanner signals
|
||||
(momentum/oversold) to generate BUY conditions, avoiding the all-HOLD problem.
|
||||
On failure, returns a defensive playbook (all HOLD, no trades).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -135,7 +134,7 @@ class PreMarketPlanner:
|
||||
except Exception:
|
||||
logger.exception("Playbook generation failed for %s", market)
|
||||
if self._settings.DEFENSIVE_PLAYBOOK_ON_FAILURE:
|
||||
return self._smart_fallback_playbook(today, market, candidates, self._settings)
|
||||
return self._defensive_playbook(today, market, candidates)
|
||||
return self._empty_playbook(today, market)
|
||||
|
||||
def build_cross_market_context(
|
||||
@@ -471,99 +470,3 @@ 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,10 +2,6 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from src.brain.gemini_client import GeminiClient
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -274,97 +270,3 @@ class TestBatchDecisionParsing:
|
||||
|
||||
assert decisions["AAPL"].action == "HOLD"
|
||||
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
|
||||
|
||||
import asyncio
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
from unittest.mock import AsyncMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
@@ -90,12 +90,12 @@ class TestTokenManagement:
|
||||
await broker.close()
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_token_refresh_cooldown_waits_then_retries(self, settings):
|
||||
"""Token refresh should wait out cooldown then retry (issue #54)."""
|
||||
async def test_token_refresh_cooldown_prevents_rapid_retries(self, settings):
|
||||
"""Token refresh should enforce cooldown after failure (issue #54)."""
|
||||
broker = KISBroker(settings)
|
||||
broker._refresh_cooldown = 0.1 # Short cooldown for testing
|
||||
broker._refresh_cooldown = 2.0 # Short cooldown for testing
|
||||
|
||||
# All attempts fail with 403 (EGW00133)
|
||||
# First refresh attempt fails with 403 (EGW00133)
|
||||
mock_resp_403 = AsyncMock()
|
||||
mock_resp_403.status = 403
|
||||
mock_resp_403.text = AsyncMock(
|
||||
@@ -109,8 +109,8 @@ class TestTokenManagement:
|
||||
with pytest.raises(ConnectionError, match="Token refresh failed"):
|
||||
await broker._ensure_token()
|
||||
|
||||
# Second attempt within cooldown should wait then retry (and still get 403)
|
||||
with pytest.raises(ConnectionError, match="Token refresh failed"):
|
||||
# Second attempt within cooldown should fail with cooldown error
|
||||
with pytest.raises(ConnectionError, match="Token refresh on cooldown"):
|
||||
await broker._ensure_token()
|
||||
|
||||
await broker.close()
|
||||
@@ -296,280 +296,3 @@ class TestHashKey:
|
||||
mock_acquire.assert_called_once()
|
||||
|
||||
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"
|
||||
|
||||
@@ -296,23 +296,3 @@ def test_scenarios_active_empty_when_no_matches(tmp_path: Path) -> None:
|
||||
get_active_scenarios = _endpoint(app, "/api/scenarios/active")
|
||||
body = get_active_scenarios(market="US", date_str="2026-02-14", limit=50)
|
||||
assert body["count"] == 0
|
||||
|
||||
|
||||
def test_pnl_history_all_markets(tmp_path: Path) -> None:
|
||||
app = _app(tmp_path)
|
||||
get_pnl_history = _endpoint(app, "/api/pnl/history")
|
||||
body = get_pnl_history(days=30, market="all")
|
||||
assert body["market"] == "all"
|
||||
assert isinstance(body["labels"], list)
|
||||
assert isinstance(body["pnl"], list)
|
||||
assert len(body["labels"]) == len(body["pnl"])
|
||||
|
||||
|
||||
def test_pnl_history_market_filter(tmp_path: Path) -> None:
|
||||
app = _app(tmp_path)
|
||||
get_pnl_history = _endpoint(app, "/api/pnl/history")
|
||||
body = get_pnl_history(days=30, market="KR")
|
||||
assert body["market"] == "KR"
|
||||
# KR has 1 trade with pnl=2.0
|
||||
assert len(body["labels"]) >= 1
|
||||
assert body["pnl"][0] == 2.0
|
||||
|
||||
@@ -111,7 +111,15 @@ class TestTradingCycleTelegramIntegration:
|
||||
def mock_broker(self) -> MagicMock:
|
||||
"""Create mock broker."""
|
||||
broker = MagicMock()
|
||||
broker.get_current_price = AsyncMock(return_value=(50000.0, 1.23, 100.0))
|
||||
broker.get_orderbook = AsyncMock(
|
||||
return_value={
|
||||
"output1": {
|
||||
"stck_prpr": "50000",
|
||||
"frgn_ntby_qty": "100",
|
||||
"prdy_ctrt": "1.23",
|
||||
}
|
||||
}
|
||||
)
|
||||
broker.get_balance = AsyncMock(
|
||||
return_value={
|
||||
"output2": [
|
||||
@@ -730,83 +738,6 @@ class TestOverseasBalanceParsing:
|
||||
# Verify price API was called
|
||||
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:
|
||||
"""Test scenario engine integration in trading_cycle."""
|
||||
@@ -815,7 +746,11 @@ class TestScenarioEngineIntegration:
|
||||
def mock_broker(self) -> MagicMock:
|
||||
"""Create mock broker with standard domestic data."""
|
||||
broker = MagicMock()
|
||||
broker.get_current_price = AsyncMock(return_value=(50000.0, 2.50, 100.0))
|
||||
broker.get_orderbook = AsyncMock(
|
||||
return_value={
|
||||
"output1": {"stck_prpr": "50000", "frgn_ntby_qty": "100", "prdy_ctrt": "2.50"}
|
||||
}
|
||||
)
|
||||
broker.get_balance = AsyncMock(
|
||||
return_value={
|
||||
"output2": [
|
||||
@@ -1237,7 +1172,9 @@ async def test_sell_updates_original_buy_decision_outcome() -> None:
|
||||
)
|
||||
|
||||
broker = MagicMock()
|
||||
broker.get_current_price = AsyncMock(return_value=(120.0, 0.0, 0.0))
|
||||
broker.get_orderbook = AsyncMock(
|
||||
return_value={"output1": {"stck_prpr": "120", "frgn_ntby_qty": "0"}}
|
||||
)
|
||||
broker.get_balance = AsyncMock(
|
||||
return_value={
|
||||
"output2": [
|
||||
@@ -1327,7 +1264,9 @@ async def test_hold_overridden_to_sell_when_stop_loss_triggered() -> None:
|
||||
)
|
||||
|
||||
broker = MagicMock()
|
||||
broker.get_current_price = AsyncMock(return_value=(95.0, -5.0, 0.0))
|
||||
broker.get_orderbook = AsyncMock(
|
||||
return_value={"output1": {"stck_prpr": "95", "frgn_ntby_qty": "0", "prdy_ctrt": "-5.0"}}
|
||||
)
|
||||
broker.get_balance = AsyncMock(
|
||||
return_value={
|
||||
"output2": [
|
||||
|
||||
@@ -1,643 +0,0 @@
|
||||
"""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,23 +164,18 @@ class TestGeneratePlaybook:
|
||||
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_gemini_failure_returns_smart_fallback(self) -> None:
|
||||
async def test_gemini_failure_returns_defensive(self) -> None:
|
||||
planner = _make_planner()
|
||||
planner._gemini.decide = AsyncMock(side_effect=RuntimeError("API timeout"))
|
||||
# oversold candidate (signal="oversold", rsi=28.5)
|
||||
candidates = [_candidate()]
|
||||
|
||||
pb = await planner.generate_playbook("KR", candidates, today=date(2026, 2, 8))
|
||||
|
||||
assert pb.default_action == ScenarioAction.HOLD
|
||||
# Smart fallback uses NEUTRAL outlook (not NEUTRAL_TO_BEARISH)
|
||||
assert pb.market_outlook == MarketOutlook.NEUTRAL
|
||||
assert pb.market_outlook == MarketOutlook.NEUTRAL_TO_BEARISH
|
||||
assert pb.stock_count == 1
|
||||
# Oversold candidate → first scenario is BUY, second is SELL stop-loss
|
||||
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
|
||||
# Defensive playbook has stop-loss scenarios
|
||||
assert pb.stock_playbooks[0].scenarios[0].action == ScenarioAction.SELL
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_gemini_failure_empty_when_defensive_disabled(self) -> None:
|
||||
@@ -662,171 +657,3 @@ class TestDefensivePlaybook:
|
||||
assert pb.stock_count == 0
|
||||
assert pb.market == "US"
|
||||
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