cal/major-domo-database
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added logging to dependencies, added week parameter to stats/totals

Browse Source
This commit is contained in:
Cal Corum 2023-05-27 11:16:52 -05:00
parent c8aad86d3d
commit 8f53d83d9e
4 changed files with 136 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/dependencies.py
View File

@ -5,13 +5,27 @@ import os
from fastapi.security import OAuth2PasswordBearer
date = f'{datetime.datetime.now().year}-{datetime.datetime.now().month}-{datetime.datetime.now().day}'
log_level = logging.INFO if os.environ.get('LOG_LEVEL') == 'INFO' else 'WARN'
LOG_DATA = {
'filename': f'logs/database/{date}.log',
'format': '%(asctime)s - database - %(levelname)s - %(message)s',
'log_level': logging.INFO if os.environ.get('LOG_LEVEL') == 'INFO' else 'WARN'
}
logging.basicConfig(
filename=f'logs/database/{date}.log',
format='%(asctime)s - database - %(levelname)s - %(message)s',
level=log_level
filename=LOG_DATA['filename'],
format=LOG_DATA['format'],
level=LOG_DATA['log_level']
)
# date = f'{datetime.datetime.now().year}-{datetime.datetime.now().month}-{datetime.datetime.now().day}'
# log_level = logging.INFO if os.environ.get('LOG_LEVEL') == 'INFO' else 'WARN'
# logging.basicConfig(
# filename=f'logs/database/{date}.log',
# format='%(asctime)s - sba-database - %(levelname)s - %(message)s',
# level=log_level
# )
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")

63
app/routers_v3/battingstats.py
View File

@ -4,7 +4,9 @@ import logging
import pydantic
from ..db_engine import db, BattingStat, Team, Player, Current, model_to_dict, chunked, fn, per_season_weeks
from ..dependencies import oauth2_scheme, valid_token
from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
logging.basicConfig(filename=LOG_DATA['filename'], format=LOG_DATA['format'], level=LOG_DATA['log_level'])
router = APIRouter(
prefix='/api/v3/battingstats',
@ -134,18 +136,9 @@ async def get_totalstats(
week_start: Optional[int] = None, week_end: Optional[int] = None, game_num: list = Query(default=None),
position: list = Query(default=None), sort: Optional[str] = None, player_id: list = Query(default=None),
group_by: Literal['team', 'player', 'playerteam'] = 'player', short_output: Optional[bool] = False,
min_pa: Optional[int] = 1):
if s_type is not None:
weeks = per_season_weeks(season, s_type)
else:
weeks = {'start': 1, 'end': 99}
if week_start is not None:
weeks['start'] = week_start
if week_end is not None:
if week_end < weeks['start']:
raise HTTPException(status_code=400, detail='week_end must be greater than or equal to week_start')
else:
weeks['end'] = week_end
min_pa: Optional[int] = 1, week: list = Query(default=None)):
if sum(1 for x in [s_type, (week_start or week_end), week] if x is not None) > 1:
raise HTTPException(status_code=400, detail=f'Only one of s_type, week_start/week_end, or week may be used.')
all_stats = (
BattingStat
@ -166,13 +159,31 @@ async def get_totalstats(
fn.SUM(BattingStat.roba).alias('sum_roba'), fn.SUM(BattingStat.robs).alias('sum_robs'),
fn.SUM(BattingStat.raa).alias('sum_raa'), fn.SUM(BattingStat.rto).alias('sum_rto'),
BattingStat.team)
.where((BattingStat.week >= weeks['start']) & (BattingStat.week <= weeks['end']) &
(BattingStat.season == season))
.where(BattingStat.season == season)
.having(fn.SUM(BattingStat.pa) >= min_pa)
)
# if min_pa is not None:
# all_stats = all_stats.having(fn.SUM(BattingStat.pa) >= min_pa)
if True in [s_type is not None, week_start is not None, week_end is not None]:
weeks = {}
if s_type is not None:
weeks = per_season_weeks(season, s_type)
elif week_start is not None or week_end is not None:
if week_start is None or week_end is None:
raise HTTPException(
status_code=400, detail='Both week_start and week_end must be included if either is used.'
)
weeks['start'] = week_start
if week_end < weeks['start']:
raise HTTPException(status_code=400, detail='week_end must be greater than or equal to week_start')
else:
weeks['end'] = week_end
all_stats = all_stats.where(
(BattingStat.week >= weeks['start']) & (BattingStat.week <= weeks['end'])
)
elif week is not None:
all_stats = all_stats.where(BattingStat.week << week)
if game_num is not None:
all_stats = all_stats.where(BattingStat.game << game_num)
if position is not None:
@ -216,7 +227,7 @@ async def get_totalstats(
all_stats = all_stats.where(BattingStat.player << all_players)
return_stats = {
'count': sum(1 for i in all_stats if i.sum_pa > 0),
'count': all_stats.count(),
'stats': [{
'player': x.player_id if short_output else model_to_dict(x.player, recurse=False),
'team': x.team_id if short_output else model_to_dict(x.team, recurse=False),
@ -239,20 +250,8 @@ async def get_totalstats(
'bphr': x.sum_bphr,
'bpfo': x.sum_bpfo,
'bp1b': x.sum_bp1b,
'bplo': x.sum_bplo,
'xba': x.sum_xba,
'xbt': x.sum_xbt,
'xch': x.sum_xch,
'xhit': x.sum_xhit,
'error': x.sum_error,
'pb': x.sum_pb,
'sbc': x.sum_sbc,
'csc': x.sum_csc,
'roba': x.sum_roba,
'robs': x.sum_robs,
'raa': x.sum_raa,
'rto': x.sum_rto,
} for x in all_stats if x.sum_pa > 0]
'bplo': x.sum_bplo
} for x in all_stats]
}
db.close()
return return_stats

42
app/routers_v3/fieldingstats.py
View File

@ -4,7 +4,9 @@ import logging
import pydantic
from ..db_engine import db, BattingStat, Team, Player, Current, model_to_dict, chunked, fn, per_season_weeks
from ..dependencies import oauth2_scheme, valid_token
from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
logging.basicConfig(filename=LOG_DATA['filename'], format=LOG_DATA['format'], level=LOG_DATA['log_level'])
router = APIRouter(
prefix='/api/v3/fieldingstats',
@ -104,18 +106,7 @@ async def get_totalstats(
week_start: Optional[int] = None, week_end: Optional[int] = None, game_num: list = Query(default=None),
position: list = Query(default=None), sort: Optional[str] = None, player_id: list = Query(default=None),
group_by: Literal['team', 'player', 'playerteam'] = 'player', short_output: Optional[bool] = False,
min_ch: Optional[int] = 1):
if s_type is not None:
weeks = per_season_weeks(season, s_type)
else:
weeks = {'start': 1, 'end': 99}
if week_start is not None:
weeks['start'] = week_start
if week_end is not None:
if week_end < weeks['start']:
raise HTTPException(status_code=400, detail='week_end must be greater than or equal to week_start')
else:
weeks['end'] = week_end
min_ch: Optional[int] = 1, week: list = Query(default=None)):
all_stats = (
BattingStat
@ -123,11 +114,32 @@ async def get_totalstats(
fn.SUM(BattingStat.xhit).alias('sum_xhit'), fn.SUM(BattingStat.error).alias('sum_error'),
fn.SUM(BattingStat.pb).alias('sum_pb'), fn.SUM(BattingStat.sbc).alias('sum_sbc'),
fn.SUM(BattingStat.csc).alias('sum_csc'), BattingStat.team)
.where((BattingStat.week >= weeks['start']) & (BattingStat.week <= weeks['end']) &
(BattingStat.season == season))
.where(BattingStat.season == season)
.having(fn.SUM(BattingStat.xch) >= min_ch)
)
if True in [s_type is not None, week_start is not None, week_end is not None]:
weeks = {}
if s_type is not None:
weeks = per_season_weeks(season, s_type)
elif week_start is not None or week_end is not None:
if week_start is None or week_end is None:
raise HTTPException(
status_code=400, detail='Both week_start and week_end must be included if either is used.'
)
weeks['start'] = week_start
if week_end < weeks['start']:
raise HTTPException(status_code=400, detail='week_end must be greater than or equal to week_start')
else:
weeks['end'] = week_end
all_stats = all_stats.where(
(BattingStat.week >= weeks['start']) & (BattingStat.week <= weeks['end'])
)
elif week is not None:
all_stats = all_stats.where(BattingStat.week << week)
if game_num is not None:
all_stats = all_stats.where(BattingStat.game << game_num)
if position is not None:

75
app/routers_v3/pitchingstats.py
View File

@ -1,10 +1,15 @@
import datetime
import os
from fastapi import APIRouter, Depends, HTTPException, Query
from typing import List, Optional, Literal
import logging
import pydantic
from ..db_engine import db, PitchingStat, Team, Player, Current, model_to_dict, chunked, fn, per_season_weeks
from ..dependencies import oauth2_scheme, valid_token
from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
logging.basicConfig(filename=LOG_DATA['filename'], format=LOG_DATA['format'], level=LOG_DATA['log_level'])
router = APIRouter(
prefix='/api/v3/pitchingstats',
@ -108,12 +113,17 @@ async def get_pitstats(
return return_stats
@router.get('/season/{season}')
async def get_seasonstats(
season: int, s_type: Literal['regular', 'post', 'total'] = 'regular', team_abbrev: list = Query(default=None),
@router.get('/totals')
async def get_totalstats(
season: int, s_type: Literal['regular', 'post', 'total', None] = None, team_abbrev: list = Query(default=None),
team_id: list = Query(default=None), player_name: list = Query(default=None),
player_id: list = Query(default=None), full_player: Optional[bool] = False):
weeks = per_season_weeks(season, s_type)
week_start: Optional[int] = None, week_end: Optional[int] = None, game_num: list = Query(default=None),
is_sp: Optional[bool] = None, min_ip: Optional[float] = 0.25, sort: Optional[str] = None,
player_id: list = Query(default=None), short_output: Optional[bool] = False,
group_by: Literal['team', 'player', 'playerteam'] = 'player', week: list = Query(default=None)):
if sum(1 for x in [s_type, (week_start or week_end), week] if x is not None) > 1:
raise HTTPException(status_code=400, detail=f'Only one of s_type, week_start/week_end, or week may be used.')
all_stats = (
PitchingStat
.select(PitchingStat.player, fn.SUM(PitchingStat.ip).alias('sum_ip'),
@ -125,26 +135,58 @@ async def get_seasonstats(
fn.SUM(PitchingStat.win).alias('sum_win'), fn.SUM(PitchingStat.loss).alias('sum_loss'),
fn.SUM(PitchingStat.hold).alias('sum_hold'), fn.SUM(PitchingStat.sv).alias('sum_sv'),
fn.SUM(PitchingStat.bsv).alias('sum_bsv'), fn.SUM(PitchingStat.irs).alias('sum_irs'),
fn.SUM(PitchingStat.gs).alias('sum_gs'))
.where((PitchingStat.week >= weeks['start']) & (PitchingStat.week <= weeks['end']) &
(PitchingStat.season == season))
.order_by(PitchingStat.player)
.group_by(PitchingStat.player)
fn.SUM(PitchingStat.gs).alias('sum_gs'), PitchingStat.team)
.where(PitchingStat.season == season)
.having(fn.SUM(PitchingStat.ip) >= min_ip)
)
if team_abbrev is None and team_id is None and player_name is None and player_id is None:
if True in [s_type is not None, week_start is not None, week_end is not None]:
weeks = {}
if s_type is not None:
weeks = per_season_weeks(season, s_type)
elif week_start is not None or week_end is not None:
if week_start is None or week_end is None:
raise HTTPException(
status_code=400,
detail=f'Must include team_id/team_abbrev and/or player_name/player_id'
status_code=400, detail='Both week_start and week_end must be included if either is used.'
)
weeks['start'] = week_start
if week_end < weeks['start']:
raise HTTPException(status_code=400, detail='week_end must be greater than or equal to week_start')
else:
weeks['end'] = week_end
all_stats = all_stats.where(
(PitchingStat.week >= weeks['start']) & (PitchingStat.week <= weeks['end'])
)
elif week is not None:
all_stats = all_stats.where(PitchingStat.week << week)
if game_num is not None:
all_stats = all_stats.where(PitchingStat.game << game_num)
if is_sp is not None:
if is_sp:
all_stats = all_stats.where(PitchingStat.gs == 1)
if not is_sp:
all_stats = all_stats.where(PitchingStat.gs == 0)
if sort is not None:
if sort == 'player':
all_stats = all_stats.order_by(PitchingStat.player)
elif sort == 'team':
all_stats = all_stats.order_by(PitchingStat.team)
if group_by is not None:
if group_by == 'team':
all_stats = all_stats.group_by(PitchingStat.team)
elif group_by == 'player':
all_stats = all_stats.group_by(PitchingStat.player)
elif group_by == 'playerteam':
all_stats = all_stats.group_by(PitchingStat.team, PitchingStat.player)
if team_id is not None:
all_teams = Team.select().where(Team.id << team_id)
all_stats = all_stats.where(PitchingStat.team << all_teams)
elif team_abbrev is not None:
all_teams = Team.select().where(fn.Lower(Team.abbrev) << [x.lower() for x in team_abbrev])
all_stats = all_stats.where(PitchingStat.team << all_teams)
if player_name is not None:
all_players = Player.select().where(fn.Lower(Player.name) << [x.lower() for x in player_name])
all_stats = all_stats.where(PitchingStat.player << all_players)
@ -155,7 +197,8 @@ async def get_seasonstats(
return_stats = {
'count': all_stats.count(),
'stats': [{
'player': model_to_dict(x.player, recurse=False) if full_player else x.player_id,
'player': x.player_id if short_output else model_to_dict(x.player, recurse=False),
'team': x.team_id if short_output else model_to_dict(x.team, recurse=False),
'ip': x.sum_ip,
'hit': x.sum_hit,
'run': x.sum_run,