Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions bedhost/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,36 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
_LOGGER.info("Initializing reference genome validator...")
app.state.ref_validator = ReferenceValidator()

scheduler = BackgroundScheduler()
scheduler.add_job(
upload_usage,
"interval",
hours=USAGE_SAVE_HOURS,
args=(app.state.bbagent, app.state.usage_data),
)
scheduler.start()
app.state.scheduler = scheduler
# Read-only guard: when BEDHOST_DISABLE_USAGE_SCHEDULER is truthy, do NOT
# start the hourly usage-flush job (which writes to the DB). Default (unset)
# keeps the scheduler ON so normal/prod deployments are unaffected.
if os.environ.get("BEDHOST_DISABLE_USAGE_SCHEDULER", "").lower() not in (
"1",
"true",
"yes",
):
scheduler = BackgroundScheduler()
scheduler.add_job(
upload_usage,
"interval",
hours=USAGE_SAVE_HOURS,
args=(app.state.bbagent, app.state.usage_data),
)
scheduler.start()
app.state.scheduler = scheduler
else:
app.state.scheduler = None
_LOGGER.info(
"BEDHOST_DISABLE_USAGE_SCHEDULER set; usage flush scheduler NOT "
"started (read-only mode)."
Comment thread
nsheff marked this conversation as resolved.
)

try:
_LOGGER.info("Starting app ...")
yield
finally:
app.state.scheduler.shutdown(wait=False)
if app.state.scheduler is not None:
app.state.scheduler.shutdown(wait=False)


app = FastAPI(
Expand Down
32 changes: 32 additions & 0 deletions bedhost/routers/base_api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import datetime
from platform import python_version
from typing import Literal

from bbconf import __version__ as bbconf_version
from bbconf.bbagent import BedBaseAgent
Expand All @@ -7,6 +9,7 @@
BedSnapshotListResult,
FileStats,
StatsReturn,
UsageResponse,
UsageStats,
)
from fastapi import APIRouter, Depends, Query, Request
Expand Down Expand Up @@ -238,3 +241,32 @@ async def redirect_to_download(
):
download_url = f"{EXPORTS_URL_BASE}{file_path}"
return RedirectResponse(url=download_url)


@router.get(
"/usage",
summary="Get per-key usage counts for one event type, optionally by date range",
response_model=UsageResponse,
)
def get_usage(
type: Literal["files", "bed_meta", "bedset_meta", "bed_search", "bedset_search"],
date_from: datetime.datetime | None = None,
date_to: datetime.datetime | None = None,
limit: int = 1000,
offset: int = 0,
bbagent: BedBaseAgent = Depends(get_bbagent),
):
"""
Returns per-key usage counts for a single event type
(files | bed_meta | bedset_meta | bed_search | bedset_search), grouped by key
and summed over the time-bucketed rows whose window overlaps the requested
[date_from, date_to] range. Both date bounds are optional; limit/offset
paginate the keys by count (default limit 1000).
"""
return bbagent.get_usage(
event_type=type,
date_from=date_from,
date_to=date_to,
limit=limit,
offset=offset,
)