From a25c633a0b28eea7b99078313a825e0ce8f6c10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A7=D0=B5=D1=80=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Fri, 18 Sep 2026 18:46:36 +0300 Subject: [PATCH] =?UTF-8?q?BUILD147=20=E2=80=94=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D1=83=D1=80=D0=BD?= =?UTF-8?q?=D0=B8=D1=80=D0=BD=D0=BE=D0=B9=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?= =?UTF-8?q?=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 28 +++++++++++++++++++++- hockey_data/service.py | 5 +++- hockey_data/static/tournament-menu.js | 30 ++++++++++++++++------- ui_builder/static/app.js | 34 +++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 11 deletions(-) diff --git a/app.py b/app.py index 43c84ce..7d0bccf 100644 --- a/app.py +++ b/app.py @@ -29,7 +29,7 @@ from ui_builder import install_ui_builder from khl_site.khl_data_center import APP as khl_site_app BASE_DIR = Path(__file__).resolve().parent -BUILD_VERSION = "2026.09.18.4" +BUILD_VERSION = "2026.09.18.5" # compatibility: BUILD_VERSION = "2026.08.26.1" # compatibility: BUILD_VERSION = "2026.08.25.1" # compatibility: BUILD_VERSION = "2026.08.24.15" @@ -371,6 +371,32 @@ app.include_router( agent_hub=hockey_agent_hub, ) ) + + +@app.post( + "/api/hockey/tournaments/{external_id}/standings/force-sync", + dependencies=[Depends(hockey_auth.require_user)], + tags=["Hockey"], +) +async def force_sync_tournament_standings( + external_id: str, + language: str = Query("ru", pattern="^(ru|en)$"), + game_id: str = Query("", max_length=64), +) -> dict[str, Any]: + """Force a fresh Stat2TV standings download, bypassing the in-memory resource cache.""" + if hockey_service.tournament(external_id, language=language) is None: + raise HTTPException(status_code=404, detail="Турнир не найден") + try: + return await hockey_service.sync_standings( + external_id, + language=language, + game_external_id=game_id, + force=True, + ) + except ValueError as error: + raise HTTPException(status_code=400, detail=str(error)) from error + except Exception as error: + raise HTTPException(status_code=502, detail=str(error)) from error app.include_router(create_hockey_auth_router(hockey_auth)) app.include_router( create_hockey_agent_router( diff --git a/hockey_data/service.py b/hockey_data/service.py index 1b501ee..3234c0f 100644 --- a/hockey_data/service.py +++ b/hockey_data/service.py @@ -2307,10 +2307,11 @@ class HockeyDataService: endpoint: str, *, cache_seconds: float, + force: bool = False, ) -> Any: now = time.monotonic() cached = self._resource_response_cache.get(endpoint) - if cached and now - cached[0] < max(0.0, cache_seconds): + if not force and cached and now - cached[0] < max(0.0, cache_seconds): return cached[1] response = await self.client.fetch_xml(endpoint) self._resource_response_cache[endpoint] = (now, response) @@ -5030,6 +5031,7 @@ class HockeyDataService: *, language: str = "ru", game_external_id: str = "", + force: bool = False, ) -> dict[str, Any]: settings = self.settings.public() endpoint = self._resolve_match_resource_endpoint( @@ -5040,6 +5042,7 @@ class HockeyDataService: response = await self._fetch_cached_resource( endpoint, cache_seconds=float(settings["standings_cache_seconds"]), + force=force, ) parsed = parse_standings_xml(response.content, language=language) source_tournament_id = str(parsed.get("tournament_id") or "") diff --git a/hockey_data/static/tournament-menu.js b/hockey_data/static/tournament-menu.js index 96ce978..d5423f2 100644 --- a/hockey_data/static/tournament-menu.js +++ b/hockey_data/static/tournament-menu.js @@ -1262,11 +1262,11 @@ })); } - function standingsUrl({ sync = false } = {}) { + function standingsUrl({ sync = false, force = false } = {}) { const params = new URLSearchParams({ language: state.language }); if (state.selectedGameId) params.set("game_id", state.selectedGameId); - return `/api/hockey/tournaments/${encodeURIComponent(state.selectedId)}/standings` - + `${sync ? "/sync" : ""}?${params.toString()}`; + const suffix = force ? "/force-sync" : (sync ? "/sync" : ""); + return `/api/hockey/tournaments/${encodeURIComponent(state.selectedId)}/standings${suffix}?${params.toString()}`; } function applyStandingsData() { @@ -1275,26 +1275,37 @@ }); } - async function loadTournamentStandings({ sync = false } = {}) { - if (!state.selectedId) return; + async function loadTournamentStandings({ sync = false, force = false } = {}) { + if (!state.selectedId) return null; try { + const shouldPost = Boolean(sync || force); const loaded = await request( - standingsUrl({ sync }), - sync ? { method: "POST", timeoutMs: 30000 } : {} + standingsUrl({ sync, force }), + shouldPost ? { method: "POST", timeoutMs: 30000 } : {} ); state.standings = loaded.standings || loaded; applyStandingsData(); + return loaded; } catch (error) { - if (sync) { + if (sync || force) { try { - const cached = await request(standingsUrl({ sync: false })); + const cached = await request(standingsUrl({ sync: false, force: false })); state.standings = cached.standings || cached; applyStandingsData(); } catch (_) {} } + if (force) throw error; + return null; } } + async function refreshTournamentStandings() { + if (!state.selectedId) { + throw new Error(state.language === "en" ? "Tournament is not selected" : "Турнир не выбран"); + } + return loadTournamentStandings({ sync: true, force: true }); + } + function tournamentStatisticsUrl({ sync = false, force = false } = {}) { const params = new URLSearchParams({ language: state.language }); if (force) params.set("force", "true"); @@ -2699,6 +2710,7 @@ document.addEventListener("visibilitychange", () => { selectTournament: openTournament, selectGame: openGame, reloadGames: () => loadGames({ autoSync: false }), + refreshStandings: refreshTournamentStandings, }; function installGlobalTooltipPortal() { diff --git a/ui_builder/static/app.js b/ui_builder/static/app.js index 4ede9fa..fd3a04c 100644 --- a/ui_builder/static/app.js +++ b/ui_builder/static/app.js @@ -11301,8 +11301,25 @@ function renderHockeyPenaltyDashboard(node, component, runtime) {
${language === "en" ? "Standings are not loaded" : "Турнирная таблица не загружена"} ${language === "en" ? "Select a tournament to load Stat2TV data" : "Выберите турнир, чтобы загрузить данные Stat2TV"} +
`; + const refreshButton = node.querySelector("[data-standings-refresh]"); + refreshButton?.addEventListener("click", async () => { + if (!runtime || !window.HockeyTournamentMenu?.refreshStandings) return; + refreshButton.disabled = true; + refreshButton.textContent = language === "en" ? "↻ Refreshing…" : "↻ Обновляем…"; + try { + await window.HockeyTournamentMenu.refreshStandings(); + } catch (error) { + console.warn("[Hockey] Standings manual refresh failed:", error); + } finally { + if (refreshButton.isConnected) { + refreshButton.disabled = false; + refreshButton.textContent = `↻ ${language === "en" ? "Refresh" : "Обновить"}`; + } + } + }); return node; } @@ -11314,6 +11331,7 @@ function renderHockeyPenaltyDashboard(node, component, runtime) { ${standings.generated_at ? `${language === "en" ? "Updated" : "Обновлено"}: ${escapeHtml(standings.generated_at)}` : ""} @@ -11339,6 +11357,22 @@ function renderHockeyPenaltyDashboard(node, component, runtime) { renderRuntime(); }); }); + const refreshButton = node.querySelector("[data-standings-refresh]"); + refreshButton?.addEventListener("click", async () => { + if (!runtime || !window.HockeyTournamentMenu?.refreshStandings) return; + refreshButton.disabled = true; + refreshButton.textContent = language === "en" ? "↻ Refreshing…" : "↻ Обновляем…"; + try { + await window.HockeyTournamentMenu.refreshStandings(); + } catch (error) { + console.warn("[Hockey] Standings manual refresh failed:", error); + } finally { + if (refreshButton.isConnected) { + refreshButton.disabled = false; + refreshButton.textContent = `↻ ${language === "en" ? "Refresh" : "Обновить"}`; + } + } + }); return node; }