sascha/homelab-butler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix long Emby history ranges (app.py)

Browse source
This commit is contained in:
sascha 2026-08-16 22:04:20 +02:00
parent 6605940a81
commit e5dd433906
1 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app.py
View file

@ -484,6 +484,12 @@ def _analyze_emby_sharing(series: list[dict], step_seconds: int) -> dict:
} }
def _emby_history_step(days: int) -> int:
"""Keep query_range below Prometheus' 11,000-points-per-series limit."""
duration_seconds = days * 86400
return max(60, math.ceil((duration_seconds / 10_500) / 60) * 60)
async def _fetch_emby_session_history(days: int, server: str) -> tuple[list[dict], int]: async def _fetch_emby_session_history(days: int, server: str) -> tuple[list[dict], int]:
cfg = SERVICES.get("grafana") cfg = SERVICES.get("grafana")
if not cfg: if not cfg:
@ -497,23 +503,43 @@ async def _fetch_emby_session_history(days: int, server: str) -> tuple[list[dict
query = f"max by ({labels}) ({selector})" query = f"max by ({labels}) ({selector})"
end = int(time.time()) end = int(time.time())
start = end - days * 86400 start = end - days * 86400
step = max(60, math.ceil(((end - start) / 30000) / 60) * 60) step = _emby_history_step(days)
url = f"{request_data['base_url'].rstrip('/')}/api/datasources/proxy/uid/{datasource_uid}/api/v1/query_range" url = f"{request_data['base_url'].rstrip('/')}/api/datasources/proxy/uid/{datasource_uid}/api/v1/query_range"
series_by_metric: dict[str, dict] = {}
chunk_seconds = 30 * 86400
try: try:
async with httpx.AsyncClient(timeout=90) as client: async with httpx.AsyncClient(timeout=90) as client:
response = await client.get( chunk_start = start
url, while chunk_start < end:
params={"query": query, "start": start, "end": end, "step": step}, chunk_end = min(chunk_start + chunk_seconds, end)
headers=request_data["headers"], cookies=request_data["cookies"], response = await client.get(
) url,
response.raise_for_status() params={"query": query, "start": chunk_start, "end": chunk_end, "step": step},
payload = response.json() headers=request_data["headers"], cookies=request_data["cookies"],
)
response.raise_for_status()
payload = response.json()
if payload.get("status") != "success":
raise HTTPException(502, "Prometheus rejected the Emby session history query")
for item in payload.get("data", {}).get("result", []):
metric = item.get("metric", {})
key = json.dumps(metric, sort_keys=True, separators=(",", ":"))
merged = series_by_metric.setdefault(key, {"metric": metric, "values": []})
merged["values"].extend(item.get("values", []))
chunk_start = chunk_end
except (httpx.HTTPError, ValueError) as exc: except (httpx.HTTPError, ValueError) as exc:
log.warning("Emby sharing history query failed: %s", type(exc).__name__) log.warning("Emby sharing history query failed: %s", type(exc).__name__)
raise HTTPException(502, "Emby session history is temporarily unavailable") raise HTTPException(502, "Emby session history is temporarily unavailable")
if payload.get("status") != "success":
raise HTTPException(502, "Prometheus rejected the Emby session history query") series = []
return payload.get("data", {}).get("result", []), step for item in series_by_metric.values():
values_by_timestamp = {
float(value[0]): value for value in item["values"]
if isinstance(value, (list, tuple)) and len(value) >= 2
}
item["values"] = [values_by_timestamp[ts] for ts in sorted(values_by_timestamp)]
series.append(item)
return series, step
@app.get("/emby/account-sharing") @app.get("/emby/account-sharing")