mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-08 04:08:06 +00:00
* refactor(web): use canonical secret helpers in api_v3; make ConfigManager secret strip/merge array-aware
api_v3.py carried three inline nested copies of find_secret_fields/
separate_secrets (main-config save, plugin-config save, plugin-config
reset). They drifted from each other (one lacked isinstance guards) and
none supported the canonical module's array-item secrets
(accounts[].token). All three endpoints now import from
src/web_interface/secret_helpers.
Adopting the canonical behavior makes array-item secrets reachable, and
their parallel-placeholder shape ([{'token': ...}, {}] alongside the
regular list) was not survivable by ConfigManager's round-trip:
_strip_secrets_recursive dropped the whole key (losing the regular
fields from config.json) and _deep_merge replaced the regular list
wholesale on load. Both are now array-aware:
- strip removes the secret fields from each item and ALWAYS keeps the
list so indices survive for merge-on-load; whole-key secrets (scalar
lists, shape mismatches) still drop the key entirely — never leak.
- merge folds each secrets item into the config item at the same index,
skipping {} placeholders. The regular list's length is authoritative
in both directions: a user deleting an array item never has it
resurrected from a stale secrets entry (extras warn and are ignored).
api_v3's own deep_merge intentionally still replaces lists wholesale —
form posts carry complete arrays and index-merging would resurrect
deleted items; a comment now documents that.
Tests: the parity guard flips from 'exactly 3 inline copies' to 'zero,
and the canonical import must exist'; TestArraySecretStripAndMerge
covers the new strip/merge semantics incl. length-mismatch contracts;
new test_api_v3_secret_roundtrip.py drives all three endpoints through
a Flask client with a REAL ConfigManager+SchemaManager over tmp_path,
proving secrets land in config_secrets.json, config.json stays clean,
and a fresh load merges them back into the right array items.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* fix: repair broken helper paths across display, cache, odds, logging, resolver, repos, config, validator
Nine fixes for bugs surfaced while writing coverage for previously
untested modules (plus the bool-duration quirk pinned in PR #441):
- base_plugin.get_display_duration: exclude bools from both numeric
branches — display_duration=True no longer reads as a 1-second slot;
it falls through to config, then the 15.0 default.
- display_helper: draw_error_message/draw_no_data_message called
_draw_centered_text with the wrong arguments and crashed with
AttributeError — both now delegate to draw_centered_text.
draw_scorebug_layout drew status and clock at the same y, overprinting
each other — they now share one combined top line.
draw_ticker_layout drew its text starting at x=display_width (fully
off-canvas), returning a blank frame every time — now draws at x=0;
scroll_speed stays accepted-but-unused and is documented as such.
- api_helper.clear_cache guarded on a nonexistent CacheManager.clear()
method, silently never clearing anything; it now uses the real surface
(clear_cache/delete/list_cache_files) and no-ops safely otherwise.
- base_odds_manager._extract_espn_data raised AttributeError when ESPN
sent explicit JSON nulls ("homeTeamOdds": null) — every level now
null-safes with 'or {}'. format_odds_summary gated on
is_odds_available, which deliberately ignores money lines, so
ML-only odds formatted as "No odds available" — it now gates only on
empty/no_odds data and formats money lines.
- logging_config.ContextualFormatter mutated record.msg in place, so a
second handler prepended the context prefix twice; it now formats a
copy. log_error hardcoded exc_info=True and raised TypeError when the
caller passed exc_info — now kwargs.setdefault.
- dynamic_team_resolver wrote its "shared" class cache through self,
creating instance shadows — the cache was per-instance and every
scoreboard refetched rankings. Writes now go through the class.
- saved_repositories cleaned URLs with an unanchored .replace('.git','')
that mangled URLs merely containing '.git' (my.github.io -> myhub.io);
now strips only a trailing suffix. add/remove also roll back the
in-memory list when the save fails, so memory always matches disk.
- config_helper.merge_configs shallow-copied the base, aliasing every
un-overridden nested dict into the result — now deep-copies.
- startup_validator.validate_all accumulated errors/warnings across
calls — now resets both lists per run.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* test: cover the previously untested modules
Nine new suites plus an extension, asserting the Phase-1b fixed behavior
and pinning the quirks deliberately left alone:
- test_logging_config.py: formatters (JSON shape, no record mutation,
single prefix through two handlers), PluginLoggerAdapter precedence,
setup_logging handler hygiene and LEDMATRIX_DEBUG, log_error exc_info.
- test_startup_validator.py: exact messages, error-vs-warning split,
accessor split (load_config vs get_config), cache-dir branches with
os.access monkeypatched (root can write anything in CI), idempotence,
raise_on_errors classification precedence.
- test_config_helper.py (full): load/save round trips, dot-notation
get/set incl. silent-failure contract, post-fix no-aliasing merge,
schema validation branches, the '{id}_config' key pin, default-enabled
pin.
- test_saved_repositories.py: three load shapes, bare-list rewrite pin,
trailing-only .git strip (my.github.io regression), save-failure
rollback, type-classification case-sensitivity pin.
- test_api_helper.py: rate-limit math, cache-hit short circuit, ESPN
URL/key formats, exact User-Agent guard, retry adapter, post-fix
clear_cache against the real CacheManager surface, ttl-dropped pin.
- test_base_odds_manager.py: cache-key/URL construction, no_odds
sentinel round trip, stale-cache fallback, null-safe extraction,
ML-only formatting, is_odds_available truth table (ML-blind by
contract), config key/attr mismatch pin.
- test_dynamic_team_resolver.py: expansion/dedup/slicing, dropped
unknown-dynamic names (TOP_ substring hazard pinned), genuinely
shared class cache (second instance: zero HTTP), TTL expiry,
failure degradation without raising.
- test_display_helper.py (full): the fixed error/no-data renders,
combined scorebug top line, non-blank ticker with scroll_speed
no-op pin, composite upconversion, logo bleed positions, square
orientation pin.
- test_skin_runtime_cache.py: discovery-cache hit/invalidation
semantics (manifest mtime, .py edits pinned as non-invalidating),
sys.modules namespacing contract incl. bare-name restore and stdlib
shadowing, entry-module execute-once, API minor-version tolerance,
skin_matches_target table.
- test_sports_capabilities.py (extended): _draw_celebration_layout
executed for real (flash window, matrix-dims fallback, highlight
alternation, logo-failure isolation), _should_celebrate_for direct,
strict duration boundary, score_to_int edges, both-teams-score
precedence, expired-coalesce refire, disabled-win baseline
preservation, id-less prune.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* test: real schedule/dim coverage for DisplayController; fix two vacuous schedule tests
New test_display_controller_schedule.py drives _check_schedule and
_check_dim_schedule on a bare controller stub: same-day and
midnight-crossing windows with inclusive boundaries, global vs per-day vs
legacy-inferred modes (and dim's global-only default — no legacy
inference), per-day disabled days, invalid %H:%M fallbacks, unknown
timezone -> UTC, dim_brightness default 30, inactive-display short
circuit, and the _was_display_active/_was_dimmed transition flags.
test_display_controller.py's test_schedule_disabled and
test_active_hours patched config_service.get_config — which
_check_schedule never reads — so both asserted the init-default value
and could not fail. Rewritten on the test_inactive_hours pattern
(inject controller.config['schedule'], reset the minute gate, flip the
flag to the opposite state first so the assertion has teeth).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* ci: raise coverage floor to 48%
Measured 50% with the new suites in place (was 47% baseline when the
gate was introduced at 45); floor stays two points under measured.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* fix: address CodeQL alert and review findings
- config_manager: the "secrets list longer than config list" warning now
interpolates only config-side data (no key name or secrets-derived
values), resolving the CodeQL clear-text-logging alert.
- base_plugin: validate_config rejects bool display_duration, matching
get_display_duration (bool is an int subclass and would otherwise pass
as a positive number).
- config_helper: merge_configs deep-copies override values in the
non-recursive branch so mutating the merged result cannot reach back
into override_config.
- saved_repositories: saves are atomic (temp file + fsync + os.replace),
so a failed write can no longer truncate saved_repositories.json.
- tests: regression cases for each fix, plus a pin that whole-item
array secrets (key[] + key[].field both marked) strip to empty {}
skeletons — no secret values can reach config.json.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
---------
Co-authored-by: Claude <noreply@anthropic.com>
298 lines
12 KiB
Python
298 lines
12 KiB
Python
"""
|
|
BaseOddsManager - Base class for odds data fetching and management.
|
|
|
|
This base class provides core odds fetching functionality that can be inherited
|
|
by plugins that need odds data (odds ticker, scoreboards, etc.).
|
|
|
|
Follows LEDMatrix configuration management patterns:
|
|
- Single responsibility: Data fetching only
|
|
- Reusable: Other plugins can inherit from it
|
|
- Clean configuration: Separate config sections
|
|
- Maintainable: Changes to odds logic affect all plugins
|
|
"""
|
|
|
|
import logging
|
|
import requests
|
|
import json
|
|
from typing import Dict, Any, Optional, List
|
|
|
|
|
|
class BaseOddsManager:
|
|
"""
|
|
Base class for odds data fetching and management.
|
|
|
|
Provides core functionality for:
|
|
- ESPN API odds fetching
|
|
- Caching and data processing
|
|
- Error handling and timeouts
|
|
- League mapping and data extraction
|
|
|
|
Plugins can inherit from this class to get odds functionality.
|
|
"""
|
|
|
|
def __init__(self, cache_manager, config_manager=None):
|
|
"""
|
|
Initialize the base odds manager.
|
|
|
|
Args:
|
|
cache_manager: Cache manager instance for data persistence
|
|
config_manager: Configuration manager (optional)
|
|
"""
|
|
self.cache_manager = cache_manager
|
|
self.config_manager = config_manager
|
|
self.logger = logging.getLogger(__name__)
|
|
self.base_url = "https://sports.core.api.espn.com/v2/sports"
|
|
|
|
# Configuration with defaults
|
|
self.update_interval = 3600 # 1 hour default
|
|
self.request_timeout = 30 # 30 seconds default
|
|
self.cache_ttl = 1800 # 30 minutes default
|
|
|
|
# Load configuration if available
|
|
if config_manager:
|
|
self._load_configuration()
|
|
|
|
def _load_configuration(self):
|
|
"""Load configuration from config manager."""
|
|
if not self.config_manager:
|
|
return
|
|
|
|
try:
|
|
config = self.config_manager.get_config()
|
|
odds_config = config.get('base_odds_manager', {})
|
|
|
|
self.update_interval = odds_config.get('update_interval', self.update_interval)
|
|
self.request_timeout = odds_config.get('timeout', self.request_timeout)
|
|
self.cache_ttl = odds_config.get('cache_ttl', self.cache_ttl)
|
|
|
|
self.logger.debug(f"BaseOddsManager configuration loaded: "
|
|
f"update_interval={self.update_interval}s, "
|
|
f"timeout={self.request_timeout}s, "
|
|
f"cache_ttl={self.cache_ttl}s")
|
|
|
|
except Exception as e:
|
|
self.logger.warning(f"Failed to load BaseOddsManager configuration: {e}")
|
|
|
|
def get_odds(self, sport: str | None, league: str | None, event_id: str,
|
|
update_interval_seconds: int = None) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Fetch odds data for a specific game.
|
|
|
|
Args:
|
|
sport: Sport name (e.g., 'football', 'basketball')
|
|
league: League name (e.g., 'nfl', 'nba')
|
|
event_id: ESPN event ID
|
|
update_interval_seconds: Override default update interval
|
|
|
|
Returns:
|
|
Dictionary containing odds data or None if unavailable
|
|
"""
|
|
if sport is None or league is None:
|
|
raise ValueError("Sport and League cannot be None")
|
|
|
|
# Use provided interval or default
|
|
interval = update_interval_seconds or self.update_interval
|
|
cache_key = f"odds_espn_{sport}_{league}_{event_id}"
|
|
|
|
# Check cache first
|
|
cached_data = self.cache_manager.get_with_auto_strategy(cache_key)
|
|
|
|
if cached_data:
|
|
self.logger.info(f"Using cached odds from ESPN for {cache_key}")
|
|
return cached_data
|
|
|
|
self.logger.info(f"Cache miss - fetching fresh odds from ESPN for {cache_key}")
|
|
|
|
try:
|
|
# Map league names to ESPN API format
|
|
league_mapping = {
|
|
'ncaa_fb': 'college-football',
|
|
'nfl': 'nfl',
|
|
'nba': 'nba',
|
|
'mlb': 'mlb',
|
|
'nhl': 'nhl'
|
|
}
|
|
|
|
espn_league = league_mapping.get(league, league)
|
|
url = f"{self.base_url}/{sport}/leagues/{espn_league}/events/{event_id}/competitions/{event_id}/odds"
|
|
self.logger.info(f"Requesting odds from URL: {url}")
|
|
|
|
response = requests.get(url, timeout=self.request_timeout)
|
|
response.raise_for_status()
|
|
raw_data = response.json()
|
|
|
|
self.logger.debug(f"Received raw odds data from ESPN: {json.dumps(raw_data, indent=2)}")
|
|
|
|
odds_data = self._extract_espn_data(raw_data)
|
|
if odds_data:
|
|
self.logger.info(f"Successfully extracted odds data: {odds_data}")
|
|
else:
|
|
self.logger.debug("No odds data available for this game")
|
|
|
|
if odds_data:
|
|
self.cache_manager.set(cache_key, odds_data, ttl=interval)
|
|
self.logger.info(f"Saved odds data to cache for {cache_key} with TTL {interval}s")
|
|
else:
|
|
self.logger.debug(f"No odds data available for {cache_key}")
|
|
# Cache the fact that no odds are available to avoid repeated API calls
|
|
self.cache_manager.set(cache_key, {"no_odds": True}, ttl=interval)
|
|
|
|
return odds_data
|
|
|
|
except requests.exceptions.RequestException as e:
|
|
self.logger.error(f"Error fetching odds from ESPN API for {cache_key}: {e}")
|
|
except json.JSONDecodeError:
|
|
self.logger.error(f"Error decoding JSON response from ESPN API for {cache_key}.")
|
|
|
|
return self.cache_manager.get_with_auto_strategy(cache_key)
|
|
|
|
def _extract_espn_data(self, data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Extract and format odds data from ESPN API response.
|
|
|
|
Args:
|
|
data: Raw ESPN API response data
|
|
|
|
Returns:
|
|
Formatted odds data dictionary or None
|
|
"""
|
|
self.logger.debug(f"Extracting ESPN odds data. Data keys: {list(data.keys())}")
|
|
|
|
if "items" in data and data["items"]:
|
|
self.logger.debug(f"Found {len(data['items'])} items in odds data")
|
|
item = data["items"][0]
|
|
self.logger.debug(f"First item keys: {list(item.keys())}")
|
|
|
|
# The ESPN API returns odds data directly in the item, not in a
|
|
# providers array. ESPN sends explicit JSON nulls for absent
|
|
# sides ("homeTeamOdds": null), so every level uses `or {}` —
|
|
# .get's default only applies when the key is missing entirely.
|
|
home = item.get("homeTeamOdds") or {}
|
|
away = item.get("awayTeamOdds") or {}
|
|
extracted_data = {
|
|
"details": item.get("details"),
|
|
"over_under": item.get("overUnder"),
|
|
"spread": item.get("spread"),
|
|
"home_team_odds": {
|
|
"money_line": home.get("moneyLine"),
|
|
"spread_odds": ((home.get("current") or {})
|
|
.get("pointSpread") or {}).get("value")
|
|
},
|
|
"away_team_odds": {
|
|
"money_line": away.get("moneyLine"),
|
|
"spread_odds": ((away.get("current") or {})
|
|
.get("pointSpread") or {}).get("value")
|
|
}
|
|
}
|
|
self.logger.debug(f"Returning extracted odds data: {json.dumps(extracted_data, indent=2)}")
|
|
return extracted_data
|
|
|
|
# Check if this is a valid empty response or an unexpected structure
|
|
if "count" in data and data["count"] == 0 and "items" in data and data["items"] == []:
|
|
# This is a valid empty response - no odds available for this game
|
|
self.logger.debug(f"No odds available for this game. Response: {json.dumps(data, indent=2)}")
|
|
return None
|
|
else:
|
|
# This is an unexpected response structure
|
|
self.logger.warning("No 'items' found in ESPN odds data.")
|
|
self.logger.warning(f"Unexpected response structure: {json.dumps(data, indent=2)}")
|
|
return None
|
|
|
|
def get_odds_for_games(self, games: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
"""
|
|
Fetch odds for multiple games efficiently.
|
|
|
|
Args:
|
|
games: List of game dictionaries with sport, league, and id
|
|
|
|
Returns:
|
|
List of games with odds data added
|
|
"""
|
|
games_with_odds = []
|
|
|
|
for game in games:
|
|
try:
|
|
sport = game.get('sport')
|
|
league = game.get('league')
|
|
event_id = game.get('id')
|
|
|
|
if sport and league and event_id:
|
|
odds_data = self.get_odds(sport, league, event_id)
|
|
game['odds'] = odds_data
|
|
else:
|
|
game['odds'] = None
|
|
|
|
games_with_odds.append(game)
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error fetching odds for game {game.get('id', 'unknown')}: {e}")
|
|
game['odds'] = None
|
|
games_with_odds.append(game)
|
|
|
|
return games_with_odds
|
|
|
|
def is_odds_available(self, odds_data: Optional[Dict[str, Any]]) -> bool:
|
|
"""
|
|
Check if odds data contains valid odds information.
|
|
|
|
Args:
|
|
odds_data: Odds data dictionary
|
|
|
|
Returns:
|
|
True if valid odds are available, False otherwise
|
|
"""
|
|
if not odds_data or odds_data.get('no_odds'):
|
|
return False
|
|
|
|
# Check for any valid odds data
|
|
if odds_data.get('spread') is not None:
|
|
return True
|
|
if odds_data.get('home_team_odds', {}).get('spread_odds') is not None:
|
|
return True
|
|
if odds_data.get('away_team_odds', {}).get('spread_odds') is not None:
|
|
return True
|
|
if odds_data.get('over_under') is not None:
|
|
return True
|
|
|
|
return False
|
|
|
|
def format_odds_summary(self, odds_data: Optional[Dict[str, Any]]) -> str:
|
|
"""
|
|
Format odds data into a human-readable summary.
|
|
|
|
Args:
|
|
odds_data: Odds data dictionary
|
|
|
|
Returns:
|
|
Formatted odds summary string
|
|
"""
|
|
# Gate only on truly-empty / negative-cached data. is_odds_available
|
|
# deliberately ignores money lines (its callers decide whether to
|
|
# RENDER an odds widget), but a summary of money-line-only odds is
|
|
# still meaningful — the parts loop below handles them.
|
|
if not odds_data or odds_data.get('no_odds'):
|
|
return "No odds available"
|
|
|
|
parts = []
|
|
|
|
# Add spread information
|
|
spread = odds_data.get('spread')
|
|
if spread is not None:
|
|
parts.append(f"Spread: {spread}")
|
|
|
|
# Add over/under
|
|
over_under = odds_data.get('over_under')
|
|
if over_under is not None:
|
|
parts.append(f"O/U: {over_under}")
|
|
|
|
# Add money lines
|
|
home_ml = odds_data.get('home_team_odds', {}).get('money_line')
|
|
away_ml = odds_data.get('away_team_odds', {}).get('money_line')
|
|
|
|
if home_ml is not None:
|
|
parts.append(f"Home ML: {home_ml}")
|
|
if away_ml is not None:
|
|
parts.append(f"Away ML: {away_ml}")
|
|
|
|
return " | ".join(parts) if parts else "No odds available"
|