- Updated validators.py to use is_runner_on_third() helper method instead of hardcoded on_base_code values - Fixed DefensiveDecision Pydantic model: infield depths now ['infield_in', 'normal', 'corners_in'] - Fixed DefensiveDecision Pydantic model: outfield depths now ['in', 'normal'] (removed 'back') - Removed invalid double_play depth tests (depth doesn't exist) - Added proper tests for corners_in and infield_in validation (requires runner on third) - All 54 validator tests now passing Changes maintain consistency between Pydantic validation and GameValidator logic.
187 lines
7.0 KiB
Python
187 lines
7.0 KiB
Python
"""
|
|
Rule Validators - Validate game actions and state transitions.
|
|
|
|
Ensures all game actions follow baseball rules and state is valid.
|
|
|
|
Author: Claude
|
|
Date: 2025-10-24
|
|
"""
|
|
import logging
|
|
from uuid import UUID
|
|
|
|
from app.models.game_models import GameState, DefensiveDecision, OffensiveDecision
|
|
|
|
logger = logging.getLogger(f'{__name__}.GameValidator')
|
|
|
|
|
|
class ValidationError(Exception):
|
|
"""Raised when validation fails"""
|
|
pass
|
|
|
|
|
|
class GameValidator:
|
|
"""Validates game actions and state"""
|
|
|
|
@staticmethod
|
|
def validate_game_active(state: GameState) -> None:
|
|
"""Ensure game is in active state"""
|
|
if state.status != "active":
|
|
raise ValidationError(f"Game is not active (status: {state.status})")
|
|
|
|
@staticmethod
|
|
def validate_outs(outs: int) -> None:
|
|
"""Ensure outs are valid"""
|
|
if outs < 0 or outs > 2:
|
|
raise ValidationError(f"Invalid outs: {outs} (must be 0-2)")
|
|
|
|
@staticmethod
|
|
def validate_inning(inning: int, half: str) -> None:
|
|
"""Ensure inning is valid"""
|
|
if inning < 1:
|
|
raise ValidationError(f"Invalid inning: {inning}")
|
|
if half not in ["top", "bottom"]:
|
|
raise ValidationError(f"Invalid half: {half}")
|
|
|
|
@staticmethod
|
|
def validate_defensive_decision(decision: DefensiveDecision, state: GameState) -> None:
|
|
"""
|
|
Validate defensive team decision against current game state.
|
|
|
|
Args:
|
|
decision: Defensive decision to validate
|
|
state: Current game state
|
|
|
|
Raises:
|
|
ValidationError: If decision is invalid for current situation
|
|
"""
|
|
# # Validate alignment (already validated by Pydantic, but double-check)
|
|
# valid_alignments = ["normal", "shifted_left", "shifted_right", "extreme_shift"]
|
|
# if decision.alignment not in valid_alignments:
|
|
# raise ValidationError(f"Invalid alignment: {decision.alignment}")
|
|
|
|
# Validate depths (already validated by Pydantic, but double-check)
|
|
valid_infield_depths = ["infield_in", "normal", "corners_in"]
|
|
if decision.infield_depth not in valid_infield_depths:
|
|
raise ValidationError(f"Invalid infield depth: {decision.infield_depth}")
|
|
|
|
valid_outfield_depths = ["in", "normal"]
|
|
if decision.outfield_depth not in valid_outfield_depths:
|
|
raise ValidationError(f"Invalid outfield depth: {decision.outfield_depth}")
|
|
|
|
# Validate hold runners - can't hold empty bases
|
|
occupied_bases = state.bases_occupied()
|
|
for base in decision.hold_runners:
|
|
if base not in [1, 2, 3]:
|
|
raise ValidationError(f"Invalid hold runner base: {base} (must be 1, 2, or 3)")
|
|
if base not in occupied_bases:
|
|
raise ValidationError(f"Cannot hold runner on base {base} - no runner present")
|
|
|
|
# Validate corners_in/infield_in depth requirements (requires runner on third)
|
|
if decision.infield_depth in ['corners_in', 'infield_in']:
|
|
if not state.is_runner_on_third():
|
|
raise ValidationError(f"Cannot play {decision.infield_depth} without a runner on third")
|
|
|
|
logger.debug("Defensive decision validated")
|
|
|
|
@staticmethod
|
|
def validate_offensive_decision(decision: OffensiveDecision, state: GameState) -> None:
|
|
"""
|
|
Validate offensive team decision against current game state.
|
|
|
|
Args:
|
|
decision: Offensive decision to validate
|
|
state: Current game state
|
|
|
|
Raises:
|
|
ValidationError: If decision is invalid for current situation
|
|
"""
|
|
# Validate approach (already validated by Pydantic, but double-check)
|
|
valid_approaches = ["normal", "contact", "power", "patient"]
|
|
if decision.approach not in valid_approaches:
|
|
raise ValidationError(f"Invalid approach: {decision.approach}")
|
|
|
|
# Validate steal attempts
|
|
occupied_bases = state.bases_occupied()
|
|
for base in decision.steal_attempts:
|
|
# Validate steal base is valid (2, 3, or 4 for home)
|
|
if base not in [2, 3, 4]:
|
|
raise ValidationError(f"Invalid steal attempt to base {base} (must be 2, 3, or 4)")
|
|
|
|
# Must have runner on base-1 to steal base
|
|
stealing_from = base - 1
|
|
if stealing_from not in occupied_bases:
|
|
raise ValidationError(f"Cannot steal base {base} - no runner on base {stealing_from}")
|
|
|
|
# Validate bunt attempt
|
|
if decision.bunt_attempt:
|
|
if state.outs >= 2:
|
|
raise ValidationError("Cannot bunt with 2 outs")
|
|
if decision.hit_and_run:
|
|
raise ValidationError("Cannot bunt and hit-and-run simultaneously")
|
|
|
|
# Validate hit and run - requires at least one runner on base
|
|
if decision.hit_and_run:
|
|
if not any(state.get_runner_at_base(b) is not None for b in [1, 2, 3]):
|
|
raise ValidationError("Hit and run requires at least one runner on base")
|
|
|
|
logger.debug("Offensive decision validated")
|
|
|
|
@staticmethod
|
|
def validate_defensive_lineup_positions(lineup: list) -> None:
|
|
"""
|
|
Validate defensive lineup has exactly 1 active player per position.
|
|
|
|
Args:
|
|
lineup: List of LineupPlayerState objects
|
|
|
|
Raises:
|
|
ValidationError: If any position is missing or duplicated
|
|
"""
|
|
required_positions = ['P', 'C', '1B', '2B', '3B', 'SS', 'LF', 'CF', 'RF']
|
|
|
|
# Count active players per position
|
|
position_counts: dict[str, int] = {}
|
|
for player in lineup:
|
|
if player.is_active:
|
|
pos = player.position
|
|
position_counts[pos] = position_counts.get(pos, 0) + 1
|
|
|
|
# Check each required position has exactly 1 active player
|
|
errors = []
|
|
for pos in required_positions:
|
|
count = position_counts.get(pos, 0)
|
|
if count == 0:
|
|
errors.append(f"Missing active player at {pos}")
|
|
elif count > 1:
|
|
errors.append(f"Multiple active players at {pos} ({count} players)")
|
|
|
|
if errors:
|
|
raise ValidationError(f"Invalid defensive lineup: {'; '.join(errors)}")
|
|
|
|
logger.debug("Defensive lineup positions validated")
|
|
|
|
@staticmethod
|
|
def can_continue_inning(state: GameState) -> bool:
|
|
"""Check if inning can continue"""
|
|
return state.outs < 3
|
|
|
|
@staticmethod
|
|
def is_game_over(state: GameState) -> bool:
|
|
"""Check if game is complete"""
|
|
# Game over after 9 innings if score not tied
|
|
if state.inning >= 9 and state.half == "bottom":
|
|
if state.home_score != state.away_score:
|
|
return True
|
|
# Home team wins if ahead in bottom of 9th
|
|
if state.home_score > state.away_score:
|
|
return True
|
|
# Also check if we're in extras and bottom team is ahead
|
|
if state.inning > 9 and state.half == "bottom":
|
|
if state.home_score > state.away_score:
|
|
return True
|
|
return False
|
|
|
|
|
|
# Singleton instance
|
|
game_validator = GameValidator()
|