Compare commits
28 Commits
8a8ba3b0cb
...
feature/is
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82167c5b8a | ||
| 06e4fc5597 | |||
|
|
b697b6d515 | ||
| 42db5b3cc1 | |||
|
|
f252a84d65 | ||
| adc5211fd2 | |||
|
|
67e0e8df41 | ||
| ffdb99c6c7 | |||
|
|
ce5ea5abde | ||
| 5ae302b083 | |||
|
|
d31a61cd0b | ||
|
|
1c7a17320c | ||
| f58d42fdb0 | |||
|
|
0b20251de0 | ||
| bffe6e9288 | |||
|
|
0146d1bf8a | ||
| 497564e75c | |||
|
|
988a56c07c | ||
| c9f1345e3c | |||
|
|
8c492eae3a | ||
| 271c592a46 | |||
|
|
a063bd9d10 | ||
| 847456e0af | |||
|
|
a3a9fd1f24 | ||
|
|
f34117bc81 | ||
| 17e012cd04 | |||
|
|
a030dcc0dc | ||
|
|
d1698dee33 |
@@ -292,3 +292,66 @@ Order result: 모의투자 매수주문이 완료 되었습니다. ✓
|
|||||||
```
|
```
|
||||||
|
|
||||||
**이슈/PR:** #149, #150
|
**이슈/PR:** #149, #150
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2026-02-23
|
||||||
|
|
||||||
|
### 국내주식 지정가 전환 및 미체결 처리 (#232)
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- 해외주식은 #211에서 지정가로 전환했으나 국내주식은 여전히 `price=0` (시장가)
|
||||||
|
- KRX도 지정가 주문 사용 시 동일한 미체결 위험이 존재
|
||||||
|
- 지정가 전환 + 미체결 처리를 함께 구현
|
||||||
|
|
||||||
|
**구현 내용:**
|
||||||
|
|
||||||
|
1. `src/broker/kis_api.py`
|
||||||
|
- `get_domestic_pending_orders()`: 모의 즉시 `[]`, 실전 `TTTC0084R` GET
|
||||||
|
- `cancel_domestic_order()`: 실전 `TTTC0013U` / 모의 `VTTC0013U`, hashkey 필수
|
||||||
|
|
||||||
|
2. `src/main.py`
|
||||||
|
- import `kr_round_down` 추가
|
||||||
|
- `trading_cycle`, `run_daily_session` 국내 주문 `price=0` → 지정가:
|
||||||
|
BUY +0.2% / SELL -0.2%, `kr_round_down` KRX 틱 반올림 적용
|
||||||
|
- `handle_domestic_pending_orders` 함수: BUY→취소+쿨다운, SELL→취소+재주문(-0.4%, 최대1회)
|
||||||
|
- daily/realtime 두 모드에서 domestic pending 체크 호출 추가
|
||||||
|
|
||||||
|
3. 테스트 14개 추가:
|
||||||
|
- `TestGetDomesticPendingOrders` (3), `TestCancelDomesticOrder` (5)
|
||||||
|
- `TestHandleDomesticPendingOrders` (4), `TestDomesticLimitOrderPrice` (2)
|
||||||
|
|
||||||
|
**이슈/PR:** #232, PR #233
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2026-02-24
|
||||||
|
|
||||||
|
### 해외잔고 ghost position 수정 — '모의투자 잔고내역이 없습니다' 반복 방지 (#235)
|
||||||
|
|
||||||
|
**배경:**
|
||||||
|
- 모의투자 실행 시 MLECW, KNRX, NBY, SNSE 등 만료/정지된 종목에 대해
|
||||||
|
`모의투자 잔고내역이 없습니다` 오류가 매 사이클 반복됨
|
||||||
|
|
||||||
|
**근본 원인:**
|
||||||
|
1. `ovrs_cblc_qty` (해외잔고수량, 총 보유) vs `ord_psbl_qty` (주문가능수량, 실제 매도 가능)
|
||||||
|
- 기존 코드: `ovrs_cblc_qty` 우선 사용 → 만료 Warrant가 `ovrs_cblc_qty=289456`이지만 실제 `ord_psbl_qty=0`
|
||||||
|
- startup sync / build_overseas_symbol_universe가 이 종목들을 포지션으로 기록
|
||||||
|
2. SELL 실패 시 DB 포지션이 닫히지 않아 다음 사이클에서도 재시도 (무한 반복)
|
||||||
|
|
||||||
|
**구현 내용:**
|
||||||
|
|
||||||
|
1. `src/main.py` — `_extract_held_codes_from_balance`, `_extract_held_qty_from_balance`
|
||||||
|
- 해외 잔고 필드 우선순위 변경: `ord_psbl_qty` → `ovrs_cblc_qty` → `hldg_qty` (fallback 유지)
|
||||||
|
- KIS 공식 문서(VTTS3012R) 기준: `ord_psbl_qty`가 실제 매도 가능 수량
|
||||||
|
|
||||||
|
2. `src/main.py` — `trading_cycle` ghost-close 처리
|
||||||
|
- 해외 SELL이 `잔고내역이 없습니다`로 실패 시 DB 포지션을 `[ghost-close]` SELL로 종료
|
||||||
|
- exchange code 불일치 등 예외 상황에서 무한 반복 방지
|
||||||
|
|
||||||
|
3. 테스트 7개 추가:
|
||||||
|
- `TestExtractHeldQtyFromBalance` 3개: ord_psbl_qty 우선, 0이면 0 반환, fallback
|
||||||
|
- `TestExtractHeldCodesFromBalance` 2개: ord_psbl_qty=0인 종목 제외, fallback
|
||||||
|
- `TestOverseasGhostPositionClose` 2개: ghost-close 로그 확인, 일반 오류 무시
|
||||||
|
|
||||||
|
**이슈/PR:** #235, PR #236
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ if [ -z "${APP_CMD:-}" ]; then
|
|||||||
|
|
||||||
dashboard_port="${DASHBOARD_PORT:-8080}"
|
dashboard_port="${DASHBOARD_PORT:-8080}"
|
||||||
|
|
||||||
APP_CMD="DASHBOARD_PORT=$dashboard_port $PYTHON_BIN -m src.main --mode=paper --dashboard"
|
APP_CMD="DASHBOARD_PORT=$dashboard_port $PYTHON_BIN -m src.main --mode=live --dashboard"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$LOG_DIR"
|
mkdir -p "$LOG_DIR"
|
||||||
|
|||||||
@@ -346,8 +346,10 @@ class GeminiClient:
|
|||||||
# Validate required fields
|
# Validate required fields
|
||||||
if not all(k in data for k in ("action", "confidence", "rationale")):
|
if not all(k in data for k in ("action", "confidence", "rationale")):
|
||||||
logger.warning("Missing fields in Gemini response — defaulting to HOLD")
|
logger.warning("Missing fields in Gemini response — defaulting to HOLD")
|
||||||
|
# Preserve raw text in rationale so prompt_override callers (e.g. pre_market_planner)
|
||||||
|
# can extract their own JSON format from decision.rationale (#245)
|
||||||
return TradeDecision(
|
return TradeDecision(
|
||||||
action="HOLD", confidence=0, rationale="Missing required fields"
|
action="HOLD", confidence=0, rationale=raw
|
||||||
)
|
)
|
||||||
|
|
||||||
action = str(data["action"]).upper()
|
action = str(data["action"]).upper()
|
||||||
@@ -439,6 +441,18 @@ class GeminiClient:
|
|||||||
action="HOLD", confidence=0, rationale=f"API error: {exc}", token_count=token_count
|
action="HOLD", confidence=0, rationale=f"API error: {exc}", token_count=token_count
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# prompt_override callers (e.g. pre_market_planner) expect raw text back,
|
||||||
|
# not a parsed TradeDecision. Skip parse_response to avoid spurious
|
||||||
|
# "Missing fields" warnings and return the raw response directly. (#247)
|
||||||
|
if "prompt_override" in market_data:
|
||||||
|
logger.info(
|
||||||
|
"Gemini raw response received (prompt_override, tokens=%d)", token_count
|
||||||
|
)
|
||||||
|
# Not a trade decision — don't inflate _total_decisions metrics
|
||||||
|
return TradeDecision(
|
||||||
|
action="HOLD", confidence=0, rationale=raw, token_count=token_count
|
||||||
|
)
|
||||||
|
|
||||||
decision = self.parse_response(raw)
|
decision = self.parse_response(raw)
|
||||||
self._total_decisions += 1
|
self._total_decisions += 1
|
||||||
|
|
||||||
|
|||||||
@@ -179,8 +179,8 @@ class PromptOptimizer:
|
|||||||
# Minimal instructions
|
# Minimal instructions
|
||||||
prompt = (
|
prompt = (
|
||||||
f"{market_name} trader. Analyze:\n{data_str}\n\n"
|
f"{market_name} trader. Analyze:\n{data_str}\n\n"
|
||||||
'Return JSON: {"act":"BUY"|"SELL"|"HOLD","conf":<0-100>,"reason":"<text>"}\n'
|
'Return JSON: {"action":"BUY"|"SELL"|"HOLD","confidence":<0-100>,"rationale":"<text>"}\n'
|
||||||
"Rules: act=BUY/SELL/HOLD, conf=0-100, reason=concise. No markdown."
|
"Rules: action=BUY/SELL/HOLD, confidence=0-100, rationale=concise. No markdown."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# Data only (for cached contexts where instructions are known)
|
# Data only (for cached contexts where instructions are known)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ from __future__ import annotations
|
|||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
import ssl
|
import ssl
|
||||||
from typing import Any
|
from typing import Any, cast
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
|
||||||
@@ -430,7 +430,7 @@ class KISBroker:
|
|||||||
"fid_cond_mrkt_div_code": "J",
|
"fid_cond_mrkt_div_code": "J",
|
||||||
"fid_cond_scr_div_code": "20170",
|
"fid_cond_scr_div_code": "20170",
|
||||||
"fid_input_iscd": "0000",
|
"fid_input_iscd": "0000",
|
||||||
"fid_rank_sort_cls_code": "0000",
|
"fid_rank_sort_cls_code": "0",
|
||||||
"fid_input_cnt_1": str(limit),
|
"fid_input_cnt_1": str(limit),
|
||||||
"fid_prc_cls_code": "0",
|
"fid_prc_cls_code": "0",
|
||||||
"fid_input_price_1": "0",
|
"fid_input_price_1": "0",
|
||||||
@@ -466,7 +466,7 @@ class KISBroker:
|
|||||||
rankings = []
|
rankings = []
|
||||||
for item in data.get("output", [])[:limit]:
|
for item in data.get("output", [])[:limit]:
|
||||||
rankings.append({
|
rankings.append({
|
||||||
"stock_code": item.get("mksc_shrn_iscd", ""),
|
"stock_code": item.get("stck_shrn_iscd") or item.get("mksc_shrn_iscd", ""),
|
||||||
"name": item.get("hts_kor_isnm", ""),
|
"name": item.get("hts_kor_isnm", ""),
|
||||||
"price": _safe_float(item.get("stck_prpr", "0")),
|
"price": _safe_float(item.get("stck_prpr", "0")),
|
||||||
"volume": _safe_float(item.get("acml_vol", "0")),
|
"volume": _safe_float(item.get("acml_vol", "0")),
|
||||||
@@ -478,6 +478,112 @@ class KISBroker:
|
|||||||
except (TimeoutError, aiohttp.ClientError) as exc:
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
raise ConnectionError(f"Network error fetching rankings: {exc}") from exc
|
raise ConnectionError(f"Network error fetching rankings: {exc}") from exc
|
||||||
|
|
||||||
|
async def get_domestic_pending_orders(self) -> list[dict[str, Any]]:
|
||||||
|
"""Fetch unfilled (pending) domestic limit orders.
|
||||||
|
|
||||||
|
The KIS pending-orders API (TTTC0084R) is unsupported in paper (VTS)
|
||||||
|
mode, so this method returns an empty list immediately when MODE is
|
||||||
|
not "live".
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of pending order dicts from the KIS ``output`` field.
|
||||||
|
Each dict includes keys such as ``odno``, ``orgn_odno``,
|
||||||
|
``ord_gno_brno``, ``psbl_qty``, ``sll_buy_dvsn_cd``, ``pdno``.
|
||||||
|
"""
|
||||||
|
if self._settings.MODE != "live":
|
||||||
|
logger.debug(
|
||||||
|
"get_domestic_pending_orders: paper mode — TTTC0084R unsupported, returning []"
|
||||||
|
)
|
||||||
|
return []
|
||||||
|
|
||||||
|
await self._rate_limiter.acquire()
|
||||||
|
session = self._get_session()
|
||||||
|
|
||||||
|
# TR_ID: 실전 TTTC0084R (모의 미지원)
|
||||||
|
# Source: 한국투자증권 오픈API 전체문서 (20260221) — '주식 미체결조회' 시트
|
||||||
|
headers = await self._auth_headers("TTTC0084R")
|
||||||
|
params = {
|
||||||
|
"CANO": self._account_no,
|
||||||
|
"ACNT_PRDT_CD": self._product_cd,
|
||||||
|
"INQR_DVSN_1": "0",
|
||||||
|
"INQR_DVSN_2": "0",
|
||||||
|
"CTX_AREA_FK100": "",
|
||||||
|
"CTX_AREA_NK100": "",
|
||||||
|
}
|
||||||
|
url = f"{self._base_url}/uapi/domestic-stock/v1/trading/inquire-psbl-rvsecncl"
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with session.get(url, headers=headers, params=params) as resp:
|
||||||
|
if resp.status != 200:
|
||||||
|
text = await resp.text()
|
||||||
|
raise ConnectionError(
|
||||||
|
f"get_domestic_pending_orders failed ({resp.status}): {text}"
|
||||||
|
)
|
||||||
|
data = await resp.json()
|
||||||
|
return data.get("output", []) or []
|
||||||
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
|
raise ConnectionError(
|
||||||
|
f"Network error fetching domestic pending orders: {exc}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
async def cancel_domestic_order(
|
||||||
|
self,
|
||||||
|
stock_code: str,
|
||||||
|
orgn_odno: str,
|
||||||
|
krx_fwdg_ord_orgno: str,
|
||||||
|
qty: int,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Cancel an unfilled domestic limit order.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
stock_code: 6-digit domestic stock code (``pdno``).
|
||||||
|
orgn_odno: Original order number from pending-orders response
|
||||||
|
(``orgn_odno`` field).
|
||||||
|
krx_fwdg_ord_orgno: KRX forwarding order branch number from
|
||||||
|
pending-orders response (``ord_gno_brno`` field).
|
||||||
|
qty: Quantity to cancel (use ``psbl_qty`` from pending order).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Raw KIS API response dict (check ``rt_cd == "0"`` for success).
|
||||||
|
"""
|
||||||
|
await self._rate_limiter.acquire()
|
||||||
|
session = self._get_session()
|
||||||
|
|
||||||
|
# TR_ID: 실전 TTTC0013U, 모의 VTTC0013U
|
||||||
|
# Source: 한국투자증권 오픈API 전체문서 (20260221) — '주식주문(정정취소)' 시트
|
||||||
|
tr_id = "TTTC0013U" if self._settings.MODE == "live" else "VTTC0013U"
|
||||||
|
|
||||||
|
body = {
|
||||||
|
"CANO": self._account_no,
|
||||||
|
"ACNT_PRDT_CD": self._product_cd,
|
||||||
|
"KRX_FWDG_ORD_ORGNO": krx_fwdg_ord_orgno,
|
||||||
|
"ORGN_ODNO": orgn_odno,
|
||||||
|
"ORD_DVSN": "00",
|
||||||
|
"ORD_QTY": str(qty),
|
||||||
|
"ORD_UNPR": "0",
|
||||||
|
"RVSE_CNCL_DVSN_CD": "02",
|
||||||
|
"QTY_ALL_ORD_YN": "Y",
|
||||||
|
}
|
||||||
|
|
||||||
|
hash_key = await self._get_hash_key(body)
|
||||||
|
headers = await self._auth_headers(tr_id)
|
||||||
|
headers["hashkey"] = hash_key
|
||||||
|
|
||||||
|
url = f"{self._base_url}/uapi/domestic-stock/v1/trading/order-rvsecncl"
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with session.post(url, headers=headers, json=body) as resp:
|
||||||
|
if resp.status != 200:
|
||||||
|
text = await resp.text()
|
||||||
|
raise ConnectionError(
|
||||||
|
f"cancel_domestic_order failed ({resp.status}): {text}"
|
||||||
|
)
|
||||||
|
return cast(dict[str, Any], await resp.json())
|
||||||
|
except (TimeoutError, aiohttp.ClientError) as exc:
|
||||||
|
raise ConnectionError(
|
||||||
|
f"Network error cancelling domestic order: {exc}"
|
||||||
|
) from exc
|
||||||
|
|
||||||
async def get_daily_prices(
|
async def get_daily_prices(
|
||||||
self,
|
self,
|
||||||
stock_code: str,
|
stock_code: str,
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ class OverseasBroker:
|
|||||||
"AUTH": "",
|
"AUTH": "",
|
||||||
"EXCD": ranking_excd,
|
"EXCD": ranking_excd,
|
||||||
"NDAY": "0",
|
"NDAY": "0",
|
||||||
"GUBN": "1",
|
"GUBN": "0", # 0=전체(상승+하락), 1=상승만 — 변동성 스캐너는 전체 필요
|
||||||
"VOL_RANG": "0",
|
"VOL_RANG": "0",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,10 +13,11 @@ from fastapi import FastAPI, HTTPException, Query
|
|||||||
from fastapi.responses import FileResponse
|
from fastapi.responses import FileResponse
|
||||||
|
|
||||||
|
|
||||||
def create_dashboard_app(db_path: str) -> FastAPI:
|
def create_dashboard_app(db_path: str, mode: str = "paper") -> FastAPI:
|
||||||
"""Create dashboard FastAPI app bound to a SQLite database path."""
|
"""Create dashboard FastAPI app bound to a SQLite database path."""
|
||||||
app = FastAPI(title="The Ouroboros Dashboard", version="1.0.0")
|
app = FastAPI(title="The Ouroboros Dashboard", version="1.0.0")
|
||||||
app.state.db_path = db_path
|
app.state.db_path = db_path
|
||||||
|
app.state.mode = mode
|
||||||
|
|
||||||
@app.get("/")
|
@app.get("/")
|
||||||
def index() -> FileResponse:
|
def index() -> FileResponse:
|
||||||
@@ -111,6 +112,7 @@ def create_dashboard_app(db_path: str) -> FastAPI:
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
"date": today,
|
"date": today,
|
||||||
|
"mode": mode,
|
||||||
"markets": market_status,
|
"markets": market_status,
|
||||||
"totals": {
|
"totals": {
|
||||||
"trade_count": total_trades,
|
"trade_count": total_trades,
|
||||||
|
|||||||
@@ -43,6 +43,19 @@
|
|||||||
font-size: 12px; transition: border-color 0.2s;
|
font-size: 12px; transition: border-color 0.2s;
|
||||||
}
|
}
|
||||||
.refresh-btn:hover { border-color: var(--accent); color: var(--accent); }
|
.refresh-btn:hover { border-color: var(--accent); color: var(--accent); }
|
||||||
|
.mode-badge {
|
||||||
|
padding: 3px 10px; border-radius: 5px; font-size: 12px; font-weight: 700;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.mode-badge.live {
|
||||||
|
background: rgba(224, 85, 85, 0.15); color: var(--red);
|
||||||
|
border: 1px solid rgba(224, 85, 85, 0.4);
|
||||||
|
animation: pulse-warn 2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
.mode-badge.paper {
|
||||||
|
background: rgba(232, 160, 64, 0.15); color: var(--warn);
|
||||||
|
border: 1px solid rgba(232, 160, 64, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
/* CB Gauge */
|
/* CB Gauge */
|
||||||
.cb-gauge-wrap {
|
.cb-gauge-wrap {
|
||||||
@@ -225,6 +238,7 @@
|
|||||||
<header>
|
<header>
|
||||||
<h1>🐍 The Ouroboros</h1>
|
<h1>🐍 The Ouroboros</h1>
|
||||||
<div class="header-right">
|
<div class="header-right">
|
||||||
|
<span class="mode-badge" id="mode-badge">--</span>
|
||||||
<div class="cb-gauge-wrap" id="cb-gauge" title="Circuit Breaker">
|
<div class="cb-gauge-wrap" id="cb-gauge" title="Circuit Breaker">
|
||||||
<span class="cb-dot unknown" id="cb-dot"></span>
|
<span class="cb-dot unknown" id="cb-dot"></span>
|
||||||
<span id="cb-label">CB --</span>
|
<span id="cb-label">CB --</span>
|
||||||
@@ -512,9 +526,22 @@
|
|||||||
}
|
}
|
||||||
document.getElementById('card-pnl-sub').textContent = `결정 ${t.decision_count ?? 0}건`;
|
document.getElementById('card-pnl-sub').textContent = `결정 ${t.decision_count ?? 0}건`;
|
||||||
renderCbGauge(d.circuit_breaker);
|
renderCbGauge(d.circuit_breaker);
|
||||||
|
renderModeBadge(d.mode);
|
||||||
} catch {}
|
} catch {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderModeBadge(mode) {
|
||||||
|
const el = document.getElementById('mode-badge');
|
||||||
|
if (!el) return;
|
||||||
|
if (mode === 'live') {
|
||||||
|
el.textContent = '🔴 실전투자';
|
||||||
|
el.className = 'mode-badge live';
|
||||||
|
} else {
|
||||||
|
el.textContent = '🟡 모의투자';
|
||||||
|
el.className = 'mode-badge paper';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchPerformance() {
|
async function fetchPerformance() {
|
||||||
try {
|
try {
|
||||||
const r = await fetch('/api/performance?market=all');
|
const r = await fetch('/api/performance?market=all');
|
||||||
|
|||||||
299
src/main.py
299
src/main.py
@@ -19,7 +19,7 @@ from src.analysis.smart_scanner import ScanCandidate, SmartVolatilityScanner
|
|||||||
from src.analysis.volatility import VolatilityAnalyzer
|
from src.analysis.volatility import VolatilityAnalyzer
|
||||||
from src.brain.context_selector import ContextSelector
|
from src.brain.context_selector import ContextSelector
|
||||||
from src.brain.gemini_client import GeminiClient, TradeDecision
|
from src.brain.gemini_client import GeminiClient, TradeDecision
|
||||||
from src.broker.kis_api import KISBroker
|
from src.broker.kis_api import KISBroker, kr_round_down
|
||||||
from src.broker.overseas import OverseasBroker
|
from src.broker.overseas import OverseasBroker
|
||||||
from src.config import Settings
|
from src.config import Settings
|
||||||
from src.context.aggregator import ContextAggregator
|
from src.context.aggregator import ContextAggregator
|
||||||
@@ -182,6 +182,9 @@ async def sync_positions_from_broker(
|
|||||||
qty = _extract_held_qty_from_balance(
|
qty = _extract_held_qty_from_balance(
|
||||||
balance_data, stock_code, is_domestic=market.is_domestic
|
balance_data, stock_code, is_domestic=market.is_domestic
|
||||||
)
|
)
|
||||||
|
avg_price = _extract_avg_price_from_balance(
|
||||||
|
balance_data, stock_code, is_domestic=market.is_domestic
|
||||||
|
)
|
||||||
log_trade(
|
log_trade(
|
||||||
conn=db_conn,
|
conn=db_conn,
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
@@ -189,7 +192,7 @@ async def sync_positions_from_broker(
|
|||||||
confidence=0,
|
confidence=0,
|
||||||
rationale="[startup-sync] Position detected from broker at startup",
|
rationale="[startup-sync] Position detected from broker at startup",
|
||||||
quantity=qty,
|
quantity=qty,
|
||||||
price=0.0,
|
price=avg_price,
|
||||||
market=log_market,
|
market=log_market,
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
mode=settings.MODE,
|
mode=settings.MODE,
|
||||||
@@ -257,7 +260,15 @@ def _extract_held_codes_from_balance(
|
|||||||
if is_domestic:
|
if is_domestic:
|
||||||
qty = int(holding.get("ord_psbl_qty") or holding.get("hldg_qty") or 0)
|
qty = int(holding.get("ord_psbl_qty") or holding.get("hldg_qty") or 0)
|
||||||
else:
|
else:
|
||||||
qty = int(holding.get("ovrs_cblc_qty") or holding.get("hldg_qty") or 0)
|
# ord_psbl_qty (주문가능수량) is the actual sellable quantity.
|
||||||
|
# ovrs_cblc_qty (해외잔고수량) includes unsettled/expired holdings
|
||||||
|
# that cannot actually be sold (e.g. expired warrants).
|
||||||
|
qty = int(
|
||||||
|
holding.get("ord_psbl_qty")
|
||||||
|
or holding.get("ovrs_cblc_qty")
|
||||||
|
or holding.get("hldg_qty")
|
||||||
|
or 0
|
||||||
|
)
|
||||||
if qty > 0:
|
if qty > 0:
|
||||||
codes.append(code)
|
codes.append(code)
|
||||||
return codes
|
return codes
|
||||||
@@ -280,10 +291,12 @@ def _extract_held_qty_from_balance(
|
|||||||
ord_psbl_qty — 주문가능수량 (preferred: excludes unsettled)
|
ord_psbl_qty — 주문가능수량 (preferred: excludes unsettled)
|
||||||
hldg_qty — 보유수량 (fallback)
|
hldg_qty — 보유수량 (fallback)
|
||||||
|
|
||||||
Overseas fields (output1):
|
Overseas fields (VTTS3012R / TTTS3012R output1):
|
||||||
ovrs_pdno — 종목코드
|
ovrs_pdno — 종목코드
|
||||||
ovrs_cblc_qty — 해외잔고수량 (preferred)
|
ord_psbl_qty — 주문가능수량 (preferred: actual sellable qty)
|
||||||
hldg_qty — 보유수량 (fallback)
|
ovrs_cblc_qty — 해외잔고수량 (fallback: total holding, may include
|
||||||
|
unsettled or expired positions with ord_psbl_qty=0)
|
||||||
|
hldg_qty — 보유수량 (last-resort fallback)
|
||||||
"""
|
"""
|
||||||
output1 = balance_data.get("output1", [])
|
output1 = balance_data.get("output1", [])
|
||||||
if isinstance(output1, dict):
|
if isinstance(output1, dict):
|
||||||
@@ -301,11 +314,47 @@ def _extract_held_qty_from_balance(
|
|||||||
if is_domestic:
|
if is_domestic:
|
||||||
qty = int(holding.get("ord_psbl_qty") or holding.get("hldg_qty") or 0)
|
qty = int(holding.get("ord_psbl_qty") or holding.get("hldg_qty") or 0)
|
||||||
else:
|
else:
|
||||||
qty = int(holding.get("ovrs_cblc_qty") or holding.get("hldg_qty") or 0)
|
qty = int(
|
||||||
|
holding.get("ord_psbl_qty")
|
||||||
|
or holding.get("ovrs_cblc_qty")
|
||||||
|
or holding.get("hldg_qty")
|
||||||
|
or 0
|
||||||
|
)
|
||||||
return qty
|
return qty
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def _extract_avg_price_from_balance(
|
||||||
|
balance_data: dict[str, Any],
|
||||||
|
stock_code: str,
|
||||||
|
*,
|
||||||
|
is_domestic: bool,
|
||||||
|
) -> float:
|
||||||
|
"""Extract the broker-reported average purchase price for a stock.
|
||||||
|
|
||||||
|
Uses ``pchs_avg_pric`` (매입평균가격) from the balance response (output1).
|
||||||
|
Returns 0.0 when absent so callers can use ``if price > 0`` as sentinel.
|
||||||
|
|
||||||
|
Domestic fields (VTTC8434R output1): pdno, pchs_avg_pric
|
||||||
|
Overseas fields (VTTS3012R output1): ovrs_pdno, pchs_avg_pric
|
||||||
|
"""
|
||||||
|
output1 = balance_data.get("output1", [])
|
||||||
|
if isinstance(output1, dict):
|
||||||
|
output1 = [output1]
|
||||||
|
if not isinstance(output1, list):
|
||||||
|
return 0.0
|
||||||
|
|
||||||
|
for holding in output1:
|
||||||
|
if not isinstance(holding, dict):
|
||||||
|
continue
|
||||||
|
code_key = "pdno" if is_domestic else "ovrs_pdno"
|
||||||
|
held_code = str(holding.get(code_key, "")).strip().upper()
|
||||||
|
if held_code != stock_code.strip().upper():
|
||||||
|
continue
|
||||||
|
return safe_float(holding.get("pchs_avg_pric"), 0.0)
|
||||||
|
return 0.0
|
||||||
|
|
||||||
|
|
||||||
def _determine_order_quantity(
|
def _determine_order_quantity(
|
||||||
*,
|
*,
|
||||||
action: str,
|
action: str,
|
||||||
@@ -681,7 +730,7 @@ async def trading_cycle(
|
|||||||
open_position = get_open_position(db_conn, stock_code, market.code)
|
open_position = get_open_position(db_conn, stock_code, market.code)
|
||||||
if open_position:
|
if open_position:
|
||||||
entry_price = safe_float(open_position.get("price"), 0.0)
|
entry_price = safe_float(open_position.get("price"), 0.0)
|
||||||
if entry_price > 0:
|
if entry_price > 0 and current_price > 0:
|
||||||
loss_pct = (current_price - entry_price) / entry_price * 100
|
loss_pct = (current_price - entry_price) / entry_price * 100
|
||||||
stop_loss_threshold = -2.0
|
stop_loss_threshold = -2.0
|
||||||
take_profit_threshold = 3.0
|
take_profit_threshold = 3.0
|
||||||
@@ -853,11 +902,19 @@ async def trading_cycle(
|
|||||||
# 5. Send order
|
# 5. Send order
|
||||||
order_succeeded = True
|
order_succeeded = True
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
|
# Use limit orders (지정가) for domestic stocks to avoid market order
|
||||||
|
# quantity calculation issues. KRX tick rounding applied via kr_round_down.
|
||||||
|
# BUY: +0.2% — ensures fill even when ask is slightly above last price.
|
||||||
|
# SELL: -0.2% — ensures fill even when bid is slightly below last price.
|
||||||
|
if decision.action == "BUY":
|
||||||
|
order_price = kr_round_down(current_price * 1.002)
|
||||||
|
else:
|
||||||
|
order_price = kr_round_down(current_price * 0.998)
|
||||||
result = await broker.send_order(
|
result = await broker.send_order(
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
order_type=decision.action,
|
order_type=decision.action,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
price=0, # market order
|
price=order_price,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# For overseas orders, always use limit orders (지정가):
|
# For overseas orders, always use limit orders (지정가):
|
||||||
@@ -867,16 +924,20 @@ async def trading_cycle(
|
|||||||
# achieving >90% fill rate on large-cap US stocks.
|
# achieving >90% fill rate on large-cap US stocks.
|
||||||
# - SELL: -0.2% below last price — ensures fill even when price dips slightly
|
# - SELL: -0.2% below last price — ensures fill even when price dips slightly
|
||||||
# (placing at exact last price risks no-fill if the bid is just below).
|
# (placing at exact last price risks no-fill if the bid is just below).
|
||||||
|
overseas_price: float
|
||||||
|
# KIS requires at most 2 decimal places for prices >= $1 (≥1달러 소수점 2자리 제한).
|
||||||
|
# Penny stocks (< $1) keep 4 decimal places to preserve price precision.
|
||||||
|
_price_decimals = 2 if current_price >= 1.0 else 4
|
||||||
if decision.action == "BUY":
|
if decision.action == "BUY":
|
||||||
order_price = round(current_price * 1.002, 4)
|
overseas_price = round(current_price * 1.002, _price_decimals)
|
||||||
else:
|
else:
|
||||||
order_price = round(current_price * 0.998, 4)
|
overseas_price = round(current_price * 0.998, _price_decimals)
|
||||||
result = await overseas_broker.send_overseas_order(
|
result = await overseas_broker.send_overseas_order(
|
||||||
exchange_code=market.exchange_code,
|
exchange_code=market.exchange_code,
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
order_type=decision.action,
|
order_type=decision.action,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
price=order_price, # limit order
|
price=overseas_price, # limit order
|
||||||
)
|
)
|
||||||
# Check if KIS rejected the order (rt_cd != "0")
|
# Check if KIS rejected the order (rt_cd != "0")
|
||||||
if result.get("rt_cd", "") != "0":
|
if result.get("rt_cd", "") != "0":
|
||||||
@@ -899,6 +960,33 @@ async def trading_cycle(
|
|||||||
stock_code,
|
stock_code,
|
||||||
_BUY_COOLDOWN_SECONDS,
|
_BUY_COOLDOWN_SECONDS,
|
||||||
)
|
)
|
||||||
|
# Close ghost position when broker has no matching balance.
|
||||||
|
# This prevents infinite SELL retry cycles for positions that
|
||||||
|
# exist in the DB (from startup sync) but are no longer
|
||||||
|
# sellable at the broker (expired warrants, delisted stocks, etc.)
|
||||||
|
if decision.action == "SELL" and "잔고내역이 없습니다" in msg1:
|
||||||
|
logger.warning(
|
||||||
|
"Ghost position detected for %s (%s): broker reports no balance."
|
||||||
|
" Closing DB position to prevent infinite retry.",
|
||||||
|
stock_code,
|
||||||
|
market.exchange_code,
|
||||||
|
)
|
||||||
|
log_trade(
|
||||||
|
conn=db_conn,
|
||||||
|
stock_code=stock_code,
|
||||||
|
action="SELL",
|
||||||
|
confidence=0,
|
||||||
|
rationale=(
|
||||||
|
"[ghost-close] Broker reported no balance;"
|
||||||
|
" position closed without fill"
|
||||||
|
),
|
||||||
|
quantity=0,
|
||||||
|
price=0.0,
|
||||||
|
pnl=0.0,
|
||||||
|
market=market.code,
|
||||||
|
exchange_code=market.exchange_code,
|
||||||
|
mode=settings.MODE if settings else "paper",
|
||||||
|
)
|
||||||
logger.info("Order result: %s", result.get("msg1", "OK"))
|
logger.info("Order result: %s", result.get("msg1", "OK"))
|
||||||
|
|
||||||
# 5.5. Notify trade execution (only on success)
|
# 5.5. Notify trade execution (only on success)
|
||||||
@@ -978,6 +1066,153 @@ async def trading_cycle(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def handle_domestic_pending_orders(
|
||||||
|
broker: KISBroker,
|
||||||
|
telegram: TelegramClient,
|
||||||
|
settings: Settings,
|
||||||
|
sell_resubmit_counts: dict[str, int],
|
||||||
|
buy_cooldown: dict[str, float] | None = None,
|
||||||
|
) -> None:
|
||||||
|
"""Check and handle unfilled (pending) domestic limit orders.
|
||||||
|
|
||||||
|
Called once per market loop iteration before new orders are considered.
|
||||||
|
In paper mode the KIS pending-orders API (TTTC0084R) is unsupported, so
|
||||||
|
``get_domestic_pending_orders`` returns [] immediately and this function
|
||||||
|
exits without making further API calls.
|
||||||
|
|
||||||
|
BUY pending → cancel (to free up balance) + optionally set cooldown.
|
||||||
|
SELL pending → cancel then resubmit at a wider spread (-0.4% from last
|
||||||
|
price, kr_round_down applied). Resubmission is attempted
|
||||||
|
at most once per key per session to avoid infinite loops.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
broker: KISBroker instance.
|
||||||
|
telegram: TelegramClient for notifications.
|
||||||
|
settings: Application settings.
|
||||||
|
sell_resubmit_counts: Mutable dict tracking SELL resubmission attempts
|
||||||
|
per "KR:{stock_code}" key. Passed by reference so counts persist
|
||||||
|
across calls within the same session.
|
||||||
|
buy_cooldown: Optional cooldown dict shared with the main trading loop.
|
||||||
|
When provided, cancelled BUY orders are added with a
|
||||||
|
_BUY_COOLDOWN_SECONDS expiry.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
orders = await broker.get_domestic_pending_orders()
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Failed to fetch domestic pending orders: %s", exc)
|
||||||
|
return
|
||||||
|
|
||||||
|
now = asyncio.get_event_loop().time()
|
||||||
|
|
||||||
|
for order in orders:
|
||||||
|
try:
|
||||||
|
stock_code = order.get("pdno", "")
|
||||||
|
orgn_odno = order.get("orgn_odno", "")
|
||||||
|
krx_fwdg_ord_orgno = order.get("ord_gno_brno", "")
|
||||||
|
sll_buy = order.get("sll_buy_dvsn_cd", "") # "01"=SELL, "02"=BUY
|
||||||
|
psbl_qty = int(order.get("psbl_qty", "0") or "0")
|
||||||
|
key = f"KR:{stock_code}"
|
||||||
|
|
||||||
|
if not stock_code or not orgn_odno or psbl_qty <= 0:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Cancel the pending order first regardless of direction.
|
||||||
|
cancel_result = await broker.cancel_domestic_order(
|
||||||
|
stock_code=stock_code,
|
||||||
|
orgn_odno=orgn_odno,
|
||||||
|
krx_fwdg_ord_orgno=krx_fwdg_ord_orgno,
|
||||||
|
qty=psbl_qty,
|
||||||
|
)
|
||||||
|
if cancel_result.get("rt_cd") != "0":
|
||||||
|
logger.warning(
|
||||||
|
"Cancel failed for KR %s: rt_cd=%s msg=%s",
|
||||||
|
stock_code,
|
||||||
|
cancel_result.get("rt_cd"),
|
||||||
|
cancel_result.get("msg1"),
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
if sll_buy == "02":
|
||||||
|
# BUY pending → cancelled; set cooldown to avoid immediate re-buy.
|
||||||
|
if buy_cooldown is not None:
|
||||||
|
buy_cooldown[key] = now + _BUY_COOLDOWN_SECONDS
|
||||||
|
try:
|
||||||
|
await telegram.notify_unfilled_order(
|
||||||
|
stock_code=stock_code,
|
||||||
|
market="KR",
|
||||||
|
action="BUY",
|
||||||
|
quantity=psbl_qty,
|
||||||
|
outcome="cancelled",
|
||||||
|
)
|
||||||
|
except Exception as notify_exc:
|
||||||
|
logger.warning("notify_unfilled_order failed: %s", notify_exc)
|
||||||
|
|
||||||
|
elif sll_buy == "01":
|
||||||
|
# SELL pending — attempt one resubmit at a wider spread.
|
||||||
|
if sell_resubmit_counts.get(key, 0) >= 1:
|
||||||
|
# Already resubmitted once — only cancel (already done above).
|
||||||
|
logger.warning(
|
||||||
|
"SELL KR %s already resubmitted once — no further resubmit",
|
||||||
|
stock_code,
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
await telegram.notify_unfilled_order(
|
||||||
|
stock_code=stock_code,
|
||||||
|
market="KR",
|
||||||
|
action="SELL",
|
||||||
|
quantity=psbl_qty,
|
||||||
|
outcome="cancelled",
|
||||||
|
)
|
||||||
|
except Exception as notify_exc:
|
||||||
|
logger.warning(
|
||||||
|
"notify_unfilled_order failed: %s", notify_exc
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# First unfilled SELL → resubmit at last * 0.996 (-0.4%).
|
||||||
|
try:
|
||||||
|
last_price, _, _ = await broker.get_current_price(stock_code)
|
||||||
|
if last_price <= 0:
|
||||||
|
raise ValueError(
|
||||||
|
f"Invalid price ({last_price}) for {stock_code}"
|
||||||
|
)
|
||||||
|
new_price = kr_round_down(last_price * 0.996)
|
||||||
|
await broker.send_order(
|
||||||
|
stock_code=stock_code,
|
||||||
|
order_type="SELL",
|
||||||
|
quantity=psbl_qty,
|
||||||
|
price=new_price,
|
||||||
|
)
|
||||||
|
sell_resubmit_counts[key] = (
|
||||||
|
sell_resubmit_counts.get(key, 0) + 1
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
await telegram.notify_unfilled_order(
|
||||||
|
stock_code=stock_code,
|
||||||
|
market="KR",
|
||||||
|
action="SELL",
|
||||||
|
quantity=psbl_qty,
|
||||||
|
outcome="resubmitted",
|
||||||
|
new_price=float(new_price),
|
||||||
|
)
|
||||||
|
except Exception as notify_exc:
|
||||||
|
logger.warning(
|
||||||
|
"notify_unfilled_order failed: %s", notify_exc
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error(
|
||||||
|
"SELL resubmit failed for KR %s: %s",
|
||||||
|
stock_code,
|
||||||
|
exc,
|
||||||
|
)
|
||||||
|
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error(
|
||||||
|
"Error handling domestic pending order for %s: %s",
|
||||||
|
order.get("pdno", "?"),
|
||||||
|
exc,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def handle_overseas_pending_orders(
|
async def handle_overseas_pending_orders(
|
||||||
overseas_broker: OverseasBroker,
|
overseas_broker: OverseasBroker,
|
||||||
telegram: TelegramClient,
|
telegram: TelegramClient,
|
||||||
@@ -1205,6 +1440,19 @@ async def run_daily_session(
|
|||||||
# Use market-local date for playbook keying
|
# Use market-local date for playbook keying
|
||||||
market_today = datetime.now(market.timezone).date()
|
market_today = datetime.now(market.timezone).date()
|
||||||
|
|
||||||
|
# Check and handle domestic pending (unfilled) limit orders before new decisions.
|
||||||
|
if market.is_domestic:
|
||||||
|
try:
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker,
|
||||||
|
telegram,
|
||||||
|
settings,
|
||||||
|
sell_resubmit_counts,
|
||||||
|
daily_buy_cooldown,
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Domestic pending order check failed: %s", exc)
|
||||||
|
|
||||||
# Check and handle overseas pending (unfilled) limit orders before new decisions.
|
# Check and handle overseas pending (unfilled) limit orders before new decisions.
|
||||||
if not market.is_domestic:
|
if not market.is_domestic:
|
||||||
try:
|
try:
|
||||||
@@ -1607,11 +1855,21 @@ async def run_daily_session(
|
|||||||
order_succeeded = True
|
order_succeeded = True
|
||||||
try:
|
try:
|
||||||
if market.is_domestic:
|
if market.is_domestic:
|
||||||
|
# Use limit orders (지정가) for domestic stocks.
|
||||||
|
# KRX tick rounding applied via kr_round_down.
|
||||||
|
if decision.action == "BUY":
|
||||||
|
order_price = kr_round_down(
|
||||||
|
stock_data["current_price"] * 1.002
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
order_price = kr_round_down(
|
||||||
|
stock_data["current_price"] * 0.998
|
||||||
|
)
|
||||||
result = await broker.send_order(
|
result = await broker.send_order(
|
||||||
stock_code=stock_code,
|
stock_code=stock_code,
|
||||||
order_type=decision.action,
|
order_type=decision.action,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
price=0, # market order
|
price=order_price,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# KIS VTS only accepts limit orders; use 0.5% premium for BUY
|
# KIS VTS only accepts limit orders; use 0.5% premium for BUY
|
||||||
@@ -1824,7 +2082,7 @@ def _start_dashboard_server(settings: Settings) -> threading.Thread | None:
|
|||||||
import uvicorn
|
import uvicorn
|
||||||
from src.dashboard import create_dashboard_app
|
from src.dashboard import create_dashboard_app
|
||||||
|
|
||||||
app = create_dashboard_app(settings.DB_PATH)
|
app = create_dashboard_app(settings.DB_PATH, mode=settings.MODE)
|
||||||
uvicorn.run(
|
uvicorn.run(
|
||||||
app,
|
app,
|
||||||
host=settings.DASHBOARD_HOST,
|
host=settings.DASHBOARD_HOST,
|
||||||
@@ -2464,6 +2722,19 @@ async def run(settings: Settings) -> None:
|
|||||||
logger.warning("Market open notification failed: %s", exc)
|
logger.warning("Market open notification failed: %s", exc)
|
||||||
_market_states[market.code] = True
|
_market_states[market.code] = True
|
||||||
|
|
||||||
|
# Check and handle domestic pending (unfilled) limit orders.
|
||||||
|
if market.is_domestic:
|
||||||
|
try:
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker,
|
||||||
|
telegram,
|
||||||
|
settings,
|
||||||
|
sell_resubmit_counts,
|
||||||
|
buy_cooldown,
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Domestic pending order check failed: %s", exc)
|
||||||
|
|
||||||
# Check and handle overseas pending (unfilled) limit orders.
|
# Check and handle overseas pending (unfilled) limit orders.
|
||||||
if not market.is_domestic:
|
if not market.is_domestic:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
"""Auto-generated strategy: v20260220_210124
|
|
||||||
|
|
||||||
Generated at: 2026-02-20T21:01:24.706847+00:00
|
|
||||||
Rationale: Auto-evolved from 6 failures. Primary failure markets: ['US_AMEX', 'US_NYSE', 'US_NASDAQ']. Average loss: -194.69
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
from typing import Any
|
|
||||||
from src.strategies.base import BaseStrategy
|
|
||||||
|
|
||||||
|
|
||||||
class Strategy_v20260220_210124(BaseStrategy):
|
|
||||||
"""Strategy: v20260220_210124"""
|
|
||||||
|
|
||||||
def evaluate(self, market_data: dict[str, Any]) -> dict[str, Any]:
|
|
||||||
import datetime
|
|
||||||
|
|
||||||
# --- Strategy Constants ---
|
|
||||||
# Minimum price for a stock to be considered for trading (avoids penny stocks)
|
|
||||||
MIN_PRICE = 5.0
|
|
||||||
|
|
||||||
# Momentum signal thresholds (stricter than previous failures)
|
|
||||||
MOMENTUM_PRICE_CHANGE_THRESHOLD = 7.0 # % price change
|
|
||||||
MOMENTUM_VOLUME_RATIO_THRESHOLD = 4.0 # X times average volume
|
|
||||||
|
|
||||||
# Oversold signal thresholds (more conservative)
|
|
||||||
OVERSOLD_RSI_THRESHOLD = 25.0 # RSI value (lower means more oversold)
|
|
||||||
|
|
||||||
# Confidence levels
|
|
||||||
CONFIDENCE_HOLD = 30
|
|
||||||
CONFIDENCE_BUY_OVERSOLD = 65
|
|
||||||
CONFIDENCE_BUY_MOMENTUM = 85
|
|
||||||
CONFIDENCE_BUY_STRONG_MOMENTUM = 90 # For higher-priced stocks with strong momentum
|
|
||||||
|
|
||||||
# Market hours in UTC (9:30 AM ET to 4:00 PM ET)
|
|
||||||
MARKET_OPEN_UTC = datetime.time(14, 30)
|
|
||||||
MARKET_CLOSE_UTC = datetime.time(21, 0)
|
|
||||||
|
|
||||||
# Volatile periods within market hours (UTC) to avoid
|
|
||||||
# First hour after open (14:30 UTC - 15:30 UTC)
|
|
||||||
VOLATILE_OPEN_END_UTC = datetime.time(15, 30)
|
|
||||||
# Last 30 minutes before close (20:30 UTC - 21:00 UTC)
|
|
||||||
VOLATILE_CLOSE_START_UTC = datetime.time(20, 30)
|
|
||||||
|
|
||||||
current_price = market_data.get('current_price')
|
|
||||||
price_change_pct = market_data.get('price_change_pct')
|
|
||||||
volume_ratio = market_data.get('volume_ratio') # Assumed pre-computed indicator
|
|
||||||
rsi = market_data.get('rsi') # Assumed pre-computed indicator
|
|
||||||
timestamp_str = market_data.get('timestamp')
|
|
||||||
|
|
||||||
action = "HOLD"
|
|
||||||
confidence = CONFIDENCE_HOLD
|
|
||||||
rationale = "Initial HOLD: No clear signal or conditions not met."
|
|
||||||
|
|
||||||
# --- 1. Basic Data Validation ---
|
|
||||||
if current_price is None or price_change_pct is None:
|
|
||||||
return {"action": "HOLD", "confidence": CONFIDENCE_HOLD,
|
|
||||||
"rationale": "Insufficient core data (price or price change) to evaluate."}
|
|
||||||
|
|
||||||
# --- 2. Price Filter: Avoid low-priced/penny stocks ---
|
|
||||||
if current_price < MIN_PRICE:
|
|
||||||
return {"action": "HOLD", "confidence": CONFIDENCE_HOLD,
|
|
||||||
"rationale": f"Avoiding low-priced stock (${current_price:.2f} < ${MIN_PRICE:.2f})."}
|
|
||||||
|
|
||||||
# --- 3. Time Filter: Only trade during core market hours ---
|
|
||||||
if timestamp_str:
|
|
||||||
try:
|
|
||||||
dt_object = datetime.datetime.fromisoformat(timestamp_str)
|
|
||||||
current_time_utc = dt_object.time()
|
|
||||||
|
|
||||||
if not (MARKET_OPEN_UTC <= current_time_utc < MARKET_CLOSE_UTC):
|
|
||||||
return {"action": "HOLD", "confidence": CONFIDENCE_HOLD,
|
|
||||||
"rationale": f"Avoiding trade outside core market hours ({current_time_utc} UTC)."}
|
|
||||||
|
|
||||||
if (MARKET_OPEN_UTC <= current_time_utc < VOLATILE_OPEN_END_UTC) or \
|
|
||||||
(VOLATILE_CLOSE_START_UTC <= current_time_utc < MARKET_CLOSE_UTC):
|
|
||||||
return {"action": "HOLD", "confidence": CONFIDENCE_HOLD,
|
|
||||||
"rationale": f"Avoiding trade during volatile market open/close periods ({current_time_utc} UTC)."}
|
|
||||||
|
|
||||||
except ValueError:
|
|
||||||
rationale += " (Warning: Malformed timestamp, time filters skipped)"
|
|
||||||
|
|
||||||
# --- Initialize signal states ---
|
|
||||||
has_momentum_buy_signal = False
|
|
||||||
has_oversold_buy_signal = False
|
|
||||||
|
|
||||||
# --- 4. Evaluate Enhanced Buy Signals ---
|
|
||||||
|
|
||||||
# Momentum Buy Signal
|
|
||||||
if volume_ratio is not None and \
|
|
||||||
price_change_pct > MOMENTUM_PRICE_CHANGE_THRESHOLD and \
|
|
||||||
volume_ratio > MOMENTUM_VOLUME_RATIO_THRESHOLD:
|
|
||||||
has_momentum_buy_signal = True
|
|
||||||
rationale = f"Momentum BUY: Price change {price_change_pct:.2f}%, Volume {volume_ratio:.2f}x."
|
|
||||||
confidence = CONFIDENCE_BUY_MOMENTUM
|
|
||||||
if current_price >= 10.0:
|
|
||||||
confidence = CONFIDENCE_BUY_STRONG_MOMENTUM
|
|
||||||
|
|
||||||
# Oversold Buy Signal
|
|
||||||
if rsi is not None and rsi < OVERSOLD_RSI_THRESHOLD:
|
|
||||||
has_oversold_buy_signal = True
|
|
||||||
if not has_momentum_buy_signal:
|
|
||||||
rationale = f"Oversold BUY: RSI {rsi:.2f}."
|
|
||||||
confidence = CONFIDENCE_BUY_OVERSOLD
|
|
||||||
if current_price >= 10.0:
|
|
||||||
confidence = min(CONFIDENCE_BUY_OVERSOLD + 5, 80)
|
|
||||||
|
|
||||||
# --- 5. Decision Logic ---
|
|
||||||
if has_momentum_buy_signal:
|
|
||||||
action = "BUY"
|
|
||||||
elif has_oversold_buy_signal:
|
|
||||||
action = "BUY"
|
|
||||||
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
"""Auto-generated strategy: v20260220_210159
|
|
||||||
|
|
||||||
Generated at: 2026-02-20T21:01:59.391523+00:00
|
|
||||||
Rationale: Auto-evolved from 6 failures. Primary failure markets: ['US_AMEX', 'US_NYSE', 'US_NASDAQ']. Average loss: -194.69
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
from typing import Any
|
|
||||||
from src.strategies.base import BaseStrategy
|
|
||||||
|
|
||||||
|
|
||||||
class Strategy_v20260220_210159(BaseStrategy):
|
|
||||||
"""Strategy: v20260220_210159"""
|
|
||||||
|
|
||||||
def evaluate(self, market_data: dict[str, Any]) -> dict[str, Any]:
|
|
||||||
import datetime
|
|
||||||
|
|
||||||
current_price = market_data.get('current_price')
|
|
||||||
price_change_pct = market_data.get('price_change_pct')
|
|
||||||
volume_ratio = market_data.get('volume_ratio')
|
|
||||||
rsi = market_data.get('rsi')
|
|
||||||
timestamp_str = market_data.get('timestamp')
|
|
||||||
market_name = market_data.get('market')
|
|
||||||
|
|
||||||
# Default action
|
|
||||||
action = "HOLD"
|
|
||||||
confidence = 0
|
|
||||||
rationale = "No strong signal or conditions not met."
|
|
||||||
|
|
||||||
# --- FAILURE PATTERN AVOIDANCE ---
|
|
||||||
|
|
||||||
# 1. Avoid low-priced/penny stocks
|
|
||||||
MIN_PRICE_THRESHOLD = 5.0 # USD
|
|
||||||
if current_price is not None and current_price < MIN_PRICE_THRESHOLD:
|
|
||||||
rationale = (
|
|
||||||
f"HOLD: Stock price (${current_price:.2f}) is below minimum threshold "
|
|
||||||
f"(${MIN_PRICE_THRESHOLD:.2f}). Past failures consistently involved low-priced stocks."
|
|
||||||
)
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
|
|
||||||
# 2. Avoid early market hour volatility
|
|
||||||
if timestamp_str:
|
|
||||||
try:
|
|
||||||
dt_obj = datetime.datetime.fromisoformat(timestamp_str)
|
|
||||||
utc_hour = dt_obj.hour
|
|
||||||
utc_minute = dt_obj.minute
|
|
||||||
|
|
||||||
if (utc_hour == 14 and utc_minute < 45) or (utc_hour == 13 and utc_minute >= 30):
|
|
||||||
rationale = (
|
|
||||||
f"HOLD: Trading during early market hours (UTC {utc_hour}:{utc_minute}), "
|
|
||||||
f"a period identified with past failures due to high volatility."
|
|
||||||
)
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# --- IMPROVED BUY STRATEGY ---
|
|
||||||
|
|
||||||
# Momentum BUY signal
|
|
||||||
if volume_ratio is not None and price_change_pct is not None:
|
|
||||||
if price_change_pct > 7.0 and volume_ratio > 3.0:
|
|
||||||
action = "BUY"
|
|
||||||
confidence = 70
|
|
||||||
rationale = "Improved BUY: Momentum signal with high volume and above price threshold."
|
|
||||||
|
|
||||||
if market_name == 'US_AMEX':
|
|
||||||
confidence = max(55, confidence - 5)
|
|
||||||
rationale += " (Adjusted lower for AMEX market's higher risk profile)."
|
|
||||||
elif market_name == 'US_NASDAQ' and price_change_pct > 20:
|
|
||||||
confidence = max(50, confidence - 10)
|
|
||||||
rationale += " (Adjusted lower for aggressive NASDAQ momentum volatility)."
|
|
||||||
|
|
||||||
if price_change_pct > 15.0:
|
|
||||||
confidence = max(50, confidence - 5)
|
|
||||||
rationale += " (Caution: Very high daily price change, potential for reversal)."
|
|
||||||
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
|
|
||||||
# Oversold BUY signal
|
|
||||||
if rsi is not None and price_change_pct is not None:
|
|
||||||
if rsi < 30 and price_change_pct < -3.0:
|
|
||||||
action = "BUY"
|
|
||||||
confidence = 65
|
|
||||||
rationale = "Improved BUY: Oversold signal with recent decline and above price threshold."
|
|
||||||
|
|
||||||
if market_name == 'US_AMEX':
|
|
||||||
confidence = max(50, confidence - 5)
|
|
||||||
rationale += " (Adjusted lower for AMEX market's higher risk on oversold assets)."
|
|
||||||
|
|
||||||
if price_change_pct < -10.0:
|
|
||||||
confidence = max(45, confidence - 10)
|
|
||||||
rationale += " (Caution: Very steep decline, potential falling knife)."
|
|
||||||
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
|
|
||||||
# If no specific BUY signal, default to HOLD
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
"""Auto-generated strategy: v20260220_210244
|
|
||||||
|
|
||||||
Generated at: 2026-02-20T21:02:44.387355+00:00
|
|
||||||
Rationale: Auto-evolved from 6 failures. Primary failure markets: ['US_AMEX', 'US_NYSE', 'US_NASDAQ']. Average loss: -194.69
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
from typing import Any
|
|
||||||
from src.strategies.base import BaseStrategy
|
|
||||||
|
|
||||||
|
|
||||||
class Strategy_v20260220_210244(BaseStrategy):
|
|
||||||
"""Strategy: v20260220_210244"""
|
|
||||||
|
|
||||||
def evaluate(self, market_data: dict[str, Any]) -> dict[str, Any]:
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
# Extract required data points safely
|
|
||||||
current_price = market_data.get("current_price")
|
|
||||||
price_change_pct = market_data.get("price_change_pct")
|
|
||||||
volume_ratio = market_data.get("volume_ratio")
|
|
||||||
rsi = market_data.get("rsi")
|
|
||||||
timestamp_str = market_data.get("timestamp")
|
|
||||||
market_name = market_data.get("market")
|
|
||||||
stock_code = market_data.get("stock_code", "UNKNOWN")
|
|
||||||
|
|
||||||
# Default action is HOLD with conservative confidence and rationale
|
|
||||||
action = "HOLD"
|
|
||||||
confidence = 50
|
|
||||||
rationale = f"No strong BUY signal for {stock_code} or awaiting more favorable conditions after avoiding known failure patterns."
|
|
||||||
|
|
||||||
# --- 1. Failure Pattern Avoidance Filters ---
|
|
||||||
|
|
||||||
# A. Avoid low-priced (penny) stocks
|
|
||||||
if current_price is not None and current_price < 5.0:
|
|
||||||
return {
|
|
||||||
"action": "HOLD",
|
|
||||||
"confidence": 50,
|
|
||||||
"rationale": f"AVOID {stock_code}: Stock price (${current_price:.2f}) is below minimum threshold ($5.00) for BUY action. Identified past failures on highly volatile, low-priced stocks."
|
|
||||||
}
|
|
||||||
|
|
||||||
# B. Avoid initiating BUY trades during identified high-volatility hours
|
|
||||||
if timestamp_str:
|
|
||||||
try:
|
|
||||||
trade_hour = datetime.fromisoformat(timestamp_str).hour
|
|
||||||
if trade_hour in [14, 20]:
|
|
||||||
return {
|
|
||||||
"action": "HOLD",
|
|
||||||
"confidence": 50,
|
|
||||||
"rationale": f"AVOID {stock_code}: Trading during historically volatile hour ({trade_hour} UTC) where previous BUYs resulted in losses. Prefer to observe market stability."
|
|
||||||
}
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# C. Be cautious with extreme momentum spikes
|
|
||||||
if volume_ratio is not None and price_change_pct is not None:
|
|
||||||
if volume_ratio >= 9.0 and price_change_pct >= 15.0:
|
|
||||||
return {
|
|
||||||
"action": "HOLD",
|
|
||||||
"confidence": 50,
|
|
||||||
"rationale": f"AVOID {stock_code}: Extreme short-term momentum detected (price change: +{price_change_pct:.2f}%, volume ratio: {volume_ratio:.1f}x). Historical failures indicate buying into such rapid spikes often leads to reversals."
|
|
||||||
}
|
|
||||||
|
|
||||||
# D. Be cautious with "oversold" signals without further confirmation
|
|
||||||
if rsi is not None and rsi < 30:
|
|
||||||
return {
|
|
||||||
"action": "HOLD",
|
|
||||||
"confidence": 50,
|
|
||||||
"rationale": f"AVOID {stock_code}: Oversold signal (RSI={rsi:.1f}) detected. While often a BUY signal, historical failures on similar 'oversold' trades suggest waiting for stronger confirmation."
|
|
||||||
}
|
|
||||||
|
|
||||||
# --- 2. Improved BUY Signal Generation ---
|
|
||||||
if volume_ratio is not None and 2.0 <= volume_ratio < 9.0 and \
|
|
||||||
price_change_pct is not None and 2.0 <= price_change_pct < 15.0:
|
|
||||||
|
|
||||||
action = "BUY"
|
|
||||||
confidence = 70
|
|
||||||
rationale = f"BUY {stock_code}: Moderate momentum detected (price change: +{price_change_pct:.2f}%, volume ratio: {volume_ratio:.1f}x). Passed filters for price and extreme momentum, avoiding past failure patterns."
|
|
||||||
|
|
||||||
if market_name in ["US_AMEX", "US_NASDAQ"]:
|
|
||||||
confidence = max(60, confidence - 5)
|
|
||||||
rationale += f" Adjusted confidence for {market_name} market characteristics."
|
|
||||||
elif market_name == "US_NYSE":
|
|
||||||
confidence = max(65, confidence)
|
|
||||||
|
|
||||||
confidence = max(50, min(85, confidence))
|
|
||||||
|
|
||||||
return {"action": action, "confidence": confidence, "rationale": rationale}
|
|
||||||
@@ -93,9 +93,21 @@ class TestMalformedJsonHandling:
|
|||||||
|
|
||||||
def test_json_with_missing_fields_returns_hold(self, settings):
|
def test_json_with_missing_fields_returns_hold(self, settings):
|
||||||
client = GeminiClient(settings)
|
client = GeminiClient(settings)
|
||||||
decision = client.parse_response('{"action": "BUY"}')
|
raw = '{"action": "BUY"}'
|
||||||
|
decision = client.parse_response(raw)
|
||||||
assert decision.action == "HOLD"
|
assert decision.action == "HOLD"
|
||||||
assert decision.confidence == 0
|
assert decision.confidence == 0
|
||||||
|
# rationale preserves raw so prompt_override callers (e.g. pre_market_planner)
|
||||||
|
# can extract non-TradeDecision JSON from decision.rationale (#245)
|
||||||
|
assert decision.rationale == raw
|
||||||
|
|
||||||
|
def test_non_trade_decision_json_preserves_raw_in_rationale(self, settings):
|
||||||
|
"""Playbook JSON (no action/confidence/rationale) must be preserved for planner."""
|
||||||
|
client = GeminiClient(settings)
|
||||||
|
playbook_json = '{"market_outlook": "neutral", "stocks": []}'
|
||||||
|
decision = client.parse_response(playbook_json)
|
||||||
|
assert decision.action == "HOLD"
|
||||||
|
assert decision.rationale == playbook_json
|
||||||
|
|
||||||
def test_json_with_invalid_action_returns_hold(self, settings):
|
def test_json_with_invalid_action_returns_hold(self, settings):
|
||||||
client = GeminiClient(settings)
|
client = GeminiClient(settings)
|
||||||
@@ -290,9 +302,10 @@ class TestPromptOverride:
|
|||||||
client = GeminiClient(settings)
|
client = GeminiClient(settings)
|
||||||
|
|
||||||
custom_prompt = "You are a playbook generator. Return JSON with scenarios."
|
custom_prompt = "You are a playbook generator. Return JSON with scenarios."
|
||||||
|
playbook_json = '{"market_outlook": "neutral", "stocks": []}'
|
||||||
|
|
||||||
mock_response = MagicMock()
|
mock_response = MagicMock()
|
||||||
mock_response.text = '{"action": "HOLD", "confidence": 50, "rationale": "test"}'
|
mock_response.text = playbook_json
|
||||||
|
|
||||||
with patch.object(
|
with patch.object(
|
||||||
client._client.aio.models,
|
client._client.aio.models,
|
||||||
@@ -305,7 +318,7 @@ class TestPromptOverride:
|
|||||||
"current_price": 0,
|
"current_price": 0,
|
||||||
"prompt_override": custom_prompt,
|
"prompt_override": custom_prompt,
|
||||||
}
|
}
|
||||||
await client.decide(market_data)
|
decision = await client.decide(market_data)
|
||||||
|
|
||||||
# Verify the custom prompt was sent, not a built prompt
|
# Verify the custom prompt was sent, not a built prompt
|
||||||
mock_generate.assert_called_once()
|
mock_generate.assert_called_once()
|
||||||
@@ -313,17 +326,50 @@ class TestPromptOverride:
|
|||||||
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
||||||
)
|
)
|
||||||
assert actual_prompt == custom_prompt
|
assert actual_prompt == custom_prompt
|
||||||
|
# Raw response preserved in rationale without parse_response (#247)
|
||||||
|
assert decision.rationale == playbook_json
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_prompt_override_skips_optimization(self, settings):
|
async def test_prompt_override_skips_parse_response(self, settings):
|
||||||
"""prompt_override should bypass prompt optimization."""
|
"""prompt_override bypasses parse_response — no Missing fields warning, raw preserved."""
|
||||||
client = GeminiClient(settings)
|
client = GeminiClient(settings)
|
||||||
client._enable_optimization = True
|
client._enable_optimization = True
|
||||||
|
|
||||||
custom_prompt = "Custom playbook prompt"
|
custom_prompt = "Custom playbook prompt"
|
||||||
|
playbook_json = '{"market_outlook": "bullish", "stocks": [{"stock_code": "AAPL"}]}'
|
||||||
|
|
||||||
mock_response = MagicMock()
|
mock_response = MagicMock()
|
||||||
mock_response.text = '{"action": "HOLD", "confidence": 50, "rationale": "ok"}'
|
mock_response.text = playbook_json
|
||||||
|
|
||||||
|
with patch.object(
|
||||||
|
client._client.aio.models,
|
||||||
|
"generate_content",
|
||||||
|
new_callable=AsyncMock,
|
||||||
|
return_value=mock_response,
|
||||||
|
):
|
||||||
|
with patch.object(client, "parse_response") as mock_parse:
|
||||||
|
market_data = {
|
||||||
|
"stock_code": "PLANNER",
|
||||||
|
"current_price": 0,
|
||||||
|
"prompt_override": custom_prompt,
|
||||||
|
}
|
||||||
|
decision = await client.decide(market_data)
|
||||||
|
|
||||||
|
# parse_response must NOT be called for prompt_override
|
||||||
|
mock_parse.assert_not_called()
|
||||||
|
# Raw playbook JSON preserved in rationale
|
||||||
|
assert decision.rationale == playbook_json
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_prompt_override_takes_priority_over_optimization(self, settings):
|
||||||
|
"""prompt_override must win over enable_optimization=True."""
|
||||||
|
client = GeminiClient(settings)
|
||||||
|
client._enable_optimization = True
|
||||||
|
|
||||||
|
custom_prompt = "Explicit playbook prompt"
|
||||||
|
|
||||||
|
mock_response = MagicMock()
|
||||||
|
mock_response.text = '{"market_outlook": "neutral", "stocks": []}'
|
||||||
|
|
||||||
with patch.object(
|
with patch.object(
|
||||||
client._client.aio.models,
|
client._client.aio.models,
|
||||||
@@ -341,6 +387,7 @@ class TestPromptOverride:
|
|||||||
actual_prompt = mock_generate.call_args[1].get(
|
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
|
"contents", mock_generate.call_args[0][1] if len(mock_generate.call_args[0]) > 1 else None
|
||||||
)
|
)
|
||||||
|
# The custom prompt must be used, not the compressed prompt
|
||||||
assert actual_prompt == custom_prompt
|
assert actual_prompt == custom_prompt
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
|
|||||||
@@ -354,6 +354,8 @@ class TestFetchMarketRankings:
|
|||||||
assert "ranking/fluctuation" in url
|
assert "ranking/fluctuation" in url
|
||||||
assert headers.get("tr_id") == "FHPST01700000"
|
assert headers.get("tr_id") == "FHPST01700000"
|
||||||
assert params.get("fid_cond_scr_div_code") == "20170"
|
assert params.get("fid_cond_scr_div_code") == "20170"
|
||||||
|
# 실전 API는 4자리("0000") 거부 — 1자리("0")여야 한다 (#240)
|
||||||
|
assert params.get("fid_rank_sort_cls_code") == "0"
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_volume_returns_parsed_rows(self, broker: KISBroker) -> None:
|
async def test_volume_returns_parsed_rows(self, broker: KISBroker) -> None:
|
||||||
@@ -376,6 +378,27 @@ class TestFetchMarketRankings:
|
|||||||
assert result[0]["price"] == 75000.0
|
assert result[0]["price"] == 75000.0
|
||||||
assert result[0]["change_rate"] == 2.5
|
assert result[0]["change_rate"] == 2.5
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_fluctuation_parses_stck_shrn_iscd(self, broker: KISBroker) -> None:
|
||||||
|
"""실전 API는 mksc_shrn_iscd 대신 stck_shrn_iscd를 반환한다 (#240)."""
|
||||||
|
items = [
|
||||||
|
{
|
||||||
|
"stck_shrn_iscd": "015260",
|
||||||
|
"hts_kor_isnm": "에이엔피",
|
||||||
|
"stck_prpr": "794",
|
||||||
|
"acml_vol": "4896196",
|
||||||
|
"prdy_ctrt": "29.74",
|
||||||
|
"vol_inrt": "0",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
mock_resp = _make_ranking_mock(items)
|
||||||
|
with patch("aiohttp.ClientSession.get", return_value=mock_resp):
|
||||||
|
result = await broker.fetch_market_rankings(ranking_type="fluctuation")
|
||||||
|
|
||||||
|
assert len(result) == 1
|
||||||
|
assert result[0]["stock_code"] == "015260"
|
||||||
|
assert result[0]["change_rate"] == 29.74
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# KRX tick unit / round-down helpers (issue #157)
|
# KRX tick unit / round-down helpers (issue #157)
|
||||||
@@ -725,3 +748,195 @@ class TestTRIDBranchingDomestic:
|
|||||||
|
|
||||||
order_headers = mock_post.call_args_list[1][1].get("headers", {})
|
order_headers = mock_post.call_args_list[1][1].get("headers", {})
|
||||||
assert order_headers["tr_id"] == "TTTC0011U"
|
assert order_headers["tr_id"] == "TTTC0011U"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Domestic Pending Orders (get_domestic_pending_orders)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestGetDomesticPendingOrders:
|
||||||
|
"""get_domestic_pending_orders must return [] in paper mode and call TTTC0084R in live."""
|
||||||
|
|
||||||
|
def _make_broker(self, settings, mode: str) -> KISBroker:
|
||||||
|
from src.config import Settings
|
||||||
|
|
||||||
|
s = Settings(
|
||||||
|
KIS_APP_KEY=settings.KIS_APP_KEY,
|
||||||
|
KIS_APP_SECRET=settings.KIS_APP_SECRET,
|
||||||
|
KIS_ACCOUNT_NO=settings.KIS_ACCOUNT_NO,
|
||||||
|
GEMINI_API_KEY=settings.GEMINI_API_KEY,
|
||||||
|
DB_PATH=":memory:",
|
||||||
|
ENABLED_MARKETS="KR",
|
||||||
|
MODE=mode,
|
||||||
|
)
|
||||||
|
b = KISBroker(s)
|
||||||
|
b._access_token = "tok"
|
||||||
|
b._token_expires_at = float("inf")
|
||||||
|
b._rate_limiter.acquire = AsyncMock()
|
||||||
|
return b
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_paper_mode_returns_empty(self, settings) -> None:
|
||||||
|
"""Paper mode must return [] immediately without any API call."""
|
||||||
|
broker = self._make_broker(settings, "paper")
|
||||||
|
|
||||||
|
with patch("aiohttp.ClientSession.get") as mock_get:
|
||||||
|
result = await broker.get_domestic_pending_orders()
|
||||||
|
|
||||||
|
assert result == []
|
||||||
|
mock_get.assert_not_called()
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_live_mode_calls_tttc0084r_with_correct_params(
|
||||||
|
self, settings
|
||||||
|
) -> None:
|
||||||
|
"""Live mode must call TTTC0084R with INQR_DVSN_1/2 and paging params."""
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
pending = [{"odno": "001", "pdno": "005930", "psbl_qty": "10"}]
|
||||||
|
mock_resp = AsyncMock()
|
||||||
|
mock_resp.status = 200
|
||||||
|
mock_resp.json = AsyncMock(return_value={"output": pending})
|
||||||
|
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:
|
||||||
|
result = await broker.get_domestic_pending_orders()
|
||||||
|
|
||||||
|
assert result == pending
|
||||||
|
headers = mock_get.call_args[1].get("headers", {})
|
||||||
|
assert headers["tr_id"] == "TTTC0084R"
|
||||||
|
params = mock_get.call_args[1].get("params", {})
|
||||||
|
assert params["INQR_DVSN_1"] == "0"
|
||||||
|
assert params["INQR_DVSN_2"] == "0"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_live_mode_connection_error(self, settings) -> None:
|
||||||
|
"""Network error must raise ConnectionError."""
|
||||||
|
import aiohttp as _aiohttp
|
||||||
|
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.get",
|
||||||
|
side_effect=_aiohttp.ClientError("timeout"),
|
||||||
|
):
|
||||||
|
with pytest.raises(ConnectionError):
|
||||||
|
await broker.get_domestic_pending_orders()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Domestic Order Cancellation (cancel_domestic_order)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestCancelDomesticOrder:
|
||||||
|
"""cancel_domestic_order must use correct TR_ID and build body correctly."""
|
||||||
|
|
||||||
|
def _make_broker(self, settings, mode: str) -> KISBroker:
|
||||||
|
from src.config import Settings
|
||||||
|
|
||||||
|
s = Settings(
|
||||||
|
KIS_APP_KEY=settings.KIS_APP_KEY,
|
||||||
|
KIS_APP_SECRET=settings.KIS_APP_SECRET,
|
||||||
|
KIS_ACCOUNT_NO=settings.KIS_ACCOUNT_NO,
|
||||||
|
GEMINI_API_KEY=settings.GEMINI_API_KEY,
|
||||||
|
DB_PATH=":memory:",
|
||||||
|
ENABLED_MARKETS="KR",
|
||||||
|
MODE=mode,
|
||||||
|
)
|
||||||
|
b = KISBroker(s)
|
||||||
|
b._access_token = "tok"
|
||||||
|
b._token_expires_at = float("inf")
|
||||||
|
b._rate_limiter.acquire = AsyncMock()
|
||||||
|
return b
|
||||||
|
|
||||||
|
def _make_post_mocks(self, order_payload: dict) -> tuple:
|
||||||
|
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=order_payload)
|
||||||
|
mock_order.__aenter__ = AsyncMock(return_value=mock_order)
|
||||||
|
mock_order.__aexit__ = AsyncMock(return_value=False)
|
||||||
|
|
||||||
|
return mock_hash, mock_order
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_live_uses_tttc0013u(self, settings) -> None:
|
||||||
|
"""Live mode must use TR_ID TTTC0013U."""
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
mock_hash, mock_order = self._make_post_mocks({"rt_cd": "0"})
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.cancel_domestic_order("005930", "ORD001", "BRNO01", 5)
|
||||||
|
|
||||||
|
order_headers = mock_post.call_args_list[1][1].get("headers", {})
|
||||||
|
assert order_headers["tr_id"] == "TTTC0013U"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_paper_uses_vttc0013u(self, settings) -> None:
|
||||||
|
"""Paper mode must use TR_ID VTTC0013U."""
|
||||||
|
broker = self._make_broker(settings, "paper")
|
||||||
|
mock_hash, mock_order = self._make_post_mocks({"rt_cd": "0"})
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.cancel_domestic_order("005930", "ORD001", "BRNO01", 5)
|
||||||
|
|
||||||
|
order_headers = mock_post.call_args_list[1][1].get("headers", {})
|
||||||
|
assert order_headers["tr_id"] == "VTTC0013U"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_cancel_sets_rvse_cncl_dvsn_cd_02(self, settings) -> None:
|
||||||
|
"""Body must have RVSE_CNCL_DVSN_CD='02' (취소) and QTY_ALL_ORD_YN='Y'."""
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
mock_hash, mock_order = self._make_post_mocks({"rt_cd": "0"})
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.cancel_domestic_order("005930", "ORD001", "BRNO01", 5)
|
||||||
|
|
||||||
|
body = mock_post.call_args_list[1][1].get("json", {})
|
||||||
|
assert body["RVSE_CNCL_DVSN_CD"] == "02"
|
||||||
|
assert body["QTY_ALL_ORD_YN"] == "Y"
|
||||||
|
assert body["ORD_UNPR"] == "0"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_cancel_sets_krx_fwdg_ord_orgno_in_body(self, settings) -> None:
|
||||||
|
"""Body must include KRX_FWDG_ORD_ORGNO and ORGN_ODNO from arguments."""
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
mock_hash, mock_order = self._make_post_mocks({"rt_cd": "0"})
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.cancel_domestic_order("005930", "ORD123", "BRN456", 3)
|
||||||
|
|
||||||
|
body = mock_post.call_args_list[1][1].get("json", {})
|
||||||
|
assert body["KRX_FWDG_ORD_ORGNO"] == "BRN456"
|
||||||
|
assert body["ORGN_ODNO"] == "ORD123"
|
||||||
|
assert body["ORD_QTY"] == "3"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_cancel_sets_hashkey_header(self, settings) -> None:
|
||||||
|
"""Request must include hashkey header (same pattern as send_order)."""
|
||||||
|
broker = self._make_broker(settings, "live")
|
||||||
|
mock_hash, mock_order = self._make_post_mocks({"rt_cd": "0"})
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"aiohttp.ClientSession.post", side_effect=[mock_hash, mock_order]
|
||||||
|
) as mock_post:
|
||||||
|
await broker.cancel_domestic_order("005930", "ORD001", "BRNO01", 2)
|
||||||
|
|
||||||
|
order_headers = mock_post.call_args_list[1][1].get("headers", {})
|
||||||
|
assert "hashkey" in order_headers
|
||||||
|
assert order_headers["hashkey"] == "h"
|
||||||
|
|||||||
@@ -413,3 +413,39 @@ def test_status_circuit_breaker_unknown_when_no_data(tmp_path: Path) -> None:
|
|||||||
cb = body["circuit_breaker"]
|
cb = body["circuit_breaker"]
|
||||||
assert cb["status"] == "unknown"
|
assert cb["status"] == "unknown"
|
||||||
assert cb["current_pnl_pct"] is None
|
assert cb["current_pnl_pct"] is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_status_mode_paper(tmp_path: Path) -> None:
|
||||||
|
"""mode=paper로 생성하면 status 응답에 mode=paper가 포함돼야 한다."""
|
||||||
|
db_path = tmp_path / "dashboard_test.db"
|
||||||
|
conn = init_db(str(db_path))
|
||||||
|
_seed_db(conn)
|
||||||
|
conn.close()
|
||||||
|
app = create_dashboard_app(str(db_path), mode="paper")
|
||||||
|
get_status = _endpoint(app, "/api/status")
|
||||||
|
body = get_status()
|
||||||
|
assert body["mode"] == "paper"
|
||||||
|
|
||||||
|
|
||||||
|
def test_status_mode_live(tmp_path: Path) -> None:
|
||||||
|
"""mode=live로 생성하면 status 응답에 mode=live가 포함돼야 한다."""
|
||||||
|
db_path = tmp_path / "dashboard_test.db"
|
||||||
|
conn = init_db(str(db_path))
|
||||||
|
_seed_db(conn)
|
||||||
|
conn.close()
|
||||||
|
app = create_dashboard_app(str(db_path), mode="live")
|
||||||
|
get_status = _endpoint(app, "/api/status")
|
||||||
|
body = get_status()
|
||||||
|
assert body["mode"] == "live"
|
||||||
|
|
||||||
|
|
||||||
|
def test_status_mode_default_paper(tmp_path: Path) -> None:
|
||||||
|
"""mode 파라미터 미전달 시 기본값은 paper여야 한다."""
|
||||||
|
db_path = tmp_path / "dashboard_test.db"
|
||||||
|
conn = init_db(str(db_path))
|
||||||
|
_seed_db(conn)
|
||||||
|
conn.close()
|
||||||
|
app = create_dashboard_app(str(db_path))
|
||||||
|
get_status = _endpoint(app, "/api/status")
|
||||||
|
body = get_status()
|
||||||
|
assert body["mode"] == "paper"
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ from src.logging.decision_logger import DecisionLogger
|
|||||||
from src.main import (
|
from src.main import (
|
||||||
_apply_dashboard_flag,
|
_apply_dashboard_flag,
|
||||||
_determine_order_quantity,
|
_determine_order_quantity,
|
||||||
|
_extract_avg_price_from_balance,
|
||||||
_extract_held_codes_from_balance,
|
_extract_held_codes_from_balance,
|
||||||
_extract_held_qty_from_balance,
|
_extract_held_qty_from_balance,
|
||||||
_handle_market_close,
|
_handle_market_close,
|
||||||
@@ -22,6 +23,7 @@ from src.main import (
|
|||||||
_run_context_scheduler,
|
_run_context_scheduler,
|
||||||
_run_evolution_loop,
|
_run_evolution_loop,
|
||||||
_start_dashboard_server,
|
_start_dashboard_server,
|
||||||
|
handle_domestic_pending_orders,
|
||||||
handle_overseas_pending_orders,
|
handle_overseas_pending_orders,
|
||||||
run_daily_session,
|
run_daily_session,
|
||||||
safe_float,
|
safe_float,
|
||||||
@@ -75,6 +77,81 @@ def _make_sell_match(stock_code: str = "005930") -> ScenarioMatch:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestExtractAvgPriceFromBalance:
|
||||||
|
"""Tests for _extract_avg_price_from_balance() (issue #249)."""
|
||||||
|
|
||||||
|
def test_domestic_returns_pchs_avg_pric(self) -> None:
|
||||||
|
"""Domestic balance with pchs_avg_pric returns the correct float."""
|
||||||
|
balance = {"output1": [{"pdno": "005930", "pchs_avg_pric": "68000.00"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 68000.0
|
||||||
|
|
||||||
|
def test_overseas_returns_pchs_avg_pric(self) -> None:
|
||||||
|
"""Overseas balance with pchs_avg_pric returns the correct float."""
|
||||||
|
balance = {"output1": [{"ovrs_pdno": "AAPL", "pchs_avg_pric": "170.50"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "AAPL", is_domestic=False)
|
||||||
|
assert result == 170.5
|
||||||
|
|
||||||
|
def test_returns_zero_when_field_absent(self) -> None:
|
||||||
|
"""Returns 0.0 when pchs_avg_pric key is missing entirely."""
|
||||||
|
balance = {"output1": [{"pdno": "005930", "ord_psbl_qty": "5"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_returns_zero_when_field_empty_string(self) -> None:
|
||||||
|
"""Returns 0.0 when pchs_avg_pric is an empty string."""
|
||||||
|
balance = {"output1": [{"pdno": "005930", "pchs_avg_pric": ""}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_returns_zero_when_stock_not_found(self) -> None:
|
||||||
|
"""Returns 0.0 when the requested stock_code is not in output1."""
|
||||||
|
balance = {"output1": [{"pdno": "000660", "pchs_avg_pric": "100000.0"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_returns_zero_when_output1_empty(self) -> None:
|
||||||
|
"""Returns 0.0 when output1 is an empty list."""
|
||||||
|
balance = {"output1": []}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_returns_zero_when_output1_key_absent(self) -> None:
|
||||||
|
"""Returns 0.0 when output1 key is missing from balance_data."""
|
||||||
|
balance: dict = {}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_handles_output1_as_dict(self) -> None:
|
||||||
|
"""Handles the edge case where output1 is a dict instead of a list."""
|
||||||
|
balance = {"output1": {"pdno": "005930", "pchs_avg_pric": "55000.0"}}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 55000.0
|
||||||
|
|
||||||
|
def test_case_insensitive_code_matching(self) -> None:
|
||||||
|
"""Stock code comparison is case-insensitive."""
|
||||||
|
balance = {"output1": [{"ovrs_pdno": "aapl", "pchs_avg_pric": "170.0"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "AAPL", is_domestic=False)
|
||||||
|
assert result == 170.0
|
||||||
|
|
||||||
|
def test_returns_zero_for_non_numeric_string(self) -> None:
|
||||||
|
"""Returns 0.0 when pchs_avg_pric contains a non-numeric value."""
|
||||||
|
balance = {"output1": [{"pdno": "005930", "pchs_avg_pric": "N/A"}]}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 0.0
|
||||||
|
|
||||||
|
def test_returns_correct_stock_among_multiple(self) -> None:
|
||||||
|
"""Returns only the avg price of the requested stock when output1 has multiple holdings."""
|
||||||
|
balance = {
|
||||||
|
"output1": [
|
||||||
|
{"pdno": "000660", "pchs_avg_pric": "150000.0"},
|
||||||
|
{"pdno": "005930", "pchs_avg_pric": "68000.0"},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
result = _extract_avg_price_from_balance(balance, "005930", is_domestic=True)
|
||||||
|
assert result == 68000.0
|
||||||
|
|
||||||
|
|
||||||
class TestExtractHeldQtyFromBalance:
|
class TestExtractHeldQtyFromBalance:
|
||||||
"""Tests for _extract_held_qty_from_balance()."""
|
"""Tests for _extract_held_qty_from_balance()."""
|
||||||
|
|
||||||
@@ -100,10 +177,24 @@ class TestExtractHeldQtyFromBalance:
|
|||||||
balance = {"output1": [], "output2": [{}]}
|
balance = {"output1": [], "output2": [{}]}
|
||||||
assert _extract_held_qty_from_balance(balance, "005930", is_domestic=True) == 0
|
assert _extract_held_qty_from_balance(balance, "005930", is_domestic=True) == 0
|
||||||
|
|
||||||
def test_overseas_returns_ovrs_cblc_qty(self) -> None:
|
def test_overseas_returns_ord_psbl_qty_first(self) -> None:
|
||||||
|
"""ord_psbl_qty (주문가능수량) takes priority over ovrs_cblc_qty."""
|
||||||
|
balance = {
|
||||||
|
"output1": [{"ovrs_pdno": "AAPL", "ord_psbl_qty": "8", "ovrs_cblc_qty": "10"}]
|
||||||
|
}
|
||||||
|
assert _extract_held_qty_from_balance(balance, "AAPL", is_domestic=False) == 8
|
||||||
|
|
||||||
|
def test_overseas_fallback_to_ovrs_cblc_qty_when_ord_psbl_qty_absent(self) -> None:
|
||||||
balance = {"output1": [{"ovrs_pdno": "AAPL", "ovrs_cblc_qty": "10"}]}
|
balance = {"output1": [{"ovrs_pdno": "AAPL", "ovrs_cblc_qty": "10"}]}
|
||||||
assert _extract_held_qty_from_balance(balance, "AAPL", is_domestic=False) == 10
|
assert _extract_held_qty_from_balance(balance, "AAPL", is_domestic=False) == 10
|
||||||
|
|
||||||
|
def test_overseas_returns_zero_when_ord_psbl_qty_zero(self) -> None:
|
||||||
|
"""Expired/delisted securities: ovrs_cblc_qty large but ord_psbl_qty=0."""
|
||||||
|
balance = {
|
||||||
|
"output1": [{"ovrs_pdno": "MLECW", "ord_psbl_qty": "0", "ovrs_cblc_qty": "289456"}]
|
||||||
|
}
|
||||||
|
assert _extract_held_qty_from_balance(balance, "MLECW", is_domestic=False) == 0
|
||||||
|
|
||||||
def test_overseas_fallback_to_hldg_qty(self) -> None:
|
def test_overseas_fallback_to_hldg_qty(self) -> None:
|
||||||
balance = {"output1": [{"ovrs_pdno": "AAPL", "hldg_qty": "4"}]}
|
balance = {"output1": [{"ovrs_pdno": "AAPL", "hldg_qty": "4"}]}
|
||||||
assert _extract_held_qty_from_balance(balance, "AAPL", is_domestic=False) == 4
|
assert _extract_held_qty_from_balance(balance, "AAPL", is_domestic=False) == 4
|
||||||
@@ -146,6 +237,26 @@ class TestExtractHeldCodesFromBalance:
|
|||||||
result = _extract_held_codes_from_balance(balance, is_domestic=False)
|
result = _extract_held_codes_from_balance(balance, is_domestic=False)
|
||||||
assert result == ["AAPL"]
|
assert result == ["AAPL"]
|
||||||
|
|
||||||
|
def test_overseas_uses_ord_psbl_qty_to_filter(self) -> None:
|
||||||
|
"""ord_psbl_qty=0 should exclude stock even if ovrs_cblc_qty is large."""
|
||||||
|
balance = {
|
||||||
|
"output1": [
|
||||||
|
{"ovrs_pdno": "MLECW", "ord_psbl_qty": "0", "ovrs_cblc_qty": "289456"},
|
||||||
|
{"ovrs_pdno": "AAPL", "ord_psbl_qty": "5", "ovrs_cblc_qty": "5"},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
result = _extract_held_codes_from_balance(balance, is_domestic=False)
|
||||||
|
assert "MLECW" not in result
|
||||||
|
assert "AAPL" in result
|
||||||
|
|
||||||
|
def test_overseas_includes_stock_when_ord_psbl_qty_absent_and_ovrs_cblc_qty_positive(
|
||||||
|
self,
|
||||||
|
) -> None:
|
||||||
|
"""Fallback to ovrs_cblc_qty when ord_psbl_qty field is missing."""
|
||||||
|
balance = {"output1": [{"ovrs_pdno": "TSLA", "ovrs_cblc_qty": "3"}]}
|
||||||
|
result = _extract_held_codes_from_balance(balance, is_domestic=False)
|
||||||
|
assert "TSLA" in result
|
||||||
|
|
||||||
|
|
||||||
class TestDetermineOrderQuantity:
|
class TestDetermineOrderQuantity:
|
||||||
"""Test _determine_order_quantity() — SELL uses broker_held_qty."""
|
"""Test _determine_order_quantity() — SELL uses broker_held_qty."""
|
||||||
@@ -1135,7 +1246,8 @@ class TestOverseasBalanceParsing:
|
|||||||
mock_overseas_broker_with_buy_scenario.send_overseas_order.assert_called_once()
|
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
|
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]
|
sent_price = call_kwargs[1].get("price") or call_kwargs[0][4]
|
||||||
expected_price = round(182.5 * 1.002, 4) # 0.2% premium for BUY limit orders
|
# KIS requires max 2 decimal places for prices >= $1 (#252)
|
||||||
|
expected_price = round(182.5 * 1.002, 2) # 0.2% premium for BUY limit orders
|
||||||
assert sent_price == expected_price, (
|
assert sent_price == expected_price, (
|
||||||
f"Expected limit price {expected_price} (182.5 * 1.002) but got {sent_price}. "
|
f"Expected limit price {expected_price} (182.5 * 1.002) but got {sent_price}. "
|
||||||
"BUY uses +0.2% to improve fill rate while minimising overpayment (#211)."
|
"BUY uses +0.2% to improve fill rate while minimising overpayment (#211)."
|
||||||
@@ -1214,12 +1326,133 @@ class TestOverseasBalanceParsing:
|
|||||||
overseas_broker.send_overseas_order.assert_called_once()
|
overseas_broker.send_overseas_order.assert_called_once()
|
||||||
call_kwargs = overseas_broker.send_overseas_order.call_args
|
call_kwargs = overseas_broker.send_overseas_order.call_args
|
||||||
sent_price = call_kwargs[1].get("price") or call_kwargs[0][4]
|
sent_price = call_kwargs[1].get("price") or call_kwargs[0][4]
|
||||||
expected_price = round(sell_price * 0.998, 4) # -0.2% for SELL limit orders
|
# KIS requires max 2 decimal places for prices >= $1 (#252)
|
||||||
|
expected_price = round(sell_price * 0.998, 2) # -0.2% for SELL limit orders
|
||||||
assert sent_price == expected_price, (
|
assert sent_price == expected_price, (
|
||||||
f"Expected SELL limit price {expected_price} (182.5 * 0.998) but got {sent_price}. "
|
f"Expected SELL limit price {expected_price} (182.5 * 0.998) but got {sent_price}. "
|
||||||
"SELL uses -0.2% to ensure fill even when price dips slightly (#211)."
|
"SELL uses -0.2% to ensure fill even when price dips slightly (#211)."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_overseas_buy_price_rounded_to_2_decimals_for_dollar_plus_stock(
|
||||||
|
self,
|
||||||
|
mock_domestic_broker: 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:
|
||||||
|
"""BUY price for $1+ stocks is rounded to 2 decimal places (issue #252).
|
||||||
|
|
||||||
|
KIS rejects prices with more than 2 decimal places for stocks priced >= $1.
|
||||||
|
current_price=50.1234 * 1.002 = 50.22... should be sent as 50.22, not 50.2236.
|
||||||
|
"""
|
||||||
|
overseas_broker = MagicMock()
|
||||||
|
overseas_broker.get_overseas_balance = AsyncMock(
|
||||||
|
return_value={
|
||||||
|
"output1": [],
|
||||||
|
"output2": [{"frcr_evlu_tota": "0", "frcr_dncl_amt_2": "10000", "frcr_buy_amt_smtl": "0"}],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
overseas_broker.get_overseas_price = AsyncMock(
|
||||||
|
return_value={"output": {"last": "50.1234", "rate": "0"}}
|
||||||
|
)
|
||||||
|
overseas_broker.send_overseas_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": None, "msg1": "주문접수"}
|
||||||
|
)
|
||||||
|
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
decision_logger = DecisionLogger(db_conn)
|
||||||
|
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=_make_buy_match())
|
||||||
|
|
||||||
|
await trading_cycle(
|
||||||
|
broker=mock_domestic_broker,
|
||||||
|
overseas_broker=overseas_broker,
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=mock_playbook,
|
||||||
|
risk=mock_risk,
|
||||||
|
db_conn=db_conn,
|
||||||
|
decision_logger=decision_logger,
|
||||||
|
context_store=mock_context_store,
|
||||||
|
criticality_assessor=mock_criticality_assessor,
|
||||||
|
telegram=mock_telegram,
|
||||||
|
market=mock_overseas_market,
|
||||||
|
stock_code="TQQQ",
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
overseas_broker.send_overseas_order.assert_called_once()
|
||||||
|
sent_price = overseas_broker.send_overseas_order.call_args[1].get("price") or \
|
||||||
|
overseas_broker.send_overseas_order.call_args[0][4]
|
||||||
|
# 50.1234 * 1.002 = 50.2235... rounded to 2 decimals = 50.22
|
||||||
|
assert sent_price == round(50.1234 * 1.002, 2), (
|
||||||
|
f"Expected 2-decimal price {round(50.1234 * 1.002, 2)} but got {sent_price} (#252)"
|
||||||
|
)
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_overseas_penny_stock_price_keeps_4_decimals(
|
||||||
|
self,
|
||||||
|
mock_domestic_broker: 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:
|
||||||
|
"""BUY price for penny stocks (< $1) uses 4 decimal places (issue #252)."""
|
||||||
|
overseas_broker = MagicMock()
|
||||||
|
overseas_broker.get_overseas_balance = AsyncMock(
|
||||||
|
return_value={
|
||||||
|
"output1": [],
|
||||||
|
"output2": [{"frcr_evlu_tota": "0", "frcr_dncl_amt_2": "10000", "frcr_buy_amt_smtl": "0"}],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
overseas_broker.get_overseas_price = AsyncMock(
|
||||||
|
return_value={"output": {"last": "0.5678", "rate": "0"}}
|
||||||
|
)
|
||||||
|
overseas_broker.send_overseas_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": None, "msg1": "주문접수"}
|
||||||
|
)
|
||||||
|
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
decision_logger = DecisionLogger(db_conn)
|
||||||
|
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=_make_buy_match())
|
||||||
|
|
||||||
|
await trading_cycle(
|
||||||
|
broker=mock_domestic_broker,
|
||||||
|
overseas_broker=overseas_broker,
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=mock_playbook,
|
||||||
|
risk=mock_risk,
|
||||||
|
db_conn=db_conn,
|
||||||
|
decision_logger=decision_logger,
|
||||||
|
context_store=mock_context_store,
|
||||||
|
criticality_assessor=mock_criticality_assessor,
|
||||||
|
telegram=mock_telegram,
|
||||||
|
market=mock_overseas_market,
|
||||||
|
stock_code="PENNYX",
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
overseas_broker.send_overseas_order.assert_called_once()
|
||||||
|
sent_price = overseas_broker.send_overseas_order.call_args[1].get("price") or \
|
||||||
|
overseas_broker.send_overseas_order.call_args[0][4]
|
||||||
|
# 0.5678 * 1.002 = 0.56893... rounded to 4 decimals = 0.5689
|
||||||
|
assert sent_price == round(0.5678 * 1.002, 4), (
|
||||||
|
f"Expected 4-decimal price {round(0.5678 * 1.002, 4)} but got {sent_price} (#252)"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestScenarioEngineIntegration:
|
class TestScenarioEngineIntegration:
|
||||||
"""Test scenario engine integration in trading_cycle."""
|
"""Test scenario engine integration in trading_cycle."""
|
||||||
@@ -2013,6 +2246,92 @@ async def test_hold_not_overridden_when_between_stop_loss_and_take_profit() -> N
|
|||||||
broker.send_order.assert_not_called()
|
broker.send_order.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_stop_loss_not_triggered_when_current_price_is_zero() -> None:
|
||||||
|
"""HOLD must stay HOLD when current_price=0 even if entry_price is set (issue #251).
|
||||||
|
|
||||||
|
A price API failure that returns 0.0 must not cause a false -100% stop-loss.
|
||||||
|
"""
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
decision_logger = DecisionLogger(db_conn)
|
||||||
|
|
||||||
|
buy_decision_id = decision_logger.log_decision(
|
||||||
|
stock_code="005930",
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
action="BUY",
|
||||||
|
confidence=90,
|
||||||
|
rationale="entry",
|
||||||
|
context_snapshot={},
|
||||||
|
input_data={},
|
||||||
|
)
|
||||||
|
log_trade(
|
||||||
|
conn=db_conn,
|
||||||
|
stock_code="005930",
|
||||||
|
action="BUY",
|
||||||
|
confidence=90,
|
||||||
|
rationale="entry",
|
||||||
|
quantity=1,
|
||||||
|
price=100.0, # valid entry price
|
||||||
|
market="KR",
|
||||||
|
exchange_code="KRX",
|
||||||
|
decision_id=buy_decision_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
broker = MagicMock()
|
||||||
|
# Price API returns 0.0 — simulates API failure or pre-market unavailability
|
||||||
|
broker.get_current_price = AsyncMock(return_value=(0.0, 0.0, 0.0))
|
||||||
|
broker.get_balance = AsyncMock(
|
||||||
|
return_value={
|
||||||
|
"output2": [
|
||||||
|
{
|
||||||
|
"tot_evlu_amt": "100000",
|
||||||
|
"dnca_tot_amt": "10000",
|
||||||
|
"pchs_amt_smtl_amt": "90000",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
broker.send_order = AsyncMock(return_value={"msg1": "OK"})
|
||||||
|
|
||||||
|
market = MagicMock()
|
||||||
|
market.name = "Korea"
|
||||||
|
market.code = "KR"
|
||||||
|
market.exchange_code = "KRX"
|
||||||
|
market.is_domestic = True
|
||||||
|
|
||||||
|
telegram = MagicMock()
|
||||||
|
telegram.notify_trade_execution = AsyncMock()
|
||||||
|
telegram.notify_fat_finger = AsyncMock()
|
||||||
|
telegram.notify_circuit_breaker = AsyncMock()
|
||||||
|
telegram.notify_scenario_matched = AsyncMock()
|
||||||
|
|
||||||
|
await trading_cycle(
|
||||||
|
broker=broker,
|
||||||
|
overseas_broker=MagicMock(),
|
||||||
|
scenario_engine=MagicMock(evaluate=MagicMock(return_value=_make_hold_match())),
|
||||||
|
playbook=_make_playbook("KR"),
|
||||||
|
risk=MagicMock(),
|
||||||
|
db_conn=db_conn,
|
||||||
|
decision_logger=decision_logger,
|
||||||
|
context_store=MagicMock(
|
||||||
|
get_latest_timeframe=MagicMock(return_value=None),
|
||||||
|
set_context=MagicMock(),
|
||||||
|
),
|
||||||
|
criticality_assessor=MagicMock(
|
||||||
|
assess_market_conditions=MagicMock(return_value=MagicMock(value="NORMAL")),
|
||||||
|
get_timeout=MagicMock(return_value=5.0),
|
||||||
|
),
|
||||||
|
telegram=telegram,
|
||||||
|
market=market,
|
||||||
|
stock_code="005930",
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
# No SELL order must be placed — current_price=0 must suppress stop-loss
|
||||||
|
broker.send_order.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_sell_order_uses_broker_balance_qty_not_db() -> None:
|
async def test_sell_order_uses_broker_balance_qty_not_db() -> None:
|
||||||
"""SELL quantity must come from broker balance output1, not DB.
|
"""SELL quantity must come from broker balance output1, not DB.
|
||||||
@@ -3783,6 +4102,70 @@ class TestSyncPositionsFromBroker:
|
|||||||
# Two distinct exchange codes (NASD, NYSE) → 2 calls
|
# Two distinct exchange codes (NASD, NYSE) → 2 calls
|
||||||
assert overseas_broker.get_overseas_balance.call_count == 2
|
assert overseas_broker.get_overseas_balance.call_count == 2
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_syncs_domestic_position_with_correct_avg_price(self) -> None:
|
||||||
|
"""Domestic position is stored with pchs_avg_pric as price (issue #249)."""
|
||||||
|
settings = self._make_settings("KR")
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
|
||||||
|
balance = {
|
||||||
|
"output1": [{"pdno": "005930", "ord_psbl_qty": "5", "pchs_avg_pric": "68000.0"}],
|
||||||
|
"output2": [{"tot_evlu_amt": "1000000", "dnca_tot_amt": "500000", "pchs_amt_smtl_amt": "500000"}],
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_balance = AsyncMock(return_value=balance)
|
||||||
|
overseas_broker = MagicMock()
|
||||||
|
|
||||||
|
await sync_positions_from_broker(broker, overseas_broker, db_conn, settings)
|
||||||
|
|
||||||
|
from src.db import get_open_position
|
||||||
|
pos = get_open_position(db_conn, "005930", "KR")
|
||||||
|
assert pos is not None
|
||||||
|
assert pos["price"] == 68000.0
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_syncs_overseas_position_with_correct_avg_price(self) -> None:
|
||||||
|
"""Overseas position is stored with pchs_avg_pric as price (issue #249)."""
|
||||||
|
settings = self._make_settings("US_NASDAQ")
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
|
||||||
|
balance = {
|
||||||
|
"output1": [{"ovrs_pdno": "AAPL", "ovrs_cblc_qty": "10", "pchs_avg_pric": "170.0"}],
|
||||||
|
"output2": [{"frcr_evlu_tota": "50000", "frcr_dncl_amt_2": "10000", "frcr_buy_amt_smtl": "40000"}],
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
overseas_broker = MagicMock()
|
||||||
|
overseas_broker.get_overseas_balance = AsyncMock(return_value=balance)
|
||||||
|
|
||||||
|
await sync_positions_from_broker(broker, overseas_broker, db_conn, settings)
|
||||||
|
|
||||||
|
from src.db import get_open_position
|
||||||
|
pos = get_open_position(db_conn, "AAPL", "US_NASDAQ")
|
||||||
|
assert pos is not None
|
||||||
|
assert pos["price"] == 170.0
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_syncs_position_with_zero_price_when_pchs_avg_pric_absent(self) -> None:
|
||||||
|
"""Fallback to price=0.0 when pchs_avg_pric is absent (issue #249)."""
|
||||||
|
settings = self._make_settings("KR")
|
||||||
|
db_conn = init_db(":memory:")
|
||||||
|
|
||||||
|
# No pchs_avg_pric in output1
|
||||||
|
balance = {
|
||||||
|
"output1": [{"pdno": "005930", "ord_psbl_qty": "5"}],
|
||||||
|
"output2": [{"tot_evlu_amt": "1000000", "dnca_tot_amt": "500000", "pchs_amt_smtl_amt": "500000"}],
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_balance = AsyncMock(return_value=balance)
|
||||||
|
overseas_broker = MagicMock()
|
||||||
|
|
||||||
|
await sync_positions_from_broker(broker, overseas_broker, db_conn, settings)
|
||||||
|
|
||||||
|
from src.db import get_open_position
|
||||||
|
pos = get_open_position(db_conn, "005930", "KR")
|
||||||
|
assert pos is not None
|
||||||
|
assert pos["price"] == 0.0
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Domestic BUY double-prevention (issue #206) — trading_cycle integration
|
# Domestic BUY double-prevention (issue #206) — trading_cycle integration
|
||||||
@@ -4058,3 +4441,508 @@ class TestHandleOverseasPendingOrders:
|
|||||||
# Should be called exactly once with "NASD"
|
# Should be called exactly once with "NASD"
|
||||||
assert overseas_broker.get_overseas_pending_orders.call_count == 1
|
assert overseas_broker.get_overseas_pending_orders.call_count == 1
|
||||||
overseas_broker.get_overseas_pending_orders.assert_called_once_with("NASD")
|
overseas_broker.get_overseas_pending_orders.assert_called_once_with("NASD")
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Domestic Pending Order Handling
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestHandleDomesticPendingOrders:
|
||||||
|
"""Tests for handle_domestic_pending_orders function."""
|
||||||
|
|
||||||
|
def _make_settings(self) -> Settings:
|
||||||
|
return Settings(
|
||||||
|
KIS_APP_KEY="k",
|
||||||
|
KIS_APP_SECRET="s",
|
||||||
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
|
GEMINI_API_KEY="g",
|
||||||
|
ENABLED_MARKETS="KR",
|
||||||
|
)
|
||||||
|
|
||||||
|
def _make_telegram(self) -> MagicMock:
|
||||||
|
t = MagicMock()
|
||||||
|
t.notify_unfilled_order = AsyncMock()
|
||||||
|
return t
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_buy_pending_is_cancelled_and_cooldown_set(self) -> None:
|
||||||
|
"""BUY pending order should be cancelled and buy_cooldown should be set."""
|
||||||
|
settings = self._make_settings()
|
||||||
|
telegram = self._make_telegram()
|
||||||
|
|
||||||
|
pending_order = {
|
||||||
|
"pdno": "005930",
|
||||||
|
"orgn_odno": "ORD001",
|
||||||
|
"ord_gno_brno": "BRN01",
|
||||||
|
"sll_buy_dvsn_cd": "02", # BUY
|
||||||
|
"psbl_qty": "3",
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_domestic_pending_orders = AsyncMock(return_value=[pending_order])
|
||||||
|
broker.cancel_domestic_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": "0", "msg1": "OK"}
|
||||||
|
)
|
||||||
|
|
||||||
|
sell_resubmit_counts: dict[str, int] = {}
|
||||||
|
buy_cooldown: dict[str, float] = {}
|
||||||
|
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker, telegram, settings, sell_resubmit_counts, buy_cooldown
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.cancel_domestic_order.assert_called_once_with(
|
||||||
|
stock_code="005930",
|
||||||
|
orgn_odno="ORD001",
|
||||||
|
krx_fwdg_ord_orgno="BRN01",
|
||||||
|
qty=3,
|
||||||
|
)
|
||||||
|
assert "KR:005930" in buy_cooldown
|
||||||
|
telegram.notify_unfilled_order.assert_called_once()
|
||||||
|
call_kwargs = telegram.notify_unfilled_order.call_args[1]
|
||||||
|
assert call_kwargs["action"] == "BUY"
|
||||||
|
assert call_kwargs["outcome"] == "cancelled"
|
||||||
|
assert call_kwargs["market"] == "KR"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_sell_pending_is_cancelled_then_resubmitted(self) -> None:
|
||||||
|
"""First unfilled SELL should be cancelled then resubmitted at -0.4% price."""
|
||||||
|
from src.broker.kis_api import kr_round_down
|
||||||
|
|
||||||
|
settings = self._make_settings()
|
||||||
|
telegram = self._make_telegram()
|
||||||
|
|
||||||
|
pending_order = {
|
||||||
|
"pdno": "005930",
|
||||||
|
"orgn_odno": "ORD002",
|
||||||
|
"ord_gno_brno": "BRN02",
|
||||||
|
"sll_buy_dvsn_cd": "01", # SELL
|
||||||
|
"psbl_qty": "5",
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_domestic_pending_orders = AsyncMock(return_value=[pending_order])
|
||||||
|
broker.cancel_domestic_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": "0", "msg1": "OK"}
|
||||||
|
)
|
||||||
|
broker.get_current_price = AsyncMock(return_value=(50000.0, 0.0, 0.0))
|
||||||
|
broker.send_order = AsyncMock(return_value={"rt_cd": "0"})
|
||||||
|
|
||||||
|
sell_resubmit_counts: dict[str, int] = {}
|
||||||
|
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker, telegram, settings, sell_resubmit_counts
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.cancel_domestic_order.assert_called_once()
|
||||||
|
broker.send_order.assert_called_once()
|
||||||
|
resubmit_kwargs = broker.send_order.call_args[1]
|
||||||
|
assert resubmit_kwargs["order_type"] == "SELL"
|
||||||
|
expected_price = kr_round_down(50000.0 * 0.996)
|
||||||
|
assert resubmit_kwargs["price"] == expected_price
|
||||||
|
assert sell_resubmit_counts.get("KR:005930") == 1
|
||||||
|
notify_kwargs = telegram.notify_unfilled_order.call_args[1]
|
||||||
|
assert notify_kwargs["outcome"] == "resubmitted"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_sell_cancel_failure_skips_resubmit(self) -> None:
|
||||||
|
"""When cancel returns rt_cd != '0', resubmit should NOT be attempted."""
|
||||||
|
settings = self._make_settings()
|
||||||
|
telegram = self._make_telegram()
|
||||||
|
|
||||||
|
pending_order = {
|
||||||
|
"pdno": "005930",
|
||||||
|
"orgn_odno": "ORD003",
|
||||||
|
"ord_gno_brno": "BRN03",
|
||||||
|
"sll_buy_dvsn_cd": "01", # SELL
|
||||||
|
"psbl_qty": "2",
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_domestic_pending_orders = AsyncMock(return_value=[pending_order])
|
||||||
|
broker.cancel_domestic_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": "1", "msg1": "Error"} # failure
|
||||||
|
)
|
||||||
|
broker.send_order = AsyncMock()
|
||||||
|
|
||||||
|
sell_resubmit_counts: dict[str, int] = {}
|
||||||
|
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker, telegram, settings, sell_resubmit_counts
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.send_order.assert_not_called()
|
||||||
|
telegram.notify_unfilled_order.assert_not_called()
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_sell_already_resubmitted_is_only_cancelled(self) -> None:
|
||||||
|
"""Second unfilled SELL (sell_resubmit_counts >= 1) should only cancel, no resubmit."""
|
||||||
|
settings = self._make_settings()
|
||||||
|
telegram = self._make_telegram()
|
||||||
|
|
||||||
|
pending_order = {
|
||||||
|
"pdno": "005930",
|
||||||
|
"orgn_odno": "ORD004",
|
||||||
|
"ord_gno_brno": "BRN04",
|
||||||
|
"sll_buy_dvsn_cd": "01", # SELL
|
||||||
|
"psbl_qty": "4",
|
||||||
|
}
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_domestic_pending_orders = AsyncMock(return_value=[pending_order])
|
||||||
|
broker.cancel_domestic_order = AsyncMock(
|
||||||
|
return_value={"rt_cd": "0", "msg1": "OK"}
|
||||||
|
)
|
||||||
|
broker.send_order = AsyncMock()
|
||||||
|
|
||||||
|
# Already resubmitted once
|
||||||
|
sell_resubmit_counts: dict[str, int] = {"KR:005930": 1}
|
||||||
|
|
||||||
|
await handle_domestic_pending_orders(
|
||||||
|
broker, telegram, settings, sell_resubmit_counts
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.cancel_domestic_order.assert_called_once()
|
||||||
|
broker.send_order.assert_not_called()
|
||||||
|
notify_kwargs = telegram.notify_unfilled_order.call_args[1]
|
||||||
|
assert notify_kwargs["outcome"] == "cancelled"
|
||||||
|
assert notify_kwargs["action"] == "SELL"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Domestic Limit Order Price in trading_cycle
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestDomesticLimitOrderPrice:
|
||||||
|
"""trading_cycle must use kr_round_down limit prices for domestic orders."""
|
||||||
|
|
||||||
|
def _make_market(self) -> MagicMock:
|
||||||
|
market = MagicMock()
|
||||||
|
market.name = "Korea"
|
||||||
|
market.code = "KR"
|
||||||
|
market.exchange_code = "KRX"
|
||||||
|
market.is_domestic = True
|
||||||
|
return market
|
||||||
|
|
||||||
|
def _make_broker(self, current_price: float, balance_data: dict) -> MagicMock:
|
||||||
|
broker = MagicMock()
|
||||||
|
broker.get_current_price = AsyncMock(return_value=(current_price, 0.0, 0.0))
|
||||||
|
broker.get_balance = AsyncMock(return_value=balance_data)
|
||||||
|
broker.send_order = AsyncMock(return_value={"rt_cd": "0", "msg1": "OK"})
|
||||||
|
return broker
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_trading_cycle_domestic_buy_uses_limit_price(self) -> None:
|
||||||
|
"""BUY order for domestic stock must use kr_round_down(price * 1.002)."""
|
||||||
|
from src.broker.kis_api import kr_round_down
|
||||||
|
from src.strategy.models import ScenarioAction
|
||||||
|
|
||||||
|
current_price = 70000.0
|
||||||
|
balance_data = {
|
||||||
|
"output2": [
|
||||||
|
{
|
||||||
|
"tot_evlu_amt": "10000000",
|
||||||
|
"dnca_tot_amt": "5000000",
|
||||||
|
"pchs_amt_smtl_amt": "5000000",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
broker = self._make_broker(current_price, balance_data)
|
||||||
|
market = self._make_market()
|
||||||
|
|
||||||
|
buy_match = ScenarioMatch(
|
||||||
|
stock_code="005930",
|
||||||
|
matched_scenario=None,
|
||||||
|
action=ScenarioAction.BUY,
|
||||||
|
confidence=85,
|
||||||
|
rationale="test",
|
||||||
|
)
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=buy_match)
|
||||||
|
|
||||||
|
risk = MagicMock()
|
||||||
|
risk.validate_order = MagicMock()
|
||||||
|
risk.check_circuit_breaker = MagicMock()
|
||||||
|
telegram = MagicMock()
|
||||||
|
telegram.notify_trade_execution = AsyncMock()
|
||||||
|
telegram.notify_fat_finger = AsyncMock()
|
||||||
|
telegram.notify_circuit_breaker = AsyncMock()
|
||||||
|
telegram.notify_scenario_matched = AsyncMock()
|
||||||
|
|
||||||
|
with patch("src.main.log_trade"):
|
||||||
|
await trading_cycle(
|
||||||
|
broker=broker,
|
||||||
|
overseas_broker=MagicMock(),
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=_make_playbook(),
|
||||||
|
risk=risk,
|
||||||
|
db_conn=MagicMock(),
|
||||||
|
decision_logger=MagicMock(),
|
||||||
|
context_store=MagicMock(get_latest_timeframe=MagicMock(return_value=None)),
|
||||||
|
criticality_assessor=MagicMock(
|
||||||
|
assess_market_conditions=MagicMock(return_value=MagicMock(value="NORMAL")),
|
||||||
|
get_timeout=MagicMock(return_value=5.0),
|
||||||
|
),
|
||||||
|
telegram=telegram,
|
||||||
|
market=market,
|
||||||
|
stock_code="005930",
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.send_order.assert_called_once()
|
||||||
|
call_kwargs = broker.send_order.call_args[1]
|
||||||
|
expected_price = kr_round_down(current_price * 1.002)
|
||||||
|
assert call_kwargs["price"] == expected_price
|
||||||
|
assert call_kwargs["order_type"] == "BUY"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_trading_cycle_domestic_sell_uses_limit_price(self) -> None:
|
||||||
|
"""SELL order for domestic stock must use kr_round_down(price * 0.998)."""
|
||||||
|
from src.broker.kis_api import kr_round_down
|
||||||
|
from src.strategy.models import ScenarioAction
|
||||||
|
|
||||||
|
current_price = 70000.0
|
||||||
|
stock_code = "005930"
|
||||||
|
balance_data = {
|
||||||
|
"output1": [
|
||||||
|
{"pdno": stock_code, "hldg_qty": "5", "prpr": "70000", "evlu_amt": "350000"}
|
||||||
|
],
|
||||||
|
"output2": [
|
||||||
|
{
|
||||||
|
"tot_evlu_amt": "350000",
|
||||||
|
"dnca_tot_amt": "0",
|
||||||
|
"pchs_amt_smtl_amt": "350000",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
broker = self._make_broker(current_price, balance_data)
|
||||||
|
market = self._make_market()
|
||||||
|
|
||||||
|
sell_match = ScenarioMatch(
|
||||||
|
stock_code=stock_code,
|
||||||
|
matched_scenario=None,
|
||||||
|
action=ScenarioAction.SELL,
|
||||||
|
confidence=85,
|
||||||
|
rationale="test",
|
||||||
|
)
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=sell_match)
|
||||||
|
|
||||||
|
risk = MagicMock()
|
||||||
|
risk.validate_order = MagicMock()
|
||||||
|
risk.check_circuit_breaker = MagicMock()
|
||||||
|
telegram = MagicMock()
|
||||||
|
telegram.notify_trade_execution = AsyncMock()
|
||||||
|
telegram.notify_fat_finger = AsyncMock()
|
||||||
|
telegram.notify_circuit_breaker = AsyncMock()
|
||||||
|
telegram.notify_scenario_matched = AsyncMock()
|
||||||
|
|
||||||
|
with patch("src.main.log_trade"):
|
||||||
|
await trading_cycle(
|
||||||
|
broker=broker,
|
||||||
|
overseas_broker=MagicMock(),
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=_make_playbook(),
|
||||||
|
risk=risk,
|
||||||
|
db_conn=MagicMock(),
|
||||||
|
decision_logger=MagicMock(),
|
||||||
|
context_store=MagicMock(get_latest_timeframe=MagicMock(return_value=None)),
|
||||||
|
criticality_assessor=MagicMock(
|
||||||
|
assess_market_conditions=MagicMock(return_value=MagicMock(value="NORMAL")),
|
||||||
|
get_timeout=MagicMock(return_value=5.0),
|
||||||
|
),
|
||||||
|
telegram=telegram,
|
||||||
|
market=market,
|
||||||
|
stock_code=stock_code,
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
broker.send_order.assert_called_once()
|
||||||
|
call_kwargs = broker.send_order.call_args[1]
|
||||||
|
expected_price = kr_round_down(current_price * 0.998)
|
||||||
|
assert call_kwargs["price"] == expected_price
|
||||||
|
assert call_kwargs["order_type"] == "SELL"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Ghost position — overseas SELL "잔고내역이 없습니다" handling
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class TestOverseasGhostPositionClose:
|
||||||
|
"""trading_cycle must close ghost DB position when broker returns 잔고없음."""
|
||||||
|
|
||||||
|
def _make_overseas_market(self) -> MagicMock:
|
||||||
|
market = MagicMock()
|
||||||
|
market.name = "NASDAQ"
|
||||||
|
market.code = "US_NASDAQ"
|
||||||
|
market.exchange_code = "NASD"
|
||||||
|
market.is_domestic = False
|
||||||
|
return market
|
||||||
|
|
||||||
|
def _make_overseas_broker(
|
||||||
|
self,
|
||||||
|
current_price: float,
|
||||||
|
balance_data: dict,
|
||||||
|
sell_result: dict,
|
||||||
|
) -> MagicMock:
|
||||||
|
ob = MagicMock()
|
||||||
|
ob.get_overseas_price = AsyncMock(
|
||||||
|
return_value={"output": {"last": str(current_price), "rate": "0.0"}}
|
||||||
|
)
|
||||||
|
ob.get_overseas_balance = AsyncMock(return_value=balance_data)
|
||||||
|
ob.send_overseas_order = AsyncMock(return_value=sell_result)
|
||||||
|
return ob
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_ghost_position_closes_db_on_no_balance_error(self) -> None:
|
||||||
|
"""When SELL fails with '잔고내역이 없습니다', log_trade is called to close the ghost.
|
||||||
|
|
||||||
|
This can happen when exchange code recorded at startup differs from the
|
||||||
|
exchange code used in the SELL cycle (e.g. KNRX recorded as NASD but
|
||||||
|
actually traded on AMEX), causing the broker to see no matching balance.
|
||||||
|
The position has ord_psbl_qty > 0 (so a SELL is attempted), but KIS
|
||||||
|
rejects it with '잔고내역이 없습니다'.
|
||||||
|
"""
|
||||||
|
from src.strategy.models import ScenarioAction
|
||||||
|
|
||||||
|
stock_code = "KNRX"
|
||||||
|
current_price = 1.5
|
||||||
|
# ord_psbl_qty=5 means the code passes the qty check and a SELL is sent
|
||||||
|
balance_data = {
|
||||||
|
"output1": [
|
||||||
|
{"ovrs_pdno": stock_code, "ord_psbl_qty": "5", "ovrs_cblc_qty": "5"}
|
||||||
|
],
|
||||||
|
"output2": [{"tot_evlu_amt": "10000", "frcr_dncl_amt_2": "10000"}],
|
||||||
|
}
|
||||||
|
sell_result = {"rt_cd": "1", "msg1": "모의투자 잔고내역이 없습니다"}
|
||||||
|
|
||||||
|
domestic_broker = MagicMock()
|
||||||
|
domestic_broker.get_balance = AsyncMock(return_value={"output1": [], "output2": [{}]})
|
||||||
|
overseas_broker = self._make_overseas_broker(current_price, balance_data, sell_result)
|
||||||
|
market = self._make_overseas_market()
|
||||||
|
|
||||||
|
sell_match = ScenarioMatch(
|
||||||
|
stock_code=stock_code,
|
||||||
|
matched_scenario=None,
|
||||||
|
action=ScenarioAction.SELL,
|
||||||
|
confidence=85,
|
||||||
|
rationale="test ghost KNRX",
|
||||||
|
)
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=sell_match)
|
||||||
|
|
||||||
|
risk = MagicMock()
|
||||||
|
risk.validate_order = MagicMock()
|
||||||
|
risk.check_circuit_breaker = MagicMock()
|
||||||
|
telegram = MagicMock()
|
||||||
|
telegram.notify_trade_execution = AsyncMock()
|
||||||
|
telegram.notify_fat_finger = AsyncMock()
|
||||||
|
telegram.notify_circuit_breaker = AsyncMock()
|
||||||
|
telegram.notify_scenario_matched = AsyncMock()
|
||||||
|
|
||||||
|
db_conn = MagicMock()
|
||||||
|
|
||||||
|
settings = MagicMock(spec=Settings)
|
||||||
|
settings.MODE = "paper"
|
||||||
|
settings.POSITION_SIZING_ENABLED = False
|
||||||
|
settings.PAPER_OVERSEAS_CASH = 0
|
||||||
|
|
||||||
|
with patch("src.main.log_trade") as mock_log_trade, patch(
|
||||||
|
"src.main.get_open_position", return_value=None
|
||||||
|
), patch("src.main.get_latest_buy_trade", return_value=None):
|
||||||
|
await trading_cycle(
|
||||||
|
broker=domestic_broker,
|
||||||
|
overseas_broker=overseas_broker,
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=_make_playbook(market="US_NASDAQ"),
|
||||||
|
risk=risk,
|
||||||
|
db_conn=db_conn,
|
||||||
|
decision_logger=MagicMock(),
|
||||||
|
context_store=MagicMock(get_latest_timeframe=MagicMock(return_value=None)),
|
||||||
|
criticality_assessor=MagicMock(
|
||||||
|
assess_market_conditions=MagicMock(return_value=MagicMock(value="NORMAL")),
|
||||||
|
get_timeout=MagicMock(return_value=5.0),
|
||||||
|
),
|
||||||
|
telegram=telegram,
|
||||||
|
market=market,
|
||||||
|
stock_code=stock_code,
|
||||||
|
scan_candidates={},
|
||||||
|
settings=settings,
|
||||||
|
)
|
||||||
|
|
||||||
|
# log_trade must be called with action="SELL" to close the ghost position
|
||||||
|
ghost_close_calls = [
|
||||||
|
c
|
||||||
|
for c in mock_log_trade.call_args_list
|
||||||
|
if c.kwargs.get("action") == "SELL"
|
||||||
|
and "[ghost-close]" in (c.kwargs.get("rationale") or "")
|
||||||
|
]
|
||||||
|
assert ghost_close_calls, "Expected ghost-close log_trade call was not made"
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_normal_sell_failure_does_not_close_db(self) -> None:
|
||||||
|
"""Non-잔고없음 SELL failures must NOT close the DB position."""
|
||||||
|
from src.strategy.models import ScenarioAction
|
||||||
|
|
||||||
|
stock_code = "TSLA"
|
||||||
|
current_price = 250.0
|
||||||
|
balance_data = {
|
||||||
|
"output1": [{"ovrs_pdno": stock_code, "ord_psbl_qty": "5", "ovrs_cblc_qty": "5"}],
|
||||||
|
"output2": [{"tot_evlu_amt": "100000", "frcr_dncl_amt_2": "100000"}],
|
||||||
|
}
|
||||||
|
sell_result = {"rt_cd": "1", "msg1": "일시적 오류가 발생했습니다"}
|
||||||
|
|
||||||
|
domestic_broker = MagicMock()
|
||||||
|
domestic_broker.get_balance = AsyncMock(return_value={"output1": [], "output2": [{}]})
|
||||||
|
overseas_broker = self._make_overseas_broker(current_price, balance_data, sell_result)
|
||||||
|
market = self._make_overseas_market()
|
||||||
|
|
||||||
|
sell_match = ScenarioMatch(
|
||||||
|
stock_code=stock_code,
|
||||||
|
matched_scenario=None,
|
||||||
|
action=ScenarioAction.SELL,
|
||||||
|
confidence=85,
|
||||||
|
rationale="test",
|
||||||
|
)
|
||||||
|
engine = MagicMock(spec=ScenarioEngine)
|
||||||
|
engine.evaluate = MagicMock(return_value=sell_match)
|
||||||
|
|
||||||
|
risk = MagicMock()
|
||||||
|
risk.validate_order = MagicMock()
|
||||||
|
risk.check_circuit_breaker = MagicMock()
|
||||||
|
telegram = MagicMock()
|
||||||
|
telegram.notify_trade_execution = AsyncMock()
|
||||||
|
telegram.notify_fat_finger = AsyncMock()
|
||||||
|
telegram.notify_circuit_breaker = AsyncMock()
|
||||||
|
telegram.notify_scenario_matched = AsyncMock()
|
||||||
|
|
||||||
|
db_conn = MagicMock()
|
||||||
|
|
||||||
|
with patch("src.main.log_trade") as mock_log_trade, patch(
|
||||||
|
"src.main.get_open_position", return_value=None
|
||||||
|
):
|
||||||
|
await trading_cycle(
|
||||||
|
broker=domestic_broker,
|
||||||
|
overseas_broker=overseas_broker,
|
||||||
|
scenario_engine=engine,
|
||||||
|
playbook=_make_playbook(market="US_NASDAQ"),
|
||||||
|
risk=risk,
|
||||||
|
db_conn=db_conn,
|
||||||
|
decision_logger=MagicMock(),
|
||||||
|
context_store=MagicMock(get_latest_timeframe=MagicMock(return_value=None)),
|
||||||
|
criticality_assessor=MagicMock(
|
||||||
|
assess_market_conditions=MagicMock(return_value=MagicMock(value="NORMAL")),
|
||||||
|
get_timeout=MagicMock(return_value=5.0),
|
||||||
|
),
|
||||||
|
telegram=telegram,
|
||||||
|
market=market,
|
||||||
|
stock_code=stock_code,
|
||||||
|
scan_candidates={},
|
||||||
|
)
|
||||||
|
|
||||||
|
ghost_close_calls = [
|
||||||
|
c
|
||||||
|
for c in mock_log_trade.call_args_list
|
||||||
|
if c.kwargs.get("action") == "SELL"
|
||||||
|
and "[ghost-close]" in (c.kwargs.get("rationale") or "")
|
||||||
|
]
|
||||||
|
assert not ghost_close_calls, "Ghost-close must NOT be triggered for non-잔고없음 errors"
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ def mock_settings() -> Settings:
|
|||||||
KIS_APP_SECRET="test_secret",
|
KIS_APP_SECRET="test_secret",
|
||||||
KIS_ACCOUNT_NO="12345678-01",
|
KIS_ACCOUNT_NO="12345678-01",
|
||||||
GEMINI_API_KEY="test_gemini_key",
|
GEMINI_API_KEY="test_gemini_key",
|
||||||
|
MODE="paper", # Explicitly set to avoid .env MODE=live override
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -124,7 +125,7 @@ class TestFetchOverseasRankings:
|
|||||||
assert "/uapi/overseas-stock/v1/ranking/updown-rate" in url
|
assert "/uapi/overseas-stock/v1/ranking/updown-rate" in url
|
||||||
assert params["EXCD"] == "NAS"
|
assert params["EXCD"] == "NAS"
|
||||||
assert params["NDAY"] == "0"
|
assert params["NDAY"] == "0"
|
||||||
assert params["GUBN"] == "1"
|
assert params["GUBN"] == "0" # 0=전체(상승+하락), 변동성 스캐너에 필요
|
||||||
assert params["VOL_RANG"] == "0"
|
assert params["VOL_RANG"] == "0"
|
||||||
|
|
||||||
overseas_broker._broker._auth_headers.assert_called_with("HHDFS76290000")
|
overseas_broker._broker._auth_headers.assert_called_with("HHDFS76290000")
|
||||||
|
|||||||
@@ -124,6 +124,10 @@ class TestPromptOptimizer:
|
|||||||
assert len(prompt) < 300
|
assert len(prompt) < 300
|
||||||
assert "005930" in prompt
|
assert "005930" in prompt
|
||||||
assert "75000" in prompt
|
assert "75000" in prompt
|
||||||
|
# Keys must match parse_response expectations (#242)
|
||||||
|
assert '"action"' in prompt
|
||||||
|
assert '"confidence"' in prompt
|
||||||
|
assert '"rationale"' in prompt
|
||||||
|
|
||||||
def test_build_compressed_prompt_no_instructions(self):
|
def test_build_compressed_prompt_no_instructions(self):
|
||||||
"""Test compressed prompt without instructions."""
|
"""Test compressed prompt without instructions."""
|
||||||
|
|||||||
Reference in New Issue
Block a user