Refactor opportunity scoring model
This commit is contained in:
@@ -1,17 +1,28 @@
|
||||
"""Shared market signal scoring."""
|
||||
"""Market signal scoring primitives and domain-specific models."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from math import log10
|
||||
from statistics import mean
|
||||
from typing import Any
|
||||
|
||||
|
||||
def _clamp(value: float, low: float, high: float) -> float:
|
||||
return max(low, min(value, high))
|
||||
|
||||
|
||||
def _safe_pct(new: float, old: float) -> float:
|
||||
if old == 0:
|
||||
return 0.0
|
||||
return (new - old) / old
|
||||
|
||||
|
||||
def _range_pct(values: list[float], denominator: float) -> float:
|
||||
if not values or denominator == 0:
|
||||
return 0.0
|
||||
return (max(values) - min(values)) / denominator
|
||||
|
||||
|
||||
def get_signal_weights(config: dict[str, Any]) -> dict[str, float]:
|
||||
signal_config = config.get("signal", {})
|
||||
return {
|
||||
@@ -35,6 +46,15 @@ def score_market_signal(
|
||||
volumes: list[float],
|
||||
ticker: dict[str, Any],
|
||||
weights: dict[str, float],
|
||||
) -> tuple[float, dict[str, float]]:
|
||||
return score_portfolio_signal(closes, volumes, ticker, weights)
|
||||
|
||||
|
||||
def score_portfolio_signal(
|
||||
closes: list[float],
|
||||
volumes: list[float],
|
||||
ticker: dict[str, Any],
|
||||
weights: dict[str, float],
|
||||
) -> tuple[float, dict[str, float]]:
|
||||
if len(closes) < 2 or not volumes:
|
||||
return 0.0, {
|
||||
@@ -76,3 +96,97 @@ def score_market_signal(
|
||||
"volatility": round(volatility, 4),
|
||||
}
|
||||
return score, metrics
|
||||
|
||||
|
||||
def score_opportunity_signal(
|
||||
closes: list[float],
|
||||
volumes: list[float],
|
||||
ticker: dict[str, Any],
|
||||
opportunity_config: dict[str, Any],
|
||||
) -> tuple[float, dict[str, float]]:
|
||||
if len(closes) < 6 or len(volumes) < 2:
|
||||
return 0.0, {
|
||||
"setup_score": 0.0,
|
||||
"trigger_score": 0.0,
|
||||
"liquidity_score": 0.0,
|
||||
"extension_penalty": 0.0,
|
||||
"breakout_pct": 0.0,
|
||||
"recent_runup": 0.0,
|
||||
"volume_confirmation": 1.0,
|
||||
"volatility": 0.0,
|
||||
}
|
||||
|
||||
current = closes[-1]
|
||||
prior_closes = closes[:-1]
|
||||
prev_high = max(prior_closes[-20:]) if prior_closes else current
|
||||
recent_low = min(closes[-20:])
|
||||
range_width = prev_high - recent_low
|
||||
range_position = _clamp((current - recent_low) / range_width, 0.0, 1.2) if range_width else 0.0
|
||||
breakout_pct = _safe_pct(current, prev_high)
|
||||
|
||||
recent_range = _range_pct(closes[-6:], current)
|
||||
prior_window = closes[-20:-6] if len(closes) >= 20 else closes[:-6]
|
||||
prior_range = _range_pct(prior_window, current) if prior_window else recent_range
|
||||
compression = _clamp(1.0 - (recent_range / prior_range), -1.0, 1.0) if prior_range else 0.0
|
||||
|
||||
recent_low_window = min(closes[-5:])
|
||||
prior_low_window = min(closes[-10:-5]) if len(closes) >= 10 else min(closes[:-5])
|
||||
higher_lows = 1.0 if recent_low_window > prior_low_window else 0.0
|
||||
breakout_proximity = _clamp(1.0 - abs(breakout_pct) / 0.03, 0.0, 1.0)
|
||||
setup_score = _clamp(0.45 * compression + 0.35 * breakout_proximity + 0.20 * higher_lows, 0.0, 1.0)
|
||||
|
||||
avg_volume = mean(volumes[:-1])
|
||||
volume_confirmation = volumes[-1] / avg_volume if avg_volume else 1.0
|
||||
volume_score = _clamp((volume_confirmation - 1.0) / 1.5, -0.5, 1.0)
|
||||
momentum_3 = _safe_pct(closes[-1], closes[-4])
|
||||
if momentum_3 <= 0:
|
||||
controlled_momentum = _clamp(momentum_3 / 0.05, -0.5, 0.0)
|
||||
elif momentum_3 <= 0.05:
|
||||
controlled_momentum = momentum_3 / 0.05
|
||||
elif momentum_3 <= 0.12:
|
||||
controlled_momentum = 1.0 - ((momentum_3 - 0.05) / 0.07) * 0.5
|
||||
else:
|
||||
controlled_momentum = 0.2
|
||||
fresh_breakout = _clamp(1.0 - abs(breakout_pct) / 0.025, 0.0, 1.0)
|
||||
trigger_score = _clamp(0.40 * fresh_breakout + 0.35 * volume_score + 0.25 * controlled_momentum, 0.0, 1.0)
|
||||
|
||||
sma_short = mean(closes[-5:])
|
||||
sma_long = mean(closes[-20:]) if len(closes) >= 20 else mean(closes)
|
||||
extension_from_short = _safe_pct(current, sma_short)
|
||||
recent_runup = _safe_pct(current, closes[-6])
|
||||
extension_penalty = (
|
||||
_clamp((extension_from_short - 0.025) / 0.075, 0.0, 1.0)
|
||||
+ _clamp((recent_runup - 0.08) / 0.12, 0.0, 1.0)
|
||||
+ _clamp((float(ticker.get("price_change_pct", 0.0)) / 100.0 - 0.12) / 0.18, 0.0, 1.0)
|
||||
)
|
||||
volatility = _range_pct(closes[-10:], current)
|
||||
|
||||
min_quote_volume = float(opportunity_config.get("min_quote_volume", 0.0))
|
||||
quote_volume = float(ticker.get("quote_volume") or ticker.get("quoteVolume") or 0.0)
|
||||
if min_quote_volume > 0 and quote_volume > 0:
|
||||
liquidity_score = _clamp(log10(max(quote_volume / min_quote_volume, 1.0)) / 2.0, 0.0, 1.0)
|
||||
else:
|
||||
liquidity_score = 1.0
|
||||
|
||||
score = (
|
||||
setup_score
|
||||
+ 1.2 * trigger_score
|
||||
+ 0.4 * liquidity_score
|
||||
- 0.8 * volatility
|
||||
- 0.9 * extension_penalty
|
||||
)
|
||||
metrics = {
|
||||
"setup_score": round(setup_score, 4),
|
||||
"trigger_score": round(trigger_score, 4),
|
||||
"liquidity_score": round(liquidity_score, 4),
|
||||
"extension_penalty": round(extension_penalty, 4),
|
||||
"compression": round(compression, 4),
|
||||
"range_position": round(range_position, 4),
|
||||
"breakout_pct": round(breakout_pct, 4),
|
||||
"recent_runup": round(recent_runup, 4),
|
||||
"volume_confirmation": round(volume_confirmation, 4),
|
||||
"volatility": round(volatility, 4),
|
||||
"sma_short_distance": round(extension_from_short, 4),
|
||||
"sma_long_distance": round(_safe_pct(current, sma_long), 4),
|
||||
}
|
||||
return score, metrics
|
||||
|
||||
Reference in New Issue
Block a user