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>
360 lines
13 KiB
Python
360 lines
13 KiB
Python
"""
|
|
Tests for src/base_odds_manager.py (BaseOddsManager).
|
|
|
|
Covers get_odds validation/caching/URL construction, the null-safe
|
|
_extract_espn_data fix (ESPN sends explicit JSON nulls for absent sides),
|
|
the no_odds sentinel, stale-cache fallback on request failure,
|
|
is_odds_available's ML-blind truth table, the fixed format_odds_summary
|
|
gate (money-line-only odds now format), get_odds_for_games, and
|
|
configuration loading.
|
|
|
|
No real network: src.base_odds_manager.requests.get is always patched.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
import requests
|
|
|
|
from src.base_odds_manager import BaseOddsManager
|
|
|
|
|
|
FULL_ITEM = {
|
|
'details': 'DAL -3.5',
|
|
'overUnder': 47.5,
|
|
'spread': -3.5,
|
|
'homeTeamOdds': {'moneyLine': -150, 'current': {'pointSpread': {'value': -3.5}}},
|
|
'awayTeamOdds': {'moneyLine': 130, 'current': {'pointSpread': {'value': 3.5}}},
|
|
}
|
|
|
|
FULL_EXTRACTED = {
|
|
'details': 'DAL -3.5',
|
|
'over_under': 47.5,
|
|
'spread': -3.5,
|
|
'home_team_odds': {'money_line': -150, 'spread_odds': -3.5},
|
|
'away_team_odds': {'money_line': 130, 'spread_odds': 3.5},
|
|
}
|
|
|
|
|
|
def _make_response(payload):
|
|
response = MagicMock()
|
|
response.json.return_value = payload
|
|
response.raise_for_status.return_value = None
|
|
return response
|
|
|
|
|
|
@pytest.fixture
|
|
def cache_manager():
|
|
cm = MagicMock()
|
|
# A bare MagicMock returns truthy Mocks from every call, so every
|
|
# get_odds() would look like a cache hit. Explicitly wire a miss.
|
|
cm.get_with_auto_strategy.return_value = None
|
|
return cm
|
|
|
|
|
|
@pytest.fixture
|
|
def manager(cache_manager):
|
|
return BaseOddsManager(cache_manager)
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_get():
|
|
with patch('src.base_odds_manager.requests.get') as m:
|
|
m.return_value = _make_response({'items': [dict(FULL_ITEM)]})
|
|
yield m
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# get_odds
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestGetOdds:
|
|
def test_none_sport_raises(self, manager):
|
|
with pytest.raises(ValueError):
|
|
manager.get_odds(None, 'nfl', '1')
|
|
|
|
def test_none_league_raises(self, manager):
|
|
with pytest.raises(ValueError):
|
|
manager.get_odds('football', None, '1')
|
|
|
|
def test_cache_key_and_url(self, manager, cache_manager, mock_get):
|
|
manager.get_odds('football', 'nfl', '401')
|
|
|
|
cache_manager.get_with_auto_strategy.assert_called_once_with(
|
|
'odds_espn_football_nfl_401')
|
|
url = mock_get.call_args[0][0]
|
|
# Event id appears twice: /events/<id>/competitions/<id>/odds
|
|
assert '/events/401/competitions/401/odds' in url
|
|
assert url == ('https://sports.core.api.espn.com/v2/sports/football/'
|
|
'leagues/nfl/events/401/competitions/401/odds')
|
|
assert mock_get.call_args.kwargs['timeout'] == 30
|
|
|
|
def test_ncaa_fb_maps_to_college_football(self, manager, mock_get):
|
|
manager.get_odds('football', 'ncaa_fb', '401')
|
|
|
|
url = mock_get.call_args[0][0]
|
|
assert '/leagues/college-football/' in url
|
|
|
|
def test_unknown_league_passes_through(self, manager, mock_get):
|
|
manager.get_odds('football', 'xfl', '401')
|
|
|
|
assert '/leagues/xfl/' in mock_get.call_args[0][0]
|
|
|
|
def test_cache_hit_skips_http(self, manager, cache_manager, mock_get):
|
|
cache_manager.get_with_auto_strategy.return_value = {'spread': -3.0}
|
|
|
|
result = manager.get_odds('football', 'nfl', '401')
|
|
|
|
assert result == {'spread': -3.0}
|
|
mock_get.assert_not_called()
|
|
|
|
def test_cached_no_odds_sentinel_returned_verbatim(
|
|
self, manager, cache_manager, mock_get):
|
|
cache_manager.get_with_auto_strategy.return_value = {'no_odds': True}
|
|
|
|
result = manager.get_odds('football', 'nfl', '401')
|
|
|
|
assert result == {'no_odds': True}
|
|
mock_get.assert_not_called()
|
|
assert manager.is_odds_available(result) is False
|
|
|
|
def test_success_caches_extracted_data_with_interval_ttl(
|
|
self, manager, cache_manager, mock_get):
|
|
result = manager.get_odds('football', 'nfl', '401',
|
|
update_interval_seconds=100)
|
|
|
|
assert result == FULL_EXTRACTED
|
|
cache_manager.set.assert_called_once_with(
|
|
'odds_espn_football_nfl_401', FULL_EXTRACTED, ttl=100)
|
|
|
|
def test_no_odds_caches_sentinel(self, manager, cache_manager, mock_get):
|
|
mock_get.return_value = _make_response({'count': 0, 'items': []})
|
|
|
|
result = manager.get_odds('football', 'nfl', '401')
|
|
|
|
assert result is None
|
|
cache_manager.set.assert_called_once_with(
|
|
'odds_espn_football_nfl_401', {'no_odds': True}, ttl=3600)
|
|
|
|
def test_zero_interval_falls_back_to_default(
|
|
self, manager, cache_manager, mock_get):
|
|
# Quirk pin: `update_interval_seconds or self.update_interval`
|
|
# treats an explicit 0 as falsy, so the 3600 default wins.
|
|
manager.get_odds('football', 'nfl', '401', update_interval_seconds=0)
|
|
|
|
assert cache_manager.set.call_args.kwargs['ttl'] == 3600
|
|
|
|
def test_request_exception_falls_back_to_stale_cache(
|
|
self, manager, cache_manager, mock_get):
|
|
cache_manager.get_with_auto_strategy.side_effect = [
|
|
None, {'stale': True}]
|
|
mock_get.side_effect = requests.exceptions.RequestException('boom')
|
|
|
|
result = manager.get_odds('football', 'nfl', '401')
|
|
|
|
assert result == {'stale': True}
|
|
assert cache_manager.get_with_auto_strategy.call_count == 2
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _extract_espn_data
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestExtractEspnData:
|
|
def test_full_item_extracts_all_fields(self, manager):
|
|
result = manager._extract_espn_data({'items': [dict(FULL_ITEM)]})
|
|
assert result == FULL_EXTRACTED
|
|
|
|
def test_explicit_nulls_do_not_raise(self, manager):
|
|
# Post-fix: ESPN sends explicit JSON nulls for absent sides
|
|
# ("homeTeamOdds": null, "current": null); extraction must not
|
|
# raise and yields None fields.
|
|
payload = {'items': [{
|
|
'homeTeamOdds': None,
|
|
'awayTeamOdds': {'moneyLine': 150, 'current': None},
|
|
}]}
|
|
|
|
result = manager._extract_espn_data(payload)
|
|
|
|
assert result is not None
|
|
assert result['home_team_odds']['money_line'] is None
|
|
assert result['home_team_odds']['spread_odds'] is None
|
|
assert result['away_team_odds']['money_line'] == 150
|
|
assert result['away_team_odds']['spread_odds'] is None
|
|
|
|
def test_valid_empty_response_returns_none(self, manager):
|
|
assert manager._extract_espn_data({'count': 0, 'items': []}) is None
|
|
|
|
def test_unexpected_structure_returns_none(self, manager):
|
|
assert manager._extract_espn_data({'unexpected': True}) is None
|
|
|
|
def test_item_without_odds_fields_cached_as_data_not_sentinel(
|
|
self, manager, cache_manager, mock_get):
|
|
# Characterization pin: an item with no odds fields still extracts
|
|
# to a truthy dict of all-None values, so get_odds caches it as
|
|
# real data (NOT the no_odds sentinel) — but is_odds_available
|
|
# correctly reports False for it.
|
|
mock_get.return_value = _make_response({'items': [{}]})
|
|
|
|
result = manager.get_odds('football', 'nfl', '401')
|
|
|
|
assert result == {
|
|
'details': None,
|
|
'over_under': None,
|
|
'spread': None,
|
|
'home_team_odds': {'money_line': None, 'spread_odds': None},
|
|
'away_team_odds': {'money_line': None, 'spread_odds': None},
|
|
}
|
|
cache_manager.set.assert_called_once_with(
|
|
'odds_espn_football_nfl_401', result, ttl=3600)
|
|
assert manager.is_odds_available(result) is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# is_odds_available
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestIsOddsAvailable:
|
|
def test_none_is_false(self, manager):
|
|
assert manager.is_odds_available(None) is False
|
|
|
|
def test_empty_dict_is_false(self, manager):
|
|
assert manager.is_odds_available({}) is False
|
|
|
|
def test_no_odds_sentinel_is_false(self, manager):
|
|
assert manager.is_odds_available({'no_odds': True}) is False
|
|
|
|
def test_spread_is_true(self, manager):
|
|
assert manager.is_odds_available({'spread': -3.5}) is True
|
|
|
|
def test_over_under_is_true(self, manager):
|
|
assert manager.is_odds_available({'over_under': 47.5}) is True
|
|
|
|
def test_nested_home_spread_odds_is_true(self, manager):
|
|
assert manager.is_odds_available(
|
|
{'home_team_odds': {'spread_odds': -3.5}}) is True
|
|
|
|
def test_nested_away_spread_odds_is_true(self, manager):
|
|
assert manager.is_odds_available(
|
|
{'away_team_odds': {'spread_odds': 3.5}}) is True
|
|
|
|
def test_moneyline_only_is_false(self, manager):
|
|
# Pinned ML-blind contract: is_odds_available ignores money lines
|
|
# (its callers decide whether to render an odds widget). Note that
|
|
# format_odds_summary deliberately uses a DIFFERENT gate — it will
|
|
# still format money-line-only odds (see TestFormatOddsSummary).
|
|
ml_only = {
|
|
'home_team_odds': {'money_line': -120},
|
|
'away_team_odds': {'money_line': 100},
|
|
}
|
|
assert manager.is_odds_available(ml_only) is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# format_odds_summary (fixed gate: empty / no_odds only)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestFormatOddsSummary:
|
|
def test_moneyline_only_formats(self, manager):
|
|
result = manager.format_odds_summary({
|
|
'home_team_odds': {'money_line': -120},
|
|
'away_team_odds': {'money_line': 100},
|
|
})
|
|
assert result == 'Home ML: -120 | Away ML: 100'
|
|
|
|
def test_full_data_formats_all_parts(self, manager):
|
|
result = manager.format_odds_summary(FULL_EXTRACTED)
|
|
assert result == 'Spread: -3.5 | O/U: 47.5 | Home ML: -150 | Away ML: 130'
|
|
|
|
def test_none_is_no_odds(self, manager):
|
|
assert manager.format_odds_summary(None) == 'No odds available'
|
|
|
|
def test_empty_dict_is_no_odds(self, manager):
|
|
assert manager.format_odds_summary({}) == 'No odds available'
|
|
|
|
def test_no_odds_sentinel_is_no_odds(self, manager):
|
|
assert manager.format_odds_summary(
|
|
{'no_odds': True}) == 'No odds available'
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# get_odds_for_games
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestGetOddsForGames:
|
|
def test_missing_fields_get_none_odds_without_http(self, manager, mock_get):
|
|
games = [
|
|
{'sport': 'football'},
|
|
{'league': 'nfl'},
|
|
{'id': '9'},
|
|
{},
|
|
]
|
|
|
|
result = manager.get_odds_for_games(games)
|
|
|
|
assert all(g['odds'] is None for g in result)
|
|
mock_get.assert_not_called()
|
|
|
|
def test_per_game_exception_continues_loop(self, manager, monkeypatch):
|
|
def fake_get_odds(sport, league, event_id,
|
|
update_interval_seconds=None):
|
|
if event_id == 'bad':
|
|
raise RuntimeError('boom')
|
|
return {'spread': -1.0}
|
|
|
|
monkeypatch.setattr(manager, 'get_odds', fake_get_odds)
|
|
games = [
|
|
{'sport': 'football', 'league': 'nfl', 'id': 'bad'},
|
|
{'sport': 'football', 'league': 'nfl', 'id': 'ok'},
|
|
]
|
|
|
|
result = manager.get_odds_for_games(games)
|
|
|
|
assert len(result) == 2
|
|
assert result[0]['odds'] is None
|
|
assert result[1]['odds'] == {'spread': -1.0}
|
|
|
|
def test_input_dicts_mutated_in_place_and_returned(self, manager, mock_get):
|
|
# Pin: get_odds_for_games mutates the caller's game dicts in place
|
|
# and returns the same objects, not copies.
|
|
game = {'sport': 'football', 'league': 'nfl', 'id': '401'}
|
|
|
|
result = manager.get_odds_for_games([game])
|
|
|
|
assert result[0] is game
|
|
assert game['odds'] == FULL_EXTRACTED
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _load_configuration
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestLoadConfiguration:
|
|
def test_loads_values_from_config(self, cache_manager):
|
|
config_manager = MagicMock()
|
|
config_manager.get_config.return_value = {
|
|
'base_odds_manager': {
|
|
'update_interval': 100,
|
|
'timeout': 5,
|
|
'cache_ttl': 42,
|
|
}
|
|
}
|
|
|
|
manager = BaseOddsManager(cache_manager, config_manager=config_manager)
|
|
|
|
assert manager.update_interval == 100
|
|
# Key/attr mismatch pin: the config key is 'timeout' but the
|
|
# attribute is request_timeout.
|
|
assert manager.request_timeout == 5
|
|
assert manager.cache_ttl == 42
|
|
|
|
def test_get_config_raising_keeps_defaults(self, cache_manager):
|
|
config_manager = MagicMock()
|
|
config_manager.get_config.side_effect = RuntimeError('boom')
|
|
|
|
manager = BaseOddsManager(cache_manager, config_manager=config_manager)
|
|
|
|
assert manager.update_interval == 3600
|
|
assert manager.request_timeout == 30
|
|
assert manager.cache_ttl == 1800
|