fix: compute CSV after appending data row in get_one_player (#12)

return_val was assigned from DataFrame(data_list).to_csv() before the
player data row was appended to data_list, so the CSV response contained
only the header row. Moved the to_csv() call to after the append.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/db_engine.py

@@ -30,20 +30,20 @@ if DATABASE_TYPE.lower() == "postgresql":
         autorollback=True,  # Automatically rollback failed transactions
     )
 else:
-    # Default SQLite configuration for local development
+    # SQLite configuration for local development only.
+    # Production always uses PostgreSQL (see DATABASE_TYPE env var).
+    #
+    # synchronous=0 (OFF): SQLite skips fsync() after every write, maximising
+    # throughput at the cost of durability — a hard crash could corrupt the DB.
+    # This is an acceptable trade-off in dev where data loss is tolerable and
+    # write speed matters.  WAL journal mode reduces (but does not eliminate)
+    # the corruption window by keeping the main database file consistent while
+    # writes land in the WAL file first.
     db = SqliteDatabase(
         "storage/pd_master.db",
         pragmas={"journal_mode": "wal", "cache_size": -1 * 64000, "synchronous": 0},
     )
 
-date = f"{datetime.now().year}-{datetime.now().month}-{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 - database - %(levelname)s - %(message)s",
-    level=log_level,
-)
-
 # 2025, 2005
 ranked_cardsets = [24, 25, 26, 27, 28, 29]
 LIVE_CARDSET_ID = 27
@@ -925,7 +925,13 @@ CardPosition.add_index(pos_index)
 
 if not SKIP_TABLE_CREATION:
     db.create_tables(
-        [BattingCard, BattingCardRatings, PitchingCard, PitchingCardRatings, CardPosition],
+        [
+            BattingCard,
+            BattingCardRatings,
+            PitchingCard,
+            PitchingCardRatings,
+            CardPosition,
+        ],
         safe=True,
     )
 

app/dependencies.py

@@ -5,21 +5,6 @@ import os
 import requests
 from fastapi.security import OAuth2PasswordBearer
 
-date = f"{datetime.datetime.now().year}-{datetime.datetime.now().month}-{datetime.datetime.now().day}"
-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=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
-
-
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 master_debug = False
 DB_URL = "https://pd.manticorum.com/api/"

app/main.py

@@ -1,7 +1,18 @@
+import logging
+import os
+from datetime import datetime
+
 from fastapi import FastAPI, Request
 from fastapi.openapi.docs import get_swagger_ui_html
 from fastapi.openapi.utils import get_openapi
 
+_log_date = f"{datetime.now().year}-{datetime.now().month}-{datetime.now().day}"
+logging.basicConfig(
+    filename=f"logs/database/{_log_date}.log",
+    format="%(asctime)s - database - %(levelname)s - %(message)s",
+    level=logging.INFO if os.environ.get("LOG_LEVEL") == "INFO" else logging.WARNING,
+)
+
 # from fastapi.staticfiles import StaticFiles
 # from fastapi.templating import Jinja2Templates
 

app/routers_v2/admin.py

@@ -2,13 +2,8 @@ from fastapi import APIRouter, Depends, HTTPException
 import logging
 
 from ..db_engine import Player
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA, PRIVATE_IN_SCHEMA
+from ..dependencies import oauth2_scheme, valid_token, PRIVATE_IN_SCHEMA
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/admin',

app/routers_v2/awards.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Award, model_to_dict
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA, PRIVATE_IN_SCHEMA
+from ..dependencies import oauth2_scheme, valid_token, PRIVATE_IN_SCHEMA
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/awards',

app/routers_v2/batstats.py

@@ -7,13 +7,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import db, BattingStat, model_to_dict, fn, Card, Player, Current
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA, PRIVATE_IN_SCHEMA
+from ..dependencies import oauth2_scheme, valid_token, PRIVATE_IN_SCHEMA
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/batstats',

app/routers_v2/battingcardratings.py

@@ -18,13 +18,8 @@ from ..db_engine import (
     CardPosition,
 )
 from ..db_helpers import upsert_batting_card_ratings
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA, PRIVATE_IN_SCHEMA
+from ..dependencies import oauth2_scheme, valid_token, PRIVATE_IN_SCHEMA
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/battingcardratings", tags=["battingcardratings"])
 RATINGS_FILE = "storage/batting-ratings.csv"

app/routers_v2/battingcards.py

@@ -7,13 +7,8 @@ import pydantic
 
 from ..db_engine import db, BattingCard, model_to_dict, fn, Player, MlbPlayer
 from ..db_helpers import upsert_batting_cards
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/battingcards", tags=["battingcards"])
 

app/routers_v2/cardpositions.py

@@ -6,13 +6,8 @@ from pydantic import root_validator
 
 from ..db_engine import db, CardPosition, model_to_dict, Player, fn
 from ..db_helpers import upsert_card_positions
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/cardpositions", tags=["cardpositions"])
 

app/routers_v2/cards.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import db, Card, model_to_dict, Team, Player, Pack, Paperdex, CARDSETS
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/cards',

app/routers_v2/cardsets.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Cardset, model_to_dict, fn, Event
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/cardsets',

app/routers_v2/current.py

@@ -5,13 +5,8 @@ import logging
 import pydantic
 
 from ..db_engine import Current, model_to_dict
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA, PRIVATE_IN_SCHEMA
+from ..dependencies import oauth2_scheme, valid_token, PRIVATE_IN_SCHEMA
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/current',

app/routers_v2/decisions.py

@@ -16,13 +16,8 @@ from ..db_engine import (
     StratPlay,
 )
 from ..db_helpers import upsert_decisions
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/decisions", tags=["decisions"])
 

app/routers_v2/events.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Event, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/events',

app/routers_v2/gamerewards.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import GameRewards, model_to_dict
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/gamerewards',

app/routers_v2/gauntletrewards.py

@@ -5,13 +5,8 @@ import pydantic
 
 from ..db_engine import db, GauntletReward, model_to_dict, DatabaseError
 from ..db_helpers import upsert_gauntlet_rewards
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/gauntletrewards", tags=["gauntletrewards"])
 

app/routers_v2/gauntletruns.py

@@ -5,13 +5,8 @@ import logging
 import pydantic
 
 from ..db_engine import GauntletRun, model_to_dict, DatabaseError
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/gauntletruns',

app/routers_v2/mlbplayers.py

@@ -16,13 +16,8 @@ from ..db_engine import (
     query_to_csv,
 )
 from ..db_helpers import upsert_mlb_players
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/mlbplayers", tags=["mlbplayers"])
 

app/routers_v2/notifications.py

@@ -6,13 +6,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Notification, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/notifs',

app/routers_v2/packs.py

@@ -7,13 +7,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import db, Cardset, model_to_dict, Pack, Team, PackType
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/packs',
@@ -109,7 +104,7 @@ async def get_packs(
 
 
 @router.get('/{pack_id}')
-async def get_one_pack(pack_id, csv: Optional[bool] = False):
+async def get_one_pack(pack_id: int, csv: Optional[bool] = False):
     try:
         this_pack = Pack.get_by_id(pack_id)
     except Exception:

app/routers_v2/packtypes.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import PackType, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/packtypes',

app/routers_v2/paperdex.py

@@ -6,13 +6,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Paperdex, model_to_dict, Player, Cardset, Team
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/paperdex',

app/routers_v2/pitchingcardratings.py

@@ -19,13 +19,8 @@ from ..db_engine import (
     CardPosition,
 )
 from ..db_helpers import upsert_pitching_card_ratings
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/pitchingcardratings", tags=["pitchingcardratings"])
 RATINGS_FILE = "storage/pitching-ratings.csv"

app/routers_v2/pitchingcards.py

@@ -7,13 +7,8 @@ import pydantic
 
 from ..db_engine import db, PitchingCard, model_to_dict, Player, fn, MlbPlayer
 from ..db_helpers import upsert_pitching_cards
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/pitchingcards", tags=["pitchingcards"])
 

app/routers_v2/pitstats.py

@@ -6,13 +6,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import db, PitchingStat, model_to_dict, Card, Player, Current
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/pitstats',

app/routers_v2/players.py

@@ -28,7 +28,7 @@ from ..db_engine import (
     MlbPlayer,
 )
 from ..db_helpers import upsert_players
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
 # Franchise normalization: Convert city+team names to city-agnostic team names
 # This enables cross-era player matching (e.g., 'Oakland Athletics' -> 'Athletics')
@@ -73,11 +73,6 @@ def normalize_franchise(franchise: str) -> str:
     return FRANCHISE_NORMALIZE.get(titled, titled)
 
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/players", tags=["players"])
 
@@ -587,7 +582,7 @@ async def search_players(
 
 
 @router.get("/{player_id}")
-async def get_one_player(player_id, csv: Optional[bool] = False):
+async def get_one_player(player_id: int, csv: Optional[bool] = False):
     try:
         this_player = Player.get_by_id(player_id)
     except Exception:
@@ -1119,7 +1114,7 @@ async def post_image_reset(
 
 
 @router.delete("/{player_id}")
-async def delete_player(player_id, token: str = Depends(oauth2_scheme)):
+async def delete_player(player_id: int, token: str = Depends(oauth2_scheme)):
     if not valid_token(token):
         logging.warning(f"Bad Token: {token}")
         raise HTTPException(

app/routers_v2/rarity.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Rarity, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/rarities',

app/routers_v2/results.py

@@ -5,13 +5,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Result, model_to_dict, Team, DataError
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/results',

app/routers_v2/rewards.py

@@ -6,13 +6,8 @@ import pydantic
 from pandas import DataFrame
 
 from ..db_engine import Reward, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/rewards',

app/routers_v2/scouting.py

@@ -3,14 +3,9 @@ import logging
 import pydantic
 
 from ..db_engine import Player
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 from ..player_scouting import get_player_ids
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/scouting',

app/routers_v2/stratgame.py

@@ -5,13 +5,8 @@ import pandas as pd
 import pydantic
 
 from ..db_engine import StratGame, model_to_dict, fn
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA['filename'],
-    format=LOG_DATA['format'],
-    level=LOG_DATA['log_level']
-)
 
 router = APIRouter(
     prefix='/api/v2/games',

app/routers_v2/stratplays.py

@@ -19,13 +19,8 @@ from ..db_engine import (
     Decision,
 )
 from ..db_helpers import upsert_strat_plays
-from ..dependencies import oauth2_scheme, valid_token, LOG_DATA
+from ..dependencies import oauth2_scheme, valid_token
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/plays", tags=["plays"])
 

app/routers_v2/teams.py

@@ -35,15 +35,9 @@ from ..db_engine import (
 from ..dependencies import (
     oauth2_scheme,
     valid_token,
-    LOG_DATA,
     PRIVATE_IN_SCHEMA,
 )
 
-logging.basicConfig(
-    filename=LOG_DATA["filename"],
-    format=LOG_DATA["format"],
-    level=LOG_DATA["log_level"],
-)
 
 router = APIRouter(prefix="/api/v2/teams", tags=["teams"])
 
@@ -138,9 +132,6 @@ async def get_teams(
     if ranking_max is not None:
         all_teams = all_teams.where(Team.ranking <= ranking_max)
 
-    if ranking_max is not None:
-        all_teams = all_teams.where(Team.ranking <= ranking_max)
-
     if has_guide is not None:
         # Use boolean comparison (PostgreSQL-compatible)
         if not has_guide:
@@ -176,7 +167,7 @@ async def get_teams(
 
 
 @router.get("/{team_id}")
-async def get_one_team(team_id, inc_packs: bool = True, csv: Optional[bool] = False):
+async def get_one_team(team_id: int, inc_packs: bool = True, csv: Optional[bool] = False):
     try:
         this_team = Team.get_by_id(team_id)
     except Exception:
@@ -282,7 +273,6 @@ def get_scouting_dfs(allowed_players, position: str):
             )
         )
 
-
     def get_total_ops(df_data):
         ops_vl = df_data["obp_vl"] + df_data["slg_vl"]
         ops_vr = df_data["obp_vr"] + df_data["slg_vr"]
@@ -590,16 +580,21 @@ def sort_pitchers(pitching_card_query) -> DataFrame | None:
     pitcher_df = pd.DataFrame(all_s).set_index("player", drop=False)
     logging.debug(f"pitcher_df: {pitcher_df}")
 
-    def get_total_ops(df_data):
-        vlval = PitchingCardRatings.get_or_none(
-            PitchingCardRatings.pitchingcard_id == df_data["id"],
-            PitchingCardRatings.vs_hand == "L",
-        )
-        vrval = PitchingCardRatings.get_or_none(
-            PitchingCardRatings.pitchingcard_id == df_data["id"],
-            PitchingCardRatings.vs_hand == "R",
+    card_ids = pitcher_df["id"].tolist()
+    ratings_map = {
+        (r.pitchingcard_id, r.vs_hand): r
+        for r in PitchingCardRatings.select().where(
+            (PitchingCardRatings.pitchingcard_id << card_ids)
+            & (PitchingCardRatings.vs_hand << ["L", "R"])
         )
+    }
 
+    def get_total_ops(df_data):
+        vlval = ratings_map.get((df_data["id"], "L"))
+        vrval = ratings_map.get((df_data["id"], "R"))
+
+        if vlval is None or vrval is None:
+            return float("inf")
         ops_vl = vlval.obp + vlval.slg
         ops_vr = vrval.obp + vrval.slg
         # TODO: should this be max??
@@ -667,16 +662,21 @@ async def get_team_sp(
         starter_df = pd.DataFrame(all_s).set_index("player", drop=False)
         logging.debug(f"starter_df: {starter_df}")
 
-        def get_total_ops(df_data):
-            vlval = PitchingCardRatings.get_or_none(
-                PitchingCardRatings.pitchingcard_id == df_data["id"],
-                PitchingCardRatings.vs_hand == "L",
-            )
-            vrval = PitchingCardRatings.get_or_none(
-                PitchingCardRatings.pitchingcard_id == df_data["id"],
-                PitchingCardRatings.vs_hand == "R",
+        card_ids = starter_df["id"].tolist()
+        ratings_map = {
+            (r.pitchingcard_id, r.vs_hand): r
+            for r in PitchingCardRatings.select().where(
+                (PitchingCardRatings.pitchingcard_id << card_ids)
+                & (PitchingCardRatings.vs_hand << ["L", "R"])
             )
+        }
 
+        def get_total_ops(df_data):
+            vlval = ratings_map.get((df_data["id"], "L"))
+            vrval = ratings_map.get((df_data["id"], "R"))
+
+            if vlval is None or vrval is None:
+                return float("inf")
             ops_vl = vlval.obp + vlval.slg
             ops_vr = vrval.obp + vrval.slg
             return (ops_vr + ops_vl + min(ops_vl, ops_vr)) / 3