fix: 해외 cash=0.00 및 get_open_position HOLD 필터링 수정 (#264, #265)
Some checks failed
CI / test (pull_request) Has been cancelled
Some checks failed
CI / test (pull_request) Has been cancelled
## 변경사항 ### #264 — 해외 매수가능금액 조회 API 교체 (frcr_dncl_amt_2 → inquire-psamount) - TTTS3012R (해외주식 잔고) output2에 frcr_dncl_amt_2 필드가 존재하지 않아 총 가용 현금이 항상 0.00으로 산출되는 문제 수정 - OverseasBroker에 get_overseas_buying_power() 메서드 추가 (TR_ID: 실전 TTTS3007R / 모의 VTTS3007R, ord_psbl_frcr_amt 반환) - main.py trading_cycle() 및 daily cycle 모두 수정 - 출처: 한국투자증권 오픈API 전체문서 (20260221) — 해외주식 매수가능금액조회 시트 ### #265 — get_open_position() HOLD 레코드 필터링 추가 - HOLD 결정도 trades 테이블에 저장되어 BUY 이후 HOLD 기록 시 최신 레코드가 HOLD → get_open_position이 None 반환하는 문제 수정 - 쿼리에 AND action IN ('BUY', 'SELL') 필터 추가 - HOLD 레코드를 제외하고 마지막 BUY/SELL 기록만 확인 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
agentson
91
src/main.py
91
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)
|
||||
@@ -1659,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 (
|
||||
|
||||
Reference in New Issue
Block a user