что то поменял, но нужно проверить
This commit is contained in:
150
get_data.py
150
get_data.py
@@ -1,5 +1,5 @@
|
|||||||
from fastapi import FastAPI, HTTPException, Query
|
from fastapi import FastAPI, HTTPException, Query
|
||||||
from fastapi.responses import Response, JSONResponse, HTMLResponse
|
from fastapi.responses import Response, JSONResponse, HTMLResponse, StreamingResponse
|
||||||
from fastapi.encoders import jsonable_encoder
|
from fastapi.encoders import jsonable_encoder
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
import requests, io, os
|
import requests, io, os
|
||||||
@@ -12,6 +12,10 @@ import time
|
|||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import nasio
|
import nasio
|
||||||
|
import logging
|
||||||
|
import logging.config
|
||||||
|
import platform
|
||||||
|
from pprint import pprint
|
||||||
|
|
||||||
|
|
||||||
# --- Глобальные переменные ---
|
# --- Глобальные переменные ---
|
||||||
@@ -42,7 +46,6 @@ PASSWORD = os.getenv("SYNO_PASSWORD")
|
|||||||
PATH = "/team-folders/GFX/Hockey/KHL/Soft/MATCH.xlsm"
|
PATH = "/team-folders/GFX/Hockey/KHL/Soft/MATCH.xlsm"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def load_today_schedule():
|
def load_today_schedule():
|
||||||
"""Возвращает DataFrame матчей на сегодня с нужными колонками (или пустой DF)."""
|
"""Возвращает DataFrame матчей на сегодня с нужными колонками (или пустой DF)."""
|
||||||
url_tournaments = "http://stat2tv.khl.ru/tournaments.xml"
|
url_tournaments = "http://stat2tv.khl.ru/tournaments.xml"
|
||||||
@@ -74,7 +77,17 @@ def load_today_schedule():
|
|||||||
schedule_df = pd.read_xml(io.StringIO(r.text))
|
schedule_df = pd.read_xml(io.StringIO(r.text))
|
||||||
|
|
||||||
# Нужные колонки (скорректируй под реальные имена из XML)
|
# Нужные колонки (скорректируй под реальные имена из XML)
|
||||||
needed_columns = ["id", "date", "time", "homeName_en", "visitorName_en", "arena_en", "arena_city_en", "homeCity_en", "visitorCity_en"]
|
needed_columns = [
|
||||||
|
"id",
|
||||||
|
"date",
|
||||||
|
"time",
|
||||||
|
"homeName_en",
|
||||||
|
"visitorName_en",
|
||||||
|
"arena_en",
|
||||||
|
"arena_city_en",
|
||||||
|
"homeCity_en",
|
||||||
|
"visitorCity_en",
|
||||||
|
]
|
||||||
exist = [c for c in needed_columns if c in schedule_df.columns]
|
exist = [c for c in needed_columns if c in schedule_df.columns]
|
||||||
schedule_df = schedule_df[exist].copy()
|
schedule_df = schedule_df[exist].copy()
|
||||||
|
|
||||||
@@ -124,10 +137,7 @@ def _fetch_game_once(tournament_id: int, game_id: int) -> dict:
|
|||||||
"""Один запрос к API матча -> чистый JSON из API."""
|
"""Один запрос к API матча -> чистый JSON из API."""
|
||||||
url = _build_game_url(tournament_id, game_id)
|
url = _build_game_url(tournament_id, game_id)
|
||||||
r = requests.get(
|
r = requests.get(
|
||||||
url,
|
url, auth=HTTPBasicAuth(api_user, api_pass), verify=False, timeout=10
|
||||||
auth=HTTPBasicAuth(api_user, api_pass),
|
|
||||||
verify=False,
|
|
||||||
timeout=10
|
|
||||||
)
|
)
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
|
|
||||||
@@ -183,11 +193,12 @@ async def lifespan(app: FastAPI):
|
|||||||
_worker_thread.join(timeout=2)
|
_worker_thread.join(timeout=2)
|
||||||
print("🛑 Background thread stopped")
|
print("🛑 Background thread stopped")
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
docs_url=None, # ❌ отключает /docs
|
docs_url=None, # ❌ отключает /docs
|
||||||
redoc_url=None, # ❌ отключает /redoc
|
redoc_url=None, # ❌ отключает /redoc
|
||||||
openapi_url=None # ❌ отключает /openapi.json
|
openapi_url=None, # ❌ отключает /openapi.json
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -202,8 +213,6 @@ async def games():
|
|||||||
return Response(content=json_schedule, media_type="application/json")
|
return Response(content=json_schedule, media_type="application/json")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/select")
|
@app.get("/select")
|
||||||
async def select():
|
async def select():
|
||||||
df = load_today_schedule()
|
df = load_today_schedule()
|
||||||
@@ -336,11 +345,13 @@ async def get_selected_game():
|
|||||||
async def game_url():
|
async def game_url():
|
||||||
if not (selected_game_id and current_tournament_id):
|
if not (selected_game_id and current_tournament_id):
|
||||||
return JSONResponse({"message": "game_id или tournament_id не задан"})
|
return JSONResponse({"message": "game_id или tournament_id не задан"})
|
||||||
return JSONResponse({
|
return JSONResponse(
|
||||||
|
{
|
||||||
"url": _build_game_url(current_tournament_id, selected_game_id),
|
"url": _build_game_url(current_tournament_id, selected_game_id),
|
||||||
"game_id": selected_game_id,
|
"game_id": selected_game_id,
|
||||||
"tournament_id": current_tournament_id
|
"tournament_id": current_tournament_id,
|
||||||
})
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# @app.get("/info")
|
# @app.get("/info")
|
||||||
@@ -356,7 +367,9 @@ async def game_data():
|
|||||||
return JSONResponse(latest_game_data)
|
return JSONResponse(latest_game_data)
|
||||||
if latest_game_error:
|
if latest_game_error:
|
||||||
return JSONResponse({"error": latest_game_error}, status_code=502)
|
return JSONResponse({"error": latest_game_error}, status_code=502)
|
||||||
return JSONResponse({"message": "Ещё нет данных. Выберите матч и подождите первое обновление."})
|
return JSONResponse(
|
||||||
|
{"message": "Ещё нет данных. Выберите матч и подождите первое обновление."}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.get("/referee")
|
@app.get("/referee")
|
||||||
@@ -383,7 +396,6 @@ async def referee():
|
|||||||
return data_referees
|
return data_referees
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async def team(who: str):
|
async def team(who: str):
|
||||||
""" "who: A - домашняя команда, B - гостевая"""
|
""" "who: A - домашняя команда, B - гостевая"""
|
||||||
with _latest_lock:
|
with _latest_lock:
|
||||||
@@ -489,10 +501,12 @@ async def team(who:str):
|
|||||||
async def team1():
|
async def team1():
|
||||||
return await team("A")
|
return await team("A")
|
||||||
|
|
||||||
|
|
||||||
@app.get("/team2")
|
@app.get("/team2")
|
||||||
async def team2():
|
async def team2():
|
||||||
return await team("B")
|
return await team("B")
|
||||||
|
|
||||||
|
|
||||||
# 👉 метка для первой строки (period row)
|
# 👉 метка для первой строки (period row)
|
||||||
def _period_label(period: str | int) -> str:
|
def _period_label(period: str | int) -> str:
|
||||||
s = str(period).strip().upper()
|
s = str(period).strip().upper()
|
||||||
@@ -516,6 +530,7 @@ def _period_label(period: str | int) -> str:
|
|||||||
return "FINAL"
|
return "FINAL"
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
|
||||||
# 👉 сортировка периодов: 1,2,3, затем OT/OT2/...
|
# 👉 сортировка периодов: 1,2,3, затем OT/OT2/...
|
||||||
def _period_sort_key(k: str) -> tuple[int, int]:
|
def _period_sort_key(k: str) -> tuple[int, int]:
|
||||||
s = str(k).strip().upper()
|
s = str(k).strip().upper()
|
||||||
@@ -582,15 +597,21 @@ def format_team_stat(team1: dict, team2: dict, period: str | None = None) -> lis
|
|||||||
formatted = []
|
formatted = []
|
||||||
|
|
||||||
if period is not None:
|
if period is not None:
|
||||||
formatted.append({
|
formatted.append(
|
||||||
|
{
|
||||||
"name0": "period",
|
"name0": "period",
|
||||||
"name1": str(period),
|
"name1": str(period),
|
||||||
"name2": "",
|
"name2": "",
|
||||||
"StatParameterGFX": _period_label(period) or "Period"
|
"StatParameterGFX": _period_label(period) or "Period",
|
||||||
})
|
}
|
||||||
|
)
|
||||||
|
|
||||||
for key in keys:
|
for key in keys:
|
||||||
row = {"name0": key, "name1": teams[0].get(key, ""), "name2": teams[1].get(key, "")}
|
row = {
|
||||||
|
"name0": key,
|
||||||
|
"name1": teams[0].get(key, ""),
|
||||||
|
"name2": teams[1].get(key, ""),
|
||||||
|
}
|
||||||
# подписи
|
# подписи
|
||||||
for code, eng, _ru in stat_list:
|
for code, eng, _ru in stat_list:
|
||||||
if key == code:
|
if key == code:
|
||||||
@@ -608,6 +629,7 @@ def format_team_stat(team1: dict, team2: dict, period: str | None = None) -> lis
|
|||||||
def flip(s: str) -> str:
|
def flip(s: str) -> str:
|
||||||
parts = s.split()
|
parts = s.split()
|
||||||
return f"{parts[1]} {parts[0]}" if len(parts) >= 2 else s
|
return f"{parts[1]} {parts[0]}" if len(parts) >= 2 else s
|
||||||
|
|
||||||
r["name1"] = flip(r["name1"])
|
r["name1"] = flip(r["name1"])
|
||||||
r["name2"] = flip(r["name2"])
|
r["name2"] = flip(r["name2"])
|
||||||
|
|
||||||
@@ -622,11 +644,13 @@ def _iter_period_pairs(teams_periods: dict):
|
|||||||
"""
|
"""
|
||||||
a = teams_periods.get("A", {})
|
a = teams_periods.get("A", {})
|
||||||
b = teams_periods.get("B", {})
|
b = teams_periods.get("B", {})
|
||||||
|
|
||||||
def _key(k):
|
def _key(k):
|
||||||
try:
|
try:
|
||||||
return int(k)
|
return int(k)
|
||||||
except (TypeError, ValueError):
|
except (TypeError, ValueError):
|
||||||
return k
|
return k
|
||||||
|
|
||||||
for k in sorted(a.keys(), key=_key):
|
for k in sorted(a.keys(), key=_key):
|
||||||
if k in b:
|
if k in b:
|
||||||
yield k, a[k], b[k]
|
yield k, a[k], b[k]
|
||||||
@@ -638,22 +662,20 @@ def _build_all_stats(payload: dict) -> dict:
|
|||||||
"""
|
"""
|
||||||
total_a = payload["teams"]["A"]
|
total_a = payload["teams"]["A"]
|
||||||
total_b = payload["teams"]["B"]
|
total_b = payload["teams"]["B"]
|
||||||
result = {
|
result = {"total": format_team_stat(total_a, total_b), "periods": []}
|
||||||
"total": format_team_stat(total_a, total_b),
|
|
||||||
"periods": []
|
|
||||||
}
|
|
||||||
for period_key, a_stat, b_stat in _iter_period_pairs(payload["teams_periods"]):
|
for period_key, a_stat, b_stat in _iter_period_pairs(payload["teams_periods"]):
|
||||||
result["periods"].append({
|
result["periods"].append(
|
||||||
"period": period_key,
|
{"period": period_key, "stats": format_team_stat(a_stat, b_stat)}
|
||||||
"stats": format_team_stat(a_stat, b_stat)
|
)
|
||||||
})
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
@app.get("/teams/stats")
|
@app.get("/teams/stats")
|
||||||
async def teams_stats(
|
async def teams_stats(
|
||||||
scope: str = Query("all", pattern="^(all|total|period)$"),
|
scope: str = Query("all", pattern="^(all|total|period)$"),
|
||||||
n: str | None = Query(None, description="Номер периода (строка или число) при scope=period"),
|
n: str | None = Query(
|
||||||
|
None, description="Номер периода (строка или число) при scope=period"
|
||||||
|
),
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Все-в-одном: GET /teams/stats?scope=all
|
Все-в-одном: GET /teams/stats?scope=all
|
||||||
@@ -671,7 +693,9 @@ async def teams_stats(
|
|||||||
payload = lgd["data"]
|
payload = lgd["data"]
|
||||||
|
|
||||||
if scope == "total":
|
if scope == "total":
|
||||||
data = format_team_stat(payload["teams"]["A"], payload["teams"]["B"], period="Total")
|
data = format_team_stat(
|
||||||
|
payload["teams"]["A"], payload["teams"]["B"], period="Total"
|
||||||
|
)
|
||||||
return JSONResponse({"scope": "total", "data": data})
|
return JSONResponse({"scope": "total", "data": data})
|
||||||
|
|
||||||
if scope == "period":
|
if scope == "period":
|
||||||
@@ -688,21 +712,23 @@ async def teams_stats(
|
|||||||
a = payload["teams_periods"]["A"].get(period_key)
|
a = payload["teams_periods"]["A"].get(period_key)
|
||||||
b = payload["teams_periods"]["B"].get(period_key)
|
b = payload["teams_periods"]["B"].get(period_key)
|
||||||
if a is None or b is None:
|
if a is None or b is None:
|
||||||
raise HTTPException(status_code=404, detail=f"Период {period_key} не найден.")
|
raise HTTPException(
|
||||||
return JSONResponse({
|
status_code=404, detail=f"Период {period_key} не найден."
|
||||||
|
)
|
||||||
|
return JSONResponse(
|
||||||
|
{
|
||||||
"scope": "period",
|
"scope": "period",
|
||||||
"period": period_key,
|
"period": period_key,
|
||||||
"is_current": period_key == _current_period_key(payload),
|
"is_current": period_key == _current_period_key(payload),
|
||||||
"data": format_team_stat(a, b, period=period_key)
|
"data": format_team_stat(a, b, period=period_key),
|
||||||
})
|
}
|
||||||
|
)
|
||||||
|
|
||||||
# scope == "all"
|
# scope == "all"
|
||||||
cur = _current_period_key(payload)
|
cur = _current_period_key(payload)
|
||||||
return JSONResponse({
|
return JSONResponse(
|
||||||
"scope": "all",
|
{"scope": "all", "current_period": cur, "data": _build_all_stats(payload)}
|
||||||
"current_period": cur,
|
)
|
||||||
"data": _build_all_stats(payload)
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
def _norm_name(s: str | None) -> str:
|
def _norm_name(s: str | None) -> str:
|
||||||
@@ -711,8 +737,9 @@ def _norm_name(s: str | None) -> str:
|
|||||||
return ""
|
return ""
|
||||||
return str(s).strip().casefold()
|
return str(s).strip().casefold()
|
||||||
|
|
||||||
|
|
||||||
@app.get("/info")
|
@app.get("/info")
|
||||||
async def info():
|
def info():
|
||||||
# 1) Проверяем, выбран ли матч
|
# 1) Проверяем, выбран ли матч
|
||||||
global current_season
|
global current_season
|
||||||
if not selected_game_id:
|
if not selected_game_id:
|
||||||
@@ -721,26 +748,47 @@ async def info():
|
|||||||
# 2) Берём расписание и ищем строку по выбранному ID
|
# 2) Берём расписание и ищем строку по выбранному ID
|
||||||
df = load_today_schedule()
|
df = load_today_schedule()
|
||||||
if df.empty:
|
if df.empty:
|
||||||
return JSONResponse({"message": "Сегодня матчей нет", "selected_id": selected_game_id})
|
return JSONResponse(
|
||||||
|
{"message": "Сегодня матчей нет", "selected_id": selected_game_id}
|
||||||
|
)
|
||||||
|
|
||||||
# безопасно приводим id к int и ищем
|
# безопасно приводим id к int и ищем
|
||||||
try:
|
try:
|
||||||
row = df.loc[df["id"].astype(int) == int(selected_game_id)].iloc[0]
|
row = df.loc[df["id"].astype(int) == int(selected_game_id)].iloc[0]
|
||||||
except Exception:
|
except Exception:
|
||||||
return JSONResponse({"message": "Выбранный матч не найден в расписании на сегодня",
|
return JSONResponse(
|
||||||
"selected_id": selected_game_id}, status_code=404)
|
{
|
||||||
|
"message": "Выбранный матч не найден в расписании на сегодня",
|
||||||
|
"selected_id": selected_game_id,
|
||||||
|
},
|
||||||
|
status_code=404,
|
||||||
|
)
|
||||||
|
|
||||||
home_name = str(row.get("homeName_en", "")).strip()
|
home_name = str(row.get("homeName_en", "")).strip()
|
||||||
away_name = str(row.get("visitorName_en", "")).strip()
|
away_name = str(row.get("visitorName_en", "")).strip()
|
||||||
|
|
||||||
# 3) Подтягиваем справочник команд из Excel (лист TEAMS)
|
# 3) Подтягиваем справочник команд из Excel (лист TEAMS)
|
||||||
teams_df = nasio.load_formatted(
|
try:
|
||||||
|
binary_bytes: bytes = nasio.load_bio(
|
||||||
user=USER,
|
user=USER,
|
||||||
password=PASSWORD,
|
password=PASSWORD,
|
||||||
nas_ip=SERVER_NAME,
|
nas_ip=SERVER_NAME,
|
||||||
nas_port="443",
|
nas_port="443",
|
||||||
path=PATH,
|
path=PATH,
|
||||||
sheet="TEAMS"
|
# sheet="TEAMS"
|
||||||
|
)
|
||||||
|
buf = io.BytesIO(binary_bytes)
|
||||||
|
headers = {
|
||||||
|
"Content-Length": str(len(binary_bytes)),
|
||||||
|
"Cache-Control": "no-cache, no-store, must-revalidate",
|
||||||
|
"Pragma": "no-cache",
|
||||||
|
# можно подсунуть имя файла (если парсеру это важно)
|
||||||
|
"Content-Disposition": 'inline; filename="MATCH.xlsm"',
|
||||||
|
}
|
||||||
|
return StreamingResponse(
|
||||||
|
buf,
|
||||||
|
media_type="application/vnd.ms-excel.sheet.macroEnabled.12",
|
||||||
|
headers=headers,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Оставляем только полезные поля (подгони под свой файл)
|
# Оставляем только полезные поля (подгони под свой файл)
|
||||||
@@ -773,10 +821,12 @@ async def info():
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
full_format = date_obj.strftime("%B %#d, %Y")
|
full_format = date_obj.strftime("%B %#d, %Y")
|
||||||
|
|
||||||
|
payload = [
|
||||||
payload = [{
|
{
|
||||||
"selected_id": int(selected_game_id),
|
"selected_id": int(selected_game_id),
|
||||||
"tournament_id": int(current_tournament_id) if current_tournament_id else None,
|
"tournament_id": (
|
||||||
|
int(current_tournament_id) if current_tournament_id else None
|
||||||
|
),
|
||||||
"datetime": str(full_format),
|
"datetime": str(full_format),
|
||||||
"arena": str(row.get("arena_en", "")),
|
"arena": str(row.get("arena_en", "")),
|
||||||
"arena_city": str(row.get("arena_city_en", "")),
|
"arena_city": str(row.get("arena_city_en", "")),
|
||||||
@@ -785,9 +835,13 @@ async def info():
|
|||||||
"away": away_info,
|
"away": away_info,
|
||||||
"away_city": str(row.get("visitorCity_en", "")),
|
"away_city": str(row.get("visitorCity_en", "")),
|
||||||
"season": current_season,
|
"season": current_season,
|
||||||
}]
|
}
|
||||||
|
]
|
||||||
|
|
||||||
return JSONResponse(content=payload)
|
return JSONResponse(content=payload)
|
||||||
|
except Exception as ex:
|
||||||
|
pprint(ex)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
uvicorn.run(
|
uvicorn.run(
|
||||||
|
|||||||
Reference in New Issue
Block a user