feat: implement signal frequency penalties for flip-flop detection
PHASE 1 IMPLEMENTATION: Signal quality scoring now checks database for recent trading patterns and applies penalties to prevent overtrading and flip-flop losses. NEW PENALTIES: 1. Overtrading: 3+ signals in 30min → -20 points - Detects consolidation zones where system generates excessive signals - Counts both executed trades AND blocked signals 2. Flip-flop: Opposite direction in last 15min → -25 points - Prevents rapid long→short→long whipsaws - Example: SHORT at 10:00, LONG at 10:12 = blocked 3. Alternating pattern: Last 3 trades flip directions → -30 points - Detects choppy market conditions - Pattern like long→short→long = system getting chopped DATABASE INTEGRATION: - New function: getRecentSignals() in lib/database/trades.ts - Queries last 30min of trades + blocked signals - Checks last 3 executed trades for alternating pattern - Zero performance impact (fast indexed queries) ARCHITECTURE: - scoreSignalQuality() now async (requires database access) - All callers updated: check-risk, execute, reentry-check - skipFrequencyCheck flag available for special cases - Frequency penalties included in qualityResult breakdown EXPECTED IMPACT: - Eliminate overnight flip-flop losses (like SOL $141-145 chop) - Reduce overtrading during sideways consolidation - Better capital preservation in non-trending markets - Should improve win rate by 5-10% by avoiding worst setups TESTING: - Deploy and monitor next 5 signals in choppy markets - Check logs for frequency penalty messages - Analyze if blocked signals would have been losers Files changed: - lib/database/trades.ts: Added getRecentSignals() - lib/trading/signal-quality.ts: Made async, added frequency checks - app/api/trading/check-risk/route.ts: await + symbol parameter - app/api/trading/execute/route.ts: await + symbol parameter - app/api/analytics/reentry-check/route.ts: await + skipFrequencyCheck
This commit is contained in:
@@ -139,13 +139,15 @@ export async function POST(request: NextRequest) {
|
|||||||
console.log(`📊 Recent performance: ${last3Count} trades, ${winRate.toFixed(0)}% WR, ${avgPnL.toFixed(2)}% avg P&L`)
|
console.log(`📊 Recent performance: ${last3Count} trades, ${winRate.toFixed(0)}% WR, ${avgPnL.toFixed(2)}% avg P&L`)
|
||||||
|
|
||||||
// 3. Score the re-entry with real/fallback metrics
|
// 3. Score the re-entry with real/fallback metrics
|
||||||
const qualityResult = scoreSignalQuality({
|
const qualityResult = await scoreSignalQuality({
|
||||||
atr: metrics.atr,
|
atr: metrics.atr,
|
||||||
adx: metrics.adx,
|
adx: metrics.adx,
|
||||||
rsi: metrics.rsi,
|
rsi: metrics.rsi,
|
||||||
volumeRatio: metrics.volumeRatio,
|
volumeRatio: metrics.volumeRatio,
|
||||||
pricePosition: metrics.pricePosition,
|
pricePosition: metrics.pricePosition,
|
||||||
direction: direction as 'long' | 'short'
|
direction: direction as 'long' | 'short',
|
||||||
|
symbol: symbol,
|
||||||
|
skipFrequencyCheck: true, // Re-entry check already considers recent trades
|
||||||
})
|
})
|
||||||
|
|
||||||
let finalScore = qualityResult.score
|
let finalScore = qualityResult.score
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ export interface RiskCheckResponse {
|
|||||||
* Position Scaling Validation
|
* Position Scaling Validation
|
||||||
* Determines if adding to an existing position is allowed
|
* Determines if adding to an existing position is allowed
|
||||||
*/
|
*/
|
||||||
function shouldAllowScaling(
|
async function shouldAllowScaling(
|
||||||
existingTrade: ActiveTrade,
|
existingTrade: ActiveTrade,
|
||||||
newSignal: RiskCheckRequest,
|
newSignal: RiskCheckRequest,
|
||||||
config: TradingConfig
|
config: TradingConfig
|
||||||
): { allowed: boolean; reasons: string[]; qualityScore?: number; qualityReasons?: string[] } {
|
): Promise<{ allowed: boolean; reasons: string[]; qualityScore?: number; qualityReasons?: string[] }> {
|
||||||
const reasons: string[] = []
|
const reasons: string[] = []
|
||||||
|
|
||||||
// Check if we have context metrics
|
// Check if we have context metrics
|
||||||
@@ -50,13 +50,14 @@ function shouldAllowScaling(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 1. Calculate new signal quality score
|
// 1. Calculate new signal quality score
|
||||||
const qualityScore = scoreSignalQuality({
|
const qualityScore = await scoreSignalQuality({
|
||||||
atr: newSignal.atr,
|
atr: newSignal.atr,
|
||||||
adx: newSignal.adx,
|
adx: newSignal.adx,
|
||||||
rsi: newSignal.rsi || 50,
|
rsi: newSignal.rsi || 50,
|
||||||
volumeRatio: newSignal.volumeRatio || 1,
|
volumeRatio: newSignal.volumeRatio || 1,
|
||||||
pricePosition: newSignal.pricePosition,
|
pricePosition: newSignal.pricePosition,
|
||||||
direction: newSignal.direction,
|
direction: newSignal.direction,
|
||||||
|
symbol: newSignal.symbol,
|
||||||
minScore: config.minScaleQualityScore,
|
minScore: config.minScaleQualityScore,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -156,7 +157,7 @@ export async function POST(request: NextRequest): Promise<NextResponse<RiskCheck
|
|||||||
if (existingPosition.direction === body.direction) {
|
if (existingPosition.direction === body.direction) {
|
||||||
// Position scaling feature
|
// Position scaling feature
|
||||||
if (config.enablePositionScaling) {
|
if (config.enablePositionScaling) {
|
||||||
const scalingCheck = shouldAllowScaling(existingPosition, body, config)
|
const scalingCheck = await shouldAllowScaling(existingPosition, body, config)
|
||||||
|
|
||||||
if (scalingCheck.allowed) {
|
if (scalingCheck.allowed) {
|
||||||
console.log('✅ Position scaling ALLOWED:', scalingCheck.reasons)
|
console.log('✅ Position scaling ALLOWED:', scalingCheck.reasons)
|
||||||
@@ -309,13 +310,14 @@ export async function POST(request: NextRequest): Promise<NextResponse<RiskCheck
|
|||||||
|
|
||||||
// 4. Check signal quality (if context metrics provided)
|
// 4. Check signal quality (if context metrics provided)
|
||||||
if (hasContextMetrics) {
|
if (hasContextMetrics) {
|
||||||
const qualityScore = scoreSignalQuality({
|
const qualityScore = await scoreSignalQuality({
|
||||||
atr: body.atr || 0,
|
atr: body.atr || 0,
|
||||||
adx: body.adx || 0,
|
adx: body.adx || 0,
|
||||||
rsi: body.rsi || 0,
|
rsi: body.rsi || 0,
|
||||||
volumeRatio: body.volumeRatio || 0,
|
volumeRatio: body.volumeRatio || 0,
|
||||||
pricePosition: body.pricePosition || 0,
|
pricePosition: body.pricePosition || 0,
|
||||||
direction: body.direction,
|
direction: body.direction,
|
||||||
|
symbol: body.symbol,
|
||||||
timeframe: body.timeframe, // Pass timeframe for context-aware scoring
|
timeframe: body.timeframe, // Pass timeframe for context-aware scoring
|
||||||
minScore: config.minSignalQualityScore // Use config value
|
minScore: config.minSignalQualityScore // Use config value
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -357,13 +357,14 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
|
|||||||
// Save phantom trade to database for analysis
|
// Save phantom trade to database for analysis
|
||||||
let phantomTradeId: string | undefined
|
let phantomTradeId: string | undefined
|
||||||
try {
|
try {
|
||||||
const qualityResult = scoreSignalQuality({
|
const qualityResult = await scoreSignalQuality({
|
||||||
atr: body.atr || 0,
|
atr: body.atr || 0,
|
||||||
adx: body.adx || 0,
|
adx: body.adx || 0,
|
||||||
rsi: body.rsi || 0,
|
rsi: body.rsi || 0,
|
||||||
volumeRatio: body.volumeRatio || 0,
|
volumeRatio: body.volumeRatio || 0,
|
||||||
pricePosition: body.pricePosition || 0,
|
pricePosition: body.pricePosition || 0,
|
||||||
direction: body.direction,
|
direction: body.direction,
|
||||||
|
symbol: driftSymbol,
|
||||||
timeframe: body.timeframe,
|
timeframe: body.timeframe,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -587,13 +588,14 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
|
|||||||
let qualityResult
|
let qualityResult
|
||||||
try {
|
try {
|
||||||
// Calculate quality score if metrics available
|
// Calculate quality score if metrics available
|
||||||
qualityResult = scoreSignalQuality({
|
qualityResult = await scoreSignalQuality({
|
||||||
atr: body.atr || 0,
|
atr: body.atr || 0,
|
||||||
adx: body.adx || 0,
|
adx: body.adx || 0,
|
||||||
rsi: body.rsi || 0,
|
rsi: body.rsi || 0,
|
||||||
volumeRatio: body.volumeRatio || 0,
|
volumeRatio: body.volumeRatio || 0,
|
||||||
pricePosition: body.pricePosition || 0,
|
pricePosition: body.pricePosition || 0,
|
||||||
direction: body.direction,
|
direction: body.direction,
|
||||||
|
symbol: driftSymbol,
|
||||||
timeframe: body.timeframe,
|
timeframe: body.timeframe,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -555,6 +555,88 @@ export async function getBlockedSignalsForAnalysis(olderThanMinutes: number = 30
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get recent signals for frequency analysis
|
||||||
|
* Used to detect overtrading, flip-flops, and chop patterns
|
||||||
|
*/
|
||||||
|
export async function getRecentSignals(params: {
|
||||||
|
symbol: string
|
||||||
|
direction: 'long' | 'short'
|
||||||
|
timeWindowMinutes: number
|
||||||
|
}): Promise<{
|
||||||
|
totalSignals: number
|
||||||
|
oppositeDirectionInWindow: boolean
|
||||||
|
oppositeDirectionMinutesAgo?: number
|
||||||
|
last3Trades: Array<{ direction: 'long' | 'short'; createdAt: Date }>
|
||||||
|
isAlternatingPattern: boolean
|
||||||
|
}> {
|
||||||
|
const prisma = getPrismaClient()
|
||||||
|
|
||||||
|
const timeAgo = new Date(Date.now() - params.timeWindowMinutes * 60 * 1000)
|
||||||
|
|
||||||
|
// Get all signals for this symbol in the time window (including blocked signals)
|
||||||
|
const [trades, blockedSignals] = await Promise.all([
|
||||||
|
prisma.trade.findMany({
|
||||||
|
where: {
|
||||||
|
symbol: params.symbol,
|
||||||
|
createdAt: { gte: timeAgo },
|
||||||
|
},
|
||||||
|
select: { direction: true, createdAt: true },
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
}),
|
||||||
|
prisma.blockedSignal.findMany({
|
||||||
|
where: {
|
||||||
|
symbol: params.symbol,
|
||||||
|
createdAt: { gte: timeAgo },
|
||||||
|
},
|
||||||
|
select: { direction: true, createdAt: true },
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
|
||||||
|
// Combine and sort all signals
|
||||||
|
const allSignals = [
|
||||||
|
...trades.map(t => ({ direction: t.direction as 'long' | 'short', createdAt: t.createdAt })),
|
||||||
|
...blockedSignals.map(b => ({ direction: b.direction as 'long' | 'short', createdAt: b.createdAt })),
|
||||||
|
].sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
|
||||||
|
|
||||||
|
// Check for opposite direction in last 15 minutes
|
||||||
|
const fifteenMinAgo = new Date(Date.now() - 15 * 60 * 1000)
|
||||||
|
const oppositeInLast15 = allSignals.find(
|
||||||
|
s => s.direction !== params.direction && s.createdAt >= fifteenMinAgo
|
||||||
|
)
|
||||||
|
|
||||||
|
// Get last 3 executed trades (not blocked signals) for alternating pattern check
|
||||||
|
const last3Trades = await prisma.trade.findMany({
|
||||||
|
where: { symbol: params.symbol },
|
||||||
|
select: { direction: true, createdAt: true },
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
take: 3,
|
||||||
|
})
|
||||||
|
|
||||||
|
// Check if last 3 trades alternate (long → short → long OR short → long → short)
|
||||||
|
let isAlternating = false
|
||||||
|
if (last3Trades.length === 3) {
|
||||||
|
const dirs = last3Trades.map(t => t.direction)
|
||||||
|
isAlternating = (
|
||||||
|
(dirs[0] !== dirs[1] && dirs[1] !== dirs[2] && dirs[0] !== dirs[2]) // All different in alternating pattern
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
totalSignals: allSignals.length,
|
||||||
|
oppositeDirectionInWindow: !!oppositeInLast15,
|
||||||
|
oppositeDirectionMinutesAgo: oppositeInLast15
|
||||||
|
? Math.floor((Date.now() - oppositeInLast15.createdAt.getTime()) / 60000)
|
||||||
|
: undefined,
|
||||||
|
last3Trades: last3Trades.map(t => ({
|
||||||
|
direction: t.direction as 'long' | 'short',
|
||||||
|
createdAt: t.createdAt
|
||||||
|
})),
|
||||||
|
isAlternatingPattern: isAlternating,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disconnect Prisma client (for graceful shutdown)
|
* Disconnect Prisma client (for graceful shutdown)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -5,10 +5,17 @@
|
|||||||
* Ensures consistent scoring across the trading pipeline.
|
* Ensures consistent scoring across the trading pipeline.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { getRecentSignals } from '../database/trades'
|
||||||
|
|
||||||
export interface SignalQualityResult {
|
export interface SignalQualityResult {
|
||||||
score: number
|
score: number
|
||||||
passed: boolean
|
passed: boolean
|
||||||
reasons: string[]
|
reasons: string[]
|
||||||
|
frequencyPenalties?: {
|
||||||
|
overtrading: number
|
||||||
|
flipFlop: number
|
||||||
|
alternating: number
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -22,6 +29,7 @@ export interface SignalQualityResult {
|
|||||||
* - Volume: -10 to +15 points
|
* - Volume: -10 to +15 points
|
||||||
* - Price position: -15 to +5 points
|
* - Price position: -15 to +5 points
|
||||||
* - Volume breakout bonus: +10 points
|
* - Volume breakout bonus: +10 points
|
||||||
|
* - Signal frequency penalties: -20 to -30 points
|
||||||
*
|
*
|
||||||
* Total range: ~15-115 points (realistically 30-100)
|
* Total range: ~15-115 points (realistically 30-100)
|
||||||
* Threshold: 60 points minimum for execution
|
* Threshold: 60 points minimum for execution
|
||||||
@@ -29,17 +37,24 @@ export interface SignalQualityResult {
|
|||||||
* TIMEFRAME-AWARE SCORING:
|
* TIMEFRAME-AWARE SCORING:
|
||||||
* - 5min charts have lower ADX/ATR thresholds (trends develop slower)
|
* - 5min charts have lower ADX/ATR thresholds (trends develop slower)
|
||||||
* - Higher timeframes require stronger confirmation
|
* - Higher timeframes require stronger confirmation
|
||||||
|
*
|
||||||
|
* SIGNAL FREQUENCY PENALTIES (NEW):
|
||||||
|
* - 3+ signals in 30 min: -20 points (overtrading zone)
|
||||||
|
* - Opposite direction in last 15 min: -25 points (flip-flop)
|
||||||
|
* - Last 3 trades alternating: -30 points (chop pattern)
|
||||||
*/
|
*/
|
||||||
export function scoreSignalQuality(params: {
|
export async function scoreSignalQuality(params: {
|
||||||
atr: number
|
atr: number
|
||||||
adx: number
|
adx: number
|
||||||
rsi: number
|
rsi: number
|
||||||
volumeRatio: number
|
volumeRatio: number
|
||||||
pricePosition: number
|
pricePosition: number
|
||||||
direction: 'long' | 'short'
|
direction: 'long' | 'short'
|
||||||
|
symbol: string // Required for frequency check
|
||||||
timeframe?: string // "5" = 5min, "15" = 15min, "60" = 1H, "D" = daily
|
timeframe?: string // "5" = 5min, "15" = 15min, "60" = 1H, "D" = daily
|
||||||
minScore?: number // Configurable minimum score threshold
|
minScore?: number // Configurable minimum score threshold
|
||||||
}): SignalQualityResult {
|
skipFrequencyCheck?: boolean // For testing or when frequency check not needed
|
||||||
|
}): Promise<SignalQualityResult> {
|
||||||
let score = 50 // Base score
|
let score = 50 // Base score
|
||||||
const reasons: string[] = []
|
const reasons: string[] = []
|
||||||
|
|
||||||
@@ -171,6 +186,49 @@ export function scoreSignalQuality(params: {
|
|||||||
reasons.push(`Volume breakout compensates for low ATR`)
|
reasons.push(`Volume breakout compensates for low ATR`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Signal frequency penalties (check database for recent signals)
|
||||||
|
const frequencyPenalties = {
|
||||||
|
overtrading: 0,
|
||||||
|
flipFlop: 0,
|
||||||
|
alternating: 0,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!params.skipFrequencyCheck) {
|
||||||
|
try {
|
||||||
|
const recentSignals = await getRecentSignals({
|
||||||
|
symbol: params.symbol,
|
||||||
|
direction: params.direction,
|
||||||
|
timeWindowMinutes: 30,
|
||||||
|
})
|
||||||
|
|
||||||
|
// Penalty 1: Overtrading (3+ signals in 30 minutes)
|
||||||
|
if (recentSignals.totalSignals >= 3) {
|
||||||
|
frequencyPenalties.overtrading = -20
|
||||||
|
score -= 20
|
||||||
|
reasons.push(`⚠️ Overtrading zone: ${recentSignals.totalSignals} signals in 30min (-20 pts)`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Penalty 2: Flip-flop (opposite direction in last 15 minutes)
|
||||||
|
if (recentSignals.oppositeDirectionInWindow) {
|
||||||
|
frequencyPenalties.flipFlop = -25
|
||||||
|
score -= 25
|
||||||
|
reasons.push(`⚠️ Flip-flop detected: opposite direction ${recentSignals.oppositeDirectionMinutesAgo}min ago (-25 pts)`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Penalty 3: Alternating pattern (last 3 trades flip directions)
|
||||||
|
if (recentSignals.isAlternatingPattern) {
|
||||||
|
frequencyPenalties.alternating = -30
|
||||||
|
score -= 30
|
||||||
|
const pattern = recentSignals.last3Trades.map(t => t.direction).join(' → ')
|
||||||
|
reasons.push(`⚠️ Chop pattern: last 3 trades alternating (${pattern}) (-30 pts)`)
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// Don't fail the whole score if frequency check fails
|
||||||
|
console.error('❌ Signal frequency check failed:', error)
|
||||||
|
reasons.push('⚠️ Frequency check unavailable (no penalty applied)')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const minScore = params.minScore || 60
|
const minScore = params.minScore || 60
|
||||||
const passed = score >= minScore
|
const passed = score >= minScore
|
||||||
|
|
||||||
@@ -178,5 +236,6 @@ export function scoreSignalQuality(params: {
|
|||||||
score,
|
score,
|
||||||
passed,
|
passed,
|
||||||
reasons,
|
reasons,
|
||||||
|
frequencyPenalties,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user