Merge main into feature/issue-49-valueerror-empty-string
Some checks failed
CI / test (pull_request) Has been cancelled

Resolved conflict in src/main.py by using safe_float() from main
instead of float(...or '0') pattern.

Changes:
- src/main.py: Use safe_float() for consistent empty string handling
- All 16 tests pass including test_overseas_price_empty_string
This commit is contained in:
agentson
2026-02-05 00:44:07 +09:00
4 changed files with 80 additions and 13 deletions

View File

@@ -16,8 +16,9 @@ CONFIDENCE_THRESHOLD=80
# Database # Database
DB_PATH=data/trade_logs.db DB_PATH=data/trade_logs.db
# Rate Limiting # Rate Limiting (requests per second for KIS API)
RATE_LIMIT_RPS=10.0 # Reduced to 5.0 to avoid "초당 거래건수 초과" errors (EGW00201)
RATE_LIMIT_RPS=5.0
# Trading Mode (paper / live) # Trading Mode (paper / live)
MODE=paper MODE=paper

View File

@@ -37,7 +37,8 @@ class Settings(BaseSettings):
DB_PATH: str = "data/trade_logs.db" DB_PATH: str = "data/trade_logs.db"
# Rate Limiting (requests per second for KIS API) # Rate Limiting (requests per second for KIS API)
RATE_LIMIT_RPS: float = 10.0 # Reduced to 5.0 to avoid EGW00201 "초당 거래건수 초과" errors
RATE_LIMIT_RPS: float = 5.0
# Trading mode # Trading mode
MODE: str = Field(default="paper", pattern="^(paper|live)$") MODE: str = Field(default="paper", pattern="^(paper|live)$")

View File

@@ -33,6 +33,35 @@ from src.notifications.telegram_client import TelegramClient
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def safe_float(value: str | float | None, default: float = 0.0) -> float:
"""Convert to float, handling empty strings and None.
Args:
value: Value to convert (string, float, or None)
default: Default value if conversion fails
Returns:
Converted float or default value
Examples:
>>> safe_float("123.45")
123.45
>>> safe_float("")
0.0
>>> safe_float(None)
0.0
>>> safe_float("invalid", 99.0)
99.0
"""
if value is None or value == "":
return default
try:
return float(value)
except (ValueError, TypeError):
return default
# Target stock codes to monitor per market # Target stock codes to monitor per market
WATCHLISTS = { WATCHLISTS = {
"KR": ["005930", "000660", "035420"], # Samsung, SK Hynix, NAVER "KR": ["005930", "000660", "035420"], # Samsung, SK Hynix, NAVER
@@ -77,16 +106,16 @@ async def trading_cycle(
balance_data = await broker.get_balance() balance_data = await broker.get_balance()
output2 = balance_data.get("output2", [{}]) output2 = balance_data.get("output2", [{}])
total_eval = float(output2[0].get("tot_evlu_amt", "0")) if output2 else 0 total_eval = safe_float(output2[0].get("tot_evlu_amt", "0")) if output2 else 0
total_cash = float( total_cash = safe_float(
balance_data.get("output2", [{}])[0].get("dnca_tot_amt", "0") balance_data.get("output2", [{}])[0].get("dnca_tot_amt", "0")
if output2 if output2
else "0" else "0"
) )
purchase_total = float(output2[0].get("pchs_amt_smtl_amt", "0")) if output2 else 0 purchase_total = safe_float(output2[0].get("pchs_amt_smtl_amt", "0")) if output2 else 0
current_price = float(orderbook.get("output1", {}).get("stck_prpr", "0")) current_price = safe_float(orderbook.get("output1", {}).get("stck_prpr", "0"))
foreigner_net = float(orderbook.get("output1", {}).get("frgn_ntby_qty", "0")) foreigner_net = safe_float(orderbook.get("output1", {}).get("frgn_ntby_qty", "0"))
else: else:
# Overseas market # Overseas market
price_data = await overseas_broker.get_overseas_price( price_data = await overseas_broker.get_overseas_price(
@@ -103,11 +132,11 @@ async def trading_cycle(
else: else:
balance_info = {} balance_info = {}
total_eval = float(balance_info.get("frcr_evlu_tota", "0") or "0") total_eval = safe_float(balance_info.get("frcr_evlu_tota", "0") or "0")
total_cash = float(balance_info.get("frcr_dncl_amt_2", "0") or "0") total_cash = safe_float(balance_info.get("frcr_dncl_amt_2", "0") or "0")
purchase_total = float(balance_info.get("frcr_buy_amt_smtl", "0") or "0") purchase_total = safe_float(balance_info.get("frcr_buy_amt_smtl", "0") or "0")
current_price = float(price_data.get("output", {}).get("last", "0") or "0") current_price = safe_float(price_data.get("output", {}).get("last", "0"))
foreigner_net = 0.0 # Not available for overseas foreigner_net = 0.0 # Not available for overseas
# Calculate daily P&L % # Calculate daily P&L %

View File

@@ -6,7 +6,43 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest import pytest
from src.core.risk_manager import CircuitBreakerTripped, FatFingerRejected from src.core.risk_manager import CircuitBreakerTripped, FatFingerRejected
from src.main import trading_cycle from src.main import safe_float, trading_cycle
class TestSafeFloat:
"""Test safe_float() helper function."""
def test_converts_valid_string(self):
"""Test conversion of valid numeric string."""
assert safe_float("123.45") == 123.45
assert safe_float("0") == 0.0
assert safe_float("-99.9") == -99.9
def test_handles_empty_string(self):
"""Test empty string returns default."""
assert safe_float("") == 0.0
assert safe_float("", 99.0) == 99.0
def test_handles_none(self):
"""Test None returns default."""
assert safe_float(None) == 0.0
assert safe_float(None, 42.0) == 42.0
def test_handles_invalid_string(self):
"""Test invalid string returns default."""
assert safe_float("invalid") == 0.0
assert safe_float("not_a_number", 100.0) == 100.0
assert safe_float("12.34.56") == 0.0
def test_handles_float_input(self):
"""Test float input passes through."""
assert safe_float(123.45) == 123.45
assert safe_float(0.0) == 0.0
def test_custom_default(self):
"""Test custom default value."""
assert safe_float("", -1.0) == -1.0
assert safe_float(None, 999.0) == 999.0
class TestTradingCycleTelegramIntegration: class TestTradingCycleTelegramIntegration: