cal/paper-dynasty-database
1
0
Fork 0
Code Issues 7 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: add limit/pagination to pitstats endpoint (#134)' (#158) from issue/134-feat-add-limit-pagination-to-pitstats-endpoint into main

Browse Source
This commit is contained in:
cal 2026-03-24 12:10:59 +00:00
commit f2ff85556a
1 changed files with 109 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
app/routers_v2/pitstats.py
View File

@ -5,14 +5,19 @@ import logging
import pydantic import pydantic
from pandas import DataFrame from pandas import DataFrame
from ..db_engine import db, PitchingStat, model_to_dict, Card, Player, Current, DoesNotExist from ..db_engine import (
db,
PitchingStat,
model_to_dict,
Card,
Player,
Current,
DoesNotExist,
)
from ..dependencies import oauth2_scheme, valid_token from ..dependencies import oauth2_scheme, valid_token
router = APIRouter( router = APIRouter(prefix="/api/v2/pitstats", tags=["pitstats"])
prefix='/api/v2/pitstats',
tags=['pitstats']
)
class PitStat(pydantic.BaseModel): class PitStat(pydantic.BaseModel):
@ -40,7 +45,7 @@ class PitStat(pydantic.BaseModel):
bsv: Optional[int] = 0 bsv: Optional[int] = 0
week: int week: int
season: int season: int
created: Optional[int] = int(datetime.timestamp(datetime.now())*1000) created: Optional[int] = int(datetime.timestamp(datetime.now()) * 1000)
game_id: int game_id: int
@ -48,13 +53,23 @@ class PitchingStatModel(pydantic.BaseModel):
stats: List[PitStat] stats: List[PitStat]
@router.get('') @router.get("")
async def get_pit_stats( async def get_pit_stats(
card_id: int = None, player_id: int = None, team_id: int = None, vs_team_id: int = None, week: int = None, card_id: int = None,
season: int = None, week_start: int = None, week_end: int = None, created: int = None, gs: bool = None, player_id: int = None,
csv: bool = None): team_id: int = None,
vs_team_id: int = None,
week: int = None,
season: int = None,
week_start: int = None,
week_end: int = None,
created: int = None,
gs: bool = None,
csv: bool = None,
limit: Optional[int] = 100,
):
all_stats = PitchingStat.select().join(Card).join(Player).order_by(PitchingStat.id) all_stats = PitchingStat.select().join(Card).join(Player).order_by(PitchingStat.id)
logging.debug(f'pit query:\n\n{all_stats}') logging.debug(f"pit query:\n\n{all_stats}")
if season is not None: if season is not None:
all_stats = all_stats.where(PitchingStat.season == season) all_stats = all_stats.where(PitchingStat.season == season)
@ -83,43 +98,99 @@ async def get_pit_stats(
if gs is not None: if gs is not None:
all_stats = all_stats.where(PitchingStat.gs == 1 if gs else 0) all_stats = all_stats.where(PitchingStat.gs == 1 if gs else 0)
all_stats = all_stats.limit(max(0, min(limit, 500)))
# if all_stats.count() == 0: # if all_stats.count() == 0:
# db.close() # db.close()
# raise HTTPException(status_code=404, detail=f'No pitching stats found') # raise HTTPException(status_code=404, detail=f'No pitching stats found')
if csv: if csv:
data_list = [['id', 'card_id', 'player_id', 'cardset', 'team', 'vs_team', 'ip', 'hit', 'run', 'erun', 'so', 'bb', 'hbp', data_list = [
'wp', 'balk', 'hr', 'ir', 'irs', 'gs', 'win', 'loss', 'hold', 'sv', 'bsv', 'week', 'season', [
'created', 'game_id', 'roster_num']] "id",
"card_id",
"player_id",
"cardset",
"team",
"vs_team",
"ip",
"hit",
"run",
"erun",
"so",
"bb",
"hbp",
"wp",
"balk",
"hr",
"ir",
"irs",
"gs",
"win",
"loss",
"hold",
"sv",
"bsv",
"week",
"season",
"created",
"game_id",
"roster_num",
]
]
for line in all_stats: for line in all_stats:
data_list.append( data_list.append(
[ [
line.id, line.card.id, line.card.player.player_id, line.card.player.cardset.name, line.team.abbrev, line.id,
line.vs_team.abbrev, line.ip, line.hit, line.card.id,
line.run, line.erun, line.so, line.bb, line.hbp, line.wp, line.balk, line.hr, line.ir, line.irs, line.card.player.player_id,
line.gs, line.win, line.loss, line.hold, line.sv, line.bsv, line.week, line.season, line.created, line.card.player.cardset.name,
line.game_id, line.roster_num line.team.abbrev,
line.vs_team.abbrev,
line.ip,
line.hit,
line.run,
line.erun,
line.so,
line.bb,
line.hbp,
line.wp,
line.balk,
line.hr,
line.ir,
line.irs,
line.gs,
line.win,
line.loss,
line.hold,
line.sv,
line.bsv,
line.week,
line.season,
line.created,
line.game_id,
line.roster_num,
] ]
) )
return_val = DataFrame(data_list).to_csv(header=False, index=False) return_val = DataFrame(data_list).to_csv(header=False, index=False)
return Response(content=return_val, media_type='text/csv') return Response(content=return_val, media_type="text/csv")
else: else:
return_val = {'count': all_stats.count(), 'stats': []} return_val = {"count": all_stats.count(), "stats": []}
for x in all_stats: for x in all_stats:
return_val['stats'].append(model_to_dict(x, recurse=False)) return_val["stats"].append(model_to_dict(x, recurse=False))
return return_val return return_val
@router.post('') @router.post("")
async def post_pitstat(stats: PitchingStatModel, token: str = Depends(oauth2_scheme)): async def post_pitstat(stats: PitchingStatModel, token: str = Depends(oauth2_scheme)):
if not valid_token(token): if not valid_token(token):
logging.warning('Bad Token: [REDACTED]') logging.warning("Bad Token: [REDACTED]")
raise HTTPException( raise HTTPException(
status_code=401, status_code=401,
detail='You are not authorized to post stats. This event has been logged.' detail="You are not authorized to post stats. This event has been logged.",
) )
new_stats = [] new_stats = []
@ -149,33 +220,37 @@ async def post_pitstat(stats: PitchingStatModel, token: str = Depends(oauth2_sch
bsv=x.bsv, bsv=x.bsv,
week=x.week, week=x.week,
season=x.season, season=x.season,
created=datetime.fromtimestamp(x.created / 1000) if x.created else datetime.now(), created=datetime.fromtimestamp(x.created / 1000)
game_id=x.game_id if x.created
else datetime.now(),
game_id=x.game_id,
) )
new_stats.append(this_stat) new_stats.append(this_stat)
with db.atomic(): with db.atomic():
PitchingStat.bulk_create(new_stats, batch_size=15) PitchingStat.bulk_create(new_stats, batch_size=15)
raise HTTPException(status_code=200, detail=f'{len(new_stats)} pitching lines have been added') raise HTTPException(
status_code=200, detail=f"{len(new_stats)} pitching lines have been added"
)
@router.delete('/{stat_id}') @router.delete("/{stat_id}")
async def delete_pitstat(stat_id, token: str = Depends(oauth2_scheme)): async def delete_pitstat(stat_id, token: str = Depends(oauth2_scheme)):
if not valid_token(token): if not valid_token(token):
logging.warning('Bad Token: [REDACTED]') logging.warning("Bad Token: [REDACTED]")
raise HTTPException( raise HTTPException(
status_code=401, status_code=401,
detail='You are not authorized to delete stats. This event has been logged.' detail="You are not authorized to delete stats. This event has been logged.",
) )
try: try:
this_stat = PitchingStat.get_by_id(stat_id) this_stat = PitchingStat.get_by_id(stat_id)
except DoesNotExist: except DoesNotExist:
raise HTTPException(status_code=404, detail=f'No stat found with id {stat_id}') raise HTTPException(status_code=404, detail=f"No stat found with id {stat_id}")
count = this_stat.delete_instance() count = this_stat.delete_instance()
if count == 1: if count == 1:
raise HTTPException(status_code=200, detail=f'Stat {stat_id} has been deleted') raise HTTPException(status_code=200, detail=f"Stat {stat_id} has been deleted")
else: else:
raise HTTPException(status_code=500, detail=f'Stat {stat_id} was not deleted') raise HTTPException(status_code=500, detail=f"Stat {stat_id} was not deleted")