Compare commits
34 Commits
feature/re
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 19003215a3 | |||
|
|
73be3dd6f3 | ||
| 35fbe2082d | |||
|
|
a105d5412a | ||
| 85f6783eea | |||
|
|
1fd681d595 | ||
| 7cb998561e | |||
|
|
321efa4909 | ||
| 0dc096be93 | |||
|
|
20f7ac5958 | ||
| 67d1f10455 | |||
|
|
30b5eefa29 | ||
| 02da6f9cc8 | |||
|
|
543c8cddf6 | ||
|
|
fac9f66b3e | ||
|
|
c75e2781be | ||
|
|
f4a90da629 | ||
|
|
be8bebe663 | ||
|
|
4ccc0841a8 | ||
|
|
534d50f1a8 | ||
|
|
088d30b96b | ||
| abb1c71f0a | |||
|
|
bf3a8ca0d5 | ||
|
|
bbb5689b1f | ||
|
|
0d009eb1f8 | ||
| ad5d5561c6 | |||
|
|
dc9269eeed | ||
| 3e84a06b23 | |||
|
|
d92ab86aa7 | ||
|
|
830e703e76 | ||
|
|
b32e19a4ac | ||
| ffe07ec54c | |||
|
|
add175e528 | ||
| 31c86525de |
31
.githooks/install-hooks.sh
Executable file
31
.githooks/install-hooks.sh
Executable file
@ -0,0 +1,31 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Install git hooks for this repository
|
||||
#
|
||||
|
||||
REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
|
||||
|
||||
if [ -z "$REPO_ROOT" ]; then
|
||||
echo "Error: Not in a git repository"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
HOOKS_DIR="$REPO_ROOT/.githooks"
|
||||
GIT_HOOKS_DIR="$REPO_ROOT/.git/hooks"
|
||||
|
||||
echo "Installing git hooks..."
|
||||
|
||||
if [ -f "$HOOKS_DIR/pre-commit" ]; then
|
||||
cp "$HOOKS_DIR/pre-commit" "$GIT_HOOKS_DIR/pre-commit"
|
||||
chmod +x "$GIT_HOOKS_DIR/pre-commit"
|
||||
echo "Installed pre-commit hook"
|
||||
else
|
||||
echo "pre-commit hook not found in $HOOKS_DIR"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "The pre-commit hook will:"
|
||||
echo " - Auto-fix ruff lint violations (unused imports, formatting, etc.)"
|
||||
echo " - Block commits only on truly unfixable issues"
|
||||
echo ""
|
||||
echo "To bypass in emergency: git commit --no-verify"
|
||||
53
.githooks/pre-commit
Executable file
53
.githooks/pre-commit
Executable file
@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Pre-commit hook: ruff lint check on staged Python files.
|
||||
# Catches syntax errors, unused imports, and basic issues before commit.
|
||||
# To bypass in emergency: git commit --no-verify
|
||||
#
|
||||
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m'
|
||||
|
||||
REPO_ROOT=$(git rev-parse --show-toplevel)
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
STAGED_PY=$(git diff --cached --name-only --diff-filter=ACM -z -- '*.py')
|
||||
if [ -z "$STAGED_PY" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "ruff check on staged files..."
|
||||
|
||||
# Stash unstaged changes so ruff only operates on staged content.
|
||||
# Without this, ruff --fix runs on the full working tree file (staged +
|
||||
# unstaged), and the subsequent git add would silently include unstaged
|
||||
# changes in the commit — breaking git add -p workflows.
|
||||
STASHED=0
|
||||
if git stash --keep-index -q 2>/dev/null; then
|
||||
STASHED=1
|
||||
fi
|
||||
|
||||
# Auto-fix what we can, then re-stage the fixed files
|
||||
printf '%s' "$STAGED_PY" | xargs -0 ruff check --fix --exit-zero
|
||||
printf '%s' "$STAGED_PY" | xargs -0 git add
|
||||
|
||||
# Restore unstaged changes
|
||||
if [ $STASHED -eq 1 ]; then
|
||||
git stash pop -q
|
||||
fi
|
||||
|
||||
# Now check for remaining unfixable issues
|
||||
printf '%s' "$STAGED_PY" | xargs -0 ruff check
|
||||
RUFF_EXIT=$?
|
||||
|
||||
if [ $RUFF_EXIT -ne 0 ]; then
|
||||
echo ""
|
||||
echo -e "${RED}Pre-commit checks failed (unfixable issues). Commit blocked.${NC}"
|
||||
echo -e "${YELLOW}To bypass (not recommended): git commit --no-verify${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}All checks passed.${NC}"
|
||||
exit 0
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -59,6 +59,8 @@ pyenv.cfg
|
||||
pyvenv.cfg
|
||||
docker-compose.override.yml
|
||||
docker-compose.*.yml
|
||||
.run-local.pid
|
||||
.env.local
|
||||
*.db
|
||||
venv
|
||||
.claude/
|
||||
|
||||
@ -31,7 +31,7 @@ docker build -t paper-dynasty-db . # Build image
|
||||
| **URL** | pddev.manticorum.com | pd.manticorum.com |
|
||||
| **Host** | `ssh pd-database` | `ssh akamai` → `/root/container-data/paper-dynasty` |
|
||||
| **API container** | `dev_pd_database` | `pd_api` |
|
||||
| **PostgreSQL** | `pd_postgres` (port 5432) | `pd_postgres` |
|
||||
| **PostgreSQL** | `sba_postgres` / `paperdynasty_dev` / `sba_admin` | `pd_postgres` / `pd_master` |
|
||||
| **Adminer** | port 8081 | — |
|
||||
| **API port** | 816 | 815 |
|
||||
| **Image** | `manticorum67/paper-dynasty-database` | `manticorum67/paper-dynasty-database` |
|
||||
|
||||
@ -1257,50 +1257,15 @@ refractor_card_state_team_index = ModelIndex(
|
||||
RefractorCardState.add_index(refractor_card_state_team_index)
|
||||
|
||||
|
||||
class RefractorTierBoost(BaseModel):
|
||||
track = ForeignKeyField(RefractorTrack)
|
||||
tier = IntegerField() # 1-4
|
||||
boost_type = CharField() # e.g. 'rating', 'stat'
|
||||
boost_target = CharField() # e.g. 'contact_vl', 'power_vr'
|
||||
boost_value = FloatField(default=0.0)
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
table_name = "refractor_tier_boost"
|
||||
|
||||
|
||||
refractor_tier_boost_index = ModelIndex(
|
||||
RefractorTierBoost,
|
||||
(
|
||||
RefractorTierBoost.track,
|
||||
RefractorTierBoost.tier,
|
||||
RefractorTierBoost.boost_type,
|
||||
RefractorTierBoost.boost_target,
|
||||
),
|
||||
unique=True,
|
||||
)
|
||||
RefractorTierBoost.add_index(refractor_tier_boost_index)
|
||||
|
||||
|
||||
class RefractorCosmetic(BaseModel):
|
||||
name = CharField(unique=True)
|
||||
tier_required = IntegerField(default=0)
|
||||
cosmetic_type = CharField() # 'frame', 'badge', 'theme'
|
||||
css_class = CharField(null=True)
|
||||
asset_url = CharField(null=True)
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
table_name = "refractor_cosmetic"
|
||||
|
||||
|
||||
class RefractorBoostAudit(BaseModel):
|
||||
card_state = ForeignKeyField(RefractorCardState, on_delete="CASCADE")
|
||||
tier = IntegerField() # 1-4
|
||||
battingcard = ForeignKeyField(BattingCard, null=True)
|
||||
pitchingcard = ForeignKeyField(PitchingCard, null=True)
|
||||
variant_created = IntegerField()
|
||||
boost_delta_json = TextField() # JSONB in PostgreSQL; TextField for SQLite test compat
|
||||
boost_delta_json = (
|
||||
TextField()
|
||||
) # JSONB in PostgreSQL; TextField for SQLite test compat
|
||||
applied_at = DateTimeField(default=datetime.now)
|
||||
|
||||
class Meta:
|
||||
@ -1313,8 +1278,6 @@ if not SKIP_TABLE_CREATION:
|
||||
[
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
RefractorBoostAudit,
|
||||
],
|
||||
safe=True,
|
||||
|
||||
@ -2,7 +2,15 @@ import datetime
|
||||
import os.path
|
||||
|
||||
import pandas as pd
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, Response, Query
|
||||
from fastapi import (
|
||||
APIRouter,
|
||||
BackgroundTasks,
|
||||
Depends,
|
||||
HTTPException,
|
||||
Request,
|
||||
Response,
|
||||
Query,
|
||||
)
|
||||
from fastapi.responses import FileResponse
|
||||
from fastapi.templating import Jinja2Templates
|
||||
from typing import Optional, List, Literal
|
||||
@ -32,6 +40,9 @@ from ..db_engine import (
|
||||
)
|
||||
from ..db_helpers import upsert_players
|
||||
from ..dependencies import oauth2_scheme, valid_token
|
||||
from ..services.card_storage import backfill_variant_image_url
|
||||
from ..services.refractor_boost import compute_variant_hash
|
||||
from ..services.apng_generator import apng_cache_path, generate_animated_card
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Persistent browser instance (WP-02)
|
||||
@ -132,6 +143,19 @@ def normalize_franchise(franchise: str) -> str:
|
||||
return FRANCHISE_NORMALIZE.get(titled, titled)
|
||||
|
||||
|
||||
def resolve_refractor_tier(player_id: int, variant: int) -> int:
|
||||
"""Determine the refractor tier (0-4) from a player's variant hash.
|
||||
|
||||
Pure math — no DB query needed. Returns 0 for base cards or unknown variants.
|
||||
"""
|
||||
if variant == 0:
|
||||
return 0
|
||||
for tier in range(1, 5):
|
||||
if compute_variant_hash(player_id, tier) == variant:
|
||||
return tier
|
||||
return 0
|
||||
|
||||
|
||||
router = APIRouter(prefix="/api/v2/players", tags=["players"])
|
||||
|
||||
|
||||
@ -713,16 +737,146 @@ async def get_one_player(player_id: int, csv: Optional[bool] = False):
|
||||
return return_val
|
||||
|
||||
|
||||
@router.get("/{player_id}/{card_type}card/{d}/{variant}/animated")
|
||||
async def get_animated_card(
|
||||
request: Request,
|
||||
player_id: int,
|
||||
card_type: Literal["batting", "pitching"],
|
||||
variant: int,
|
||||
d: str,
|
||||
tier: Optional[int] = Query(
|
||||
None, ge=0, le=4, description="Override refractor tier for preview (dev only)"
|
||||
),
|
||||
):
|
||||
try:
|
||||
this_player = Player.get_by_id(player_id)
|
||||
except DoesNotExist:
|
||||
raise HTTPException(
|
||||
status_code=404, detail=f"No player found with id {player_id}"
|
||||
)
|
||||
|
||||
refractor_tier = (
|
||||
tier if tier is not None else resolve_refractor_tier(player_id, variant)
|
||||
)
|
||||
if refractor_tier < 3:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=f"No animation for tier {refractor_tier}; animated cards require T3 or T4",
|
||||
)
|
||||
|
||||
cache_path = apng_cache_path(
|
||||
this_player.cardset.id, card_type, player_id, d, variant
|
||||
)
|
||||
headers = {"Cache-Control": "public, max-age=86400"}
|
||||
|
||||
if os.path.isfile(cache_path) and tier is None:
|
||||
return FileResponse(path=cache_path, media_type="image/png", headers=headers)
|
||||
|
||||
all_pos = (
|
||||
CardPosition.select()
|
||||
.where(CardPosition.player == this_player)
|
||||
.order_by(CardPosition.innings.desc())
|
||||
)
|
||||
|
||||
if card_type == "batting":
|
||||
this_bc = BattingCard.get_or_none(
|
||||
BattingCard.player == this_player, BattingCard.variant == variant
|
||||
)
|
||||
if this_bc is None:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=f"Batting card not found for id {player_id}, variant {variant}",
|
||||
)
|
||||
rating_vl = BattingCardRatings.get_or_none(
|
||||
BattingCardRatings.battingcard == this_bc, BattingCardRatings.vs_hand == "L"
|
||||
)
|
||||
rating_vr = BattingCardRatings.get_or_none(
|
||||
BattingCardRatings.battingcard == this_bc, BattingCardRatings.vs_hand == "R"
|
||||
)
|
||||
if None in [rating_vr, rating_vl]:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=f"Ratings not found for batting card {this_bc.id}",
|
||||
)
|
||||
card_data = get_batter_card_data(
|
||||
this_player, this_bc, rating_vl, rating_vr, all_pos
|
||||
)
|
||||
if (
|
||||
this_player.description in this_player.cardset.name
|
||||
and this_player.cardset.id not in [23]
|
||||
):
|
||||
card_data["cardset_name"] = this_player.cardset.name
|
||||
else:
|
||||
card_data["cardset_name"] = this_player.description
|
||||
card_data["refractor_tier"] = refractor_tier
|
||||
card_data["request"] = request
|
||||
html_response = templates.TemplateResponse("player_card.html", card_data)
|
||||
|
||||
else:
|
||||
this_pc = PitchingCard.get_or_none(
|
||||
PitchingCard.player == this_player, PitchingCard.variant == variant
|
||||
)
|
||||
if this_pc is None:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=f"Pitching card not found for id {player_id}, variant {variant}",
|
||||
)
|
||||
rating_vl = PitchingCardRatings.get_or_none(
|
||||
PitchingCardRatings.pitchingcard == this_pc,
|
||||
PitchingCardRatings.vs_hand == "L",
|
||||
)
|
||||
rating_vr = PitchingCardRatings.get_or_none(
|
||||
PitchingCardRatings.pitchingcard == this_pc,
|
||||
PitchingCardRatings.vs_hand == "R",
|
||||
)
|
||||
if None in [rating_vr, rating_vl]:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=f"Ratings not found for pitching card {this_pc.id}",
|
||||
)
|
||||
card_data = get_pitcher_card_data(
|
||||
this_player, this_pc, rating_vl, rating_vr, all_pos
|
||||
)
|
||||
if (
|
||||
this_player.description in this_player.cardset.name
|
||||
and this_player.cardset.id not in [23]
|
||||
):
|
||||
card_data["cardset_name"] = this_player.cardset.name
|
||||
else:
|
||||
card_data["cardset_name"] = this_player.description
|
||||
card_data["refractor_tier"] = refractor_tier
|
||||
card_data["request"] = request
|
||||
html_response = templates.TemplateResponse("player_card.html", card_data)
|
||||
|
||||
browser = await get_browser()
|
||||
page = await browser.new_page(viewport={"width": 1280, "height": 720})
|
||||
try:
|
||||
await generate_animated_card(
|
||||
page,
|
||||
html_response.body.decode("UTF-8"),
|
||||
cache_path,
|
||||
refractor_tier,
|
||||
)
|
||||
finally:
|
||||
await page.close()
|
||||
|
||||
return FileResponse(path=cache_path, media_type="image/png", headers=headers)
|
||||
|
||||
|
||||
@router.get("/{player_id}/{card_type}card")
|
||||
@router.get("/{player_id}/{card_type}card/{d}")
|
||||
@router.get("/{player_id}/{card_type}card/{d}/{variant}")
|
||||
async def get_batter_card(
|
||||
request: Request,
|
||||
background_tasks: BackgroundTasks,
|
||||
player_id: int,
|
||||
card_type: Literal["batting", "pitching"],
|
||||
variant: int = 0,
|
||||
d: str = None,
|
||||
html: Optional[bool] = False,
|
||||
tier: Optional[int] = Query(
|
||||
None, ge=0, le=4, description="Override refractor tier for preview (dev only)"
|
||||
),
|
||||
):
|
||||
try:
|
||||
this_player = Player.get_by_id(player_id)
|
||||
@ -740,6 +894,7 @@ async def get_batter_card(
|
||||
f"storage/cards/cardset-{this_player.cardset.id}/{card_type}/{player_id}-{d}-v{variant}.png"
|
||||
)
|
||||
and html is False
|
||||
and tier is None
|
||||
):
|
||||
return FileResponse(
|
||||
path=f"storage/cards/cardset-{this_player.cardset.id}/{card_type}/{player_id}-{d}-v{variant}.png",
|
||||
@ -786,6 +941,9 @@ async def get_batter_card(
|
||||
card_data["cardset_name"] = this_player.cardset.name
|
||||
else:
|
||||
card_data["cardset_name"] = this_player.description
|
||||
card_data["refractor_tier"] = (
|
||||
tier if tier is not None else resolve_refractor_tier(player_id, variant)
|
||||
)
|
||||
card_data["request"] = request
|
||||
html_response = templates.TemplateResponse("player_card.html", card_data)
|
||||
|
||||
@ -823,6 +981,9 @@ async def get_batter_card(
|
||||
card_data["cardset_name"] = this_player.cardset.name
|
||||
else:
|
||||
card_data["cardset_name"] = this_player.description
|
||||
card_data["refractor_tier"] = (
|
||||
tier if tier is not None else resolve_refractor_tier(player_id, variant)
|
||||
)
|
||||
card_data["request"] = request
|
||||
html_response = templates.TemplateResponse("player_card.html", card_data)
|
||||
|
||||
@ -882,6 +1043,27 @@ async def get_batter_card(
|
||||
# save_as=f'{player_id}-{d}-v{variant}.png'
|
||||
# )
|
||||
|
||||
# Schedule S3 upload for variant cards that don't have an image_url yet.
|
||||
# Skip when tier is overridden (?tier= dev preview) — those renders don't
|
||||
# correspond to real variant card rows.
|
||||
if variant > 0 and tier is None:
|
||||
CardModel = BattingCard if card_type == "batting" else PitchingCard
|
||||
try:
|
||||
card_row = CardModel.get(
|
||||
(CardModel.player_id == player_id) & (CardModel.variant == variant)
|
||||
)
|
||||
if card_row.image_url is None:
|
||||
background_tasks.add_task(
|
||||
backfill_variant_image_url,
|
||||
player_id=player_id,
|
||||
variant=variant,
|
||||
card_type=card_type,
|
||||
cardset_id=this_player.cardset.id,
|
||||
png_path=file_path,
|
||||
)
|
||||
except CardModel.DoesNotExist:
|
||||
pass
|
||||
|
||||
return FileResponse(path=file_path, media_type="image/png", headers=headers)
|
||||
|
||||
|
||||
|
||||
@ -4,8 +4,9 @@ from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from ..db_engine import model_to_dict
|
||||
from ..db_engine import model_to_dict, BattingCard, PitchingCard
|
||||
from ..dependencies import oauth2_scheme, valid_token
|
||||
from ..services.refractor_init import initialize_card_refractor, _determine_card_type
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@ -66,6 +67,24 @@ def _build_card_state_response(state, player_name=None) -> dict:
|
||||
if player_name is not None:
|
||||
result["player_name"] = player_name
|
||||
|
||||
# Resolve image_url from the variant card row
|
||||
image_url = None
|
||||
if state.variant and state.variant > 0:
|
||||
card_type = (
|
||||
state.track.card_type if hasattr(state, "track") and state.track else None
|
||||
)
|
||||
if card_type:
|
||||
CardModel = BattingCard if card_type == "batter" else PitchingCard
|
||||
try:
|
||||
variant_card = CardModel.get(
|
||||
(CardModel.player_id == state.player_id)
|
||||
& (CardModel.variant == state.variant)
|
||||
)
|
||||
image_url = variant_card.image_url
|
||||
except CardModel.DoesNotExist:
|
||||
pass
|
||||
result["image_url"] = image_url
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@ -210,7 +229,7 @@ async def list_card_states(
|
||||
if evaluated_only:
|
||||
query = query.where(RefractorCardState.last_evaluated_at.is_null(False))
|
||||
|
||||
total = query.count()
|
||||
total = query.count() or 0
|
||||
items = []
|
||||
for state in query.offset(offset).limit(limit):
|
||||
player_name = None
|
||||
@ -302,8 +321,9 @@ async def evaluate_game(game_id: int, token: str = Depends(oauth2_scheme)):
|
||||
|
||||
Finds all unique (player_id, team_id) pairs from the game's StratPlay rows,
|
||||
then for each pair that has a RefractorCardState, re-computes the refractor
|
||||
tier. Pairs without a state row are silently skipped. Per-player errors are
|
||||
logged but do not abort the batch.
|
||||
tier. Pairs without a state row are auto-initialized on-the-fly via
|
||||
initialize_card_refractor (idempotent). Per-player errors are logged but
|
||||
do not abort the batch.
|
||||
"""
|
||||
if not valid_token(token):
|
||||
logging.warning("Bad Token: [REDACTED]")
|
||||
@ -334,7 +354,17 @@ async def evaluate_game(game_id: int, token: str = Depends(oauth2_scheme)):
|
||||
& (RefractorCardState.team_id == team_id)
|
||||
)
|
||||
if state is None:
|
||||
continue
|
||||
try:
|
||||
player = Player.get_by_id(player_id)
|
||||
card_type = _determine_card_type(player)
|
||||
state = initialize_card_refractor(player_id, team_id, card_type)
|
||||
except Exception:
|
||||
logger.warning(
|
||||
f"Refractor auto-init failed for player={player_id} "
|
||||
f"team={team_id} — skipping"
|
||||
)
|
||||
if state is None:
|
||||
continue
|
||||
|
||||
old_tier = state.current_tier
|
||||
# Use dry_run=True so that current_tier is NOT written here.
|
||||
|
||||
125
app/services/apng_generator.py
Normal file
125
app/services/apng_generator.py
Normal file
@ -0,0 +1,125 @@
|
||||
"""
|
||||
APNG animated card generation for T3 and T4 refractor tiers.
|
||||
|
||||
Captures animation frames by scrubbing CSS animations via Playwright — each
|
||||
frame is rendered with a negative animation-delay that freezes the render at a
|
||||
specific point in the animation cycle. The captured PNGs are then assembled
|
||||
into a looping APNG using the apng library.
|
||||
|
||||
Cache / S3 path convention:
|
||||
Local: storage/cards/cardset-{id}/{card_type}/{player_id}-{date}-v{variant}.apng
|
||||
S3: cards/cardset-{id}/{card_type}/{player_id}-{date}-v{variant}.apng
|
||||
"""
|
||||
|
||||
import os
|
||||
import tempfile
|
||||
|
||||
from apng import APNG
|
||||
from playwright.async_api import Page
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Animation specs per tier
|
||||
# Each entry: list of (css_selector, animation_duration_seconds) pairs that
|
||||
# need to be scrubbed, plus the frame count and per-frame display time.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
_T3_SPEC = {
|
||||
"selectors_and_durations": [("#header::after", 2.5)],
|
||||
"num_frames": 12,
|
||||
"frame_delay_ms": 200,
|
||||
}
|
||||
|
||||
_T4_SPEC = {
|
||||
"selectors_and_durations": [
|
||||
("#header::after", 6.0),
|
||||
(".tier-diamond.diamond-glow", 2.0),
|
||||
],
|
||||
"num_frames": 24,
|
||||
"frame_delay_ms": 250,
|
||||
}
|
||||
|
||||
ANIM_SPECS = {3: _T3_SPEC, 4: _T4_SPEC}
|
||||
|
||||
|
||||
def apng_cache_path(
|
||||
cardset_id: int, card_type: str, player_id: int, d: str, variant: int
|
||||
) -> str:
|
||||
"""Return the local filesystem cache path for an animated card APNG."""
|
||||
return f"storage/cards/cardset-{cardset_id}/{card_type}/{player_id}-{d}-v{variant}.apng"
|
||||
|
||||
|
||||
async def generate_animated_card(
|
||||
page: Page,
|
||||
html_content: str,
|
||||
output_path: str,
|
||||
tier: int,
|
||||
) -> None:
|
||||
"""Generate an animated APNG for a T3 or T4 refractor card.
|
||||
|
||||
Scrubs each CSS animation by injecting an override <style> tag that sets
|
||||
animation-play-state: running and a negative animation-delay, freezing the
|
||||
render at evenly-spaced intervals across one animation cycle. The captured
|
||||
frames are assembled into a looping APNG at output_path.
|
||||
|
||||
Args:
|
||||
page: An open Playwright page (caller is responsible for lifecycle).
|
||||
html_content: Rendered card HTML string (from TemplateResponse.body).
|
||||
output_path: Destination path for the .apng file.
|
||||
tier: Refractor tier — must be 3 or 4.
|
||||
|
||||
Raises:
|
||||
ValueError: If tier is not 3 or 4.
|
||||
"""
|
||||
spec = ANIM_SPECS.get(tier)
|
||||
if spec is None:
|
||||
raise ValueError(
|
||||
f"No animation spec for tier {tier}; animated cards are T3 and T4 only"
|
||||
)
|
||||
|
||||
num_frames = spec["num_frames"]
|
||||
frame_delay_ms = spec["frame_delay_ms"]
|
||||
selectors_and_durations = spec["selectors_and_durations"]
|
||||
|
||||
frame_paths: list[str] = []
|
||||
try:
|
||||
for i in range(num_frames):
|
||||
progress = i / num_frames # 0.0 .. (N-1)/N, seamless loop
|
||||
await page.set_content(html_content)
|
||||
|
||||
# Inject override CSS: unpauses animation and seeks to frame offset
|
||||
css_parts = []
|
||||
for selector, duration in selectors_and_durations:
|
||||
delay_s = -progress * duration
|
||||
css_parts.append(
|
||||
f"{selector} {{"
|
||||
f" animation-play-state: running !important;"
|
||||
f" animation-delay: {delay_s:.4f}s !important;"
|
||||
f" }}"
|
||||
)
|
||||
await page.add_style_tag(content="\n".join(css_parts))
|
||||
|
||||
tmp = tempfile.NamedTemporaryFile(suffix=".png", delete=False)
|
||||
tmp.close()
|
||||
await page.screenshot(
|
||||
path=tmp.name,
|
||||
type="png",
|
||||
clip={"x": 0.0, "y": 0, "width": 1200, "height": 600},
|
||||
)
|
||||
frame_paths.append(tmp.name)
|
||||
|
||||
dir_path = os.path.dirname(output_path)
|
||||
if dir_path:
|
||||
os.makedirs(dir_path, exist_ok=True)
|
||||
|
||||
apng_obj = APNG()
|
||||
for frame_path in frame_paths:
|
||||
# delay/delay_den is the frame display time in seconds as a fraction
|
||||
apng_obj.append_file(frame_path, delay=frame_delay_ms, delay_den=1000)
|
||||
apng_obj.save(output_path)
|
||||
|
||||
finally:
|
||||
for path in frame_paths:
|
||||
try:
|
||||
os.unlink(path)
|
||||
except OSError:
|
||||
pass
|
||||
198
app/services/card_storage.py
Normal file
198
app/services/card_storage.py
Normal file
@ -0,0 +1,198 @@
|
||||
"""
|
||||
card_storage.py — S3 upload utility for variant card images.
|
||||
|
||||
Public API
|
||||
----------
|
||||
get_s3_client()
|
||||
Create and return a boto3 S3 client using ambient AWS credentials
|
||||
(environment variables or instance profile).
|
||||
|
||||
build_s3_key(cardset_id, player_id, variant, card_type)
|
||||
Construct the S3 object key for a variant card image.
|
||||
|
||||
build_s3_url(s3_key, render_date)
|
||||
Return the full HTTPS S3 URL with a cache-busting date query param.
|
||||
|
||||
upload_card_to_s3(s3_client, png_bytes, s3_key)
|
||||
Upload raw PNG bytes to S3 with correct ContentType and CacheControl headers.
|
||||
|
||||
backfill_variant_image_url(player_id, variant, card_type, cardset_id, png_path)
|
||||
End-to-end: read PNG from disk, upload to S3, update BattingCard or
|
||||
PitchingCard.image_url in the database. All exceptions are caught and
|
||||
logged; this function never raises (safe to call as a background task).
|
||||
|
||||
Design notes
|
||||
------------
|
||||
- S3 credentials are resolved from the environment by boto3 at call time;
|
||||
no credentials are hard-coded here.
|
||||
- The cache-bust ?d= param matches the card-creation pipeline convention so
|
||||
that clients can compare URLs across pipelines.
|
||||
"""
|
||||
|
||||
import logging
|
||||
import os
|
||||
from datetime import date
|
||||
|
||||
import boto3
|
||||
|
||||
from app.db_engine import BattingCard, PitchingCard
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
S3_BUCKET = os.environ.get("S3_BUCKET", "paper-dynasty")
|
||||
S3_REGION = os.environ.get("S3_REGION", "us-east-1")
|
||||
|
||||
|
||||
def get_s3_client():
|
||||
"""Create and return a boto3 S3 client for the configured region.
|
||||
|
||||
Credentials are resolved by boto3 from the standard chain:
|
||||
environment variables → ~/.aws/credentials → instance profile.
|
||||
|
||||
Returns:
|
||||
A boto3 S3 client instance.
|
||||
"""
|
||||
return boto3.client("s3", region_name=S3_REGION)
|
||||
|
||||
|
||||
def build_s3_key(cardset_id: int, player_id: int, variant: int, card_type: str) -> str:
|
||||
"""Construct the S3 object key for a variant card image.
|
||||
|
||||
Key format:
|
||||
cards/cardset-{csid:03d}/player-{pid}/v{variant}/{card_type}card.png
|
||||
|
||||
Args:
|
||||
cardset_id: Numeric cardset ID (zero-padded to 3 digits).
|
||||
player_id: Player ID.
|
||||
variant: Variant number (0 = base, 1-4 = refractor tiers).
|
||||
card_type: Either "batting" or "pitching".
|
||||
|
||||
Returns:
|
||||
The S3 object key string.
|
||||
"""
|
||||
return (
|
||||
f"cards/cardset-{cardset_id:03d}/player-{player_id}"
|
||||
f"/v{variant}/{card_type}card.png"
|
||||
)
|
||||
|
||||
|
||||
def build_s3_url(s3_key: str, render_date: date) -> str:
|
||||
"""Return the full HTTPS S3 URL for a card image with a cache-bust param.
|
||||
|
||||
URL format:
|
||||
https://{bucket}.s3.{region}.amazonaws.com/{key}?d={date}
|
||||
|
||||
The ?d= query param matches the card-creation pipeline convention so that
|
||||
clients invalidate their cache after each re-render.
|
||||
|
||||
Args:
|
||||
s3_key: S3 object key (from build_s3_key).
|
||||
render_date: The date the card was rendered, used for cache-busting.
|
||||
|
||||
Returns:
|
||||
Full HTTPS URL string.
|
||||
"""
|
||||
base_url = f"https://{S3_BUCKET}.s3.{S3_REGION}.amazonaws.com"
|
||||
date_str = render_date.strftime("%Y-%m-%d")
|
||||
return f"{base_url}/{s3_key}?d={date_str}"
|
||||
|
||||
|
||||
def upload_card_to_s3(s3_client, png_bytes: bytes, s3_key: str) -> None:
|
||||
"""Upload raw PNG bytes to S3 with the standard card image headers.
|
||||
|
||||
Sets ContentType=image/png and CacheControl=public, max-age=300 (5 min)
|
||||
so that CDN and browser caches are refreshed within a short window after
|
||||
a re-render.
|
||||
|
||||
Args:
|
||||
s3_client: A boto3 S3 client (from get_s3_client).
|
||||
png_bytes: Raw PNG image bytes.
|
||||
s3_key: S3 object key (from build_s3_key).
|
||||
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
s3_client.put_object(
|
||||
Bucket=S3_BUCKET,
|
||||
Key=s3_key,
|
||||
Body=png_bytes,
|
||||
ContentType="image/png",
|
||||
CacheControl="public, max-age=300",
|
||||
)
|
||||
|
||||
|
||||
def backfill_variant_image_url(
|
||||
player_id: int,
|
||||
variant: int,
|
||||
card_type: str,
|
||||
cardset_id: int,
|
||||
png_path: str,
|
||||
) -> None:
|
||||
"""Read a rendered PNG from disk, upload it to S3, and update the DB row.
|
||||
|
||||
Determines the correct card model (BattingCard or PitchingCard) from
|
||||
card_type, then:
|
||||
1. Reads PNG bytes from png_path.
|
||||
2. Uploads to S3 via upload_card_to_s3.
|
||||
3. Fetches the card row by (player_id, variant).
|
||||
4. Sets image_url to the new S3 URL and calls save().
|
||||
|
||||
All exceptions are caught and logged — this function is intended to be
|
||||
called as a background task and must never propagate exceptions.
|
||||
|
||||
Args:
|
||||
player_id: Player ID used to locate the card row.
|
||||
variant: Variant number (matches the card row's variant field).
|
||||
card_type: "batting" or "pitching" — selects the model.
|
||||
cardset_id: Cardset ID used for the S3 key.
|
||||
png_path: Absolute path to the rendered PNG file on disk.
|
||||
|
||||
Returns:
|
||||
None
|
||||
"""
|
||||
try:
|
||||
# 1. Read PNG from disk
|
||||
with open(png_path, "rb") as f:
|
||||
png_bytes = f.read()
|
||||
|
||||
# 2. Build key and upload
|
||||
s3_key = build_s3_key(
|
||||
cardset_id=cardset_id,
|
||||
player_id=player_id,
|
||||
variant=variant,
|
||||
card_type=card_type,
|
||||
)
|
||||
s3_client = get_s3_client()
|
||||
upload_card_to_s3(s3_client, png_bytes, s3_key)
|
||||
|
||||
# 3. Build URL with today's date for cache-busting
|
||||
image_url = build_s3_url(s3_key, render_date=date.today())
|
||||
|
||||
# 4. Locate the card row and update image_url
|
||||
if card_type == "batting":
|
||||
card = BattingCard.get(
|
||||
BattingCard.player_id == player_id, BattingCard.variant == variant
|
||||
)
|
||||
else:
|
||||
card = PitchingCard.get(
|
||||
PitchingCard.player_id == player_id, PitchingCard.variant == variant
|
||||
)
|
||||
|
||||
card.image_url = image_url
|
||||
card.save()
|
||||
|
||||
logger.info(
|
||||
"backfill_variant_image_url: updated %s card player=%s variant=%s url=%s",
|
||||
card_type,
|
||||
player_id,
|
||||
variant,
|
||||
image_url,
|
||||
)
|
||||
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"backfill_variant_image_url: failed for player=%s variant=%s card_type=%s",
|
||||
player_id,
|
||||
variant,
|
||||
card_type,
|
||||
)
|
||||
7
migrations/2026-04-05_drop_unused_refractor_tables.sql
Normal file
7
migrations/2026-04-05_drop_unused_refractor_tables.sql
Normal file
@ -0,0 +1,7 @@
|
||||
-- Drop orphaned RefractorTierBoost and RefractorCosmetic tables.
|
||||
-- These were speculative schema from the initial Refractor design that were
|
||||
-- never used — boosts are hardcoded in refractor_boost.py and tier visuals
|
||||
-- are embedded in CSS templates. Both tables have zero rows on dev and prod.
|
||||
|
||||
DROP TABLE IF EXISTS refractor_tier_boost;
|
||||
DROP TABLE IF EXISTS refractor_cosmetic;
|
||||
@ -12,3 +12,5 @@ requests==2.32.3
|
||||
html2image==2.0.6
|
||||
jinja2==3.1.4
|
||||
playwright==1.45.1
|
||||
apng==0.3.4
|
||||
boto3==1.42.65
|
||||
|
||||
132
run-local.sh
Executable file
132
run-local.sh
Executable file
@ -0,0 +1,132 @@
|
||||
#!/usr/bin/env bash
|
||||
# run-local.sh — Spin up the Paper Dynasty Database API locally for testing.
|
||||
#
|
||||
# Connects to the dev PostgreSQL on the homelab (10.10.0.42) so you get real
|
||||
# card data for rendering. Playwright Chromium must be installed locally
|
||||
# (it already is on this workstation).
|
||||
#
|
||||
# Usage:
|
||||
# ./run-local.sh # start on default port 8000
|
||||
# ./run-local.sh 8001 # start on custom port
|
||||
# ./run-local.sh --stop # kill a running instance
|
||||
#
|
||||
# Card rendering test URLs (after startup):
|
||||
# HTML preview: http://localhost:8000/api/v2/players/{id}/battingcard/{date}/{variant}?html=True
|
||||
# PNG render: http://localhost:8000/api/v2/players/{id}/battingcard/{date}/{variant}
|
||||
# API docs: http://localhost:8000/api/docs
|
||||
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
PORT="${1:-8000}"
|
||||
PIDFILE=".run-local.pid"
|
||||
LOGFILE="logs/database/run-local.log"
|
||||
|
||||
# ── Stop mode ────────────────────────────────────────────────────────────────
|
||||
if [[ "${1:-}" == "--stop" ]]; then
|
||||
if [[ -f "$PIDFILE" ]]; then
|
||||
pid=$(cat "$PIDFILE")
|
||||
if kill -0 "$pid" 2>/dev/null; then
|
||||
kill "$pid"
|
||||
echo "Stopped local API (PID $pid)"
|
||||
else
|
||||
echo "PID $pid not running (stale pidfile)"
|
||||
fi
|
||||
rm -f "$PIDFILE"
|
||||
else
|
||||
echo "No pidfile found — nothing to stop"
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ── Pre-flight checks ───────────────────────────────────────────────────────
|
||||
if [[ -f "$PIDFILE" ]] && kill -0 "$(cat "$PIDFILE")" 2>/dev/null; then
|
||||
echo "Already running (PID $(cat "$PIDFILE")). Use './run-local.sh --stop' first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Python deps are importable
|
||||
python -c "import fastapi, peewee, playwright" 2>/dev/null || {
|
||||
echo "Missing Python dependencies. Install with: pip install -r requirements.txt"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Check Playwright Chromium is available
|
||||
python -c "
|
||||
from playwright.sync_api import sync_playwright
|
||||
p = sync_playwright().start()
|
||||
print(p.chromium.executable_path)
|
||||
p.stop()
|
||||
" >/dev/null 2>&1 || {
|
||||
echo "Playwright Chromium not installed. Run: playwright install chromium"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Check dev DB is reachable
|
||||
DB_HOST="${POSTGRES_HOST_LOCAL:-10.10.0.42}"
|
||||
python -c "
|
||||
import socket, sys
|
||||
s = socket.create_connection((sys.argv[1], 5432), timeout=3)
|
||||
s.close()
|
||||
" "$DB_HOST" 2>/dev/null || {
|
||||
echo "Cannot reach dev PostgreSQL at ${DB_HOST}:5432 — is the homelab up?"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ── Ensure directories exist ────────────────────────────────────────────────
|
||||
mkdir -p logs/database
|
||||
mkdir -p storage/cards
|
||||
|
||||
# ── Launch ───────────────────────────────────────────────────────────────────
|
||||
echo "Starting Paper Dynasty Database API on http://localhost:${PORT}"
|
||||
echo " DB: paperdynasty_dev @ 10.10.0.42"
|
||||
echo " Logs: ${LOGFILE}"
|
||||
echo ""
|
||||
|
||||
# Load .env, then .env.local overrides (for passwords not in version control)
|
||||
set -a
|
||||
# shellcheck source=/dev/null
|
||||
[[ -f .env ]] && source .env
|
||||
[[ -f .env.local ]] && source .env.local
|
||||
set +a
|
||||
|
||||
# Override DB host to point at the dev server's IP (not Docker network name)
|
||||
export DATABASE_TYPE=postgresql
|
||||
export POSTGRES_HOST="$DB_HOST"
|
||||
export POSTGRES_PORT="${POSTGRES_PORT:-5432}"
|
||||
export POSTGRES_DB="${POSTGRES_DB:-paperdynasty_dev}"
|
||||
export POSTGRES_USER="${POSTGRES_USER:-sba_admin}"
|
||||
export LOG_LEVEL=INFO
|
||||
export TESTING=True
|
||||
|
||||
if [[ -z "${POSTGRES_PASSWORD:-}" || "$POSTGRES_PASSWORD" == "your_production_password" ]]; then
|
||||
echo "ERROR: POSTGRES_PASSWORD not set or is the placeholder value."
|
||||
echo "Create .env.local with: POSTGRES_PASSWORD=<actual password>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
uvicorn app.main:app \
|
||||
--host 0.0.0.0 \
|
||||
--port "$PORT" \
|
||||
--reload \
|
||||
--reload-dir app \
|
||||
--reload-dir storage/templates \
|
||||
2>&1 | tee "$LOGFILE" &
|
||||
|
||||
echo $! >"$PIDFILE"
|
||||
sleep 2
|
||||
|
||||
if kill -0 "$(cat "$PIDFILE")" 2>/dev/null; then
|
||||
echo ""
|
||||
echo "API running (PID $(cat "$PIDFILE"))."
|
||||
echo ""
|
||||
echo "Quick test URLs:"
|
||||
echo " API docs: http://localhost:${PORT}/api/docs"
|
||||
echo " Health: curl -s http://localhost:${PORT}/api/v2/players/1/battingcard?html=True"
|
||||
echo ""
|
||||
echo "Stop with: ./run-local.sh --stop"
|
||||
else
|
||||
echo "Failed to start — check ${LOGFILE}"
|
||||
rm -f "$PIDFILE"
|
||||
exit 1
|
||||
fi
|
||||
90
scripts/deploy.sh
Executable file
90
scripts/deploy.sh
Executable file
@ -0,0 +1,90 @@
|
||||
#!/bin/bash
|
||||
# Deploy Paper Dynasty Database API
|
||||
# Usage: ./scripts/deploy.sh <dev|prod> [commit]
|
||||
#
|
||||
# Dev: Force-updates the "dev" git tag → CI builds :dev Docker image
|
||||
# Prod: Creates CalVer tag + force-updates "latest" and "production" git tags
|
||||
# → CI builds :<calver>, :latest, :production Docker images
|
||||
set -euo pipefail
|
||||
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m'
|
||||
|
||||
REMOTE="origin"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 <dev|prod> [commit]"
|
||||
echo ""
|
||||
echo " dev [commit] Force-update 'dev' tag on HEAD or specified commit"
|
||||
echo " prod [commit] Create CalVer + 'latest' + 'production' tags on HEAD or specified commit"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[[ $# -lt 1 ]] && usage
|
||||
|
||||
ENV="$1"
|
||||
COMMIT="${2:-HEAD}"
|
||||
|
||||
SHA=$(git rev-parse "$COMMIT" 2>/dev/null) || {
|
||||
echo -e "${RED}Invalid commit: $COMMIT${NC}"
|
||||
exit 1
|
||||
}
|
||||
SHA_SHORT="${SHA:0:7}"
|
||||
|
||||
git fetch --tags "$REMOTE"
|
||||
|
||||
if ! git branch -a --contains "$SHA" 2>/dev/null | grep -qE '(^|\s)(main|remotes/origin/main)$'; then
|
||||
echo -e "${RED}Commit $SHA_SHORT is not on main. Aborting.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "$ENV" in
|
||||
dev)
|
||||
echo -e "${YELLOW}Deploying to dev...${NC}"
|
||||
echo -e " Commit: ${SHA_SHORT}"
|
||||
|
||||
git tag -f dev "$SHA"
|
||||
git push "$REMOTE" dev --force
|
||||
|
||||
echo -e "${GREEN}Tagged ${SHA_SHORT} as 'dev' and pushed. CI will build :dev image.${NC}"
|
||||
;;
|
||||
|
||||
prod)
|
||||
echo -e "${YELLOW}Deploying to prod...${NC}"
|
||||
|
||||
YEAR=$(date -u +%Y)
|
||||
MONTH=$(date -u +%-m)
|
||||
PREFIX="${YEAR}.${MONTH}."
|
||||
|
||||
LAST_BUILD=$(git tag -l "${PREFIX}*" | sed "s/^${PREFIX}//" | sort -n | tail -1)
|
||||
BUILD=$((${LAST_BUILD:-0} + 1))
|
||||
CALVER="${PREFIX}${BUILD}"
|
||||
|
||||
echo -e " Commit: ${SHA_SHORT}"
|
||||
echo -e " Version: ${CALVER}"
|
||||
echo -e " Tags: ${CALVER}, latest, production"
|
||||
|
||||
read -rp "Proceed? [y/N] " confirm
|
||||
[[ "$confirm" =~ ^[Yy]$ ]] || {
|
||||
echo "Aborted."
|
||||
exit 0
|
||||
}
|
||||
|
||||
git tag "$CALVER" "$SHA"
|
||||
git tag -f latest "$SHA"
|
||||
git tag -f production "$SHA"
|
||||
|
||||
git push "$REMOTE" "$CALVER"
|
||||
git push "$REMOTE" latest --force
|
||||
git push "$REMOTE" production --force
|
||||
|
||||
echo -e "${GREEN}Tagged ${SHA_SHORT} as '${CALVER}', 'latest', 'production' and pushed.${NC}"
|
||||
echo -e "${GREEN}CI will build :${CALVER}, :latest, :production images.${NC}"
|
||||
;;
|
||||
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
@ -2,9 +2,27 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
{% include 'style.html' %}
|
||||
{% include 'tier_style.html' %}
|
||||
</head>
|
||||
<body>
|
||||
<div id="fullCard" style="width: 1200px; height: 600px;">
|
||||
{% if refractor_tier is defined and refractor_tier > 0 %}
|
||||
{%- set diamond_colors = {
|
||||
1: {'color': '#1a6b1a', 'highlight': '#40b040'},
|
||||
2: {'color': '#2070b0', 'highlight': '#50a0e8'},
|
||||
3: {'color': '#a82020', 'highlight': '#e85050'},
|
||||
4: {'color': '#6b2d8e', 'highlight': '#a060d0'},
|
||||
} -%}
|
||||
{%- set dc = diamond_colors[refractor_tier] -%}
|
||||
{%- set filled_bg = 'linear-gradient(135deg, ' ~ dc.highlight ~ ' 0%, ' ~ dc.color ~ ' 50%, ' ~ dc.color ~ ' 100%)' -%}
|
||||
<div class="tier-diamond-backing"></div>
|
||||
<div class="tier-diamond{% if refractor_tier == 4 %} diamond-glow{% endif %}">
|
||||
<div class="diamond-quad{% if refractor_tier >= 2 %} filled{% endif %}" {% if refractor_tier >= 2 %}style="background: {{ filled_bg }};"{% endif %}></div>
|
||||
<div class="diamond-quad{% if refractor_tier >= 1 %} filled{% endif %}" {% if refractor_tier >= 1 %}style="background: {{ filled_bg }};"{% endif %}></div>
|
||||
<div class="diamond-quad{% if refractor_tier >= 3 %} filled{% endif %}" {% if refractor_tier >= 3 %}style="background: {{ filled_bg }};"{% endif %}></div>
|
||||
<div class="diamond-quad{% if refractor_tier >= 4 %} filled{% endif %}" {% if refractor_tier >= 4 %}style="background: {{ filled_bg }};"{% endif %}></div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div id="header" class="row-wrapper header-text border-bot" style="height: 65px">
|
||||
<!-- <div id="headerLeft" style="flex-grow: 3; height: auto">-->
|
||||
<div id="headerLeft" style="width: 477px; height: auto">
|
||||
|
||||
229
storage/templates/tier_style.html
Normal file
229
storage/templates/tier_style.html
Normal file
@ -0,0 +1,229 @@
|
||||
<style>
|
||||
#fullCard {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
{% if refractor_tier is defined and refractor_tier > 0 %}
|
||||
<style>
|
||||
.tier-diamond-backing,
|
||||
.tier-diamond {
|
||||
position: absolute;
|
||||
left: 597px;
|
||||
top: 78.5px;
|
||||
transform: translate(-50%, -50%) rotate(45deg);
|
||||
border-radius: 2px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.tier-diamond-backing {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
background: rgba(200,210,220,0.9);
|
||||
z-index: 19;
|
||||
}
|
||||
|
||||
.tier-diamond {
|
||||
display: grid;
|
||||
grid-template: 1fr 1fr / 1fr 1fr;
|
||||
gap: 2px;
|
||||
z-index: 20;
|
||||
pointer-events: none;
|
||||
background: transparent;
|
||||
border-radius: 2px;
|
||||
box-shadow: 0 0 0 1.5px rgba(0,0,0,0.7), 0 2px 5px rgba(0,0,0,0.5);
|
||||
}
|
||||
|
||||
.diamond-quad {
|
||||
width: 19px;
|
||||
height: 19px;
|
||||
background: rgba(0,0,0,0.55);
|
||||
}
|
||||
|
||||
.diamond-quad.filled {
|
||||
box-shadow: inset 0 1px 2px rgba(255,255,255,0.45),
|
||||
inset 0 -1px 2px rgba(0,0,0,0.35),
|
||||
inset 1px 0 2px rgba(255,255,255,0.15);
|
||||
}
|
||||
|
||||
|
||||
{% if refractor_tier == 1 %}
|
||||
/* T1 — Base Chrome */
|
||||
#header {
|
||||
background: linear-gradient(135deg, rgba(185,195,210,0.25) 0%, rgba(210,218,228,0.35) 50%, rgba(185,195,210,0.25) 100%), #ffffff;
|
||||
}
|
||||
.border-bot {
|
||||
border-bottom-color: #8e9baf;
|
||||
border-bottom-width: 4px;
|
||||
}
|
||||
#resultHeader.border-bot {
|
||||
border-bottom-width: 3px;
|
||||
}
|
||||
.border-right-thick {
|
||||
border-right-color: #8e9baf;
|
||||
}
|
||||
.border-right-thin {
|
||||
border-right-color: #8e9baf;
|
||||
}
|
||||
.vline {
|
||||
border-left-color: #8e9baf;
|
||||
}
|
||||
|
||||
{% elif refractor_tier == 2 %}
|
||||
/* T2 — Refractor */
|
||||
#header {
|
||||
background: linear-gradient(135deg, rgba(100,155,230,0.28) 0%, rgba(155,90,220,0.18) 25%, rgba(90,200,210,0.24) 50%, rgba(185,80,170,0.16) 75%, rgba(100,155,230,0.28) 100%), #ffffff;
|
||||
}
|
||||
#fullCard {
|
||||
box-shadow: inset 0 0 14px 3px rgba(90,143,207,0.22);
|
||||
}
|
||||
.border-bot {
|
||||
border-bottom-color: #7a9cc4;
|
||||
border-bottom-width: 4px;
|
||||
}
|
||||
#resultHeader .border-right-thick {
|
||||
border-right-width: 6px;
|
||||
}
|
||||
.border-right-thick {
|
||||
border-right-color: #7a9cc4;
|
||||
}
|
||||
.border-right-thin {
|
||||
border-right-color: #7a9cc4;
|
||||
border-right-width: 3px;
|
||||
}
|
||||
.vline {
|
||||
border-left-color: #7a9cc4;
|
||||
}
|
||||
.blue-gradient {
|
||||
background-image: linear-gradient(to right, rgba(60,110,200,1), rgba(100,55,185,0.55), rgba(60,110,200,1));
|
||||
}
|
||||
.red-gradient {
|
||||
background-image: linear-gradient(to right, rgba(190,35,80,1), rgba(165,25,100,0.55), rgba(190,35,80,1));
|
||||
}
|
||||
|
||||
{% elif refractor_tier == 3 %}
|
||||
/* T3 — Gold Refractor */
|
||||
#header {
|
||||
background: linear-gradient(135deg, rgba(195,155,35,0.26) 0%, rgba(235,200,70,0.2) 50%, rgba(195,155,35,0.26) 100%), #ffffff;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
#fullCard {
|
||||
box-shadow: inset 0 0 16px 4px rgba(200,165,48,0.22);
|
||||
}
|
||||
.border-bot {
|
||||
border-bottom-color: #c9a94e;
|
||||
border-bottom-width: 4px;
|
||||
}
|
||||
.border-right-thick {
|
||||
border-right-color: #c9a94e;
|
||||
}
|
||||
.border-right-thin {
|
||||
border-right-color: #c9a94e;
|
||||
border-right-width: 3px;
|
||||
}
|
||||
.vline {
|
||||
border-left-color: #c9a94e;
|
||||
}
|
||||
.blue-gradient {
|
||||
background-image: linear-gradient(to right, rgba(195,160,40,1), rgba(220,185,60,0.55), rgba(195,160,40,1));
|
||||
}
|
||||
.red-gradient {
|
||||
background-image: linear-gradient(to right, rgba(195,160,40,1), rgba(220,185,60,0.55), rgba(195,160,40,1));
|
||||
}
|
||||
|
||||
/* T3 shimmer animation — paused for static PNG capture */
|
||||
@keyframes t3-shimmer {
|
||||
0% { transform: translateX(-130%); }
|
||||
100% { transform: translateX(230%); }
|
||||
}
|
||||
#header::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0; left: 0; right: 0; bottom: 0;
|
||||
background: linear-gradient(
|
||||
105deg,
|
||||
transparent 38%,
|
||||
rgba(255,240,140,0.18) 44%,
|
||||
rgba(255,220,80,0.38) 50%,
|
||||
rgba(255,200,60,0.30) 53%,
|
||||
rgba(255,240,140,0.14) 58%,
|
||||
transparent 64%
|
||||
);
|
||||
pointer-events: none;
|
||||
z-index: 5;
|
||||
animation: t3-shimmer 2.5s ease-in-out infinite;
|
||||
animation-play-state: paused;
|
||||
}
|
||||
|
||||
{% elif refractor_tier == 4 %}
|
||||
/* T4 — Superfractor */
|
||||
#header {
|
||||
background: #ffffff;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
#fullCard {
|
||||
box-shadow: inset 0 0 22px 6px rgba(45,212,191,0.28), inset 0 0 39px 9px rgba(200,165,48,0.15);
|
||||
}
|
||||
.border-bot {
|
||||
border-bottom-color: #c9a94e;
|
||||
border-bottom-width: 4px;
|
||||
}
|
||||
.border-right-thick {
|
||||
border-right-color: #c9a94e;
|
||||
}
|
||||
.border-right-thin {
|
||||
border-right-color: #c9a94e;
|
||||
}
|
||||
.vline {
|
||||
border-left-color: #c9a94e;
|
||||
}
|
||||
.blue-gradient {
|
||||
background-image: linear-gradient(to right, rgba(195,160,40,1), rgba(220,185,60,0.55), rgba(195,160,40,1));
|
||||
}
|
||||
.red-gradient {
|
||||
background-image: linear-gradient(to right, rgba(195,160,40,1), rgba(220,185,60,0.55), rgba(195,160,40,1));
|
||||
}
|
||||
|
||||
/* T4 prismatic header sweep — paused for static PNG capture */
|
||||
@keyframes t4-prismatic-sweep {
|
||||
0% { transform: translateX(0%); }
|
||||
100% { transform: translateX(-50%); }
|
||||
}
|
||||
#header::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0; left: 0;
|
||||
width: 200%; height: 100%;
|
||||
background: linear-gradient(135deg,
|
||||
transparent 2%, rgba(255,100,100,0.28) 8%, rgba(255,200,50,0.32) 14%,
|
||||
rgba(100,255,150,0.30) 20%, rgba(50,190,255,0.32) 26%, rgba(140,80,255,0.28) 32%,
|
||||
rgba(255,100,180,0.24) 38%, transparent 44%,
|
||||
transparent 52%, rgba(255,100,100,0.28) 58%, rgba(255,200,50,0.32) 64%,
|
||||
rgba(100,255,150,0.30) 70%, rgba(50,190,255,0.32) 76%, rgba(140,80,255,0.28) 82%,
|
||||
rgba(255,100,180,0.24) 88%, transparent 94%
|
||||
);
|
||||
z-index: 1;
|
||||
pointer-events: none;
|
||||
animation: t4-prismatic-sweep 6s linear infinite;
|
||||
animation-play-state: paused;
|
||||
}
|
||||
#header > * { z-index: 2; }
|
||||
|
||||
/* T4 diamond glow pulse — paused for static PNG */
|
||||
@keyframes diamond-glow-pulse {
|
||||
0%, 100% { box-shadow: 0 0 0 1.5px rgba(0,0,0,0.7), 0 2px 5px rgba(0,0,0,0.5),
|
||||
0 0 8px 2px rgba(107,45,142,0.6); }
|
||||
50% { box-shadow: 0 0 0 1.5px rgba(0,0,0,0.5), 0 2px 4px rgba(0,0,0,0.3),
|
||||
0 0 14px 5px rgba(107,45,142,0.8),
|
||||
0 0 24px 8px rgba(107,45,142,0.3); }
|
||||
}
|
||||
.tier-diamond.diamond-glow {
|
||||
animation: diamond-glow-pulse 2s ease-in-out infinite;
|
||||
animation-play-state: paused;
|
||||
}
|
||||
|
||||
{% endif %}
|
||||
</style>
|
||||
{% endif %}
|
||||
@ -48,8 +48,6 @@ from app.db_engine import (
|
||||
PitchingCard,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
RefractorBoostAudit,
|
||||
ScoutOpportunity,
|
||||
ScoutClaim,
|
||||
@ -81,8 +79,6 @@ _TEST_MODELS = [
|
||||
ScoutClaim,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
BattingCard,
|
||||
PitchingCard,
|
||||
RefractorBoostAudit,
|
||||
|
||||
350
tests/test_card_storage.py
Normal file
350
tests/test_card_storage.py
Normal file
@ -0,0 +1,350 @@
|
||||
"""
|
||||
Unit tests for app/services/card_storage.py — S3 upload utility.
|
||||
|
||||
This module covers:
|
||||
- S3 key construction for variant cards (batting, pitching, zero-padded cardset)
|
||||
- Full S3 URL construction with cache-busting date param
|
||||
- put_object call validation (correct params, return value)
|
||||
- End-to-end backfill: read PNG from disk, upload to S3, update DB row
|
||||
|
||||
Why we test S3 key construction separately:
|
||||
The key format is a contract used by both the renderer and the URL builder.
|
||||
Validating it in isolation catches regressions before they corrupt stored URLs.
|
||||
|
||||
Why we test URL construction separately:
|
||||
The cache-bust param (?d=...) must be appended consistently so that clients
|
||||
invalidate cached images after a re-render. Testing it independently prevents
|
||||
the formatter from silently changing.
|
||||
|
||||
Why we test upload params:
|
||||
ContentType and CacheControl must be set exactly so that S3 serves images
|
||||
with the correct headers. A missing header is a silent misconfiguration.
|
||||
|
||||
Why we test backfill error swallowing:
|
||||
The backfill function is called as a background task — it must never raise
|
||||
exceptions that would abort a card render response. We verify that S3 failures
|
||||
and missing files are both silently logged, not propagated.
|
||||
|
||||
Test isolation:
|
||||
All tests use unittest.mock; no real S3 calls or DB connections are made.
|
||||
The `backfill_variant_image_url` tests patch `get_s3_client` and the DB
|
||||
model classes at the card_storage module level so lazy imports work correctly.
|
||||
"""
|
||||
|
||||
import os
|
||||
from datetime import date
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
# Set env before importing module so db_engine doesn't try to connect
|
||||
os.environ.setdefault("DATABASE_TYPE", "postgresql")
|
||||
os.environ.setdefault("POSTGRES_PASSWORD", "test-dummy")
|
||||
|
||||
from app.services.card_storage import (
|
||||
build_s3_key,
|
||||
build_s3_url,
|
||||
upload_card_to_s3,
|
||||
backfill_variant_image_url,
|
||||
S3_BUCKET,
|
||||
S3_REGION,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# TestBuildS3Key
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestBuildS3Key:
|
||||
"""Tests for build_s3_key — S3 object key construction.
|
||||
|
||||
The key format must match the existing card-creation pipeline so that
|
||||
the database API and card-creation tool write to the same S3 paths.
|
||||
"""
|
||||
|
||||
def test_batting_card_key(self):
|
||||
"""batting card type produces 'battingcard.png' in the key."""
|
||||
key = build_s3_key(cardset_id=27, player_id=42, variant=1, card_type="batting")
|
||||
assert key == "cards/cardset-027/player-42/v1/battingcard.png"
|
||||
|
||||
def test_pitching_card_key(self):
|
||||
"""pitching card type produces 'pitchingcard.png' in the key."""
|
||||
key = build_s3_key(cardset_id=27, player_id=99, variant=2, card_type="pitching")
|
||||
assert key == "cards/cardset-027/player-99/v2/pitchingcard.png"
|
||||
|
||||
def test_cardset_zero_padded_to_three_digits(self):
|
||||
"""Single-digit cardset IDs are zero-padded to three characters."""
|
||||
key = build_s3_key(cardset_id=5, player_id=1, variant=0, card_type="batting")
|
||||
assert "cardset-005" in key
|
||||
|
||||
def test_cardset_two_digit_zero_padded(self):
|
||||
"""Two-digit cardset IDs are zero-padded correctly."""
|
||||
key = build_s3_key(cardset_id=27, player_id=1, variant=0, card_type="batting")
|
||||
assert "cardset-027" in key
|
||||
|
||||
def test_cardset_three_digit_no_padding(self):
|
||||
"""Three-digit cardset IDs are not altered."""
|
||||
key = build_s3_key(cardset_id=100, player_id=1, variant=0, card_type="batting")
|
||||
assert "cardset-100" in key
|
||||
|
||||
def test_variant_included_in_key(self):
|
||||
"""Variant number is included in the path so variants have distinct keys."""
|
||||
key_v0 = build_s3_key(
|
||||
cardset_id=27, player_id=1, variant=0, card_type="batting"
|
||||
)
|
||||
key_v3 = build_s3_key(
|
||||
cardset_id=27, player_id=1, variant=3, card_type="batting"
|
||||
)
|
||||
assert "/v0/" in key_v0
|
||||
assert "/v3/" in key_v3
|
||||
assert key_v0 != key_v3
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# TestBuildS3Url
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestBuildS3Url:
|
||||
"""Tests for build_s3_url — full URL construction with cache-bust param.
|
||||
|
||||
The URL format must be predictable so clients can construct and verify
|
||||
image URLs without querying the database.
|
||||
"""
|
||||
|
||||
def test_url_contains_bucket_and_region(self):
|
||||
"""URL includes bucket name and region in the S3 hostname."""
|
||||
key = "cards/cardset-027/player-42/v1/battingcard.png"
|
||||
render_date = date(2026, 4, 6)
|
||||
url = build_s3_url(key, render_date)
|
||||
assert S3_BUCKET in url
|
||||
assert S3_REGION in url
|
||||
|
||||
def test_url_contains_s3_key(self):
|
||||
"""URL path includes the full S3 key."""
|
||||
key = "cards/cardset-027/player-42/v1/battingcard.png"
|
||||
render_date = date(2026, 4, 6)
|
||||
url = build_s3_url(key, render_date)
|
||||
assert key in url
|
||||
|
||||
def test_url_has_cache_bust_param(self):
|
||||
"""URL ends with ?d=<render_date> for cache invalidation."""
|
||||
key = "cards/cardset-027/player-42/v1/battingcard.png"
|
||||
render_date = date(2026, 4, 6)
|
||||
url = build_s3_url(key, render_date)
|
||||
assert "?d=2026-04-06" in url
|
||||
|
||||
def test_url_format_full(self):
|
||||
"""Full URL matches expected S3 pattern exactly."""
|
||||
key = "cards/cardset-027/player-1/v0/battingcard.png"
|
||||
render_date = date(2025, 11, 8)
|
||||
url = build_s3_url(key, render_date)
|
||||
expected = (
|
||||
f"https://{S3_BUCKET}.s3.{S3_REGION}.amazonaws.com/{key}?d=2025-11-08"
|
||||
)
|
||||
assert url == expected
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# TestUploadCardToS3
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestUploadCardToS3:
|
||||
"""Tests for upload_card_to_s3 — S3 put_object call validation.
|
||||
|
||||
We verify the exact parameters passed to put_object so that S3 serves
|
||||
images with the correct Content-Type and Cache-Control headers.
|
||||
"""
|
||||
|
||||
def test_put_object_called_with_correct_params(self):
|
||||
"""put_object is called once with bucket, key, body, ContentType, CacheControl."""
|
||||
mock_client = MagicMock()
|
||||
png_bytes = b"\x89PNG\r\n\x1a\n"
|
||||
s3_key = "cards/cardset-027/player-42/v1/battingcard.png"
|
||||
|
||||
upload_card_to_s3(mock_client, png_bytes, s3_key)
|
||||
|
||||
mock_client.put_object.assert_called_once_with(
|
||||
Bucket=S3_BUCKET,
|
||||
Key=s3_key,
|
||||
Body=png_bytes,
|
||||
ContentType="image/png",
|
||||
CacheControl="public, max-age=300",
|
||||
)
|
||||
|
||||
def test_upload_returns_none(self):
|
||||
"""upload_card_to_s3 returns None (callers should not rely on a return value)."""
|
||||
mock_client = MagicMock()
|
||||
result = upload_card_to_s3(mock_client, b"PNG", "some/key.png")
|
||||
assert result is None
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# TestBackfillVariantImageUrl
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestBackfillVariantImageUrl:
|
||||
"""Tests for backfill_variant_image_url — end-to-end disk→S3→DB path.
|
||||
|
||||
The function is fire-and-forget: it reads a PNG from disk, uploads to S3,
|
||||
then updates the appropriate card model's image_url. All errors are caught
|
||||
and logged; the function must never raise.
|
||||
|
||||
Test strategy:
|
||||
- Use tmp_path for temporary PNG files so no filesystem state leaks.
|
||||
- Patch get_s3_client at the module level to intercept the S3 call.
|
||||
- Patch BattingCard/PitchingCard at the module level (lazy import target).
|
||||
"""
|
||||
|
||||
def test_batting_card_image_url_updated(self, tmp_path):
|
||||
"""BattingCard.image_url is updated after a successful upload."""
|
||||
png_path = tmp_path / "card.png"
|
||||
png_path.write_bytes(b"\x89PNG\r\n\x1a\n fake png data")
|
||||
|
||||
mock_s3 = MagicMock()
|
||||
mock_card = MagicMock()
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client", return_value=mock_s3),
|
||||
patch("app.services.card_storage.BattingCard") as MockBatting,
|
||||
):
|
||||
MockBatting.get.return_value = mock_card
|
||||
|
||||
backfill_variant_image_url(
|
||||
player_id=42,
|
||||
variant=1,
|
||||
card_type="batting",
|
||||
cardset_id=27,
|
||||
png_path=str(png_path),
|
||||
)
|
||||
|
||||
MockBatting.get.assert_called_once_with(
|
||||
MockBatting.player_id == 42, MockBatting.variant == 1
|
||||
)
|
||||
assert mock_card.image_url is not None
|
||||
mock_card.save.assert_called_once()
|
||||
|
||||
def test_pitching_card_image_url_updated(self, tmp_path):
|
||||
"""PitchingCard.image_url is updated after a successful upload."""
|
||||
png_path = tmp_path / "card.png"
|
||||
png_path.write_bytes(b"\x89PNG\r\n\x1a\n fake png data")
|
||||
|
||||
mock_s3 = MagicMock()
|
||||
mock_card = MagicMock()
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client", return_value=mock_s3),
|
||||
patch("app.services.card_storage.PitchingCard") as MockPitching,
|
||||
):
|
||||
MockPitching.get.return_value = mock_card
|
||||
|
||||
backfill_variant_image_url(
|
||||
player_id=99,
|
||||
variant=2,
|
||||
card_type="pitching",
|
||||
cardset_id=27,
|
||||
png_path=str(png_path),
|
||||
)
|
||||
|
||||
MockPitching.get.assert_called_once_with(
|
||||
MockPitching.player_id == 99, MockPitching.variant == 2
|
||||
)
|
||||
assert mock_card.image_url is not None
|
||||
mock_card.save.assert_called_once()
|
||||
|
||||
def test_s3_upload_called_with_png_bytes(self, tmp_path):
|
||||
"""The PNG bytes read from disk are passed to put_object."""
|
||||
png_bytes = b"\x89PNG\r\n\x1a\n real png content"
|
||||
png_path = tmp_path / "card.png"
|
||||
png_path.write_bytes(png_bytes)
|
||||
|
||||
mock_s3 = MagicMock()
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client", return_value=mock_s3),
|
||||
patch("app.services.card_storage.BattingCard") as MockBatting,
|
||||
):
|
||||
MockBatting.get.return_value = MagicMock()
|
||||
|
||||
backfill_variant_image_url(
|
||||
player_id=1,
|
||||
variant=0,
|
||||
card_type="batting",
|
||||
cardset_id=5,
|
||||
png_path=str(png_path),
|
||||
)
|
||||
|
||||
mock_s3.put_object.assert_called_once()
|
||||
call_kwargs = mock_s3.put_object.call_args.kwargs
|
||||
assert call_kwargs["Body"] == png_bytes
|
||||
|
||||
def test_s3_error_is_swallowed(self, tmp_path):
|
||||
"""If S3 raises an exception, backfill swallows it and returns normally.
|
||||
|
||||
The function is called as a background task — it must never propagate
|
||||
exceptions that would abort the calling request handler.
|
||||
"""
|
||||
png_path = tmp_path / "card.png"
|
||||
png_path.write_bytes(b"PNG data")
|
||||
|
||||
mock_s3 = MagicMock()
|
||||
mock_s3.put_object.side_effect = Exception("S3 connection refused")
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client", return_value=mock_s3),
|
||||
patch("app.services.card_storage.BattingCard"),
|
||||
):
|
||||
# Must not raise
|
||||
backfill_variant_image_url(
|
||||
player_id=1,
|
||||
variant=0,
|
||||
card_type="batting",
|
||||
cardset_id=27,
|
||||
png_path=str(png_path),
|
||||
)
|
||||
|
||||
def test_missing_file_is_swallowed(self, tmp_path):
|
||||
"""If the PNG file does not exist, backfill swallows the error and returns.
|
||||
|
||||
Render failures may leave no file on disk; the background task must
|
||||
handle this gracefully rather than crashing the request.
|
||||
"""
|
||||
missing_path = str(tmp_path / "nonexistent.png")
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client"),
|
||||
patch("app.services.card_storage.BattingCard"),
|
||||
):
|
||||
# Must not raise
|
||||
backfill_variant_image_url(
|
||||
player_id=1,
|
||||
variant=0,
|
||||
card_type="batting",
|
||||
cardset_id=27,
|
||||
png_path=missing_path,
|
||||
)
|
||||
|
||||
def test_db_error_is_swallowed(self, tmp_path):
|
||||
"""If the DB save raises, backfill swallows it and returns normally."""
|
||||
png_path = tmp_path / "card.png"
|
||||
png_path.write_bytes(b"PNG data")
|
||||
|
||||
mock_s3 = MagicMock()
|
||||
mock_card = MagicMock()
|
||||
mock_card.save.side_effect = Exception("DB connection lost")
|
||||
|
||||
with (
|
||||
patch("app.services.card_storage.get_s3_client", return_value=mock_s3),
|
||||
patch("app.services.card_storage.BattingCard") as MockBatting,
|
||||
):
|
||||
MockBatting.get.return_value = mock_card
|
||||
|
||||
# Must not raise
|
||||
backfill_variant_image_url(
|
||||
player_id=1,
|
||||
variant=0,
|
||||
card_type="batting",
|
||||
cardset_id=27,
|
||||
png_path=str(png_path),
|
||||
)
|
||||
@ -72,8 +72,6 @@ from app.db_engine import (
|
||||
Rarity,
|
||||
RefractorBoostAudit,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
@ -123,8 +121,6 @@ _WP13_MODELS = [
|
||||
PitchingCardRatings,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
RefractorBoostAudit,
|
||||
]
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@ from app.services.refractor_boost import (
|
||||
PITCHER_PRIORITY,
|
||||
PITCHER_XCHECK_COLUMNS,
|
||||
)
|
||||
from app.routers_v2.players import resolve_refractor_tier
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@ -911,6 +912,34 @@ class TestVariantHash:
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Tier resolution (from variant hash)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestResolveTier:
|
||||
"""Verify resolve_refractor_tier correctly reverse-maps variant hashes to
|
||||
tier numbers using compute_variant_hash as the source of truth.
|
||||
"""
|
||||
|
||||
@pytest.mark.parametrize("tier", [1, 2, 3, 4])
|
||||
def test_known_tier_roundtrips(self, tier):
|
||||
"""resolve_refractor_tier returns the correct tier for a variant hash
|
||||
produced by compute_variant_hash.
|
||||
"""
|
||||
player_id = 42
|
||||
variant = compute_variant_hash(player_id, tier)
|
||||
assert resolve_refractor_tier(player_id, variant) == tier
|
||||
|
||||
def test_base_card_returns_zero(self):
|
||||
"""variant=0 (base card) always returns tier 0."""
|
||||
assert resolve_refractor_tier(999, 0) == 0
|
||||
|
||||
def test_unknown_variant_returns_zero(self):
|
||||
"""An unrecognized variant hash falls back to tier 0."""
|
||||
assert resolve_refractor_tier(1, 99999999) == 0
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Batter display stats
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@ -52,8 +52,6 @@ from app.db_engine import (
|
||||
Rarity,
|
||||
RefractorBoostAudit,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
@ -111,8 +109,6 @@ _BOOST_INT_MODELS = [
|
||||
PitchingCardRatings,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
RefractorBoostAudit,
|
||||
]
|
||||
|
||||
|
||||
311
tests/test_refractor_image_url.py
Normal file
311
tests/test_refractor_image_url.py
Normal file
@ -0,0 +1,311 @@
|
||||
"""Tests for image_url field in refractor cards API response.
|
||||
|
||||
What: Verifies that GET /api/v2/refractor/cards includes image_url in each card state
|
||||
item, pulling the URL from the variant BattingCard or PitchingCard row.
|
||||
|
||||
Why: The refractor card art pipeline stores rendered card image URLs in the
|
||||
BattingCard/PitchingCard rows. The Discord bot and website need image_url in
|
||||
the /refractor/cards response so they can display variant art without a separate
|
||||
lookup. These tests guard against regressions where image_url is accidentally
|
||||
dropped from the response serialization.
|
||||
|
||||
Test cases:
|
||||
test_cards_response_includes_image_url -- BattingCard with image_url set; verify
|
||||
the value appears in the /cards response.
|
||||
test_cards_response_image_url_null_when_not_set -- BattingCard with image_url=None;
|
||||
verify null is returned (not omitted).
|
||||
|
||||
Uses the shared-memory SQLite TestClient pattern from test_refractor_state_api.py
|
||||
so no PostgreSQL connection is required.
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
os.environ.setdefault("API_TOKEN", "test")
|
||||
|
||||
import pytest
|
||||
from fastapi import FastAPI, Request
|
||||
from fastapi.testclient import TestClient
|
||||
from peewee import SqliteDatabase
|
||||
|
||||
from app.db_engine import (
|
||||
BattingCard,
|
||||
BattingSeasonStats,
|
||||
Card,
|
||||
Cardset,
|
||||
Decision,
|
||||
Event,
|
||||
MlbPlayer,
|
||||
Pack,
|
||||
PackType,
|
||||
PitchingCard,
|
||||
PitchingSeasonStats,
|
||||
Player,
|
||||
ProcessedGame,
|
||||
Rarity,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
ScoutClaim,
|
||||
ScoutOpportunity,
|
||||
StratGame,
|
||||
StratPlay,
|
||||
Team,
|
||||
)
|
||||
|
||||
AUTH_HEADER = {"Authorization": "Bearer test"}
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# SQLite database + model list
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
_img_url_db = SqliteDatabase(
|
||||
"file:imgurlapitest?mode=memory&cache=shared",
|
||||
uri=True,
|
||||
pragmas={"foreign_keys": 1},
|
||||
)
|
||||
|
||||
# Full model list matching the existing state API tests — needed so all FK
|
||||
# constraints resolve in SQLite.
|
||||
_IMG_URL_MODELS = [
|
||||
Rarity,
|
||||
Event,
|
||||
Cardset,
|
||||
MlbPlayer,
|
||||
Player,
|
||||
BattingCard,
|
||||
PitchingCard,
|
||||
Team,
|
||||
PackType,
|
||||
Pack,
|
||||
Card,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
StratGame,
|
||||
StratPlay,
|
||||
Decision,
|
||||
ScoutOpportunity,
|
||||
ScoutClaim,
|
||||
BattingSeasonStats,
|
||||
PitchingSeasonStats,
|
||||
ProcessedGame,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
]
|
||||
|
||||
|
||||
@pytest.fixture(autouse=False)
|
||||
def setup_img_url_db():
|
||||
"""Bind image-url test models to shared-memory SQLite and create tables.
|
||||
|
||||
What: Initialises the in-process SQLite database before each test and drops
|
||||
all tables afterwards to ensure test isolation.
|
||||
|
||||
Why: SQLite shared-memory databases persist between tests in the same
|
||||
process unless tables are dropped. Creating and dropping around each test
|
||||
guarantees a clean state without requiring a real PostgreSQL instance.
|
||||
"""
|
||||
_img_url_db.bind(_IMG_URL_MODELS)
|
||||
_img_url_db.connect(reuse_if_open=True)
|
||||
_img_url_db.create_tables(_IMG_URL_MODELS)
|
||||
yield _img_url_db
|
||||
_img_url_db.drop_tables(list(reversed(_IMG_URL_MODELS)), safe=True)
|
||||
|
||||
|
||||
def _build_image_url_app() -> FastAPI:
|
||||
"""Minimal FastAPI app with refractor router for image_url tests."""
|
||||
from app.routers_v2.refractor import router as refractor_router
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
@app.middleware("http")
|
||||
async def db_middleware(request: Request, call_next):
|
||||
_img_url_db.connect(reuse_if_open=True)
|
||||
return await call_next(request)
|
||||
|
||||
app.include_router(refractor_router)
|
||||
return app
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def img_url_client(setup_img_url_db):
|
||||
"""FastAPI TestClient backed by shared-memory SQLite for image_url tests."""
|
||||
with TestClient(_build_image_url_app()) as c:
|
||||
yield c
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Seed helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _make_rarity():
|
||||
r, _ = Rarity.get_or_create(
|
||||
value=10, name="IU_Common", defaults={"color": "#ffffff"}
|
||||
)
|
||||
return r
|
||||
|
||||
|
||||
def _make_cardset():
|
||||
cs, _ = Cardset.get_or_create(
|
||||
name="IU Test Set",
|
||||
defaults={"description": "image url test cardset", "total_cards": 1},
|
||||
)
|
||||
return cs
|
||||
|
||||
|
||||
def _make_player(name: str = "Test Player") -> Player:
|
||||
return Player.create(
|
||||
p_name=name,
|
||||
rarity=_make_rarity(),
|
||||
cardset=_make_cardset(),
|
||||
set_num=1,
|
||||
pos_1="CF",
|
||||
image="https://example.com/img.png",
|
||||
mlbclub="TST",
|
||||
franchise="TST",
|
||||
description="image url test",
|
||||
)
|
||||
|
||||
|
||||
def _make_team(suffix: str = "IU") -> Team:
|
||||
return Team.create(
|
||||
abbrev=suffix,
|
||||
sname=suffix,
|
||||
lname=f"Team {suffix}",
|
||||
gmid=99900 + len(suffix),
|
||||
gmname=f"gm_{suffix.lower()}",
|
||||
gsheet="https://docs.google.com/iu_test",
|
||||
wallet=500,
|
||||
team_value=1000,
|
||||
collection_value=1000,
|
||||
season=11,
|
||||
is_ai=False,
|
||||
)
|
||||
|
||||
|
||||
def _make_track(card_type: str = "batter") -> RefractorTrack:
|
||||
track, _ = RefractorTrack.get_or_create(
|
||||
name=f"IU {card_type} Track",
|
||||
defaults=dict(
|
||||
card_type=card_type,
|
||||
formula="pa",
|
||||
t1_threshold=100,
|
||||
t2_threshold=300,
|
||||
t3_threshold=700,
|
||||
t4_threshold=1200,
|
||||
),
|
||||
)
|
||||
return track
|
||||
|
||||
|
||||
def _make_batting_card(player: Player, variant: int, image_url=None) -> BattingCard:
|
||||
return BattingCard.create(
|
||||
player=player,
|
||||
variant=variant,
|
||||
steal_low=1,
|
||||
steal_high=3,
|
||||
steal_auto=False,
|
||||
steal_jump=1.0,
|
||||
bunting="N",
|
||||
hit_and_run="N",
|
||||
running=5,
|
||||
offense_col=1,
|
||||
hand="R",
|
||||
image_url=image_url,
|
||||
)
|
||||
|
||||
|
||||
def _make_card_state(
|
||||
player: Player,
|
||||
team: Team,
|
||||
track: RefractorTrack,
|
||||
variant: int,
|
||||
current_tier: int = 1,
|
||||
current_value: float = 150.0,
|
||||
) -> RefractorCardState:
|
||||
import datetime
|
||||
|
||||
return RefractorCardState.create(
|
||||
player=player,
|
||||
team=team,
|
||||
track=track,
|
||||
current_tier=current_tier,
|
||||
current_value=current_value,
|
||||
fully_evolved=False,
|
||||
last_evaluated_at=datetime.datetime(2026, 4, 1, 12, 0, 0),
|
||||
variant=variant,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Tests
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def test_cards_response_includes_image_url(setup_img_url_db, img_url_client):
|
||||
"""GET /api/v2/refractor/cards includes image_url when the variant BattingCard has one.
|
||||
|
||||
What: Seeds a RefractorCardState at variant=1 and a matching BattingCard with
|
||||
image_url set. Calls the /cards endpoint and asserts that image_url in the
|
||||
response matches the seeded URL.
|
||||
|
||||
Why: This is the primary happy-path test for the image_url feature. If the
|
||||
DB lookup in _build_card_state_response fails or the field is accidentally
|
||||
omitted from the response dict, this test will catch it.
|
||||
"""
|
||||
player = _make_player("Homer Simpson")
|
||||
team = _make_team("IU1")
|
||||
track = _make_track("batter")
|
||||
|
||||
expected_url = (
|
||||
"https://s3.example.com/cards/cardset-001/player-1/v1/battingcard.png"
|
||||
)
|
||||
_make_batting_card(player, variant=1, image_url=expected_url)
|
||||
_make_card_state(player, team, track, variant=1)
|
||||
|
||||
resp = img_url_client.get(
|
||||
f"/api/v2/refractor/cards?team_id={team.id}&evaluated_only=false",
|
||||
headers=AUTH_HEADER,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
data = resp.json()
|
||||
assert data["count"] == 1
|
||||
item = data["items"][0]
|
||||
assert "image_url" in item, "image_url key missing from response"
|
||||
assert item["image_url"] == expected_url
|
||||
|
||||
|
||||
def test_cards_response_image_url_null_when_not_set(setup_img_url_db, img_url_client):
|
||||
"""GET /api/v2/refractor/cards returns image_url: null when BattingCard.image_url is None.
|
||||
|
||||
What: Seeds a BattingCard with image_url=None and a RefractorCardState at
|
||||
variant=1. Verifies the response contains image_url with a null value.
|
||||
|
||||
Why: The image_url field must always be present in the response (even when
|
||||
null) so API consumers can rely on its presence. Returning null rather than
|
||||
omitting the key is the correct contract — omitting it would break consumers
|
||||
that check for the key's presence to determine upload status.
|
||||
"""
|
||||
player = _make_player("Bart Simpson")
|
||||
team = _make_team("IU2")
|
||||
track = _make_track("batter")
|
||||
|
||||
_make_batting_card(player, variant=1, image_url=None)
|
||||
_make_card_state(player, team, track, variant=1)
|
||||
|
||||
resp = img_url_client.get(
|
||||
f"/api/v2/refractor/cards?team_id={team.id}&evaluated_only=false",
|
||||
headers=AUTH_HEADER,
|
||||
)
|
||||
assert resp.status_code == 200, resp.text
|
||||
data = resp.json()
|
||||
assert data["count"] == 1
|
||||
item = data["items"][0]
|
||||
assert "image_url" in item, "image_url key missing from response"
|
||||
assert item["image_url"] is None
|
||||
@ -5,8 +5,6 @@ Covers WP-01 acceptance criteria:
|
||||
- RefractorTrack: CRUD and unique-name constraint
|
||||
- RefractorCardState: CRUD, defaults, unique-(player,team) constraint,
|
||||
and FK resolution back to RefractorTrack
|
||||
- RefractorTierBoost: CRUD and unique-(track, tier, boost_type, boost_target)
|
||||
- RefractorCosmetic: CRUD and unique-name constraint
|
||||
- BattingSeasonStats: CRUD with defaults, unique-(player, team, season),
|
||||
and in-place stat accumulation
|
||||
|
||||
@ -22,8 +20,6 @@ from playhouse.shortcuts import model_to_dict
|
||||
from app.db_engine import (
|
||||
BattingSeasonStats,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
)
|
||||
|
||||
@ -134,115 +130,6 @@ class TestRefractorCardState:
|
||||
assert resolved_track.name == "Batter Track"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# RefractorTierBoost
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestRefractorTierBoost:
|
||||
"""Tests for RefractorTierBoost, the per-tier stat/rating bonus table.
|
||||
|
||||
Each row maps a (track, tier) combination to a single boost — the
|
||||
specific stat or rating column to buff and by how much. The four-
|
||||
column unique constraint prevents double-booking the same boost slot.
|
||||
"""
|
||||
|
||||
def test_create_tier_boost(self, track):
|
||||
"""Creating a boost row persists all fields accurately.
|
||||
|
||||
Verifies boost_type, boost_target, and boost_value are stored
|
||||
and retrieved without modification.
|
||||
"""
|
||||
boost = RefractorTierBoost.create(
|
||||
track=track,
|
||||
tier=1,
|
||||
boost_type="rating",
|
||||
boost_target="contact_vl",
|
||||
boost_value=1.5,
|
||||
)
|
||||
fetched = RefractorTierBoost.get_by_id(boost.id)
|
||||
assert fetched.track_id == track.id
|
||||
assert fetched.tier == 1
|
||||
assert fetched.boost_type == "rating"
|
||||
assert fetched.boost_target == "contact_vl"
|
||||
assert fetched.boost_value == 1.5
|
||||
|
||||
def test_tier_boost_unique_constraint(self, track):
|
||||
"""Duplicate (track, tier, boost_type, boost_target) raises IntegrityError.
|
||||
|
||||
The four-column unique index ensures that a single boost slot
|
||||
(e.g. Tier-1 contact_vl rating) cannot be defined twice for the
|
||||
same track, which would create ambiguity during evolution evaluation.
|
||||
"""
|
||||
RefractorTierBoost.create(
|
||||
track=track,
|
||||
tier=2,
|
||||
boost_type="rating",
|
||||
boost_target="power_vr",
|
||||
boost_value=2.0,
|
||||
)
|
||||
with pytest.raises(IntegrityError):
|
||||
RefractorTierBoost.create(
|
||||
track=track,
|
||||
tier=2,
|
||||
boost_type="rating",
|
||||
boost_target="power_vr",
|
||||
boost_value=3.0, # different value, same identity columns
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# RefractorCosmetic
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
class TestRefractorCosmetic:
|
||||
"""Tests for RefractorCosmetic, decorative unlocks tied to evolution tiers.
|
||||
|
||||
Cosmetics are purely visual rewards (frames, badges, themes) that a
|
||||
card unlocks when it reaches a required tier. The name column is
|
||||
the stable identifier and carries a UNIQUE constraint.
|
||||
"""
|
||||
|
||||
def test_create_cosmetic(self):
|
||||
"""Creating a cosmetic persists all fields correctly.
|
||||
|
||||
Verifies all columns including optional ones (css_class, asset_url)
|
||||
are stored and retrieved.
|
||||
"""
|
||||
cosmetic = RefractorCosmetic.create(
|
||||
name="Gold Frame",
|
||||
tier_required=2,
|
||||
cosmetic_type="frame",
|
||||
css_class="evo-frame-gold",
|
||||
asset_url="https://cdn.example.com/frames/gold.png",
|
||||
)
|
||||
fetched = RefractorCosmetic.get_by_id(cosmetic.id)
|
||||
assert fetched.name == "Gold Frame"
|
||||
assert fetched.tier_required == 2
|
||||
assert fetched.cosmetic_type == "frame"
|
||||
assert fetched.css_class == "evo-frame-gold"
|
||||
assert fetched.asset_url == "https://cdn.example.com/frames/gold.png"
|
||||
|
||||
def test_cosmetic_unique_name(self):
|
||||
"""Inserting a second cosmetic with the same name raises IntegrityError.
|
||||
|
||||
The UNIQUE constraint on RefractorCosmetic.name prevents duplicate
|
||||
cosmetic definitions that could cause ambiguous tier unlock lookups.
|
||||
"""
|
||||
RefractorCosmetic.create(
|
||||
name="Silver Badge",
|
||||
tier_required=1,
|
||||
cosmetic_type="badge",
|
||||
)
|
||||
with pytest.raises(IntegrityError):
|
||||
RefractorCosmetic.create(
|
||||
name="Silver Badge", # duplicate
|
||||
tier_required=3,
|
||||
cosmetic_type="badge",
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# BattingSeasonStats
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@ -64,8 +64,6 @@ from app.db_engine import (
|
||||
ProcessedGame,
|
||||
Rarity,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
@ -681,8 +679,6 @@ _STATE_API_MODELS = [
|
||||
ProcessedGame,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
]
|
||||
|
||||
|
||||
|
||||
@ -41,8 +41,6 @@ from app.db_engine import ( # noqa: E402
|
||||
ProcessedGame,
|
||||
Rarity,
|
||||
RefractorCardState,
|
||||
RefractorCosmetic,
|
||||
RefractorTierBoost,
|
||||
RefractorTrack,
|
||||
Roster,
|
||||
RosterSlot,
|
||||
@ -204,8 +202,6 @@ _TRACK_API_MODELS = [
|
||||
ProcessedGame,
|
||||
RefractorTrack,
|
||||
RefractorCardState,
|
||||
RefractorTierBoost,
|
||||
RefractorCosmetic,
|
||||
]
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user