"Vibe-Trading: Your Personal Trading Agent"
Python ai-agentalgorithmic-tradingbacktestingfintechllmmcpmulti-agentpythonquantitative-financetrading
fix(kis): address review on #1407
heonjinjeongecc1bde36100
diff --git a/.gitignore b/.gitignoreindex c0ca11f3a..0a917d1ab 100644--- a/.gitignore+++ b/.gitignore@@ -79,6 +79,8 @@ agent/uploads//etoro.json/futu.json/ibkr-local.json+/kis.json+/kis-token-*.json/longbridge.json/mt5.json/okx.jsondiff --git a/agent/src/trading/connectors/kis/sdk.py b/agent/src/trading/connectors/kis/sdk.pyindex ef42572b8..ff7e472fa 100644--- a/agent/src/trading/connectors/kis/sdk.py+++ b/agent/src/trading/connectors/kis/sdk.py@@ -24,13 +24,23 @@ from __future__ import annotationsimport jsonimport timefrom dataclasses import asdict, dataclass+from datetime import datetimefrom pathlib import Pathfrom typing import Any, Mapping+from zoneinfo import ZoneInfoimport requestsfrom src.config.paths import get_runtime_root+#: KIS dates (order history, chart ranges) are Korea Standard Time, not the+#: machine's local clock.+_KST = ZoneInfo("Asia/Seoul")+++def _kst_today() -> str:+ return datetime.now(_KST).strftime("%Y%m%d")+CONFIG_FILENAME = "kis.json"PROFILE_ENVIRONMENTS = {@@ -63,6 +73,23 @@ _EXCHANGE_ID_KRX = "KRX"#: treated as expired, so a request never races an in-flight expiry._TOKEN_REFRESH_MARGIN_SECONDS = 120+#: Fallback token TTL when KIS's token response omits ``expires_in`` (should+#: not happen per the docs, but re-issuing on every call would blow through+#: KIS's once-per-minute token rate limit if it ever does).+_DEFAULT_TOKEN_TTL_SECONDS = 3600.0++#: Returned by order methods for any non-paper config. KIS's host separation+#: means live order placement is technically reachable, but this connector+#: deliberately does not wire a mandate-gated live-trade profile yet.+_LIVE_ORDER_ERROR = (+ "KIS live order placement is not wired in this connector yet (no "+ "kis-live-trade profile exists); use a kis-paper-* profile."+)++#: Safety cap on KIS's tr_cont continuation loop so a misbehaving or+#: adversarial response cannot page forever.+_MAX_CONTINUATION_PAGES = 20+class KISConfigError(RuntimeError):"""Raised when the connector configuration is missing or invalid."""@@ -148,7 +175,10 @@ class KISConfig:return BASE_URLS[self.environment]-_OVERRIDE_KEYS = ("app_key", "app_secret", "account_no", "account_product_code", "profile")+#: ``profile`` is deliberately excluded: a per-call override could otherwise+#: flip a paper-declared profile to the live host/TR_ID without the service+#: layer noticing (see the structural guard in place_order/cancel_order below).+_OVERRIDE_KEYS = ("app_key", "app_secret", "account_no", "account_product_code")def build_config(@@ -280,8 +310,8 @@ def get_open_orders() -> dict[str, Any]:"""Fetch today's orders, split into still-open vs already-executed."""cfg = config or load_config()- today = time.strftime("%Y%m%d")- payload = _get(+ today = _kst_today()+ payload = _get_paginated(cfg,"/uapi/domestic-stock/v1/trading/inquire-daily-ccld",tr_id=_TR_DAILY_CCLD[cfg.environment],@@ -378,7 +408,7 @@ def get_historical_bars("symbol": ticker,}- end = time.strftime("%Y%m%d")+ end = _kst_today()try:payload = _get(cfg,@@ -414,23 +444,25 @@ def place_order() -> dict[str, Any]:"""Place an order against the account matching ``config``'s environment.- Paper-vs-live is structural: :func:`_get`/:func:`_post` send the request to- ``config.base_url``, which is the paper host for a ``paper`` profile and- the live host for a ``live-readonly`` profile — but ``live-readonly``- profiles set ``readonly=True`` and never reach this function (the caller,- ``src.trading.service.place_order``, refuses before calling any connector).- So in practice only a genuine KIS paper (모의투자) account is ever ordered- against here.+ Paper-vs-live is structural in two ways: the very first check refuses any+ non-paper config (this connector wires no live-trade profile yet, see+ ``_LIVE_ORDER_ERROR`), and — for the paper case that does proceed —+ :func:`_get`/:func:`_post` send the request to ``config.base_url``, the+ real KIS paper host.Args:symbol: 6-digit KRX ticker, e.g. ``"005930"``.side: ``buy`` or ``sell``.quantity: Share quantity (KIS trades whole shares only).order_type: ``market`` or ``limit``.- limit_price: Required for limit orders.+ limit_price: Required for limit orders (whole KRW won only)."""cfg = config or load_config()+ # ---- HARD GUARD: no live-trade profile wired yet (must run first) ----+ if not cfg.is_paper:+ return {"status": "error", "error": _LIVE_ORDER_ERROR}+ticker = str(symbol or "").strip().upper()if not ticker:return {"status": "error", "error": "symbol is required"}@@ -447,10 +479,14 @@ def place_order(return {"status": "error", "error": "KIS requires a share quantity; notional-based sizing is not supported"}if quantity is None or float(quantity) < 1:return {"status": "error", "error": "quantity must be a positive whole number of shares"}- qty = int(float(quantity))+ if float(quantity) != int(float(quantity)):+ return {"status": "error", "error": "quantity must be a whole number of shares"}+ qty = int(quantity)if type_token == "limit" and limit_price is None:return {"status": "error", "error": "limit order requires limit_price"}+ if type_token == "limit" and float(limit_price) != int(float(limit_price)):+ return {"status": "error", "error": "limit_price must be a whole KRW amount"}ord_dvsn = "00" if type_token == "limit" else "01" # 00=지정가, 01=시장가unit_price = str(int(limit_price)) if type_token == "limit" else "0"@@ -501,20 +537,37 @@ def cancel_order(order_id: The broker order number (``ODNO``) from :func:`place_order`.order_branch: The branch code (``KRX_FWDG_ORD_ORGNO``) returnedalongside ``order_id`` by :func:`place_order` — KIS requires it to- identify which order to cancel.+ identify which order to cancel. When omitted, it is looked up from+ today's order list (:func:`get_open_orders`) by ``order_id``, so a+ caller that only has the id (e.g. a later agent turn) can still+ cancel.quantity: Quantity to cancel; omit or ``0`` to cancel the fullremaining quantity (``전량``)."""cfg = config or load_config()+ # ---- HARD GUARD: no live-trade profile wired yet (must run first) ----+ if not cfg.is_paper:+ return {"status": "error", "error": _LIVE_ORDER_ERROR}+clean_id = str(order_id or "").strip()if not clean_id:return {"status": "error", "error": "order_id is required"}- if not order_branch:- return {"status": "error", "error": "order_branch (KRX_FWDG_ORD_ORGNO) is required"}if quantity is not None and 0 < float(quantity) < 1:return {"status": "error", "error": "quantity must be 0 (cancel all) or a whole number of shares"}+ branch = str(order_branch or "").strip()+ if not branch:+ branch = _lookup_order_branch(cfg, clean_id)+ if not branch:+ return {+ "status": "error",+ "error": (+ f"could not find order_branch (KRX_FWDG_ORD_ORGNO) for order_id "+ f"{clean_id!r} in today's order list; pass order_branch explicitly"+ ),+ }+qty = int(float(quantity)) if quantity else 0payload = _post(cfg,@@ -523,13 +576,14 @@ def cancel_order(body={"CANO": cfg.account_no,"ACNT_PRDT_CD": cfg.account_product_code,- "KRX_FWDG_ORD_ORGNO": order_branch,+ "KRX_FWDG_ORD_ORGNO": branch,"ORGN_ODNO": clean_id,"ORD_DVSN": "00","RVSE_CNCL_DVSN_CD": "02", # 02=취소"ORD_QTY": str(qty),"ORD_UNPR": "0","QTY_ALL_ORD_YN": "N" if qty else "Y",+ "EXCG_ID_DVSN_CD": _EXCHANGE_ID_KRX,},)@@ -550,8 +604,25 @@ def cancel_order(# ---------------------------------------------------------------------------+def _lookup_order_branch(cfg: KISConfig, order_id: str) -> str:+ """Resolve ``KRX_FWDG_ORD_ORGNO`` for ``order_id`` from today's order list.++ ``place_order`` returns the branch code directly, but a caller that only+ kept the order id (e.g. a later agent turn) has no other way to recover+ it, and KIS requires it to identify which order ``cancel_order`` targets.+ """+ try:+ orders = get_open_orders(cfg, include_executions=True)+ except (KISAPIError, KISConfigError):+ return ""+ for row in (*orders.get("open_orders", []), *orders.get("executions", [])):+ if str(row.get("order_id") or "") == order_id:+ return str(row.get("order_branch") or "")+ return ""++def _balance(cfg: KISConfig) -> dict[str, Any]:- return _get(+ return _get_paginated(cfg,"/uapi/domestic-stock/v1/trading/inquire-balance",tr_id=_TR_BALANCE[cfg.environment],@@ -611,7 +682,7 @@ def _access_token(cfg: KISConfig) -> str:token = str(body.get("access_token") or "")if not token:raise KISAPIError(f"KIS token issuance returned no access_token: {body}")- expires_in = float(body.get("expires_in") or 0)+ expires_in = float(body.get("expires_in") or 0) or _DEFAULT_TOKEN_TTL_SECONDSpath.parent.mkdir(parents=True, exist_ok=True)path.write_text(@@ -629,23 +700,64 @@ def _access_token(cfg: KISConfig) -> str:return token-def _headers(cfg: KISConfig, tr_id: str) -> dict[str, str]:+def _headers(cfg: KISConfig, tr_id: str, tr_cont: str) -> dict[str, str]:return {"content-type": "application/json; charset=utf-8","authorization": f"Bearer {_access_token(cfg)}","appkey": cfg.app_key,"appsecret": cfg.app_secret,"tr_id": tr_id,+ "tr_cont": tr_cont,"custtype": "P",}def _get(cfg: KISConfig, path: str, *, tr_id: str, params: Mapping[str, Any]) -> dict[str, Any]:- return _request(cfg, "GET", path, tr_id=tr_id, params=params)+ body, _headers_out = _request(cfg, "GET", path, tr_id=tr_id, params=params)+ return bodydef _post(cfg: KISConfig, path: str, *, tr_id: str, body: Mapping[str, Any]) -> dict[str, Any]:- return _request(cfg, "POST", path, tr_id=tr_id, body=body)+ payload, _headers_out = _request(cfg, "POST", path, tr_id=tr_id, body=body)+ return payload+++def _get_paginated(+ cfg: KISConfig,+ path: str,+ *,+ tr_id: str,+ params: Mapping[str, Any],+ rows_key: str = "output1",+) -> dict[str, Any]:+ """Follow KIS's ``tr_cont`` continuation protocol, merging every page's rows.++ A response ``tr_cont`` header of ``F`` (first page, more follows) or ``M``+ (middle page, more follows) means another page exists; the client echoes+ that response's ``ctx_area_fk100``/``ctx_area_nk100`` into the next+ request and sends request header ``tr_cont: "N"`` on every call after the+ first, per the official ``inquire_balance``/``inquire_daily_ccld``+ examples. Anything else (``D``/``E``, or an absent header) is the last+ page. Capped at :data:`_MAX_CONTINUATION_PAGES` so a misbehaving response+ cannot page forever.+ """+ rows: list[Any] = []+ last_body: dict[str, Any] = {}+ tr_cont = ""+ page_params = dict(params)+ for _ in range(_MAX_CONTINUATION_PAGES):+ body, headers = _request(cfg, "GET", path, tr_id=tr_id, params=page_params, tr_cont=tr_cont)+ last_body = body+ rows.extend(_as_list(body.get(rows_key)))+ if str(headers.get("tr_cont", "")) not in ("F", "M"):+ break+ page_params = dict(params)+ page_params["CTX_AREA_FK100"] = body.get("ctx_area_fk100", "")+ page_params["CTX_AREA_NK100"] = body.get("ctx_area_nk100", "")+ tr_cont = "N"+ merged = dict(last_body)+ merged[rows_key] = rows+ return mergeddef _request(@@ -656,7 +768,8 @@ def _request(tr_id: str,params: Mapping[str, Any] | None = None,body: Mapping[str, Any] | None = None,-) -> dict[str, Any]:+ tr_cont: str = "",+) -> tuple[dict[str, Any], Mapping[str, str]]:missing = _missing_fields(cfg)if missing:raise KISConfigError(f"KIS connector not configured: missing {', '.join(missing)}.")@@ -665,7 +778,7 @@ def _request(response = requests.request(method.upper(),f"{cfg.base_url}{path}",- headers=_headers(cfg, tr_id),+ headers=_headers(cfg, tr_id, tr_cont),params=dict(params or {}),json=dict(body) if body is not None else None,timeout=cfg.timeout,@@ -678,7 +791,7 @@ def _request(if response.status_code >= 400:raise KISAPIError(f"KIS API returned HTTP {response.status_code}: {_error_message(response)}")try:- return response.json()+ return response.json(), response.headersexcept ValueError as exc:raise KISAPIError("KIS API returned invalid JSON.") from excdiff --git a/agent/tests/test_sdk_connectors_kis.py b/agent/tests/test_sdk_connectors_kis.pyindex ee3b8e52f..48527ed46 100644--- a/agent/tests/test_sdk_connectors_kis.py+++ b/agent/tests/test_sdk_connectors_kis.py@@ -68,6 +68,62 @@ def test_kis_invalid_profile_rejected() -> None:kis.KISConfig.from_mapping({"profile": "live"}) # only paper/live-readonly+def test_kis_profile_override_is_not_forwarded() -> None:+ """A caller-supplied override must never flip paper -> live: only the+ profile's own declared config may set ``profile`` (see the note beside+ ``_OVERRIDE_KEYS``)."""+ assert "profile" not in kis._OVERRIDE_KEYS+ cfg = kis.build_config({"profile": "paper"}, {"profile": "live-readonly", "app_key": "k"})+ assert cfg.profile == "paper"+ assert cfg.app_key == "k" # allowlisted keys still pass through+++class _FakeResponse:+ def __init__(self, url: str, headers_sent: dict, json_body: dict, response_headers: dict | None = None):+ self.url = url+ self.headers_sent = headers_sent+ self._json = json_body+ self.status_code = 200+ self.headers = response_headers or {"tr_cont": "D"}++ def json(self):+ return self._json+++def test_kis_requests_pin_host_and_tr_id_by_environment(monkeypatch) -> None:+ """The order path must hit the real per-environment host with the matching+ TR_ID -- pinned directly, not inferred from other passing tests."""+ calls = []++ def fake_request(method, url, *, headers, params=None, json=None, timeout=None):+ calls.append({"method": method, "url": url, "headers": headers})+ return _FakeResponse(url, headers, {"rt_cd": "0", "output": {"ODNO": "1", "KRX_FWDG_ORD_ORGNO": "b"}})++ monkeypatch.setattr(kis, "_access_token", lambda cfg: "tok")+ monkeypatch.setattr(kis.requests, "request", fake_request)++ paper_cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")+ kis.place_order(paper_cfg, symbol="005930", side="buy", quantity=1)++ assert len(calls) == 1+ assert calls[0]["url"].startswith("https://openapivts.koreainvestment.com:29443")+ assert calls[0]["headers"]["tr_id"] == kis._TR_ORDER_BUY["paper"]+++def test_kis_live_readonly_config_never_reaches_the_paper_order_call(monkeypatch) -> None:+ """The structural guard must stop a live-readonly config before any+ request is built -- so it can never resolve to the live host/TR_ID here."""+ calls = []+ monkeypatch.setattr(kis.requests, "request", lambda *a, **k: calls.append(1))++ live_cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="live-readonly")+ result = kis.place_order(live_cfg, symbol="005930", side="buy", quantity=1)++ assert result["status"] == "error"+ assert result["error"] == kis._LIVE_ORDER_ERROR+ assert calls == []++# --------------------------------------------------------------------------- ## Order validation# --------------------------------------------------------------------------- #@@ -86,6 +142,18 @@ def test_kis_place_order_validates_before_any_request() -> None:assert "notional" in notional_rejected["error"]+def test_kis_place_order_rejects_fractional_quantity_and_price() -> None:+ """int() truncation must not silently turn 2.5 shares into an ok 2-share+ order, or drop the fraction of a limit price."""+ cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")+ fractional_qty = kis.place_order(cfg, symbol="005930", side="buy", quantity=2.5)+ fractional_price = kis.place_order(+ cfg, symbol="005930", side="buy", quantity=1, order_type="limit", limit_price=70500.5+ )+ assert fractional_qty["status"] == "error"+ assert fractional_price["status"] == "error"++def test_kis_cancel_order_rejects_fractional_sub_share_quantity() -> None:"""0.5 must not silently truncate to 0 and flip into a full-quantity cancel."""cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")@@ -93,6 +161,60 @@ def test_kis_cancel_order_rejects_fractional_sub_share_quantity() -> None:assert result["status"] == "error"+def test_kis_cancel_order_looks_up_branch_when_omitted(monkeypatch) -> None:+ cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")+ monkeypatch.setattr(+ kis,+ "get_open_orders",+ lambda cfg, **k: {"open_orders": [{"order_id": "123", "order_branch": "00099"}], "executions": []},+ )+ captured = {}++ def fake_post(cfg, path, *, tr_id, body):+ captured.update(body)+ return {"rt_cd": "0"}++ monkeypatch.setattr(kis, "_post", fake_post)+ result = kis.cancel_order(cfg, "123")+ assert result["status"] == "ok"+ assert captured["KRX_FWDG_ORD_ORGNO"] == "00099"+ assert captured["EXCG_ID_DVSN_CD"] == kis._EXCHANGE_ID_KRX+++def test_kis_cancel_order_errors_clearly_when_branch_cannot_be_found(monkeypatch) -> None:+ cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")+ monkeypatch.setattr(kis, "get_open_orders", lambda cfg, **k: {"open_orders": [], "executions": []})+ result = kis.cancel_order(cfg, "no-such-order")+ assert result["status"] == "error"+ assert "order_branch" in result["error"]+++def test_kis_order_methods_refuse_live_config_before_anything_else() -> None:+ cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="live-readonly")+ placed = kis.place_order(cfg, symbol="005930", side="buy", quantity=1)+ cancelled = kis.cancel_order(cfg, "1", order_branch="b")+ assert placed == {"status": "error", "error": kis._LIVE_ORDER_ERROR}+ assert cancelled == {"status": "error", "error": kis._LIVE_ORDER_ERROR}+++def test_kis_get_paginated_follows_tr_cont_until_the_final_page(monkeypatch) -> None:+ """A 'more data' tr_cont must fetch the next page and merge its rows;+ a larger account's positions must not be cut off after the first page."""+ cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")+ pages = [+ ({"output1": [{"n": 1}], "ctx_area_fk100": "fk1", "ctx_area_nk100": "nk1"}, {"tr_cont": "F"}),+ ({"output1": [{"n": 2}], "ctx_area_fk100": "fk2", "ctx_area_nk100": "nk2"}, {"tr_cont": "M"}),+ ({"output1": [{"n": 3}]}, {"tr_cont": "D"}),+ ]++ def fake_request(cfg, method, path, *, tr_id, params=None, body=None, tr_cont=""):+ return pages.pop(0)++ monkeypatch.setattr(kis, "_request", fake_request)+ merged = kis._get_paginated(cfg, "/some/path", tr_id="X", params={"CTX_AREA_FK100": "", "CTX_AREA_NK100": ""})+ assert [row["n"] for row in merged["output1"]] == [1, 2, 3]++def test_kis_get_historical_bars_limit_zero_returns_no_bars(monkeypatch) -> None:cfg = kis.KISConfig(app_key="k", app_secret="s", account_no="12345678", profile="paper")monkeypatch.setattr(