Compare commits
1 Commits
9927bfa13e
...
feature/is
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b961c53a92 |
@@ -175,7 +175,7 @@ class SmartVolatilityScanner:
|
||||
liquidity_score = volume_rank_bonus.get(stock_code, 0.0)
|
||||
score = min(100.0, volatility_score + liquidity_score)
|
||||
signal = "momentum" if change_rate >= 0 else "oversold"
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 4.0)))
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 2.0)))
|
||||
|
||||
candidates.append(
|
||||
ScanCandidate(
|
||||
@@ -282,7 +282,7 @@ class SmartVolatilityScanner:
|
||||
liquidity_score = volume_rank_bonus.get(stock_code, 0.0)
|
||||
score = min(100.0, volatility_score + liquidity_score)
|
||||
signal = "momentum" if change_rate >= 0 else "oversold"
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 4.0)))
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 2.0)))
|
||||
candidates.append(
|
||||
ScanCandidate(
|
||||
stock_code=stock_code,
|
||||
@@ -338,7 +338,7 @@ class SmartVolatilityScanner:
|
||||
|
||||
score = min(volatility_pct / 10.0, 1.0) * 100.0
|
||||
signal = "momentum" if change_rate >= 0 else "oversold"
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 4.0)))
|
||||
implied_rsi = max(0.0, min(100.0, 50.0 + (change_rate * 2.0)))
|
||||
candidates.append(
|
||||
ScanCandidate(
|
||||
stock_code=stock_code,
|
||||
|
||||
@@ -604,19 +604,9 @@ class TelegramCommandHandler:
|
||||
async with session.post(url, json=payload) as resp:
|
||||
if resp.status != 200:
|
||||
error_text = await resp.text()
|
||||
if resp.status == 409:
|
||||
# Another bot instance is already polling — stop this poller entirely.
|
||||
# Retrying would keep conflicting with the other instance.
|
||||
self._running = False
|
||||
logger.warning(
|
||||
"Telegram conflict (409): another instance is already polling. "
|
||||
"Disabling Telegram commands for this process. "
|
||||
"Ensure only one instance of The Ouroboros is running at a time.",
|
||||
)
|
||||
else:
|
||||
logger.error(
|
||||
"getUpdates API error (status=%d): %s", resp.status, error_text
|
||||
)
|
||||
logger.error(
|
||||
"getUpdates API error (status=%d): %s", resp.status, error_text
|
||||
)
|
||||
return []
|
||||
|
||||
data = await resp.json()
|
||||
|
||||
@@ -350,6 +350,42 @@ class TestSmartVolatilityScanner:
|
||||
assert [c.stock_code for c in candidates] == ["ABCD"]
|
||||
|
||||
|
||||
class TestImpliedRSIFormula:
|
||||
"""Test the implied_rsi formula in SmartVolatilityScanner (issue #181)."""
|
||||
|
||||
def test_neutral_change_gives_neutral_rsi(self) -> None:
|
||||
"""0% change → implied_rsi = 50 (neutral)."""
|
||||
# formula: 50 + (change_rate * 2.0)
|
||||
rsi = max(0.0, min(100.0, 50.0 + (0.0 * 2.0)))
|
||||
assert rsi == 50.0
|
||||
|
||||
def test_10pct_change_gives_rsi_70(self) -> None:
|
||||
"""10% upward change → implied_rsi = 70 (momentum signal)."""
|
||||
rsi = max(0.0, min(100.0, 50.0 + (10.0 * 2.0)))
|
||||
assert rsi == 70.0
|
||||
|
||||
def test_minus_10pct_gives_rsi_30(self) -> None:
|
||||
"""-10% change → implied_rsi = 30 (oversold signal)."""
|
||||
rsi = max(0.0, min(100.0, 50.0 + (-10.0 * 2.0)))
|
||||
assert rsi == 30.0
|
||||
|
||||
def test_saturation_at_25pct(self) -> None:
|
||||
"""Saturation occurs at >=25% change (not 12.5% as with old coefficient 4.0)."""
|
||||
rsi_12pct = max(0.0, min(100.0, 50.0 + (12.5 * 2.0)))
|
||||
rsi_25pct = max(0.0, min(100.0, 50.0 + (25.0 * 2.0)))
|
||||
rsi_30pct = max(0.0, min(100.0, 50.0 + (30.0 * 2.0)))
|
||||
# At 12.5% change: RSI = 75 (not 100, unlike old formula)
|
||||
assert rsi_12pct == 75.0
|
||||
# At 25%+ saturation
|
||||
assert rsi_25pct == 100.0
|
||||
assert rsi_30pct == 100.0 # Capped
|
||||
|
||||
def test_negative_saturation(self) -> None:
|
||||
"""Saturation at -25% gives RSI = 0."""
|
||||
rsi = max(0.0, min(100.0, 50.0 + (-25.0 * 2.0)))
|
||||
assert rsi == 0.0
|
||||
|
||||
|
||||
class TestRSICalculation:
|
||||
"""Test RSI calculation in VolatilityAnalyzer."""
|
||||
|
||||
|
||||
@@ -876,54 +876,6 @@ class TestGetUpdates:
|
||||
|
||||
assert updates == []
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_updates_409_stops_polling(self) -> None:
|
||||
"""409 Conflict response stops the poller (_running = False) and returns empty list."""
|
||||
client = TelegramClient(bot_token="123:abc", chat_id="456", enabled=True)
|
||||
handler = TelegramCommandHandler(client)
|
||||
handler._running = True # simulate active poller
|
||||
|
||||
mock_resp = AsyncMock()
|
||||
mock_resp.status = 409
|
||||
mock_resp.text = AsyncMock(
|
||||
return_value='{"ok":false,"error_code":409,"description":"Conflict"}'
|
||||
)
|
||||
mock_resp.__aenter__ = AsyncMock(return_value=mock_resp)
|
||||
mock_resp.__aexit__ = AsyncMock(return_value=False)
|
||||
|
||||
with patch("aiohttp.ClientSession.post", return_value=mock_resp):
|
||||
updates = await handler._get_updates()
|
||||
|
||||
assert updates == []
|
||||
assert handler._running is False # poller stopped
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_poll_loop_exits_after_409(self) -> None:
|
||||
"""_poll_loop exits naturally after _running is set to False by a 409 response."""
|
||||
import asyncio as _asyncio
|
||||
|
||||
client = TelegramClient(bot_token="123:abc", chat_id="456", enabled=True)
|
||||
handler = TelegramCommandHandler(client)
|
||||
|
||||
call_count = 0
|
||||
|
||||
async def mock_get_updates_409() -> list[dict]:
|
||||
nonlocal call_count
|
||||
call_count += 1
|
||||
# Simulate 409 stopping the poller
|
||||
handler._running = False
|
||||
return []
|
||||
|
||||
handler._get_updates = mock_get_updates_409 # type: ignore[method-assign]
|
||||
|
||||
handler._running = True
|
||||
task = _asyncio.create_task(handler._poll_loop())
|
||||
await _asyncio.wait_for(task, timeout=2.0)
|
||||
|
||||
# _get_updates called exactly once, then loop exited
|
||||
assert call_count == 1
|
||||
assert handler._running is False
|
||||
|
||||
|
||||
class TestCommandWithArgs:
|
||||
"""Test register_command_with_args and argument dispatch."""
|
||||
|
||||
Reference in New Issue
Block a user