Compare commits

...

3 Commits

Author SHA1 Message Date
7b3ba27ef7 Merge pull request 'fix: 해외 매수가능금액 ord_psbl_frcr_amt → ovrs_ord_psbl_amt 교체 (#269)' (#270) from feature/issue-269-overseas-cash-ovrs-ord-psbl-amt into main
Some checks failed
CI / test (push) Has been cancelled
Reviewed-on: #270
2026-02-26 02:01:57 +09:00
agentson
6ff887c047 fix: 해외 매수가능금액 ord_psbl_frcr_amt → ovrs_ord_psbl_amt 교체 (#269)
Some checks failed
CI / test (pull_request) Has been cancelled
외화 예수금만 반영하는 ord_psbl_frcr_amt 대신
미결제 매도 대금(sll_ruse_psbl_amt)을 포함하는
ovrs_ord_psbl_amt (앱 '외화' 기준 통합 주문가능금액)를 사용하도록 수정.

실제 API 응답 확인:
  ord_psbl_frcr_amt  = $139.25  (외화 예수금만)
  sll_ruse_psbl_amt  = $7292.70 (미결제 매도 대금)
  ovrs_ord_psbl_amt  = $7391.30 (합산, 원화 미포함)

원화 환산(frcr_ord_psbl_amt1)은 요구사항에 따라 사용하지 않음.
출처: KIS 공식문서(20260221) '해외주식 매수가능금액조회' 시트.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-02-26 02:01:13 +09:00
219eef6388 Merge pull request 'fix: 로그 WARNING 2종 수정 - scanner 오해 메시지 및 홀딩 종목 rsi 누락 (#267)' (#268) from feature/issue-267-fix-log-warnings into main
Some checks failed
CI / test (push) Has been cancelled
Reviewed-on: #268
2026-02-26 01:46:43 +09:00
2 changed files with 18 additions and 18 deletions

View File

@@ -537,7 +537,7 @@ async def trading_cycle(
market.exchange_code, stock_code, current_price market.exchange_code, stock_code, current_price
) )
total_cash = safe_float( total_cash = safe_float(
ps_data.get("output", {}).get("ord_psbl_frcr_amt", "0") or "0" ps_data.get("output", {}).get("ovrs_ord_psbl_amt", "0") or "0"
) )
except ConnectionError as exc: except ConnectionError as exc:
logger.warning( logger.warning(
@@ -1710,7 +1710,7 @@ async def run_daily_session(
ref_stock["current_price"], ref_stock["current_price"],
) )
total_cash = safe_float( total_cash = safe_float(
ps_data.get("output", {}).get("ord_psbl_frcr_amt", "0") or "0" ps_data.get("output", {}).get("ovrs_ord_psbl_amt", "0") or "0"
) )
except ConnectionError as exc: except ConnectionError as exc:
logger.warning( logger.warning(

View File

@@ -909,7 +909,7 @@ class TestOverseasBalanceParsing:
} }
) )
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "5000.00"}}
) )
return broker return broker
@@ -929,7 +929,7 @@ class TestOverseasBalanceParsing:
} }
) )
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "5000.00"}}
) )
return broker return broker
@@ -942,7 +942,7 @@ class TestOverseasBalanceParsing:
) )
broker.get_overseas_balance = AsyncMock(return_value={"output2": []}) broker.get_overseas_balance = AsyncMock(return_value={"output2": []})
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "0.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "0.00"}}
) )
return broker return broker
@@ -965,7 +965,7 @@ class TestOverseasBalanceParsing:
) )
# get_overseas_buying_power not called when price=0, but mock for safety # get_overseas_buying_power not called when price=0, but mock for safety
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "5000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "5000.00"}}
) )
return broker return broker
@@ -1202,7 +1202,7 @@ class TestOverseasBalanceParsing:
} }
) )
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000.00"}}
) )
broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"}) broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
return broker return broker
@@ -1309,7 +1309,7 @@ class TestOverseasBalanceParsing:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000.00"}}
) )
overseas_broker.send_overseas_order = AsyncMock( overseas_broker.send_overseas_order = AsyncMock(
return_value={"rt_cd": "0", "msg1": "OK"} return_value={"rt_cd": "0", "msg1": "OK"}
@@ -1373,7 +1373,7 @@ class TestOverseasBalanceParsing:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "10000"}} return_value={"output": {"ovrs_ord_psbl_amt": "10000"}}
) )
overseas_broker.get_overseas_price = AsyncMock( overseas_broker.get_overseas_price = AsyncMock(
return_value={"output": {"last": "50.1234", "rate": "0"}} return_value={"output": {"last": "50.1234", "rate": "0"}}
@@ -1434,7 +1434,7 @@ class TestOverseasBalanceParsing:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "10000"}} return_value={"output": {"ovrs_ord_psbl_amt": "10000"}}
) )
overseas_broker.get_overseas_price = AsyncMock( overseas_broker.get_overseas_price = AsyncMock(
return_value={"output": {"last": "0.5678", "rate": "0"}} return_value={"output": {"last": "0.5678", "rate": "0"}}
@@ -1735,7 +1735,7 @@ class TestScenarioEngineIntegration:
"output2": [{"frcr_evlu_tota": "10000", "frcr_buy_amt_smtl": "9000"}] "output2": [{"frcr_evlu_tota": "10000", "frcr_buy_amt_smtl": "9000"}]
}) })
os_broker.get_overseas_buying_power = AsyncMock(return_value={ os_broker.get_overseas_buying_power = AsyncMock(return_value={
"output": {"ord_psbl_frcr_amt": "500"} "output": {"ovrs_ord_psbl_amt": "500"}
}) })
with patch("src.main.log_trade"): with patch("src.main.log_trade"):
@@ -2861,7 +2861,7 @@ class TestBuyCooldown:
"output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}], "output2": [{"frcr_evlu_tota": "50000", "frcr_buy_amt_smtl": "0"}],
}) })
broker.get_overseas_buying_power = AsyncMock( broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000"}}
) )
broker.send_overseas_order = AsyncMock( broker.send_overseas_order = AsyncMock(
return_value={"rt_cd": "1", "msg1": "모의투자 주문가능금액이 부족합니다."} return_value={"rt_cd": "1", "msg1": "모의투자 주문가능금액이 부족합니다."}
@@ -2978,7 +2978,7 @@ class TestBuyCooldown:
"output2": [{"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( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000"}}
) )
overseas_broker.send_overseas_order = AsyncMock( overseas_broker.send_overseas_order = AsyncMock(
return_value={"rt_cd": "1", "msg1": "기타 오류 메시지"} return_value={"rt_cd": "1", "msg1": "기타 오류 메시지"}
@@ -3378,7 +3378,7 @@ async def test_buy_suppressed_when_open_position_exists() -> None:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "10000"}} return_value={"output": {"ovrs_ord_psbl_amt": "10000"}}
) )
overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"}) overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"})
@@ -3445,7 +3445,7 @@ async def test_buy_proceeds_when_no_open_position() -> None:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000"}}
) )
overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"}) overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "OK"})
@@ -3554,7 +3554,7 @@ class TestOverseasBrokerIntegration:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000.00"}}
) )
overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"}) overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
@@ -3630,7 +3630,7 @@ class TestOverseasBrokerIntegration:
} }
) )
overseas_broker.get_overseas_buying_power = AsyncMock( overseas_broker.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "50000.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "50000.00"}}
) )
overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"}) overseas_broker.send_overseas_order = AsyncMock(return_value={"msg1": "주문접수"})
@@ -4880,7 +4880,7 @@ class TestOverseasGhostPositionClose:
) )
ob.get_overseas_balance = AsyncMock(return_value=balance_data) ob.get_overseas_balance = AsyncMock(return_value=balance_data)
ob.get_overseas_buying_power = AsyncMock( ob.get_overseas_buying_power = AsyncMock(
return_value={"output": {"ord_psbl_frcr_amt": "0.00"}} return_value={"output": {"ovrs_ord_psbl_amt": "0.00"}}
) )
ob.send_overseas_order = AsyncMock(return_value=sell_result) ob.send_overseas_order = AsyncMock(return_value=sell_result)
return ob return ob