Merge pull request 'fix: 해외 cash=0.00 및 get_open_position HOLD 필터링 수정 (#264, #265)' (#266) from feature/issue-264-265-overseas-cash-and-open-position into main

Reviewed-on: #266

src/broker/overseas.py

@@ -121,6 +121,7 @@ class OverseasBroker:
             tr_id = self._broker._settings.OVERSEAS_RANKING_VOLUME_TR_ID
             path = self._broker._settings.OVERSEAS_RANKING_VOLUME_PATH
             params: dict[str, str] = {
+                "KEYB": "",  # NEXT KEY BUFF — Required, 공백
                 "AUTH": "",
                 "EXCD": ranking_excd,
                 "MIXN": "0",
@@ -130,10 +131,11 @@ class OverseasBroker:
             tr_id = self._broker._settings.OVERSEAS_RANKING_FLUCT_TR_ID
             path = self._broker._settings.OVERSEAS_RANKING_FLUCT_PATH
             params = {
+                "KEYB": "",  # NEXT KEY BUFF — Required, 공백
                 "AUTH": "",
                 "EXCD": ranking_excd,
                 "NDAY": "0",
-                "GUBN": "0",  # 0=전체(상승+하락), 1=상승만 — 변동성 스캐너는 전체 필요
+                "GUBN": "1",  # 0=하락율, 1=상승율 — 변동성 스캐너는 급등 종목 우선
                 "VOL_RANG": "0",
             }
 
@@ -220,6 +222,59 @@ class OverseasBroker:
                 f"Network error fetching overseas balance: {exc}"
             ) from exc
 
+    async def get_overseas_buying_power(
+        self,
+        exchange_code: str,
+        stock_code: str,
+        price: float,
+    ) -> dict[str, Any]:
+        """
+        Fetch overseas buying power for a specific stock and price.
+
+        Args:
+            exchange_code: Exchange code (e.g., "NASD", "NYSE")
+            stock_code: Stock ticker symbol
+            price: Current stock price (used for quantity calculation)
+
+        Returns:
+            API response; key field: output.ord_psbl_frcr_amt (주문가능외화금액)
+
+        Raises:
+            ConnectionError: On network or API errors
+        """
+        await self._broker._rate_limiter.acquire()
+        session = self._broker._get_session()
+
+        # TR_ID: 실전 TTTS3007R, 모의 VTTS3007R
+        # Source: 한국투자증권 오픈API 전체문서 (20260221) — '해외주식 매수가능금액조회' 시트
+        ps_tr_id = (
+            "TTTS3007R" if self._broker._settings.MODE == "live" else "VTTS3007R"
+        )
+        headers = await self._broker._auth_headers(ps_tr_id)
+        params = {
+            "CANO": self._broker._account_no,
+            "ACNT_PRDT_CD": self._broker._product_cd,
+            "OVRS_EXCG_CD": exchange_code,
+            "OVRS_ORD_UNPR": f"{price:.2f}",
+            "ITEM_CD": stock_code,
+        }
+        url = (
+            f"{self._broker._base_url}/uapi/overseas-stock/v1/trading/inquire-psamount"
+        )
+
+        try:
+            async with session.get(url, headers=headers, params=params) as resp:
+                if resp.status != 200:
+                    text = await resp.text()
+                    raise ConnectionError(
+                        f"get_overseas_buying_power failed ({resp.status}): {text}"
+                    )
+                return await resp.json()
+        except (TimeoutError, aiohttp.ClientError) as exc:
+            raise ConnectionError(
+                f"Network error fetching overseas buying power: {exc}"
+            ) from exc
+
     async def send_overseas_order(
         self,
         exchange_code: str,

src/db.py

@@ -254,10 +254,11 @@ def get_open_position(
     """Return open position if latest trade is BUY, else None."""
     cursor = conn.execute(
         """
-        SELECT action, decision_id, price, quantity
+        SELECT action, decision_id, price, quantity, timestamp
         FROM trades
         WHERE stock_code = ?
           AND market = ?
+          AND action IN ('BUY', 'SELL')
         ORDER BY timestamp DESC
         LIMIT 1
         """,
@@ -266,7 +267,7 @@ def get_open_position(
     row = cursor.fetchone()
     if not row or row[0] != "BUY":
         return None
-    return {"decision_id": row[1], "price": row[2], "quantity": row[3]}
+    return {"decision_id": row[1], "price": row[2], "quantity": row[3], "timestamp": row[4]}
 
 
 def get_recent_symbols(

src/main.py

@@ -508,9 +508,43 @@ async def trading_cycle(
             balance_info = {}
 
         total_eval = safe_float(balance_info.get("frcr_evlu_tota", "0") or "0")
-        total_cash = safe_float(balance_info.get("frcr_dncl_amt_2", "0") or "0")
         purchase_total = safe_float(balance_info.get("frcr_buy_amt_smtl", "0") or "0")
 
+        # Resolve current price first (needed for buying power API)
+        current_price = safe_float(price_data.get("output", {}).get("last", "0"))
+        if current_price <= 0:
+            market_candidates_lookup = scan_candidates.get(market.code, {})
+            cand_lookup = market_candidates_lookup.get(stock_code)
+            if cand_lookup and cand_lookup.price > 0:
+                logger.debug(
+                    "Price API returned 0 for %s; using scanner candidate price %.4f",
+                    stock_code,
+                    cand_lookup.price,
+                )
+                current_price = cand_lookup.price
+        foreigner_net = 0.0  # Not available for overseas
+        price_change_pct = safe_float(price_data.get("output", {}).get("rate", "0"))
+
+        # Fetch available foreign currency cash via inquire-psamount (TTTS3007R/VTTS3007R).
+        # TTTS3012R output2 does not include a cash/deposit field — frcr_dncl_amt_2 does not exist.
+        # Source: 한국투자증권 오픈API 전체문서 (20260221) — '해외주식 매수가능금액조회' 시트
+        total_cash = 0.0
+        if current_price > 0:
+            try:
+                ps_data = await overseas_broker.get_overseas_buying_power(
+                    market.exchange_code, stock_code, current_price
+                )
+                total_cash = safe_float(
+                    ps_data.get("output", {}).get("ord_psbl_frcr_amt", "0") or "0"
+                )
+            except ConnectionError as exc:
+                logger.warning(
+                    "Could not fetch overseas buying power for %s/%s: %s",
+                    market.exchange_code,
+                    stock_code,
+                    exc,
+                )
+
         # Paper mode fallback: VTS overseas balance API often fails for many accounts.
         # Only activate in paper mode — live mode must use real balance from KIS.
         if (
@@ -526,34 +560,6 @@ async def trading_cycle(
             )
             total_cash = settings.PAPER_OVERSEAS_CASH
 
-        current_price = safe_float(price_data.get("output", {}).get("last", "0"))
-        # Fallback: if price API returns 0, use scanner candidate price
-        if current_price <= 0:
-            market_candidates_lookup = scan_candidates.get(market.code, {})
-            cand_lookup = market_candidates_lookup.get(stock_code)
-            if cand_lookup and cand_lookup.price > 0:
-                logger.debug(
-                    "Price API returned 0 for %s; using scanner candidate price %.4f",
-                    stock_code,
-                    cand_lookup.price,
-                )
-                current_price = cand_lookup.price
-        foreigner_net = 0.0  # Not available for overseas
-        price_change_pct = safe_float(price_data.get("output", {}).get("rate", "0"))
-
-        # Price API may return 0/empty for certain VTS exchange codes.
-        # Fall back to the scanner candidate's price so order sizing still works.
-        if current_price <= 0:
-            market_candidates_lookup = scan_candidates.get(market.code, {})
-            cand_lookup = market_candidates_lookup.get(stock_code)
-            if cand_lookup and cand_lookup.price > 0:
-                current_price = cand_lookup.price
-                logger.debug(
-                    "Price API returned 0 for %s; using scanner price %.4f",
-                    stock_code,
-                    current_price,
-                )
-
     # Calculate daily P&L %
     pnl_pct = (
         ((total_eval - purchase_total) / purchase_total * 100)
@@ -576,6 +582,22 @@ async def trading_cycle(
         market_data["rsi"] = candidate.rsi
         market_data["volume_ratio"] = candidate.volume_ratio
 
+    # Enrich market_data with holding info for SELL/HOLD scenario conditions
+    open_pos = get_open_position(db_conn, stock_code, market.code)
+    if open_pos and current_price > 0:
+        entry_price = safe_float(open_pos.get("price"), 0.0)
+        if entry_price > 0:
+            market_data["unrealized_pnl_pct"] = (
+                (current_price - entry_price) / entry_price * 100
+            )
+        entry_ts = open_pos.get("timestamp")
+        if entry_ts:
+            try:
+                entry_date = datetime.fromisoformat(entry_ts).date()
+                market_data["holding_days"] = (datetime.now(UTC).date() - entry_date).days
+            except (ValueError, TypeError):
+                pass
+
     # 1.3. Record L7 real-time context (market-scoped keys)
     timeframe = datetime.now(UTC).isoformat()
     context_store.set_context(
@@ -1643,10 +1665,35 @@ async def run_daily_session(
                 balance_info = {}
 
             total_eval = safe_float(balance_info.get("frcr_evlu_tota", "0") or "0")
-            total_cash = safe_float(balance_info.get("frcr_dncl_amt_2", "0") or "0")
             purchase_total = safe_float(
                 balance_info.get("frcr_buy_amt_smtl", "0") or "0"
             )
+
+            # Fetch available foreign currency cash via inquire-psamount (TTTS3007R/VTTS3007R).
+            # TTTS3012R output2 does not include a cash/deposit field — frcr_dncl_amt_2 does not exist.
+            # Use the first stock with a valid price as the reference for the buying power query.
+            # Source: 한국투자증권 오픈API 전체문서 (20260221) — '해외주식 매수가능금액조회' 시트
+            total_cash = 0.0
+            ref_stock = next(
+                (s for s in stocks_data if s.get("current_price", 0) > 0), None
+            )
+            if ref_stock:
+                try:
+                    ps_data = await overseas_broker.get_overseas_buying_power(
+                        market.exchange_code,
+                        ref_stock["stock_code"],
+                        ref_stock["current_price"],
+                    )
+                    total_cash = safe_float(
+                        ps_data.get("output", {}).get("ord_psbl_frcr_amt", "0") or "0"
+                    )
+                except ConnectionError as exc:
+                    logger.warning(
+                        "Could not fetch overseas buying power for %s: %s",
+                        market.exchange_code,
+                        exc,
+                    )
+
             # Paper mode fallback: VTS overseas balance API often fails for many accounts.
             # Only activate in paper mode — live mode must use real balance from KIS.
             if (

tests/test_main.py

@@ -903,12 +903,14 @@ class TestOverseasBalanceParsing:
                 "output2": [
                     {
                         "frcr_evlu_tota": "10000.00",
-                        "frcr_dncl_amt_2": "5000.00",
                         "frcr_buy_amt_smtl": "4500.00",
                     }
                 ]
             }
         )
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}}
+        )
         return broker
 
     @pytest.fixture
@@ -922,11 +924,13 @@ class TestOverseasBalanceParsing:
             return_value={
                 "output2": {
                     "frcr_evlu_tota": "10000.00",
-                    "frcr_dncl_amt_2": "5000.00",
                     "frcr_buy_amt_smtl": "4500.00",
                 }
             }
         )
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}}
+        )
         return broker
 
     @pytest.fixture
@@ -937,6 +941,9 @@ class TestOverseasBalanceParsing:
             return_value={"output": {"last": "150.50"}}
         )
         broker.get_overseas_balance = AsyncMock(return_value={"output2": []})
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "0.00"}}
+        )
         return broker
 
     @pytest.fixture
@@ -951,12 +958,15 @@ class TestOverseasBalanceParsing:
                 "output2": [
                     {
                         "frcr_evlu_tota": "10000.00",
-                        "frcr_dncl_amt_2": "5000.00",
                         "frcr_buy_amt_smtl": "4500.00",
                     }
                 ]
             }
         )
+        # get_overseas_buying_power not called when price=0, but mock for safety
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}}
+        )
         return broker
 
     @pytest.fixture
@@ -1186,12 +1196,14 @@ class TestOverseasBalanceParsing:
                 "output2": [
                     {
                         "frcr_evlu_tota": "100000.00",
-                        "frcr_dncl_amt_2": "50000.00",
                         "frcr_buy_amt_smtl": "50000.00",
                     }
                 ]
             }
         )
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}}
+        )
         broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
         return broker
 
@@ -1291,12 +1303,14 @@ class TestOverseasBalanceParsing:
                 "output2": [
                     {
                         "frcr_evlu_tota": "100000.00",
-                        "frcr_dncl_amt_2": "50000.00",
                         "frcr_buy_amt_smtl": "50000.00",
                     }
                 ],
             }
         )
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}}
+        )
         overseas_broker.send_overseas_order = AsyncMock(
             return_value={"rt_cd": "0", "msg1": "OK"}
         )
@@ -1355,9 +1369,12 @@ class TestOverseasBalanceParsing:
         overseas_broker.get_overseas_balance = AsyncMock(
             return_value={
                 "output1": [],
-                "output2": [{"frcr_evlu_tota": "0", "frcr_dncl_amt_2": "10000", "frcr_buy_amt_smtl": "0"}],
+                "output2": [{"frcr_evlu_tota": "0", "frcr_buy_amt_smtl": "0"}],
             }
         )
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "10000"}}
+        )
         overseas_broker.get_overseas_price = AsyncMock(
             return_value={"output": {"last": "50.1234", "rate": "0"}}
         )
@@ -1413,9 +1430,12 @@ class TestOverseasBalanceParsing:
         overseas_broker.get_overseas_balance = AsyncMock(
             return_value={
                 "output1": [],
-                "output2": [{"frcr_evlu_tota": "0", "frcr_dncl_amt_2": "10000", "frcr_buy_amt_smtl": "0"}],
+                "output2": [{"frcr_evlu_tota": "0", "frcr_buy_amt_smtl": "0"}],
             }
         )
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "10000"}}
+        )
         overseas_broker.get_overseas_price = AsyncMock(
             return_value={"output": {"last": "0.5678", "rate": "0"}}
         )
@@ -2781,9 +2801,11 @@ class TestBuyCooldown:
         )
         broker.get_overseas_balance = AsyncMock(return_value={
             "output1": [],
-            "output2": [{"frcr_dncl_amt_2": "50000", "frcr_evlu_tota": "50000",
+            "output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}],
-                         "frcr_buy_amt_smtl": "0"}],
         })
+        broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000"}}
+        )
         broker.send_overseas_order = AsyncMock(
             return_value={"rt_cd": "1", "msg1": "모의투자 주문가능금액이 부족합니다."}
         )
@@ -2896,9 +2918,11 @@ class TestBuyCooldown:
         )
         overseas_broker.get_overseas_balance = AsyncMock(return_value={
             "output1": [],
-            "output2": [{"frcr_dncl_amt_2": "50000", "frcr_evlu_tota": "50000",
+            "output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}],
-                         "frcr_buy_amt_smtl": "0"}],
         })
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000"}}
+        )
         overseas_broker.send_overseas_order = AsyncMock(
             return_value={"rt_cd": "1", "msg1": "기타 오류 메시지"}
         )
@@ -3293,9 +3317,12 @@ async def test_buy_suppressed_when_open_position_exists() -> None:
     overseas_broker.get_overseas_balance = AsyncMock(
         return_value={
             "output1": [],
-            "output2": [{"frcr_dncl_amt_2": "10000", "frcr_evlu_tota": "10000", "frcr_buy_amt_smtl": "0"}],
+            "output2": [{"frcr_evlu_tota": "10000", "frcr_buy_amt_smtl": "0"}],
         }
     )
+    overseas_broker.get_overseas_buying_power = AsyncMock(
+        return_value={"output": {"ord_psbl_frcr_amt": "10000"}}
+    )
     overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"})
 
     engine = MagicMock(spec=ScenarioEngine)
@@ -3357,9 +3384,12 @@ async def test_buy_proceeds_when_no_open_position() -> None:
     overseas_broker.get_overseas_balance = AsyncMock(
         return_value={
             "output1": [],
-            "output2": [{"frcr_dncl_amt_2": "50000", "frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}],
+            "output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}],
         }
     )
+    overseas_broker.get_overseas_buying_power = AsyncMock(
+        return_value={"output": {"ord_psbl_frcr_amt": "50000"}}
+    )
     overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"})
 
     engine = MagicMock(spec=ScenarioEngine)
@@ -3460,13 +3490,15 @@ class TestOverseasBrokerIntegration:
                 "output1": [{"ovrs_pdno": "AAPL", "ovrs_cblc_qty": "10"}],
                 "output2": [
                     {
-                        "frcr_dncl_amt_2": "50000.00",
                         "frcr_evlu_tota": "60000.00",
                         "frcr_buy_amt_smtl": "50000.00",
                     }
                 ],
             }
         )
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}}
+        )
         overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
 
         engine = MagicMock(spec=ScenarioEngine)
@@ -3534,13 +3566,15 @@ class TestOverseasBrokerIntegration:
                 "output1": [],
                 "output2": [
                     {
-                        "frcr_dncl_amt_2": "50000.00",
                         "frcr_evlu_tota": "50000.00",
                         "frcr_buy_amt_smtl": "0.00",
                     }
                 ],
             }
         )
+        overseas_broker.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}}
+        )
         overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
 
         engine = MagicMock(spec=ScenarioEngine)
@@ -3963,7 +3997,6 @@ class TestSyncPositionsFromBroker:
             "output2": [
                 {
                     "frcr_evlu_tota": "50000",
-                    "frcr_dncl_amt_2": "10000",
                     "frcr_buy_amt_smtl": "40000",
                 }
             ],
@@ -4131,7 +4164,7 @@ class TestSyncPositionsFromBroker:
 
         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"}],
+            "output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "40000"}],
         }
         broker = MagicMock()
         overseas_broker = MagicMock()
@@ -4789,6 +4822,9 @@ class TestOverseasGhostPositionClose:
             return_value={"output": {"last": str(current_price), "rate": "0.0"}}
         )
         ob.get_overseas_balance = AsyncMock(return_value=balance_data)
+        ob.get_overseas_buying_power = AsyncMock(
+            return_value={"output": {"ord_psbl_frcr_amt": "0.00"}}
+        )
         ob.send_overseas_order = AsyncMock(return_value=sell_result)
         return ob
 
@@ -4811,7 +4847,7 @@ class TestOverseasGhostPositionClose:
             "output1": [
                 {"ovrs_pdno": stock_code, "ord_psbl_qty": "5", "ovrs_cblc_qty": "5"}
             ],
-            "output2": [{"tot_evlu_amt": "10000", "frcr_dncl_amt_2": "10000"}],
+            "output2": [{"tot_evlu_amt": "10000"}],
         }
         sell_result = {"rt_cd": "1", "msg1": "모의투자 잔고내역이 없습니다"}
 
@@ -4887,7 +4923,7 @@ class TestOverseasGhostPositionClose:
         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"}],
+            "output2": [{"tot_evlu_amt": "100000"}],
         }
         sell_result = {"rt_cd": "1", "msg1": "일시적 오류가 발생했습니다"}
 

tests/test_overseas_broker.py

@@ -123,9 +123,10 @@ class TestFetchOverseasRankings:
         params = call_args[1]["params"]
 
         assert "/uapi/overseas-stock/v1/ranking/updown-rate" in url
+        assert params["KEYB"] == ""  # Required by KIS API spec
         assert params["EXCD"] == "NAS"
         assert params["NDAY"] == "0"
-        assert params["GUBN"] == "0"  # 0=전체(상승+하락), 변동성 스캐너에 필요
+        assert params["GUBN"] == "1"  # 1=상승율 — 변동성 스캐너는 급등 종목 우선
         assert params["VOL_RANG"] == "0"
 
         overseas_broker._broker._auth_headers.assert_called_with("HHDFS76290000")
@@ -158,6 +159,7 @@ class TestFetchOverseasRankings:
         params = call_args[1]["params"]
 
         assert "/uapi/overseas-stock/v1/ranking/volume-surge" in url
+        assert params["KEYB"] == ""  # Required by KIS API spec
         assert params["EXCD"] == "NYS"
         assert params["MIXN"] == "0"
         assert params["VOL_RANG"] == "0"