From 14103e48b75a9588944ebfc7c622978a734b3f93 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 08:13:31 -0600 Subject: [PATCH 01/12] feat: Add Scouting feature (Wonder Pick-style social pack opening) When a player opens a pack, a scout opportunity is posted to #pack-openings with face-down card buttons. Other players can blind-pick one card using daily scout tokens (2/day), receiving a copy. The opener keeps all cards. New files: - discord_ui/scout_view.py: ScoutView with dynamic buttons and claim logic - helpers/scouting.py: create_scout_opportunity() and embed builder - cogs/economy_new/scouting.py: /scout-tokens command and cleanup task Modified: - helpers/main.py: Hook into open_st_pr_packs() after display_cards() - paperdynasty.py: Register scouting cog Requires new API endpoints in paper-dynasty-database (scout_opportunities). Tracks #44. Co-Authored-By: Claude Opus 4.6 --- cogs/economy_new/scouting.py | 104 +++++++++++ discord_ui/__init__.py | 35 ++-- discord_ui/scout_view.py | 339 +++++++++++++++++++++++++++++++++++ helpers/__init__.py | 9 +- helpers/main.py | 46 +++-- helpers/scouting.py | 173 ++++++++++++++++++ paperdynasty.py | 69 +++---- 7 files changed, 716 insertions(+), 59 deletions(-) create mode 100644 cogs/economy_new/scouting.py create mode 100644 discord_ui/scout_view.py create mode 100644 helpers/scouting.py diff --git a/cogs/economy_new/scouting.py b/cogs/economy_new/scouting.py new file mode 100644 index 0000000..9e895e5 --- /dev/null +++ b/cogs/economy_new/scouting.py @@ -0,0 +1,104 @@ +""" +Scouting Cog — Scout token management and expired opportunity cleanup. +""" + +import datetime +import logging + +import discord +from discord import app_commands +from discord.ext import commands, tasks + +from api_calls import db_get +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.main import get_team_by_owner +from helpers.constants import PD_SEASON, IMAGES + +logger = logging.getLogger("discord_app") + +SCOUT_TOKENS_PER_DAY = 2 + + +class Scouting(commands.Cog): + """Scout token tracking and expired opportunity cleanup.""" + + def __init__(self, bot): + self.bot = bot + self.cleanup_expired.start() + + async def cog_unload(self): + self.cleanup_expired.cancel() + + @app_commands.command( + name="scout-tokens", + description="Check how many scout tokens you have left today", + ) + async def scout_tokens_command(self, interaction: discord.Interaction): + await interaction.response.defer(ephemeral=True) + + team = await get_team_by_owner(interaction.user.id) + if not team: + await interaction.followup.send( + "You need a Paper Dynasty team first!", + ephemeral=True, + ) + return + + now = datetime.datetime.now() + midnight = int_timestamp( + datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + ) + + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", team["id"]), + ("created_after", midnight), + ], + ) + tokens_used = used_today["count"] if used_today else 0 + tokens_remaining = max(0, SCOUT_TOKENS_PER_DAY - tokens_used) + + embed = get_team_embed(title="Scout Tokens", team=team) + embed.description = ( + f"**{tokens_remaining}** of **{SCOUT_TOKENS_PER_DAY}** tokens remaining today.\n\n" + f"Tokens reset at midnight Central." + ) + + if tokens_remaining == 0: + embed.description += "\n\nYou've used all your tokens! Check back tomorrow." + + await interaction.followup.send(embed=embed, ephemeral=True) + + @tasks.loop(minutes=15) + async def cleanup_expired(self): + """Log expired unclaimed scout opportunities. + + This is a safety net — the ScoutView's on_timeout handles the UI side. + If the bot restarted mid-scout, those views are lost; this just logs it. + """ + try: + now = int_timestamp(datetime.datetime.now()) + expired = await db_get( + "scout_opportunities", + params=[ + ("claimed", False), + ("expired_before", now), + ], + ) + if expired and expired.get("count", 0) > 0: + logger.info( + f"Found {expired['count']} expired unclaimed scout opportunities" + ) + except Exception as e: + logger.debug(f"Scout cleanup check failed (API may not be ready): {e}") + + @cleanup_expired.before_loop + async def before_cleanup(self): + await self.bot.wait_until_ready() + + +async def setup(bot): + await bot.add_cog(Scouting(bot)) diff --git a/discord_ui/__init__.py b/discord_ui/__init__.py index 6e40231..88a3f9d 100644 --- a/discord_ui/__init__.py +++ b/discord_ui/__init__.py @@ -7,17 +7,32 @@ This package contains all Discord UI classes and components used throughout the from .confirmations import Question, Confirm, ButtonOptions from .pagination import Pagination from .selectors import ( - SelectChoicePackTeam, SelectOpenPack, SelectPaperdexCardset, - SelectPaperdexTeam, SelectBuyPacksCardset, SelectBuyPacksTeam, - SelectUpdatePlayerTeam, SelectView + SelectChoicePackTeam, + SelectOpenPack, + SelectPaperdexCardset, + SelectPaperdexTeam, + SelectBuyPacksCardset, + SelectBuyPacksTeam, + SelectUpdatePlayerTeam, + SelectView, ) from .dropdowns import Dropdown, DropdownView +from .scout_view import ScoutView __all__ = [ - 'Question', 'Confirm', 'ButtonOptions', - 'Pagination', - 'SelectChoicePackTeam', 'SelectOpenPack', 'SelectPaperdexCardset', - 'SelectPaperdexTeam', 'SelectBuyPacksCardset', 'SelectBuyPacksTeam', - 'SelectUpdatePlayerTeam', 'SelectView', - 'Dropdown', 'DropdownView' -] \ No newline at end of file + "Question", + "Confirm", + "ButtonOptions", + "Pagination", + "SelectChoicePackTeam", + "SelectOpenPack", + "SelectPaperdexCardset", + "SelectPaperdexTeam", + "SelectBuyPacksCardset", + "SelectBuyPacksTeam", + "SelectUpdatePlayerTeam", + "SelectView", + "Dropdown", + "DropdownView", + "ScoutView", +] diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py new file mode 100644 index 0000000..2e7dfb8 --- /dev/null +++ b/discord_ui/scout_view.py @@ -0,0 +1,339 @@ +""" +Scout View — Face-down card button UI for the Scouting feature. + +When a player opens a pack, a ScoutView is posted with one button per card. +Other players can click a button to "scout" (blind-pick) one card, receiving +a copy. The opener keeps all their cards. Multiple players can scout different +cards from the same pack — each costs one scout token. +""" + +import datetime +import logging + +import discord + +from api_calls import db_get, db_post, db_patch +from helpers.main import get_team_by_owner, get_card_embeds +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.constants import IMAGES, PD_SEASON + +logger = logging.getLogger("discord_app") + +SCOUT_TOKENS_PER_DAY = 2 + + +class ScoutView(discord.ui.View): + """Displays face-down card buttons for a scout opportunity. + + - One button per card, labeled "Card 1" ... "Card N" + - Any player EXCEPT the pack opener can interact + - Each card can be scouted once; multiple players can scout different cards + - One scout per player per pack + - Timeout: 30 minutes + """ + + def __init__( + self, + scout_opp_id: int, + cards: list[dict], + opener_team: dict, + opener_user_id: int, + bot, + ): + super().__init__(timeout=1800.0) + self.scout_opp_id = scout_opp_id + self.cards = cards + self.opener_team = opener_team + self.opener_user_id = opener_user_id + self.bot = bot + self.message: discord.Message | None = None + self.card_lines: list[tuple[int, str]] = [] + + # Per-card claim tracking: position -> scouter team name + self.claimed_positions: dict[int, str] = {} + # Per-user lock: user IDs who have already scouted this pack + self.scouted_users: set[int] = set() + # Positions currently being processed (prevent double-click race) + self.processing: set[int] = set() + + for i, card in enumerate(cards): + button = ScoutButton( + card=card, + position=i, + scout_view=self, + ) + self.add_item(button) + + @property + def all_claimed(self) -> bool: + return len(self.claimed_positions) >= len(self.cards) + + async def update_message(self): + """Refresh the embed with current claim state.""" + if not self.message: + return + + from helpers.scouting import build_scouted_card_list + + scouted_ids = {} + for pos, team_name in self.claimed_positions.items(): + player_id = self.cards[pos]["player"]["player_id"] + scouted_ids[player_id] = team_name + + card_list = build_scouted_card_list(self.card_lines, scouted_ids) + claim_count = len(self.claimed_positions) + + if self.all_claimed: + title = "Fully Scouted!" + footer_text = f"Paper Dynasty Season {PD_SEASON} \u2022 All cards scouted" + else: + title = f"Scout Opportunity! ({claim_count}/{len(self.cards)} scouted)" + footer_text = ( + f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player" + ) + + embed = get_team_embed(title=title, team=self.opener_team) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}\n\n" + ) + if not self.all_claimed: + embed.description += ( + "Pick a card — but which is which?\n" + "Costs 1 Scout Token (2 per day, resets at midnight Central)." + ) + + embed.set_footer(text=footer_text, icon_url=IMAGES["logo"]) + + try: + await self.message.edit(embed=embed, view=self) + except Exception as e: + logger.error(f"Failed to update scout message: {e}") + + async def on_timeout(self): + """Disable all buttons and update the embed when the window expires.""" + for item in self.children: + item.disabled = True + + if self.message: + try: + from helpers.scouting import build_scouted_card_list + + scouted_ids = {} + for pos, team_name in self.claimed_positions.items(): + player_id = self.cards[pos]["player"]["player_id"] + scouted_ids[player_id] = team_name + + card_list = build_scouted_card_list(self.card_lines, scouted_ids) + claim_count = len(self.claimed_positions) + + if claim_count > 0: + title = ( + f"Scout Window Closed ({claim_count}/{len(self.cards)} scouted)" + ) + else: + title = "Scout Window Closed" + + embed = get_team_embed(title=title, team=self.opener_team) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON}", + icon_url=IMAGES["logo"], + ) + await self.message.edit(embed=embed, view=self) + except Exception as e: + logger.error(f"Failed to edit expired scout message: {e}") + + +class ScoutButton(discord.ui.Button): + """A single face-down card button in a ScoutView.""" + + def __init__(self, card: dict, position: int, scout_view: ScoutView): + super().__init__( + label=f"Card {position + 1}", + style=discord.ButtonStyle.secondary, + row=0, + ) + self.card = card + self.position = position + self.scout_view: ScoutView = scout_view + + async def callback(self, interaction: discord.Interaction): + view = self.scout_view + + # Block the opener + if interaction.user.id == view.opener_user_id: + await interaction.response.send_message( + "You can't scout your own pack!", + ephemeral=True, + ) + return + + # One scout per player per pack + if interaction.user.id in view.scouted_users: + await interaction.response.send_message( + "You already scouted a card from this pack!", + ephemeral=True, + ) + return + + # This card already taken + if self.position in view.claimed_positions: + await interaction.response.send_message( + "This card was already scouted! Try a different one.", + ephemeral=True, + ) + return + + # Prevent double-click race on same card + if self.position in view.processing: + await interaction.response.send_message( + "Hold on, someone's claiming this card right now...", + ephemeral=True, + ) + return + + view.processing.add(self.position) + await interaction.response.defer(ephemeral=True) + + try: + # Get scouting player's team + scouter_team = await get_team_by_owner(interaction.user.id) + if not scouter_team: + await interaction.followup.send( + "You need a Paper Dynasty team to scout! Ask an admin to set one up.", + ephemeral=True, + ) + return + + # Check scout token balance + now = datetime.datetime.now() + midnight = int_timestamp( + datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + ) + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", scouter_team["id"]), + ("created_after", midnight), + ], + ) + tokens_used = used_today["count"] if used_today else 0 + + if tokens_used >= SCOUT_TOKENS_PER_DAY: + await interaction.followup.send( + "You're out of scout tokens for today! You get 2 per day, resetting at midnight Central.", + ephemeral=True, + ) + return + + # Record the claim in the database + try: + await db_post( + "scout_claims", + payload={ + "scout_opportunity_id": view.scout_opp_id, + "card_id": self.card["id"], + "claimed_by_team_id": scouter_team["id"], + }, + ) + except Exception as e: + logger.error(f"Failed to record scout claim: {e}") + await interaction.followup.send( + "Something went wrong claiming this scout. Try again!", + ephemeral=True, + ) + return + + # Consume a scout token + current = await db_get("current") + await db_post( + "rewards", + payload={ + "name": "Scout Token", + "team_id": scouter_team["id"], + "season": current["season"] if current else PD_SEASON, + "week": current["week"] if current else 1, + "created": int_timestamp(now), + }, + ) + + # Create a copy of the card for the scouter + await db_post( + "cards", + payload={ + "cards": [ + { + "player_id": self.card["player"]["player_id"], + "team_id": scouter_team["id"], + } + ], + }, + ) + + # Track the claim + view.claimed_positions[self.position] = scouter_team["lname"] + view.scouted_users.add(interaction.user.id) + + # Update this button + self.disabled = True + self.style = discord.ButtonStyle.success + self.label = "Scouted!" + + # If all cards claimed, disable remaining buttons and stop + if view.all_claimed: + for item in view.children: + item.disabled = True + view.stop() + + # Update the shared embed + await view.update_message() + + # Send the scouter their card details (ephemeral) + player_name = self.card["player"]["p_name"] + rarity_name = self.card["player"]["rarity"]["name"] + + card_for_embed = { + "player": self.card["player"], + "team": scouter_team, + } + card_embeds = await get_card_embeds(card_for_embed) + await interaction.followup.send( + content=f"You scouted a **{rarity_name}** {player_name}!", + embeds=card_embeds, + ephemeral=True, + ) + + # Notify for shiny scouts (rarity >= 5) + if self.card["player"]["rarity"]["value"] >= 5: + try: + from helpers.discord_utils import send_to_channel + + notif_embed = get_team_embed(title="Rare Scout!", team=scouter_team) + notif_embed.description = ( + f"**{scouter_team['lname']}** scouted a " + f"**{rarity_name}** {player_name}!" + ) + notif_embed.set_thumbnail( + url=self.card["player"].get("headshot", IMAGES["logo"]) + ) + await send_to_channel( + view.bot, "pd-network-news", embed=notif_embed + ) + except Exception as e: + logger.error(f"Failed to send shiny scout notification: {e}") + + except Exception as e: + logger.error(f"Unexpected error in scout callback: {e}", exc_info=True) + try: + await interaction.followup.send( + "Something went wrong. Please try again.", + ephemeral=True, + ) + except Exception: + pass + finally: + view.processing.discard(self.position) diff --git a/helpers/__init__.py b/helpers/__init__.py index 4b62f4e..8c7e39d 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py @@ -6,7 +6,7 @@ The package is organized into logical modules for better maintainability. Modules: - constants: Application constants and configuration -- utils: General utility functions +- utils: General utility functions - random_content: Random content generators - search_utils: Search and fuzzy matching functionality - discord_utils: Discord helper functions @@ -21,9 +21,10 @@ Modules: # This allows existing code to continue working during the migration from helpers.main import * -# Import from migrated modules +# Import from migrated modules from .constants import * from .utils import * from .random_content import * -from .search_utils import * -from .discord_utils import * \ No newline at end of file +from .search_utils import * +from .discord_utils import * +from .scouting import * diff --git a/helpers/main.py b/helpers/main.py index ed16a3b..4dfc659 100644 --- a/helpers/main.py +++ b/helpers/main.py @@ -8,7 +8,7 @@ import traceback import discord import pygsheets -import requests +import aiohttp from discord.ext import commands from api_calls import * @@ -43,17 +43,21 @@ async def get_player_photo(player): ) try: - resp = requests.get(req_url, timeout=0.5) - except Exception as e: + async with aiohttp.ClientSession() as session: + async with session.get( + req_url, timeout=aiohttp.ClientTimeout(total=0.5) + ) as resp: + if resp.status == 200: + data = await resp.json() + if data["player"] and data["player"][0]["strSport"] == "Baseball": + await db_patch( + "players", + object_id=player["player_id"], + params=[("headshot", data["player"][0]["strThumb"])], + ) + return data["player"][0]["strThumb"] + except Exception: return None - if resp.status_code == 200 and resp.json()["player"]: - if resp.json()["player"][0]["strSport"] == "Baseball": - await db_patch( - "players", - object_id=player["player_id"], - params=[("headshot", resp.json()["player"][0]["strThumb"])], - ) - return resp.json()["player"][0]["strThumb"] return None @@ -1681,9 +1685,9 @@ async def paperdex_team_embed(team: dict, mlb_team: dict) -> list[discord.Embed] for cardset_id in coll_data: if cardset_id != "total_owned": if coll_data[cardset_id]["players"]: - coll_data[cardset_id]["embeds"][0].description = ( - f"{mlb_team['lname']} / {coll_data[cardset_id]['name']}" - ) + coll_data[cardset_id]["embeds"][ + 0 + ].description = f"{mlb_team['lname']} / {coll_data[cardset_id]['name']}" coll_data[cardset_id]["embeds"][0].add_field( name="# Collected / # Total Cards", value=f"{coll_data[cardset_id]['owned']} / {len(coll_data[cardset_id]['players'])}", @@ -1749,6 +1753,8 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): all_cards = [] for p_id in pack_ids: new_cards = await db_get("cards", params=[("pack_id", p_id)]) + for card in new_cards["cards"]: + card.setdefault("pack_id", p_id) all_cards.extend(new_cards["cards"]) if not all_cards: @@ -1764,6 +1770,18 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): await context.channel.send(content=f"Let's head down to {pack_channel.mention}!") await display_cards(all_cards, team, pack_channel, author, pack_cover=pack_cover) + # Create scout opportunities for each pack + from helpers.scouting import create_scout_opportunity + + for p_id in pack_ids: + pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] + if pack_cards: + await create_scout_opportunity( + pack_cards, team, pack_channel, author, context + ) + if len(pack_ids) > 1: + await asyncio.sleep(2) + async def get_choice_from_cards( interaction: discord.Interaction, diff --git a/helpers/scouting.py b/helpers/scouting.py new file mode 100644 index 0000000..32536fc --- /dev/null +++ b/helpers/scouting.py @@ -0,0 +1,173 @@ +""" +Scouting Helper Functions + +Handles creation of scout opportunities after pack openings +and embed formatting for the scouting feature. +""" + +import asyncio +import datetime +import logging +import random + +import discord + +from api_calls import db_post +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.constants import IMAGES, PD_SEASON + +logger = logging.getLogger("discord_app") + +SCOUT_WINDOW_SECONDS = 1800 # 30 minutes + +# Rarity value → display symbol +RARITY_SYMBOLS = { + 8: "\U0001f7e1", # HoF — yellow + 5: "\U0001f7e3", # MVP — purple + 3: "\U0001f535", # All-Star — blue + 2: "\U0001f7e2", # Starter — green + 1: "\u26aa", # Reserve — white + 0: "\u26ab", # Replacement — black +} + + +def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: + """Build a shuffled list of (player_id, display_line) tuples.""" + lines = [] + for card in cards: + player = card["player"] + rarity_val = player["rarity"]["value"] + symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + lines.append( + ( + player["player_id"], + f"{symbol} {player['rarity']['name']} — {player['p_name']}", + ) + ) + random.shuffle(lines) + return lines + + +def build_scout_embed( + opener_team: dict, + cards: list[dict], + card_lines: list[tuple[int, str]] = None, +) -> discord.Embed: + """Build the embed shown above the scout buttons. + + Shows a shuffled list of cards (rarity + player name) so scouters + know what's in the pack but not which button maps to which card. + Returns (embed, card_lines) so the view can store the shuffled order. + """ + embed = get_team_embed(title="Scout Opportunity!", team=opener_team) + + if card_lines is None: + card_lines = _build_card_lines(cards) + + card_list = "\n".join(line for _, line in card_lines) + + embed.description = ( + f"**{opener_team['lname']}** just opened a pack!\n\n" + f"**Cards in this pack:**\n{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"This window closes in **30 minutes**." + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", + icon_url=IMAGES["logo"], + ) + return embed, card_lines + + +def build_scouted_card_list( + card_lines: list[tuple[int, str]], + scouted_cards: dict[int, str], +) -> str: + """Rebuild the card list marking scouted cards with the scouter's team name. + + Parameters + ---------- + card_lines : shuffled list of (player_id, display_line) tuples + scouted_cards : {player_id: scouter_team_name} for each claimed card + """ + result = [] + for player_id, line in card_lines: + if player_id in scouted_cards: + team_name = scouted_cards[player_id] + result.append(f"{line} \u2014 \u2714\ufe0f *{team_name}*") + else: + result.append(line) + return "\n".join(result) + + +async def create_scout_opportunity( + pack_cards: list[dict], + opener_team: dict, + channel: discord.TextChannel, + opener_user, + context, +) -> None: + """Create a scout opportunity and post the ScoutView to the channel. + + Called after display_cards() completes in open_st_pr_packs(). + Wrapped in try/except so scouting failures never crash pack opening. + + Parameters + ---------- + pack_cards : list of card dicts from a single pack + opener_team : team dict for the pack opener + channel : the #pack-openings channel + opener_user : discord.Member or discord.User who opened the pack + context : the command context (Context or Interaction), used to get bot + """ + from discord_ui.scout_view import ScoutView + + # Only create scout opportunities in the pack-openings channel + if not channel or channel.name != "pack-openings": + return + + if not pack_cards: + return + + now = datetime.datetime.now() + expires_at = int_timestamp(now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)) + created = int_timestamp(now) + + card_ids = [c["id"] for c in pack_cards] + + try: + scout_opp = await db_post( + "scout_opportunities", + payload={ + "pack_id": pack_cards[0].get("pack_id"), + "opener_team_id": opener_team["id"], + "card_ids": card_ids, + "expires_at": expires_at, + "created": created, + }, + ) + except Exception as e: + logger.error(f"Failed to create scout opportunity: {e}") + return + + embed, card_lines = build_scout_embed(opener_team, pack_cards) + + # Get bot reference from context + bot = getattr(context, "bot", None) or getattr(context, "client", None) + + view = ScoutView( + scout_opp_id=scout_opp["id"], + cards=pack_cards, + opener_team=opener_team, + opener_user_id=opener_user.id, + bot=bot, + ) + view.card_lines = card_lines + + try: + msg = await channel.send(embed=embed, view=view) + view.message = msg + except Exception as e: + logger.error(f"Failed to post scout opportunity message: {e}") diff --git a/paperdynasty.py b/paperdynasty.py index d7d9ea1..951654a 100644 --- a/paperdynasty.py +++ b/paperdynasty.py @@ -12,12 +12,12 @@ from in_game.gameplay_queries import get_channel_game_or_none from health_server import run_health_server from notify_restart import send_restart_notification -raw_log_level = os.getenv('LOG_LEVEL') -if raw_log_level == 'DEBUG': +raw_log_level = os.getenv("LOG_LEVEL") +if raw_log_level == "DEBUG": log_level = logging.DEBUG -elif raw_log_level == 'INFO': +elif raw_log_level == "INFO": log_level = logging.INFO -elif raw_log_level == 'WARN': +elif raw_log_level == "WARN": log_level = logging.WARNING else: log_level = logging.ERROR @@ -29,17 +29,17 @@ else: # level=log_level # ) # logger.getLogger('discord.http').setLevel(logger.INFO) -logger = logging.getLogger('discord_app') +logger = logging.getLogger("discord_app") logger.setLevel(log_level) handler = RotatingFileHandler( - filename='logs/discord.log', + filename="logs/discord.log", # encoding='utf-8', maxBytes=32 * 1024 * 1024, # 32 MiB backupCount=5, # Rotate through 5 files ) -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") handler.setFormatter(formatter) # dt_fmt = '%Y-%m-%d %H:%M:%S' @@ -48,27 +48,30 @@ handler.setFormatter(formatter) logger.addHandler(handler) COGS = [ - 'cogs.owner', - 'cogs.admins', - 'cogs.economy', - 'cogs.players', - 'cogs.gameplay', + "cogs.owner", + "cogs.admins", + "cogs.economy", + "cogs.players", + "cogs.gameplay", + "cogs.economy_new.scouting", ] intents = discord.Intents.default() intents.members = True intents.message_content = True -bot = commands.Bot(command_prefix='.', - intents=intents, - # help_command=None, - description='The Paper Dynasty Bot\nIf you have questions, feel free to contact Cal.', - case_insensitive=True, - owner_id=258104532423147520) +bot = commands.Bot( + command_prefix=".", + intents=intents, + # help_command=None, + description="The Paper Dynasty Bot\nIf you have questions, feel free to contact Cal.", + case_insensitive=True, + owner_id=258104532423147520, +) @bot.event async def on_ready(): - logger.info('Logged in as:') + logger.info("Logged in as:") logger.info(bot.user.name) logger.info(bot.user.id) @@ -77,9 +80,11 @@ async def on_ready(): @bot.tree.error -async def on_app_command_error(interaction: discord.Interaction, error: discord.app_commands.AppCommandError): +async def on_app_command_error( + interaction: discord.Interaction, error: discord.app_commands.AppCommandError +): """Global error handler for all app commands (slash commands).""" - logger.error(f'App command error in {interaction.command}: {error}', exc_info=error) + logger.error(f"App command error in {interaction.command}: {error}", exc_info=error) # CRITICAL: Release play lock if command failed during gameplay # This prevents permanent user lockouts when exceptions occur @@ -97,22 +102,23 @@ async def on_app_command_error(interaction: discord.Interaction, error: discord. session.add(current_play) session.commit() except Exception as lock_error: - logger.error(f'Failed to release play lock after error: {lock_error}', exc_info=lock_error) + logger.error( + f"Failed to release play lock after error: {lock_error}", + exc_info=lock_error, + ) # Try to respond to the user try: if not interaction.response.is_done(): await interaction.response.send_message( - f'❌ An error occurred: {str(error)}', - ephemeral=True + f"❌ An error occurred: {str(error)}", ephemeral=True ) else: await interaction.followup.send( - f'❌ An error occurred: {str(error)}', - ephemeral=True + f"❌ An error occurred: {str(error)}", ephemeral=True ) except Exception as e: - logger.error(f'Failed to send error message to user: {e}') + logger.error(f"Failed to send error message to user: {e}") async def main(): @@ -120,10 +126,10 @@ async def main(): for c in COGS: try: await bot.load_extension(c) - logger.info(f'Loaded cog: {c}') + logger.info(f"Loaded cog: {c}") except Exception as e: - logger.error(f'Failed to load cog: {c}') - logger.error(f'{e}') + logger.error(f"Failed to load cog: {c}") + logger.error(f"{e}") # Start health server and bot concurrently async with bot: @@ -132,7 +138,7 @@ async def main(): try: # Start bot (this blocks until bot stops) - await bot.start(os.environ.get('BOT_TOKEN', 'NONE')) + await bot.start(os.environ.get("BOT_TOKEN", "NONE")) finally: # Cleanup: cancel health server when bot stops health_task.cancel() @@ -141,4 +147,5 @@ async def main(): except asyncio.CancelledError: pass + asyncio.run(main()) -- 2.25.1 From d538c679c319be12ab3a99aca171ed5e7801f959 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 19:29:44 -0600 Subject: [PATCH 02/12] refactor: Consolidate scouting utilities, add test suite, use Discord timestamps - Consolidate SCOUT_TOKENS_PER_DAY and get_scout_tokens_used() into helpers/scouting.py (was duplicated across 3 files) - Add midnight_timestamp() utility to helpers/utils.py - Remove _build_scouted_ids() wrapper, use self.claims directly - Fix build_scout_embed return type annotation - Use Discord relative timestamps for scout window countdown - Add 66-test suite covering helpers, ScoutView, and cog Co-Authored-By: Claude Opus 4.6 --- cogs/economy_new/scouting.py | 18 +- discord_ui/__init__.py | 6 +- discord_ui/scout_view.py | 137 +-- helpers/scouting.py | 53 +- helpers/utils.py | 115 +-- tests/scouting/__init__.py | 0 tests/scouting/conftest.py | 160 ++++ tests/scouting/test_scout_view.py | 1029 +++++++++++++++++++++++ tests/scouting/test_scouting_cog.py | 269 ++++++ tests/scouting/test_scouting_helpers.py | 374 ++++++++ 10 files changed, 1987 insertions(+), 174 deletions(-) create mode 100644 tests/scouting/__init__.py create mode 100644 tests/scouting/conftest.py create mode 100644 tests/scouting/test_scout_view.py create mode 100644 tests/scouting/test_scouting_cog.py create mode 100644 tests/scouting/test_scouting_helpers.py diff --git a/cogs/economy_new/scouting.py b/cogs/economy_new/scouting.py index 9e895e5..118927a 100644 --- a/cogs/economy_new/scouting.py +++ b/cogs/economy_new/scouting.py @@ -10,6 +10,7 @@ from discord import app_commands from discord.ext import commands, tasks from api_calls import db_get +from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.main import get_team_by_owner @@ -17,8 +18,6 @@ from helpers.constants import PD_SEASON, IMAGES logger = logging.getLogger("discord_app") -SCOUT_TOKENS_PER_DAY = 2 - class Scouting(commands.Cog): """Scout token tracking and expired opportunity cleanup.""" @@ -45,20 +44,7 @@ class Scouting(commands.Cog): ) return - now = datetime.datetime.now() - midnight = int_timestamp( - datetime.datetime(now.year, now.month, now.day, 0, 0, 0) - ) - - used_today = await db_get( - "rewards", - params=[ - ("name", "Scout Token"), - ("team_id", team["id"]), - ("created_after", midnight), - ], - ) - tokens_used = used_today["count"] if used_today else 0 + tokens_used = await get_scout_tokens_used(team["id"]) tokens_remaining = max(0, SCOUT_TOKENS_PER_DAY - tokens_used) embed = get_team_embed(title="Scout Tokens", team=team) diff --git a/discord_ui/__init__.py b/discord_ui/__init__.py index 88a3f9d..ffc1390 100644 --- a/discord_ui/__init__.py +++ b/discord_ui/__init__.py @@ -17,7 +17,10 @@ from .selectors import ( SelectView, ) from .dropdowns import Dropdown, DropdownView -from .scout_view import ScoutView + +# ScoutView intentionally NOT imported here to avoid circular import: +# helpers.main → discord_ui → scout_view → helpers.main +# Import directly: from discord_ui.scout_view import ScoutView __all__ = [ "Question", @@ -34,5 +37,4 @@ __all__ = [ "SelectView", "Dropdown", "DropdownView", - "ScoutView", ] diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 2e7dfb8..11ce77a 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -3,32 +3,30 @@ Scout View — Face-down card button UI for the Scouting feature. When a player opens a pack, a ScoutView is posted with one button per card. Other players can click a button to "scout" (blind-pick) one card, receiving -a copy. The opener keeps all their cards. Multiple players can scout different -cards from the same pack — each costs one scout token. +a copy. The opener keeps all their cards. Multiple players can scout the same +card — each gets their own copy. """ -import datetime import logging import discord -from api_calls import db_get, db_post, db_patch +from api_calls import db_get, db_post from helpers.main import get_team_by_owner, get_card_embeds +from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") -SCOUT_TOKENS_PER_DAY = 2 - class ScoutView(discord.ui.View): """Displays face-down card buttons for a scout opportunity. - One button per card, labeled "Card 1" ... "Card N" - Any player EXCEPT the pack opener can interact - - Each card can be scouted once; multiple players can scout different cards + - Any card can be scouted multiple times by different players - One scout per player per pack - Timeout: 30 minutes """ @@ -40,6 +38,7 @@ class ScoutView(discord.ui.View): opener_team: dict, opener_user_id: int, bot, + expires_unix: int = None, ): super().__init__(timeout=1800.0) self.scout_opp_id = scout_opp_id @@ -47,15 +46,18 @@ class ScoutView(discord.ui.View): self.opener_team = opener_team self.opener_user_id = opener_user_id self.bot = bot + self.expires_unix = expires_unix self.message: discord.Message | None = None self.card_lines: list[tuple[int, str]] = [] - # Per-card claim tracking: position -> scouter team name - self.claimed_positions: dict[int, str] = {} + # Per-card claim tracking: player_id -> list of scouter team names + self.claims: dict[int, list[str]] = {} # Per-user lock: user IDs who have already scouted this pack self.scouted_users: set[int] = set() - # Positions currently being processed (prevent double-click race) - self.processing: set[int] = set() + # Users currently being processed (prevent double-click race) + self.processing_users: set[int] = set() + # Total scout count + self.total_scouts = 0 for i, card in enumerate(cards): button = ScoutButton( @@ -65,10 +67,6 @@ class ScoutView(discord.ui.View): ) self.add_item(button) - @property - def all_claimed(self) -> bool: - return len(self.claimed_positions) >= len(self.cards) - async def update_message(self): """Refresh the embed with current claim state.""" if not self.message: @@ -76,34 +74,26 @@ class ScoutView(discord.ui.View): from helpers.scouting import build_scouted_card_list - scouted_ids = {} - for pos, team_name in self.claimed_positions.items(): - player_id = self.cards[pos]["player"]["player_id"] - scouted_ids[player_id] = team_name - - card_list = build_scouted_card_list(self.card_lines, scouted_ids) - claim_count = len(self.claimed_positions) - - if self.all_claimed: - title = "Fully Scouted!" - footer_text = f"Paper Dynasty Season {PD_SEASON} \u2022 All cards scouted" - else: - title = f"Scout Opportunity! ({claim_count}/{len(self.cards)} scouted)" - footer_text = ( - f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player" - ) + card_list = build_scouted_card_list(self.card_lines, self.claims) + title = f"Scout Opportunity! ({self.total_scouts} scouted)" embed = get_team_embed(title=title, team=self.opener_team) - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}\n\n" - ) - if not self.all_claimed: - embed.description += ( - "Pick a card — but which is which?\n" - "Costs 1 Scout Token (2 per day, resets at midnight Central)." - ) + if self.expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." - embed.set_footer(text=footer_text, icon_url=IMAGES["logo"]) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" + f"{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"{time_line}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", + icon_url=IMAGES["logo"], + ) try: await self.message.edit(embed=embed, view=self) @@ -119,18 +109,10 @@ class ScoutView(discord.ui.View): try: from helpers.scouting import build_scouted_card_list - scouted_ids = {} - for pos, team_name in self.claimed_positions.items(): - player_id = self.cards[pos]["player"]["player_id"] - scouted_ids[player_id] = team_name + card_list = build_scouted_card_list(self.card_lines, self.claims) - card_list = build_scouted_card_list(self.card_lines, scouted_ids) - claim_count = len(self.claimed_positions) - - if claim_count > 0: - title = ( - f"Scout Window Closed ({claim_count}/{len(self.cards)} scouted)" - ) + if self.total_scouts > 0: + title = f"Scout Window Closed ({self.total_scouts} scouted)" else: title = "Scout Window Closed" @@ -179,23 +161,11 @@ class ScoutButton(discord.ui.Button): ) return - # This card already taken - if self.position in view.claimed_positions: - await interaction.response.send_message( - "This card was already scouted! Try a different one.", - ephemeral=True, - ) + # Prevent double-click race for same user + if interaction.user.id in view.processing_users: return - # Prevent double-click race on same card - if self.position in view.processing: - await interaction.response.send_message( - "Hold on, someone's claiming this card right now...", - ephemeral=True, - ) - return - - view.processing.add(self.position) + view.processing_users.add(interaction.user.id) await interaction.response.defer(ephemeral=True) try: @@ -209,19 +179,7 @@ class ScoutButton(discord.ui.Button): return # Check scout token balance - now = datetime.datetime.now() - midnight = int_timestamp( - datetime.datetime(now.year, now.month, now.day, 0, 0, 0) - ) - used_today = await db_get( - "rewards", - params=[ - ("name", "Scout Token"), - ("team_id", scouter_team["id"]), - ("created_after", midnight), - ], - ) - tokens_used = used_today["count"] if used_today else 0 + tokens_used = await get_scout_tokens_used(scouter_team["id"]) if tokens_used >= SCOUT_TOKENS_PER_DAY: await interaction.followup.send( @@ -257,7 +215,7 @@ class ScoutButton(discord.ui.Button): "team_id": scouter_team["id"], "season": current["season"] if current else PD_SEASON, "week": current["week"] if current else 1, - "created": int_timestamp(now), + "created": int_timestamp(), }, ) @@ -275,19 +233,12 @@ class ScoutButton(discord.ui.Button): ) # Track the claim - view.claimed_positions[self.position] = scouter_team["lname"] + player_id = self.card["player"]["player_id"] + if player_id not in view.claims: + view.claims[player_id] = [] + view.claims[player_id].append(scouter_team["lname"]) view.scouted_users.add(interaction.user.id) - - # Update this button - self.disabled = True - self.style = discord.ButtonStyle.success - self.label = "Scouted!" - - # If all cards claimed, disable remaining buttons and stop - if view.all_claimed: - for item in view.children: - item.disabled = True - view.stop() + view.total_scouts += 1 # Update the shared embed await view.update_message() @@ -336,4 +287,4 @@ class ScoutButton(discord.ui.Button): except Exception: pass finally: - view.processing.discard(self.position) + view.processing_users.discard(interaction.user.id) diff --git a/helpers/scouting.py b/helpers/scouting.py index 32536fc..ab2d2c2 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -12,13 +12,14 @@ import random import discord -from api_calls import db_post -from helpers.utils import int_timestamp +from api_calls import db_get, db_post +from helpers.utils import int_timestamp, midnight_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") +SCOUT_TOKENS_PER_DAY = 2 SCOUT_WINDOW_SECONDS = 1800 # 30 minutes # Rarity value → display symbol @@ -32,6 +33,19 @@ RARITY_SYMBOLS = { } +async def get_scout_tokens_used(team_id: int) -> int: + """Return how many scout tokens a team has used today.""" + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", team_id), + ("created_after", midnight_timestamp()), + ], + ) + return used_today["count"] if used_today else 0 + + def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: """Build a shuffled list of (player_id, display_line) tuples.""" lines = [] @@ -53,7 +67,8 @@ def build_scout_embed( opener_team: dict, cards: list[dict], card_lines: list[tuple[int, str]] = None, -) -> discord.Embed: + expires_unix: int = None, +) -> tuple[discord.Embed, list[tuple[int, str]]]: """Build the embed shown above the scout buttons. Shows a shuffled list of cards (rarity + player name) so scouters @@ -67,12 +82,17 @@ def build_scout_embed( card_list = "\n".join(line for _, line in card_lines) + if expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." + embed.description = ( f"**{opener_team['lname']}** just opened a pack!\n\n" f"**Cards in this pack:**\n{card_list}\n\n" f"Pick a card — but which is which?\n" f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"This window closes in **30 minutes**." + f"{time_line}" ) embed.set_footer( text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", @@ -83,20 +103,25 @@ def build_scout_embed( def build_scouted_card_list( card_lines: list[tuple[int, str]], - scouted_cards: dict[int, str], + scouted_cards: dict[int, list[str]], ) -> str: - """Rebuild the card list marking scouted cards with the scouter's team name. + """Rebuild the card list marking scouted cards with scouter team names. Parameters ---------- card_lines : shuffled list of (player_id, display_line) tuples - scouted_cards : {player_id: scouter_team_name} for each claimed card + scouted_cards : {player_id: [team_name, ...]} for each claimed card """ result = [] for player_id, line in card_lines: - if player_id in scouted_cards: - team_name = scouted_cards[player_id] - result.append(f"{line} \u2014 \u2714\ufe0f *{team_name}*") + teams = scouted_cards.get(player_id) + if teams: + count = len(teams) + names = ", ".join(f"*{t}*" for t in teams) + if count == 1: + result.append(f"{line} \u2014 \u2714\ufe0f {names}") + else: + result.append(f"{line} \u2014 \u2714\ufe0f x{count} ({names})") else: result.append(line) return "\n".join(result) @@ -152,7 +177,12 @@ async def create_scout_opportunity( logger.error(f"Failed to create scout opportunity: {e}") return - embed, card_lines = build_scout_embed(opener_team, pack_cards) + expires_unix = int( + (now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)).timestamp() + ) + embed, card_lines = build_scout_embed( + opener_team, pack_cards, expires_unix=expires_unix + ) # Get bot reference from context bot = getattr(context, "bot", None) or getattr(context, "client", None) @@ -163,6 +193,7 @@ async def create_scout_opportunity( opener_team=opener_team, opener_user_id=opener_user.id, bot=bot, + expires_unix=expires_unix, ) view.card_lines = card_lines diff --git a/helpers/utils.py b/helpers/utils.py index 9fc70e3..7535bf7 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -4,6 +4,7 @@ General Utilities This module contains standalone utility functions with minimal dependencies, including timestamp conversion, position abbreviations, and simple helpers. """ + import datetime from typing import Optional import discord @@ -16,48 +17,55 @@ def int_timestamp(datetime_obj: Optional[datetime.datetime] = None): return int(datetime.datetime.now().timestamp()) +def midnight_timestamp() -> int: + """Return today's midnight (00:00:00) as an integer millisecond timestamp.""" + now = datetime.datetime.now() + midnight = datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + return int_timestamp(midnight) + + def get_pos_abbrev(field_pos: str) -> str: """Convert position name to standard abbreviation.""" - if field_pos.lower() == 'catcher': - return 'C' - elif field_pos.lower() == 'first baseman': - return '1B' - elif field_pos.lower() == 'second baseman': - return '2B' - elif field_pos.lower() == 'third baseman': - return '3B' - elif field_pos.lower() == 'shortstop': - return 'SS' - elif field_pos.lower() == 'left fielder': - return 'LF' - elif field_pos.lower() == 'center fielder': - return 'CF' - elif field_pos.lower() == 'right fielder': - return 'RF' + if field_pos.lower() == "catcher": + return "C" + elif field_pos.lower() == "first baseman": + return "1B" + elif field_pos.lower() == "second baseman": + return "2B" + elif field_pos.lower() == "third baseman": + return "3B" + elif field_pos.lower() == "shortstop": + return "SS" + elif field_pos.lower() == "left fielder": + return "LF" + elif field_pos.lower() == "center fielder": + return "CF" + elif field_pos.lower() == "right fielder": + return "RF" else: - return 'P' + return "P" def position_name_to_abbrev(position_name): """Convert position name to abbreviation (alternate format).""" - if position_name == 'Catcher': - return 'C' - elif position_name == 'First Base': - return '1B' - elif position_name == 'Second Base': - return '2B' - elif position_name == 'Third Base': - return '3B' - elif position_name == 'Shortstop': - return 'SS' - elif position_name == 'Left Field': - return 'LF' - elif position_name == 'Center Field': - return 'CF' - elif position_name == 'Right Field': - return 'RF' - elif position_name == 'Pitcher': - return 'P' + if position_name == "Catcher": + return "C" + elif position_name == "First Base": + return "1B" + elif position_name == "Second Base": + return "2B" + elif position_name == "Third Base": + return "3B" + elif position_name == "Shortstop": + return "SS" + elif position_name == "Left Field": + return "LF" + elif position_name == "Center Field": + return "CF" + elif position_name == "Right Field": + return "RF" + elif position_name == "Pitcher": + return "P" else: return position_name @@ -67,13 +75,13 @@ def user_has_role(user: discord.User | discord.Member, role_name: str) -> bool: for x in user.roles: if x.name == role_name: return True - + return False def get_roster_sheet_legacy(team): """Get legacy roster sheet URL for a team.""" - return f'https://docs.google.com/spreadsheets/d/{team.gsheet}/edit' + return f"https://docs.google.com/spreadsheets/d/{team.gsheet}/edit" def get_roster_sheet(team): @@ -83,13 +91,15 @@ def get_roster_sheet(team): Handles both dict and Team object formats. """ # Handle both dict (team["gsheet"]) and object (team.gsheet) formats - gsheet = team.get("gsheet") if isinstance(team, dict) else getattr(team, "gsheet", None) - return f'https://docs.google.com/spreadsheets/d/{gsheet}/edit' + gsheet = ( + team.get("gsheet") if isinstance(team, dict) else getattr(team, "gsheet", None) + ) + return f"https://docs.google.com/spreadsheets/d/{gsheet}/edit" def get_player_url(team, player) -> str: """Generate player URL for SBA or Baseball Reference.""" - if team.get('league') == 'SBA': + if team.get("league") == "SBA": return f'https://statsplus.net/super-baseball-association/player/{player["player_id"]}' else: return f'https://www.baseball-reference.com/players/{player["bbref_id"][0]}/{player["bbref_id"]}.shtml' @@ -101,7 +111,7 @@ def owner_only(ctx) -> bool: owners = [287463767924137994, 1087936030899347516] # Handle both Context (has .author) and Interaction (has .user) objects - user = getattr(ctx, 'user', None) or getattr(ctx, 'author', None) + user = getattr(ctx, "user", None) or getattr(ctx, "author", None) if user and user.id in owners: return True @@ -121,35 +131,36 @@ def get_context_user(ctx): discord.User or discord.Member: The user who invoked the command """ # Handle both Context (has .author) and Interaction (has .user) objects - return getattr(ctx, 'user', None) or getattr(ctx, 'author', None) + return getattr(ctx, "user", None) or getattr(ctx, "author", None) def get_cal_user(ctx): """Get the Cal user from context. Always returns an object with .mention attribute.""" import logging - logger = logging.getLogger('discord_app') - + + logger = logging.getLogger("discord_app") + # Define placeholder user class first class PlaceholderUser: def __init__(self): self.mention = "<@287463767924137994>" self.id = 287463767924137994 - + # Handle both Context and Interaction objects - if hasattr(ctx, 'bot'): # Context object + if hasattr(ctx, "bot"): # Context object bot = ctx.bot logger.debug("get_cal_user: Using Context object") - elif hasattr(ctx, 'client'): # Interaction object + elif hasattr(ctx, "client"): # Interaction object bot = ctx.client logger.debug("get_cal_user: Using Interaction object") else: logger.error("get_cal_user: No bot or client found in context") return PlaceholderUser() - + if not bot: logger.error("get_cal_user: bot is None") return PlaceholderUser() - + logger.debug(f"get_cal_user: Searching among members") try: for user in bot.get_all_members(): @@ -158,7 +169,7 @@ def get_cal_user(ctx): return user except Exception as e: logger.error(f"get_cal_user: Exception in get_all_members: {e}") - + # Fallback: try to get user directly by ID logger.debug("get_cal_user: User not found in get_all_members, trying get_user") try: @@ -170,7 +181,7 @@ def get_cal_user(ctx): logger.debug("get_cal_user: get_user returned None") except Exception as e: logger.error(f"get_cal_user: Exception in get_user: {e}") - + # Last resort: return a placeholder user object with mention logger.debug("get_cal_user: Using placeholder user") - return PlaceholderUser() \ No newline at end of file + return PlaceholderUser() diff --git a/tests/scouting/__init__.py b/tests/scouting/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/scouting/conftest.py b/tests/scouting/conftest.py new file mode 100644 index 0000000..523e38f --- /dev/null +++ b/tests/scouting/conftest.py @@ -0,0 +1,160 @@ +"""Shared fixtures for scouting feature tests.""" + +import pytest +import asyncio +from unittest.mock import AsyncMock, MagicMock, Mock + +import discord +from discord.ext import commands + +# --------------------------------------------------------------------------- +# Sample data factories +# --------------------------------------------------------------------------- + + +def _make_player(player_id, name, rarity_name, rarity_value, headshot=None): + """Build a minimal player dict matching the API shape used by scouting.""" + return { + "player_id": player_id, + "p_name": name, + "rarity": {"name": rarity_name, "value": rarity_value, "color": "ffffff"}, + "headshot": headshot or "https://example.com/headshot.jpg", + } + + +def _make_card(card_id, player): + """Wrap a player dict inside a card dict (as returned by the cards API).""" + return {"id": card_id, "player": player} + + +@pytest.fixture +def sample_players(): + """Five players spanning different rarities for a realistic pack.""" + return [ + _make_player(101, "Mike Trout", "MVP", 5), + _make_player(102, "Juan Soto", "All-Star", 3), + _make_player(103, "Marcus Semien", "Starter", 2), + _make_player(104, "Willy Adames", "Reserve", 1), + _make_player(105, "Generic Bench", "Replacement", 0), + ] + + +@pytest.fixture +def sample_cards(sample_players): + """Five card dicts wrapping the sample players.""" + return [_make_card(i + 1, p) for i, p in enumerate(sample_players)] + + +@pytest.fixture +def opener_team(): + """Team dict for the pack opener.""" + return { + "id": 10, + "abbrev": "OPN", + "sname": "Openers", + "lname": "Opening Squad", + "gm_id": 99999, + "gmname": "Opener GM", + "color": "a6ce39", + "logo": "https://example.com/logo.png", + "season": 4, + } + + +@pytest.fixture +def scouter_team(): + """Team dict for a player who scouts a card.""" + return { + "id": 20, + "abbrev": "SCT", + "sname": "Scouts", + "lname": "Scouting Squad", + "gm_id": 88888, + "gmname": "Scout GM", + "color": "3498db", + "logo": "https://example.com/scout_logo.png", + "season": 4, + } + + +@pytest.fixture +def scouter_team_2(): + """Second scouter team for multi-scout tests.""" + return { + "id": 30, + "abbrev": "SC2", + "sname": "Scouts2", + "lname": "Second Scouts", + "gm_id": 77777, + "gmname": "Scout GM 2", + "color": "e74c3c", + "logo": "https://example.com/scout2_logo.png", + "season": 4, + } + + +# --------------------------------------------------------------------------- +# Discord mocks +# --------------------------------------------------------------------------- + + +@pytest.fixture +def mock_bot(): + """Mock Discord bot.""" + bot = AsyncMock(spec=commands.Bot) + bot.get_cog = Mock(return_value=None) + bot.add_cog = AsyncMock() + bot.wait_until_ready = AsyncMock() + + # Mock guild / channel lookup for send_to_channel + channel_mock = AsyncMock(spec=discord.TextChannel) + channel_mock.send = AsyncMock() + guild_mock = Mock(spec=discord.Guild) + guild_mock.text_channels = [channel_mock] + channel_mock.name = "pd-network-news" + bot.guilds = [guild_mock] + return bot + + +@pytest.fixture +def mock_interaction(): + """Mock Discord interaction for slash commands.""" + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.response.is_done = Mock(return_value=False) + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + + interaction.user = Mock(spec=discord.Member) + interaction.user.id = 12345 + interaction.user.mention = "<@12345>" + + interaction.channel = Mock(spec=discord.TextChannel) + interaction.channel.name = "pack-openings" + interaction.channel.send = AsyncMock() + + return interaction + + +@pytest.fixture +def mock_channel(): + """Mock #pack-openings channel.""" + channel = AsyncMock(spec=discord.TextChannel) + channel.name = "pack-openings" + channel.send = AsyncMock() + return channel + + +# --------------------------------------------------------------------------- +# Logging suppression +# --------------------------------------------------------------------------- + + +@pytest.fixture(autouse=True) +def silence_logging(): + """Suppress log noise during tests.""" + import logging + + logging.getLogger("discord_app").setLevel(logging.CRITICAL) diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py new file mode 100644 index 0000000..10853a0 --- /dev/null +++ b/tests/scouting/test_scout_view.py @@ -0,0 +1,1029 @@ +"""Tests for discord_ui/scout_view.py — ScoutView and ScoutButton behavior. + +Covers view initialization, button callbacks (guard rails, claim flow, +token checks, multi-scout), embed updates, and timeout handling. + +Note: All tests that instantiate ScoutView must be async because +discord.ui.View.__init__ requires a running event loop. +""" + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord + +from discord_ui.scout_view import ScoutView, ScoutButton, SCOUT_TOKENS_PER_DAY + +# --------------------------------------------------------------------------- +# ScoutView initialization +# --------------------------------------------------------------------------- + + +class TestScoutViewInit: + """Tests for ScoutView construction and initial state.""" + + @pytest.mark.asyncio + async def test_creates_one_button_per_card( + self, sample_cards, opener_team, mock_bot + ): + """Should add exactly one button per card in the pack.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + buttons = [c for c in view.children if isinstance(c, discord.ui.Button)] + assert len(buttons) == len(sample_cards) + + @pytest.mark.asyncio + async def test_buttons_labeled_sequentially( + self, sample_cards, opener_team, mock_bot + ): + """Buttons should be labeled 'Card 1', 'Card 2', etc.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + labels = [c.label for c in view.children if isinstance(c, discord.ui.Button)] + expected = [f"Card {i + 1}" for i in range(len(sample_cards))] + assert labels == expected + + @pytest.mark.asyncio + async def test_buttons_are_secondary_style( + self, sample_cards, opener_team, mock_bot + ): + """All buttons should start with the gray/secondary style (face-down).""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert btn.style == discord.ButtonStyle.secondary + + @pytest.mark.asyncio + async def test_initial_state_is_clean(self, sample_cards, opener_team, mock_bot): + """Claims, scouted_users, and processing_users should all start empty.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + assert view.claims == {} + assert view.scouted_users == set() + assert view.processing_users == set() + assert view.total_scouts == 0 + + @pytest.mark.asyncio + async def test_timeout_is_30_minutes(self, sample_cards, opener_team, mock_bot): + """The view timeout should be 1800 seconds (30 minutes).""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + assert view.timeout == 1800.0 + + +# --------------------------------------------------------------------------- +# ScoutButton callback — guard rails +# --------------------------------------------------------------------------- + + +class TestScoutButtonGuards: + """Tests for the access control checks in ScoutButton.callback.""" + + def _make_view(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + return view + + @pytest.mark.asyncio + async def test_opener_blocked(self, sample_cards, opener_team, mock_bot): + """The pack opener should be rejected with an ephemeral message.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.user = Mock() + interaction.user.id = 99999 # same as opener + + await button.callback(interaction) + + interaction.response.send_message.assert_called_once() + call_kwargs = interaction.response.send_message.call_args[1] + assert call_kwargs["ephemeral"] is True + assert "own pack" in interaction.response.send_message.call_args[0][0].lower() + + @pytest.mark.asyncio + async def test_already_scouted_blocked(self, sample_cards, opener_team, mock_bot): + """A user who already scouted this pack should be rejected.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + view.scouted_users.add(12345) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await button.callback(interaction) + + interaction.response.send_message.assert_called_once() + assert ( + "already scouted" + in interaction.response.send_message.call_args[0][0].lower() + ) + + @pytest.mark.asyncio + async def test_double_click_silently_ignored( + self, sample_cards, opener_team, mock_bot + ): + """If a user is already being processed, the click should be silently dropped.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + view.processing_users.add(12345) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.user = Mock() + interaction.user.id = 12345 + + await button.callback(interaction) + + # Should not have called defer or send_message + interaction.response.defer.assert_not_called() + + +# --------------------------------------------------------------------------- +# ScoutButton callback — successful scout flow +# --------------------------------------------------------------------------- + + +class TestScoutButtonSuccess: + """Tests for the happy-path scout claim flow.""" + + def _make_view_with_message(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + return view + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_successful_scout_creates_card_copy( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """A valid scout should POST a scout_claim, consume a token, and create a card copy.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + # Should have deferred + interaction.response.defer.assert_called_once_with(ephemeral=True) + + # db_post should be called 3 times: scout_claims, rewards, cards + assert mock_db_post.call_count == 3 + + # Verify scout_claims POST + claim_call = mock_db_post.call_args_list[0] + assert claim_call[0][0] == "scout_claims" + + # Verify rewards POST (token consumption) + reward_call = mock_db_post.call_args_list[1] + assert reward_call[0][0] == "rewards" + assert reward_call[1]["payload"]["name"] == "Scout Token" + + # Verify cards POST (card copy) + card_call = mock_db_post.call_args_list[2] + assert card_call[0][0] == "cards" + + # User should be marked as scouted + assert 12345 in view.scouted_users + assert view.total_scouts == 1 + + # Ephemeral follow-up with card details + interaction.followup.send.assert_called() + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_no_team_rejects( + self, + mock_get_team, + mock_db_post, + sample_cards, + opener_team, + mock_bot, + ): + """A user without a PD team should be rejected with an ephemeral message.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + interaction.followup.send.assert_called_once() + msg = interaction.followup.send.call_args[0][0] + assert "team" in msg.lower() + assert mock_db_post.call_count == 0 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_out_of_tokens_rejects( + self, + mock_get_team, + mock_get_tokens, + mock_db_post, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """A user who has used all daily tokens should be rejected.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = SCOUT_TOKENS_PER_DAY # all used + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + interaction.followup.send.assert_called_once() + msg = interaction.followup.send.call_args[0][0] + assert "out of scout tokens" in msg.lower() + assert mock_db_post.call_count == 0 + + +# --------------------------------------------------------------------------- +# Multi-scout behavior +# --------------------------------------------------------------------------- + + +class TestMultiScout: + """Tests for the multi-scout-per-card design. + + Any card can be scouted by multiple different players, but each player + can only scout one card per pack. + """ + + def _make_view_with_message(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + return view + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_two_users_can_scout_same_card( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + scouter_team_2, + mock_bot, + ): + """Two different users should both be able to scout the same card.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + button = view.children[0] # both pick the same card + + # First scouter + mock_get_team.return_value = scouter_team + interaction1 = AsyncMock(spec=discord.Interaction) + interaction1.response = AsyncMock() + interaction1.response.defer = AsyncMock() + interaction1.followup = AsyncMock() + interaction1.followup.send = AsyncMock() + interaction1.user = Mock() + interaction1.user.id = 11111 + + await button.callback(interaction1) + assert 11111 in view.scouted_users + assert view.total_scouts == 1 + + # Second scouter — same card + mock_get_team.return_value = scouter_team_2 + interaction2 = AsyncMock(spec=discord.Interaction) + interaction2.response = AsyncMock() + interaction2.response.defer = AsyncMock() + interaction2.followup = AsyncMock() + interaction2.followup.send = AsyncMock() + interaction2.user = Mock() + interaction2.user.id = 22222 + + await button.callback(interaction2) + assert 22222 in view.scouted_users + assert view.total_scouts == 2 + + # Claims should track both teams under the same player_id + player_id = sample_cards[0]["player"]["player_id"] + assert player_id in view.claims + assert len(view.claims[player_id]) == 2 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_same_user_cannot_scout_twice( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """The same user should be blocked from scouting a second card.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + # First scout succeeds + interaction1 = AsyncMock(spec=discord.Interaction) + interaction1.response = AsyncMock() + interaction1.response.defer = AsyncMock() + interaction1.followup = AsyncMock() + interaction1.followup.send = AsyncMock() + interaction1.user = Mock() + interaction1.user.id = 12345 + + await view.children[0].callback(interaction1) + assert view.total_scouts == 1 + + # Second scout by same user is blocked + interaction2 = AsyncMock(spec=discord.Interaction) + interaction2.response = AsyncMock() + interaction2.response.send_message = AsyncMock() + interaction2.user = Mock() + interaction2.user.id = 12345 + + await view.children[1].callback(interaction2) + + interaction2.response.send_message.assert_called_once() + assert ( + "already scouted" + in interaction2.response.send_message.call_args[0][0].lower() + ) + assert view.total_scouts == 1 # unchanged + + @pytest.mark.asyncio + async def test_buttons_never_disabled_after_scout( + self, sample_cards, opener_team, mock_bot + ): + """All buttons should remain enabled regardless of how many scouts happen. + + This verifies the 'unlimited scouts per card' design — buttons + only disable on timeout, not on individual claims. + """ + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + # Simulate claims on every card + for card in sample_cards: + pid = card["player"]["player_id"] + view.claims[pid] = ["Team A", "Team B"] + + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert not btn.disabled + + +# --------------------------------------------------------------------------- +# ScoutView.on_timeout +# --------------------------------------------------------------------------- + + +class TestScoutViewTimeout: + """Tests for the timeout handler that closes the scout window.""" + + @pytest.mark.asyncio + async def test_timeout_disables_all_buttons( + self, sample_cards, opener_team, mock_bot + ): + """After timeout, every button should be disabled.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert btn.disabled + + @pytest.mark.asyncio + async def test_timeout_updates_embed_title( + self, sample_cards, opener_team, mock_bot + ): + """The embed title should change to 'Scout Window Closed' on timeout.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + view.message.edit.assert_called_once() + call_kwargs = view.message.edit.call_args[1] + embed = call_kwargs["embed"] + assert "closed" in embed.title.lower() + + @pytest.mark.asyncio + async def test_timeout_with_scouts_shows_count( + self, sample_cards, opener_team, mock_bot + ): + """When there were scouts, the closed title should include the count.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.total_scouts = 5 + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + embed = view.message.edit.call_args[1]["embed"] + assert "5" in embed.title + + @pytest.mark.asyncio + async def test_timeout_without_message_is_safe( + self, sample_cards, opener_team, mock_bot + ): + """Timeout should not crash if the message reference is None.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.message = None + + # Should not raise + await view.on_timeout() + + +# --------------------------------------------------------------------------- +# Processing user cleanup +# --------------------------------------------------------------------------- + + +class TestProcessingUserCleanup: + """Verify the processing_users set is cleaned up in all code paths.""" + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_success( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """After a successful scout, the user should be removed from processing_users.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_claim_db_failure( + self, + mock_get_team, + mock_get_tokens, + mock_db_post, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """If db_post('scout_claims') raises, processing_users should still be cleared.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_post.side_effect = Exception("DB down") + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + # Scout should not have been recorded + assert view.total_scouts == 0 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_no_team( + self, + mock_get_team, + sample_cards, + opener_team, + mock_bot, + ): + """If the user has no team, they should still be removed from processing_users.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + + +# --------------------------------------------------------------------------- +# db_get("current") fallback +# --------------------------------------------------------------------------- + + +class TestCurrentSeasonFallback: + """Tests for the fallback when db_get('current') returns None.""" + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_current_returns_none_uses_fallback( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """When db_get('current') returns None, rewards should use PD_SEASON fallback.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = None # db_get("current") returns None + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + # Should still complete successfully + assert view.total_scouts == 1 + assert 12345 in view.scouted_users + + # Verify the rewards POST used fallback values + from helpers.constants import PD_SEASON + + reward_call = mock_db_post.call_args_list[1] + assert reward_call[1]["payload"]["season"] == PD_SEASON + assert reward_call[1]["payload"]["week"] == 1 + + +# --------------------------------------------------------------------------- +# Shiny scout notification +# --------------------------------------------------------------------------- + + +class TestShinyScoutNotification: + """Tests for the rare-card notification path (rarity >= 5).""" + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_shiny_card_sends_notification( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """Scouting a card with rarity >= 5 should post to #pd-network-news.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, # card 0 is MVP (rarity 5) + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Card 0 is MVP (rarity value 5) — should trigger notification + await view.children[0].callback(interaction) + + mock_send_to_channel.assert_called_once() + call_args = mock_send_to_channel.call_args + assert call_args[0][1] == "pd-network-news" + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_non_shiny_card_no_notification( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """Scouting a card with rarity < 5 should NOT post a notification.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, # card 2 is Starter (rarity 2) + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Card 2 is Starter (rarity value 2) — no notification + await view.children[2].callback(interaction) + + mock_send_to_channel.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_shiny_notification_failure_does_not_crash( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """If sending the shiny notification fails, the scout should still succeed.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + mock_send_to_channel.side_effect = Exception("Channel not found") + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Should not raise even though notification fails + await view.children[0].callback(interaction) + + # Scout should still complete + assert view.total_scouts == 1 + assert 12345 in view.scouted_users + + +# --------------------------------------------------------------------------- +# update_message edge cases +# --------------------------------------------------------------------------- + + +class TestUpdateMessage: + """Tests for ScoutView.update_message edge cases.""" + + @pytest.mark.asyncio + async def test_update_message_with_no_message_is_noop( + self, sample_cards, opener_team, mock_bot + ): + """update_message should silently return if self.message is None.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = None + + # Should not raise + await view.update_message() + + @pytest.mark.asyncio + async def test_update_message_edit_failure_is_caught( + self, sample_cards, opener_team, mock_bot + ): + """If message.edit raises, it should be caught and logged, not re-raised.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock( + side_effect=discord.HTTPException(Mock(status=500), "Server error") + ) + + # Should not raise + await view.update_message() diff --git a/tests/scouting/test_scouting_cog.py b/tests/scouting/test_scouting_cog.py new file mode 100644 index 0000000..5bca155 --- /dev/null +++ b/tests/scouting/test_scouting_cog.py @@ -0,0 +1,269 @@ +"""Tests for cogs/economy_new/scouting.py — the Scouting cog. + +Covers the /scout-tokens command and the cleanup_expired background task. + +Note: Scouting.__init__ calls self.cleanup_expired.start() which requires +a running event loop. All tests that instantiate the cog must be async. +""" + +import datetime + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord +from discord.ext import commands + +from cogs.economy_new.scouting import Scouting, SCOUT_TOKENS_PER_DAY + + +def _make_team(): + return { + "id": 1, + "lname": "Test Team", + "color": "a6ce39", + "logo": "https://example.com/logo.png", + "season": 4, + } + + +# --------------------------------------------------------------------------- +# Cog setup +# --------------------------------------------------------------------------- + + +class TestScoutingCogSetup: + """Tests for cog initialization and lifecycle.""" + + @pytest.mark.asyncio + async def test_cog_initializes(self, mock_bot): + """The Scouting cog should initialize without errors.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + assert cog.bot is mock_bot + + @pytest.mark.asyncio + async def test_cleanup_task_starts(self, mock_bot): + """The cleanup_expired loop task should be started on init.""" + cog = Scouting(mock_bot) + assert cog.cleanup_expired.is_running() + cog.cleanup_expired.cancel() + + @pytest.mark.asyncio + async def test_cog_unload_calls_cancel(self, mock_bot): + """Unloading the cog should call cancel on the cleanup task.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + # Verify cog_unload runs without error + await cog.cog_unload() + + +# --------------------------------------------------------------------------- +# /scout-tokens command +# --------------------------------------------------------------------------- + + +class TestScoutTokensCommand: + """Tests for the /scout-tokens slash command.""" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_shows_remaining_tokens( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """Should display the correct number of remaining tokens.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 1 # 1 used today + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + interaction.response.defer.assert_called_once_with(ephemeral=True) + interaction.followup.send.assert_called_once() + + call_kwargs = interaction.followup.send.call_args[1] + embed = call_kwargs["embed"] + remaining = SCOUT_TOKENS_PER_DAY - 1 + assert str(remaining) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_no_team_rejects(self, mock_get_team, mock_get_tokens, mock_bot): + """A user without a PD team should get a rejection message.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + msg = interaction.followup.send.call_args[0][0] + assert "team" in msg.lower() + mock_get_tokens.assert_not_called() + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_all_tokens_used_shows_zero( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """When all tokens are used, should show 0 remaining with extra message.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = SCOUT_TOKENS_PER_DAY + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert "0" in embed.description + assert ( + "used all" in embed.description.lower() + or "tomorrow" in embed.description.lower() + ) + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_no_tokens_used_shows_full( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """When no tokens have been used, should show the full daily allowance.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 0 + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert str(SCOUT_TOKENS_PER_DAY) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_db_get_returns_none(self, mock_get_team, mock_get_tokens, mock_bot): + """If get_scout_tokens_used returns 0 (API failure handled internally), should show full tokens.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = ( + 0 # get_scout_tokens_used handles None internally + ) + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert str(SCOUT_TOKENS_PER_DAY) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_over_limit_tokens_shows_zero( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """If somehow more tokens than the daily limit were used, should show 0 not negative.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 5 # more than SCOUT_TOKENS_PER_DAY + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + # Should show "0" not "-3" + assert "0" in embed.description + assert "-" not in embed.description.split("remaining")[0] + + +# --------------------------------------------------------------------------- +# cleanup_expired task +# --------------------------------------------------------------------------- + + +class TestCleanupExpired: + """Tests for the background cleanup task.""" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.db_get", new_callable=AsyncMock) + async def test_cleanup_logs_expired_opportunities(self, mock_db_get, mock_bot): + """The cleanup task should query for expired unclaimed opportunities.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_db_get.return_value = {"count": 3} + + # Call the coroutine directly (not via the loop) + await cog.cleanup_expired.coro(cog) + + mock_db_get.assert_called_once() + call_args = mock_db_get.call_args + assert call_args[0][0] == "scout_opportunities" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.db_get", new_callable=AsyncMock) + async def test_cleanup_handles_api_failure(self, mock_db_get, mock_bot): + """Cleanup should not crash if the API is unavailable.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_db_get.side_effect = Exception("API not ready") + + # Should not raise + await cog.cleanup_expired.coro(cog) diff --git a/tests/scouting/test_scouting_helpers.py b/tests/scouting/test_scouting_helpers.py new file mode 100644 index 0000000..dc635da --- /dev/null +++ b/tests/scouting/test_scouting_helpers.py @@ -0,0 +1,374 @@ +"""Tests for helpers/scouting.py — embed builders and scout opportunity creation. + +Covers the pure functions (_build_card_lines, build_scout_embed, +build_scouted_card_list) and the async create_scout_opportunity flow. +""" + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord + +from helpers.scouting import ( + _build_card_lines, + build_scout_embed, + build_scouted_card_list, + create_scout_opportunity, + RARITY_SYMBOLS, +) + +# --------------------------------------------------------------------------- +# _build_card_lines +# --------------------------------------------------------------------------- + + +class TestBuildCardLines: + """Tests for the shuffled card line builder.""" + + def test_returns_correct_count(self, sample_cards): + """Should produce one line per card in the pack.""" + lines = _build_card_lines(sample_cards) + assert len(lines) == len(sample_cards) + + def test_each_line_contains_player_id(self, sample_cards): + """Each tuple's first element should be the player_id from the card.""" + lines = _build_card_lines(sample_cards) + ids = {pid for pid, _ in lines} + expected_ids = {c["player"]["player_id"] for c in sample_cards} + assert ids == expected_ids + + def test_each_line_contains_player_name(self, sample_cards): + """The display string should include the player's name.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + assert card["player"]["p_name"] in display + + def test_each_line_contains_rarity_name(self, sample_cards): + """The display string should include the rarity tier name.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + assert card["player"]["rarity"]["name"] in display + + def test_rarity_symbol_present(self, sample_cards): + """Each line should start with the appropriate rarity emoji.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + rarity_val = card["player"]["rarity"]["value"] + expected_symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + assert display.startswith(expected_symbol) + + def test_output_is_shuffled(self, sample_cards): + """Over many runs, the order should not always match the input order. + + We run 20 iterations — if it comes out sorted every time, the shuffle + is broken (probability ~1/20! per run, effectively zero). + """ + input_order = [c["player"]["player_id"] for c in sample_cards] + saw_different = False + for _ in range(20): + lines = _build_card_lines(sample_cards) + output_order = [pid for pid, _ in lines] + if output_order != input_order: + saw_different = True + break + assert saw_different, "Card lines were never shuffled across 20 runs" + + def test_empty_cards(self): + """Empty input should produce an empty list.""" + assert _build_card_lines([]) == [] + + def test_unknown_rarity_uses_fallback_symbol(self): + """A rarity value not in RARITY_SYMBOLS should get the black circle fallback.""" + card = { + "id": 99, + "player": { + "player_id": 999, + "p_name": "Unknown Rarity", + "rarity": {"name": "Legendary", "value": 99, "color": "gold"}, + }, + } + lines = _build_card_lines([card]) + assert lines[0][1].startswith("\u26ab") # black circle fallback + + +# --------------------------------------------------------------------------- +# build_scout_embed +# --------------------------------------------------------------------------- + + +class TestBuildScoutEmbed: + """Tests for the embed builder shown above scout buttons.""" + + def test_returns_embed_and_card_lines(self, opener_team, sample_cards): + """Should return a (discord.Embed, list) tuple.""" + embed, card_lines = build_scout_embed(opener_team, sample_cards) + assert isinstance(embed, discord.Embed) + assert isinstance(card_lines, list) + assert len(card_lines) == len(sample_cards) + + def test_embed_description_contains_team_name(self, opener_team, sample_cards): + """The embed body should mention the opener's team name.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert opener_team["lname"] in embed.description + + def test_embed_description_contains_all_player_names( + self, opener_team, sample_cards + ): + """Every player name from the pack should appear in the embed.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + for card in sample_cards: + assert card["player"]["p_name"] in embed.description + + def test_embed_mentions_token_cost(self, opener_team, sample_cards): + """The embed should tell users about the scout token cost.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert "Scout Token" in embed.description + + def test_embed_mentions_time_limit(self, opener_team, sample_cards): + """The embed should mention the 30-minute window.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert "30 minutes" in embed.description + + def test_prebuilt_card_lines_are_reused(self, opener_team, sample_cards): + """When card_lines are passed in, they should be reused (not rebuilt).""" + prebuilt = [(101, "Custom Line 1"), (102, "Custom Line 2")] + embed, returned_lines = build_scout_embed( + opener_team, sample_cards, card_lines=prebuilt + ) + assert returned_lines is prebuilt + assert "Custom Line 1" in embed.description + assert "Custom Line 2" in embed.description + + +# --------------------------------------------------------------------------- +# build_scouted_card_list +# --------------------------------------------------------------------------- + + +class TestBuildScoutedCardList: + """Tests for the card list formatter that marks scouted cards.""" + + def test_no_scouts_returns_plain_lines(self): + """With no scouts, output should match the raw card lines.""" + card_lines = [ + (101, "\U0001f7e3 MVP — Mike Trout"), + (102, "\U0001f535 All-Star — Juan Soto"), + ] + result = build_scouted_card_list(card_lines, {}) + assert result == "\U0001f7e3 MVP — Mike Trout\n\U0001f535 All-Star — Juan Soto" + + def test_single_scout_shows_team_name(self): + """A card scouted once should show a checkmark and the team name.""" + card_lines = [ + (101, "\U0001f7e3 MVP — Mike Trout"), + (102, "\U0001f535 All-Star — Juan Soto"), + ] + scouted = {101: ["Scouting Squad"]} + result = build_scouted_card_list(card_lines, scouted) + assert "\u2714\ufe0f" in result # checkmark + assert "*Scouting Squad*" in result + # Unscouted card should appear plain + lines = result.split("\n") + assert "\u2714" not in lines[1] + + def test_multiple_scouts_shows_count_and_names(self): + """A card scouted multiple times should show the count and all team names.""" + card_lines = [(101, "\U0001f7e3 MVP — Mike Trout")] + scouted = {101: ["Team A", "Team B", "Team C"]} + result = build_scouted_card_list(card_lines, scouted) + assert "x3" in result + assert "*Team A*" in result + assert "*Team B*" in result + assert "*Team C*" in result + + def test_mixed_scouted_and_unscouted(self): + """Only scouted cards should have marks; unscouted cards stay plain.""" + card_lines = [ + (101, "Line A"), + (102, "Line B"), + (103, "Line C"), + ] + scouted = {102: ["Some Team"]} + result = build_scouted_card_list(card_lines, scouted) + lines = result.split("\n") + assert "\u2714" not in lines[0] + assert "\u2714" in lines[1] + assert "\u2714" not in lines[2] + + def test_empty_input(self): + """Empty card lines should produce an empty string.""" + assert build_scouted_card_list([], {}) == "" + + def test_two_scouts_shows_count(self): + """Two scouts on the same card should show x2.""" + card_lines = [(101, "Line A")] + scouted = {101: ["Team X", "Team Y"]} + result = build_scouted_card_list(card_lines, scouted) + assert "x2" in result + + +# --------------------------------------------------------------------------- +# create_scout_opportunity +# --------------------------------------------------------------------------- + + +class TestCreateScoutOpportunity: + """Tests for the async scout opportunity creation flow.""" + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_posts_to_api_and_sends_message( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """Should POST to scout_opportunities and send a message to the channel.""" + mock_db_post.return_value = {"id": 42} + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + # API was called to create the opportunity + mock_db_post.assert_called_once() + call_args = mock_db_post.call_args + assert call_args[0][0] == "scout_opportunities" + assert call_args[1]["payload"]["opener_team_id"] == opener_team["id"] + + # Message was sent to the channel + mock_channel.send.assert_called_once() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_wrong_channel( + self, mock_db_post, sample_cards, opener_team, mock_bot + ): + """Should silently return when the channel is not #pack-openings.""" + channel = AsyncMock(spec=discord.TextChannel) + channel.name = "general" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, channel, opener_user, context + ) + + mock_db_post.assert_not_called() + channel.send.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_empty_pack( + self, mock_db_post, opener_team, mock_channel, mock_bot + ): + """Should silently return when pack_cards is empty.""" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + [], opener_team, mock_channel, opener_user, context + ) + + mock_db_post.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_none_channel( + self, mock_db_post, sample_cards, opener_team, mock_bot + ): + """Should handle None channel without crashing.""" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, None, opener_user, context + ) + + mock_db_post.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_api_failure_does_not_raise( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """Scout creation failure must never crash the pack opening flow.""" + mock_db_post.side_effect = Exception("API down") + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + # Should not raise + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_channel_send_failure_does_not_raise( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """If the channel.send fails, it should be caught gracefully.""" + mock_db_post.return_value = {"id": 42} + mock_channel.send.side_effect = discord.HTTPException( + Mock(status=500), "Server error" + ) + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + # Should not raise + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_context_client_fallback( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """When context.bot is None, should fall back to context.client for the bot ref.""" + mock_db_post.return_value = {"id": 42} + opener_user = Mock() + opener_user.id = 99999 + context = Mock(spec=[]) # empty spec — no .bot attribute + context.client = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + mock_channel.send.assert_called_once() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_view_message_is_assigned( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """The message returned by channel.send should be assigned to view.message. + + This linkage is required for update_message and on_timeout to work. + """ + mock_db_post.return_value = {"id": 42} + sent_msg = AsyncMock(spec=discord.Message) + mock_channel.send.return_value = sent_msg + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) -- 2.25.1 From d569e9190507bdbc0ea1603e2976f8935d19f724 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 19:39:43 -0600 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20Address=20PR=20review=20findings?= =?UTF-8?q?=20=E2=80=94=20two=20bugs=20and=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix int_timestamp() no-arg path returning seconds instead of milliseconds, which would silently break the daily scout token cap against the real API - Acknowledge double-click interactions with ephemeral message instead of silently returning (Discord requires all interactions to be acked) - Reorder scout flow: create card copy before consuming token so a failure doesn't cost the player a token for nothing - Move build_scouted_card_list import to top of scout_view.py - Remove unused asyncio import from helpers/scouting.py - Fix footer text inconsistency ("One scout per player" everywhere) - Update tests for new operation order and double-click behavior Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 39 ++++++++++++++++++------------- helpers/scouting.py | 3 +-- helpers/utils.py | 11 +++++---- tests/scouting/test_scout_view.py | 31 +++++++++++++++--------- 4 files changed, 51 insertions(+), 33 deletions(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 11ce77a..0d5a12f 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -13,7 +13,11 @@ import discord from api_calls import db_get, db_post from helpers.main import get_team_by_owner, get_card_embeds -from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used +from helpers.scouting import ( + SCOUT_TOKENS_PER_DAY, + build_scouted_card_list, + get_scout_tokens_used, +) from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON @@ -72,8 +76,6 @@ class ScoutView(discord.ui.View): if not self.message: return - from helpers.scouting import build_scouted_card_list - card_list = build_scouted_card_list(self.card_lines, self.claims) title = f"Scout Opportunity! ({self.total_scouts} scouted)" @@ -163,6 +165,10 @@ class ScoutButton(discord.ui.Button): # Prevent double-click race for same user if interaction.user.id in view.processing_users: + await interaction.response.send_message( + "Your scout is already being processed!", + ephemeral=True, + ) return view.processing_users.add(interaction.user.id) @@ -206,6 +212,20 @@ class ScoutButton(discord.ui.Button): ) return + # Create a copy of the card for the scouter (before consuming token + # so a failure here doesn't cost the player a token for nothing) + await db_post( + "cards", + payload={ + "cards": [ + { + "player_id": self.card["player"]["player_id"], + "team_id": scouter_team["id"], + } + ], + }, + ) + # Consume a scout token current = await db_get("current") await db_post( @@ -219,19 +239,6 @@ class ScoutButton(discord.ui.Button): }, ) - # Create a copy of the card for the scouter - await db_post( - "cards", - payload={ - "cards": [ - { - "player_id": self.card["player"]["player_id"], - "team_id": scouter_team["id"], - } - ], - }, - ) - # Track the claim player_id = self.card["player"]["player_id"] if player_id not in view.claims: diff --git a/helpers/scouting.py b/helpers/scouting.py index ab2d2c2..a21b9f9 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -5,7 +5,6 @@ Handles creation of scout opportunities after pack openings and embed formatting for the scouting feature. """ -import asyncio import datetime import logging import random @@ -95,7 +94,7 @@ def build_scout_embed( f"{time_line}" ) embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", icon_url=IMAGES["logo"], ) return embed, card_lines diff --git a/helpers/utils.py b/helpers/utils.py index 7535bf7..8b091ab 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -11,10 +11,13 @@ import discord def int_timestamp(datetime_obj: Optional[datetime.datetime] = None): - """Convert current datetime to integer timestamp.""" - if datetime_obj: - return int(datetime.datetime.timestamp(datetime_obj) * 1000) - return int(datetime.datetime.now().timestamp()) + """Convert a datetime to an integer millisecond timestamp. + + If no argument is given, uses the current time. + """ + if datetime_obj is None: + datetime_obj = datetime.datetime.now() + return int(datetime.datetime.timestamp(datetime_obj) * 1000) def midnight_timestamp() -> int: diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py index 10853a0..906bb97 100644 --- a/tests/scouting/test_scout_view.py +++ b/tests/scouting/test_scout_view.py @@ -162,19 +162,26 @@ class TestScoutButtonGuards: async def test_double_click_silently_ignored( self, sample_cards, opener_team, mock_bot ): - """If a user is already being processed, the click should be silently dropped.""" + """If a user is already being processed, they should get an ephemeral rejection.""" view = self._make_view(sample_cards, opener_team, mock_bot) view.processing_users.add(12345) button = view.children[0] interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() interaction.user = Mock() interaction.user.id = 12345 await button.callback(interaction) - # Should not have called defer or send_message - interaction.response.defer.assert_not_called() + interaction.response.send_message.assert_called_once() + call_kwargs = interaction.response.send_message.call_args[1] + assert call_kwargs["ephemeral"] is True + assert ( + "already being processed" + in interaction.response.send_message.call_args[0][0].lower() + ) # --------------------------------------------------------------------------- @@ -242,22 +249,22 @@ class TestScoutButtonSuccess: # Should have deferred interaction.response.defer.assert_called_once_with(ephemeral=True) - # db_post should be called 3 times: scout_claims, rewards, cards + # db_post should be called 3 times: scout_claims, cards, rewards assert mock_db_post.call_count == 3 # Verify scout_claims POST claim_call = mock_db_post.call_args_list[0] assert claim_call[0][0] == "scout_claims" - # Verify rewards POST (token consumption) - reward_call = mock_db_post.call_args_list[1] + # Verify cards POST (card copy — created before token consumption) + card_call = mock_db_post.call_args_list[1] + assert card_call[0][0] == "cards" + + # Verify rewards POST (token consumption — after card is safely created) + reward_call = mock_db_post.call_args_list[2] assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["name"] == "Scout Token" - # Verify cards POST (card copy) - card_call = mock_db_post.call_args_list[2] - assert card_call[0][0] == "cards" - # User should be marked as scouted assert 12345 in view.scouted_users assert view.total_scouts == 1 @@ -797,9 +804,11 @@ class TestCurrentSeasonFallback: assert 12345 in view.scouted_users # Verify the rewards POST used fallback values + # Order: scout_claims (0), cards (1), rewards (2) from helpers.constants import PD_SEASON - reward_call = mock_db_post.call_args_list[1] + reward_call = mock_db_post.call_args_list[2] + assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["season"] == PD_SEASON assert reward_call[1]["payload"]["week"] == 1 -- 2.25.1 From 89f80727bd2655ac4eb65553ca119b766bb4674b Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:12:20 +0000 Subject: [PATCH 04/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index a4a0ceb..f286fc9 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -12,6 +12,7 @@ on: push: branches: - main + - next-release pull_request: branches: - main @@ -39,35 +40,25 @@ jobs: id: calver uses: cal/gitea-actions/calver@main - # Dev build: push with dev + dev-SHA tags (PR/feature branches) - - name: Build Docker image (dev) - if: github.ref != 'refs/heads/main' - uses: https://github.com/docker/build-push-action@v5 + - name: Resolve Docker tags + id: tags + uses: cal/gitea-actions/docker-tags@main with: - context: . - push: true - tags: | - manticorum67/paper-dynasty-discordapp:dev - manticorum67/paper-dynasty-discordapp:dev-${{ steps.calver.outputs.sha_short }} - cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache - cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max + image: manticorum67/paper-dynasty-discordapp + version: ${{ steps.calver.outputs.version }} + sha_short: ${{ steps.calver.outputs.sha_short }} - # Production build: push with latest + CalVer tags (main only) - - name: Build Docker image (production) - if: github.ref == 'refs/heads/main' + - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v5 with: context: . push: true - tags: | - manticorum67/paper-dynasty-discordapp:latest - manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version }} - manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version_sha }} + tags: ${{ steps.tags.outputs.tags }} cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max - name: Tag release - if: success() && github.ref == 'refs/heads/main' + if: success() && steps.tags.outputs.channel == 'stable' uses: cal/gitea-actions/gitea-tag@main with: version: ${{ steps.calver.outputs.version }} @@ -96,7 +87,7 @@ jobs: fi - name: Discord Notification - Success - if: success() && github.ref == 'refs/heads/main' + if: success() && steps.tags.outputs.channel != 'dev' uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} -- 2.25.1 From 75b9968149c7d8a178f3f638ed1239ded5f6e471 Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:15:37 +0000 Subject: [PATCH 05/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index f286fc9..f409d19 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -99,7 +99,7 @@ jobs: timestamp: ${{ steps.calver.outputs.timestamp }} - name: Discord Notification - Failure - if: failure() && github.ref == 'refs/heads/main' + if: failure() && steps.tags.outputs.channel != 'dev' uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} -- 2.25.1 From 0ce0707e3ead65396973a4033e239cd5e9372045 Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:16:36 +0000 Subject: [PATCH 06/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index f409d19..9fae8dc 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -68,23 +68,20 @@ jobs: run: | echo "## Docker Build Successful" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY + echo "**Channel:** \`${{ steps.tags.outputs.channel }}\`" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:latest\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version_sha }}\`" >> $GITHUB_STEP_SUMMARY + IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.tags }}" + for tag in "${TAG_ARRAY[@]}"; do + echo "- \`${tag}\`" >> $GITHUB_STEP_SUMMARY + done echo "" >> $GITHUB_STEP_SUMMARY echo "**Build Details:**" >> $GITHUB_STEP_SUMMARY echo "- Branch: \`${{ steps.calver.outputs.branch }}\`" >> $GITHUB_STEP_SUMMARY echo "- Commit: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY echo "- Timestamp: \`${{ steps.calver.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - if [ "${{ github.ref }}" == "refs/heads/main" ]; then - echo "Pushed to Docker Hub!" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:latest\`" >> $GITHUB_STEP_SUMMARY - else - echo "_PR build - image not pushed to Docker Hub_" >> $GITHUB_STEP_SUMMARY - fi + echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:${{ steps.tags.outputs.primary_tag }}\`" >> $GITHUB_STEP_SUMMARY - name: Discord Notification - Success if: success() && steps.tags.outputs.channel != 'dev' -- 2.25.1 From ed00a97c0d66d44b8f0570dfc1bffd309ccd95f9 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Thu, 5 Mar 2026 15:57:25 -0600 Subject: [PATCH 07/12] fix: update owner_only to use Cal's correct Discord ID Co-Authored-By: Claude Opus 4.6 --- helpers/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/utils.py b/helpers/utils.py index 8b091ab..6b6185f 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -111,7 +111,8 @@ def get_player_url(team, player) -> str: def owner_only(ctx) -> bool: """Check if user is the bot owner.""" # ID for discord User Cal - owners = [287463767924137994, 1087936030899347516] + owners = [258104532423147520] + # owners += [287463767924137994, 1087936030899347516] # Handle both Context (has .author) and Interaction (has .user) objects user = getattr(ctx, "user", None) or getattr(ctx, "author", None) -- 2.25.1 From 77c3f3004c3788531373e4d9c3c66a833369865d Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 13:03:15 -0600 Subject: [PATCH 08/12] fix: align scouting rarity symbols with system colors Co-Authored-By: Claude Opus 4.6 --- helpers/scouting.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/scouting.py b/helpers/scouting.py index a21b9f9..421ec32 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -23,12 +23,12 @@ SCOUT_WINDOW_SECONDS = 1800 # 30 minutes # Rarity value → display symbol RARITY_SYMBOLS = { - 8: "\U0001f7e1", # HoF — yellow - 5: "\U0001f7e3", # MVP — purple - 3: "\U0001f535", # All-Star — blue - 2: "\U0001f7e2", # Starter — green - 1: "\u26aa", # Reserve — white - 0: "\u26ab", # Replacement — black + 8: "\U0001f7e3", # HoF — purple (#751cea) + 5: "\U0001f535", # MVP — cyan/blue (#56f1fa) + 3: "\U0001f7e1", # All-Star — gold (#FFD700) + 2: "\u26aa", # Starter — silver (#C0C0C0) + 1: "\U0001f7e4", # Reserve — bronze (#CD7F32) + 0: "\u26ab", # Replacement — dark gray (#454545) } -- 2.25.1 From 8e605c2140c5d696a54b9f2ada43860065e3a7df Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 13:22:45 -0600 Subject: [PATCH 09/12] fix: add pack_id to scouted card creation, enhance embed with card links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Include pack_id in db_post("cards") payload (API requires it) - Player names now link to card image URLs in scout embed - Display format: "🟡 All-Star — [2023 Mike Trout](card_image_url)" Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 1 + helpers/scouting.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 0d5a12f..83712e6 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -221,6 +221,7 @@ class ScoutButton(discord.ui.Button): { "player_id": self.card["player"]["player_id"], "team_id": scouter_team["id"], + "pack_id": self.card["pack"]["id"], } ], }, diff --git a/helpers/scouting.py b/helpers/scouting.py index 421ec32..6666b94 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -52,10 +52,17 @@ def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: player = card["player"] rarity_val = player["rarity"]["value"] symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + desc = player.get("description", "") + image_url = player.get("image", "") + name_display = ( + f"[{desc} {player['p_name']}]({image_url})" + if image_url + else f"{desc} {player['p_name']}" + ) lines.append( ( player["player_id"], - f"{symbol} {player['rarity']['name']} — {player['p_name']}", + f"{symbol} {player['rarity']['name']} — {name_display}", ) ) random.shuffle(lines) -- 2.25.1 From e160be4137794dd43523ae90dfb1b56b76827c71 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 18:47:52 -0600 Subject: [PATCH 10/12] fix: add missing pack, description, image fields to scouting test fixtures Co-Authored-By: Claude Opus 4.6 --- tests/scouting/conftest.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/scouting/conftest.py b/tests/scouting/conftest.py index 523e38f..22164fd 100644 --- a/tests/scouting/conftest.py +++ b/tests/scouting/conftest.py @@ -12,19 +12,29 @@ from discord.ext import commands # --------------------------------------------------------------------------- -def _make_player(player_id, name, rarity_name, rarity_value, headshot=None): +def _make_player( + player_id, + name, + rarity_name, + rarity_value, + headshot=None, + description="2023", + image=None, +): """Build a minimal player dict matching the API shape used by scouting.""" return { "player_id": player_id, "p_name": name, "rarity": {"name": rarity_name, "value": rarity_value, "color": "ffffff"}, "headshot": headshot or "https://example.com/headshot.jpg", + "description": description, + "image": image or f"https://example.com/cards/{player_id}/battingcard.png", } -def _make_card(card_id, player): +def _make_card(card_id, player, pack_id=100): """Wrap a player dict inside a card dict (as returned by the cards API).""" - return {"id": card_id, "player": player} + return {"id": card_id, "player": player, "pack": {"id": pack_id}} @pytest.fixture -- 2.25.1 From da55cbe4d49488540ad9c0b46185a1b38583107f Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 21:12:46 -0600 Subject: [PATCH 11/12] feat: limit scouting to Standard/Premium packs, simplify scout view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add SCOUTABLE_PACK_TYPES env var (default: Standard,Premium) to control which pack types offer scout opportunities - Unify embed construction into build_scout_embed() — removes 3 near-duplicate embed builders across scout_view.py and scouting.py - Replace manual total_scouts counter with derived property from claims dict - Remove redundant db_get("current") API call per scout click — use PD_SEASON - Remove duplicate expiry computation in create_scout_opportunity - Move send_to_channel to top-level import, remove redundant local import - Update tests to match simplified code Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 66 ++++++++----------------- helpers/main.py | 18 ++++--- helpers/scouting.py | 81 ++++++++++++++++++++++--------- tests/scouting/test_scout_view.py | 47 +++++------------- 4 files changed, 99 insertions(+), 113 deletions(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 83712e6..a5a64ba 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -11,15 +11,15 @@ import logging import discord -from api_calls import db_get, db_post +from api_calls import db_post from helpers.main import get_team_by_owner, get_card_embeds from helpers.scouting import ( SCOUT_TOKENS_PER_DAY, - build_scouted_card_list, + build_scout_embed, get_scout_tokens_used, ) from helpers.utils import int_timestamp -from helpers.discord_utils import get_team_embed +from helpers.discord_utils import get_team_embed, send_to_channel from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") @@ -60,8 +60,6 @@ class ScoutView(discord.ui.View): self.scouted_users: set[int] = set() # Users currently being processed (prevent double-click race) self.processing_users: set[int] = set() - # Total scout count - self.total_scouts = 0 for i, card in enumerate(cards): button = ScoutButton( @@ -71,30 +69,21 @@ class ScoutView(discord.ui.View): ) self.add_item(button) + @property + def total_scouts(self) -> int: + return sum(len(v) for v in self.claims.values()) + async def update_message(self): """Refresh the embed with current claim state.""" if not self.message: return - card_list = build_scouted_card_list(self.card_lines, self.claims) - - title = f"Scout Opportunity! ({self.total_scouts} scouted)" - embed = get_team_embed(title=title, team=self.opener_team) - if self.expires_unix: - time_line = f"Scout window closes ." - else: - time_line = "Scout window closes in **30 minutes**." - - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" - f"{card_list}\n\n" - f"Pick a card — but which is which?\n" - f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"{time_line}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", - icon_url=IMAGES["logo"], + embed, _ = build_scout_embed( + self.opener_team, + card_lines=self.card_lines, + expires_unix=self.expires_unix, + claims=self.claims, + total_scouts=self.total_scouts, ) try: @@ -109,22 +98,12 @@ class ScoutView(discord.ui.View): if self.message: try: - from helpers.scouting import build_scouted_card_list - - card_list = build_scouted_card_list(self.card_lines, self.claims) - - if self.total_scouts > 0: - title = f"Scout Window Closed ({self.total_scouts} scouted)" - else: - title = "Scout Window Closed" - - embed = get_team_embed(title=title, team=self.opener_team) - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON}", - icon_url=IMAGES["logo"], + embed, _ = build_scout_embed( + self.opener_team, + card_lines=self.card_lines, + claims=self.claims, + total_scouts=self.total_scouts, + closed=True, ) await self.message.edit(embed=embed, view=self) except Exception as e: @@ -228,14 +207,12 @@ class ScoutButton(discord.ui.Button): ) # Consume a scout token - current = await db_get("current") await db_post( "rewards", payload={ "name": "Scout Token", "team_id": scouter_team["id"], - "season": current["season"] if current else PD_SEASON, - "week": current["week"] if current else 1, + "season": PD_SEASON, "created": int_timestamp(), }, ) @@ -246,7 +223,6 @@ class ScoutButton(discord.ui.Button): view.claims[player_id] = [] view.claims[player_id].append(scouter_team["lname"]) view.scouted_users.add(interaction.user.id) - view.total_scouts += 1 # Update the shared embed await view.update_message() @@ -269,8 +245,6 @@ class ScoutButton(discord.ui.Button): # Notify for shiny scouts (rarity >= 5) if self.card["player"]["rarity"]["value"] >= 5: try: - from helpers.discord_utils import send_to_channel - notif_embed = get_team_embed(title="Rare Scout!", team=scouter_team) notif_embed.description = ( f"**{scouter_team['lname']}** scouted a " diff --git a/helpers/main.py b/helpers/main.py index 4dfc659..0b989a5 100644 --- a/helpers/main.py +++ b/helpers/main.py @@ -1770,15 +1770,17 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): await context.channel.send(content=f"Let's head down to {pack_channel.mention}!") await display_cards(all_cards, team, pack_channel, author, pack_cover=pack_cover) - # Create scout opportunities for each pack - from helpers.scouting import create_scout_opportunity + # Create scout opportunities for each pack (Standard/Premium only) + from helpers.scouting import create_scout_opportunity, SCOUTABLE_PACK_TYPES - for p_id in pack_ids: - pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] - if pack_cards: - await create_scout_opportunity( - pack_cards, team, pack_channel, author, context - ) + pack_type_name = all_packs[0].get("pack_type", {}).get("name") + if pack_type_name in SCOUTABLE_PACK_TYPES: + for p_id in pack_ids: + pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] + if pack_cards: + await create_scout_opportunity( + pack_cards, team, pack_channel, author, context + ) if len(pack_ids) > 1: await asyncio.sleep(2) diff --git a/helpers/scouting.py b/helpers/scouting.py index 6666b94..6c926bb 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -7,6 +7,7 @@ and embed formatting for the scouting feature. import datetime import logging +import os import random import discord @@ -20,6 +21,8 @@ logger = logging.getLogger("discord_app") SCOUT_TOKENS_PER_DAY = 2 SCOUT_WINDOW_SECONDS = 1800 # 30 minutes +_scoutable_raw = os.environ.get("SCOUTABLE_PACK_TYPES", "Standard,Premium") +SCOUTABLE_PACK_TYPES = {s.strip() for s in _scoutable_raw.split(",") if s.strip()} # Rarity value → display symbol RARITY_SYMBOLS = { @@ -71,39 +74,70 @@ def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: def build_scout_embed( opener_team: dict, - cards: list[dict], + cards: list[dict] = None, card_lines: list[tuple[int, str]] = None, expires_unix: int = None, + claims: dict[int, list[str]] = None, + total_scouts: int = 0, + closed: bool = False, ) -> tuple[discord.Embed, list[tuple[int, str]]]: """Build the embed shown above the scout buttons. Shows a shuffled list of cards (rarity + player name) so scouters know what's in the pack but not which button maps to which card. Returns (embed, card_lines) so the view can store the shuffled order. - """ - embed = get_team_embed(title="Scout Opportunity!", team=opener_team) - if card_lines is None: + Parameters + ---------- + closed : if True, renders the "Scout Window Closed" variant + claims : scouted card tracking dict for build_scouted_card_list + total_scouts : number of scouts so far (for title display) + """ + if card_lines is None and cards is not None: card_lines = _build_card_lines(cards) - card_list = "\n".join(line for _, line in card_lines) - - if expires_unix: - time_line = f"Scout window closes ." + if claims and card_lines: + card_list = build_scouted_card_list(card_lines, claims) + elif card_lines: + card_list = "\n".join(line for _, line in card_lines) else: - time_line = "Scout window closes in **30 minutes**." + card_list = "" - embed.description = ( - f"**{opener_team['lname']}** just opened a pack!\n\n" - f"**Cards in this pack:**\n{card_list}\n\n" - f"Pick a card — but which is which?\n" - f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"{time_line}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", - icon_url=IMAGES["logo"], - ) + if closed: + if total_scouts > 0: + title = f"Scout Window Closed ({total_scouts} scouted)" + else: + title = "Scout Window Closed" + elif total_scouts > 0: + title = f"Scout Opportunity! ({total_scouts} scouted)" + else: + title = "Scout Opportunity!" + + embed = get_team_embed(title=title, team=opener_team) + + if closed: + embed.description = f"**{opener_team['lname']}**'s pack\n\n" f"{card_list}" + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON}", + icon_url=IMAGES["logo"], + ) + else: + if expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." + + embed.description = ( + f"**{opener_team['lname']}**'s pack\n\n" + f"{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"{time_line}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", + icon_url=IMAGES["logo"], + ) return embed, card_lines @@ -163,7 +197,9 @@ async def create_scout_opportunity( return now = datetime.datetime.now() - expires_at = int_timestamp(now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)) + expires_dt = now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS) + expires_at = int_timestamp(expires_dt) + expires_unix = int(expires_dt.timestamp()) created = int_timestamp(now) card_ids = [c["id"] for c in pack_cards] @@ -183,9 +219,6 @@ async def create_scout_opportunity( logger.error(f"Failed to create scout opportunity: {e}") return - expires_unix = int( - (now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)).timestamp() - ) embed, card_lines = build_scout_embed( opener_team, pack_cards, expires_unix=expires_unix ) diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py index 906bb97..186c0b1 100644 --- a/tests/scouting/test_scout_view.py +++ b/tests/scouting/test_scout_view.py @@ -210,14 +210,12 @@ class TestScoutButtonSuccess: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_successful_scout_creates_card_copy( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -230,7 +228,6 @@ class TestScoutButtonSuccess: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -369,14 +366,12 @@ class TestMultiScout: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_two_users_can_scout_same_card( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -388,7 +383,6 @@ class TestMultiScout: """Two different users should both be able to scout the same card.""" view = self._make_view_with_message(sample_cards, opener_team, mock_bot) mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -430,14 +424,12 @@ class TestMultiScout: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_same_user_cannot_scout_twice( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -449,7 +441,6 @@ class TestMultiScout: view = self._make_view_with_message(sample_cards, opener_team, mock_bot) mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -579,7 +570,9 @@ class TestScoutViewTimeout: view.card_lines = [ (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) ] - view.total_scouts = 5 + # Set up claims so total_scouts property returns 5 + pid = sample_cards[0]["player"]["player_id"] + view.claims[pid] = ["Team A", "Team B", "Team C", "Team D", "Team E"] view.message = AsyncMock(spec=discord.Message) view.message.edit = AsyncMock() @@ -617,14 +610,12 @@ class TestProcessingUserCleanup: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_processing_cleared_on_success( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -648,7 +639,6 @@ class TestProcessingUserCleanup: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -744,24 +734,22 @@ class TestProcessingUserCleanup: # --------------------------------------------------------------------------- -# db_get("current") fallback +# Rewards use PD_SEASON constant # --------------------------------------------------------------------------- -class TestCurrentSeasonFallback: - """Tests for the fallback when db_get('current') returns None.""" +class TestRewardsSeason: + """Tests that reward records always use the PD_SEASON constant.""" @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) - async def test_current_returns_none_uses_fallback( + async def test_rewards_use_pd_season( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -769,7 +757,7 @@ class TestCurrentSeasonFallback: scouter_team, mock_bot, ): - """When db_get('current') returns None, rewards should use PD_SEASON fallback.""" + """Reward records should always use the PD_SEASON constant for season.""" view = ScoutView( scout_opp_id=1, cards=sample_cards, @@ -785,7 +773,6 @@ class TestCurrentSeasonFallback: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = None # db_get("current") returns None mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -803,14 +790,13 @@ class TestCurrentSeasonFallback: assert view.total_scouts == 1 assert 12345 in view.scouted_users - # Verify the rewards POST used fallback values + # Verify the rewards POST uses PD_SEASON # Order: scout_claims (0), cards (1), rewards (2) from helpers.constants import PD_SEASON reward_call = mock_db_post.call_args_list[2] assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["season"] == PD_SEASON - assert reward_call[1]["payload"]["week"] == 1 # --------------------------------------------------------------------------- @@ -822,17 +808,15 @@ class TestShinyScoutNotification: """Tests for the rare-card notification path (rarity >= 5).""" @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_shiny_card_sends_notification( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -857,7 +841,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -877,17 +860,15 @@ class TestShinyScoutNotification: assert call_args[0][1] == "pd-network-news" @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_non_shiny_card_no_notification( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -912,7 +893,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -930,17 +910,15 @@ class TestShinyScoutNotification: mock_send_to_channel.assert_not_called() @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_shiny_notification_failure_does_not_crash( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -965,7 +943,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] mock_send_to_channel.side_effect = Exception("Channel not found") -- 2.25.1 From 109b88b9e5ea4f51117770420ecc250907d5e22b Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Thu, 5 Mar 2026 09:34:01 -0600 Subject: [PATCH 12/12] feat: add get_away_team and get_home_team methods to StratGame (#21) Implements the TODO at db_calls_gameplay.py:190. Both async methods delegate to get_game_team(), which already handles the SBA vs PD distinction, returning the appropriate Team dict without callers needing to repeat the lookup logic inline. Co-Authored-By: Claude Sonnet 4.6 --- db_calls_gameplay.py | 1437 ++++++++++++++++++++++++++---------------- 1 file changed, 897 insertions(+), 540 deletions(-) diff --git a/db_calls_gameplay.py b/db_calls_gameplay.py index cc0387f..9fd85ad 100644 --- a/db_calls_gameplay.py +++ b/db_calls_gameplay.py @@ -16,28 +16,24 @@ from api_calls import db_get from in_game.data_cache import get_pd_player, CardPosition, BattingCard, get_pd_team db = SqliteDatabase( - 'storage/gameplay-legacy.db', - pragmas={ - 'journal_mode': 'wal', - 'cache_size': -1 * 64000, - 'synchronous': 0 - } + "storage/gameplay-legacy.db", + pragmas={"journal_mode": "wal", "cache_size": -1 * 64000, "synchronous": 0}, ) -SBA_DB_URL = 'http://database/api' -logger = logging.getLogger('discord_app') +SBA_DB_URL = "http://database/api" +logger = logging.getLogger("discord_app") def param_char(other_params): if other_params: - return '&' + return "&" else: - return '?' + return "?" def get_sba_team(id_or_abbrev, season=None): - req_url = f'{SBA_DB_URL}/v1/teams/{id_or_abbrev}' + req_url = f"{SBA_DB_URL}/v1/teams/{id_or_abbrev}" if season: - req_url += f'?season={season}' + req_url += f"?season={season}" resp = requests.get(req_url, timeout=3) @@ -45,33 +41,36 @@ def get_sba_team(id_or_abbrev, season=None): return resp.json() else: logger.warning(resp.text) - raise ValueError(f'DB: {resp.text}') + raise ValueError(f"DB: {resp.text}") def get_sba_player(id_or_name, season=None): - req_url = f'{SBA_DB_URL}/v2/players/{id_or_name}' + req_url = f"{SBA_DB_URL}/v2/players/{id_or_name}" if season is not None: - req_url += f'?season={season}' + req_url += f"?season={season}" resp = requests.get(req_url, timeout=3) if resp.status_code == 200: return resp.json() else: logger.warning(resp.text) - raise ValueError(f'DB: {resp.text}') + raise ValueError(f"DB: {resp.text}") def get_sba_team_by_owner(season, owner_id): - resp = requests.get(f'{SBA_DB_URL}/v1/teams?season={season}&owner_id={owner_id}&active_only=True', timeout=3) + resp = requests.get( + f"{SBA_DB_URL}/v1/teams?season={season}&owner_id={owner_id}&active_only=True", + timeout=3, + ) if resp.status_code == 200: full_resp = resp.json() - if len(full_resp['teams']) != 1: - raise ValueError(f'One team requested, but {len(full_resp)} were returned') + if len(full_resp["teams"]) != 1: + raise ValueError(f"One team requested, but {len(full_resp)} were returned") else: - return full_resp['teams'][0] + return full_resp["teams"][0] else: logger.warning(resp.text) - raise ValueError(f'DB: {resp.text}') + raise ValueError(f"DB: {resp.text}") # def pd_await db_get(endpoint: str, api_ver: int = 1, object_id: int = None, params: list = None, none_okay: bool = True): @@ -151,9 +150,7 @@ class ManagerAi(BaseModel): def load_ai(): - all_ai = [ - {'name': 'Basic'} - ] + all_ai = [{"name": "Basic"}] for x in all_ai: ManagerAi.create(**x) @@ -161,8 +158,9 @@ def load_ai(): def ai_batting(this_game, this_play) -> bool: - return (this_play.inning_half == 'Top' and this_game.ai_team == 'away') or \ - (this_play.inning_half == 'Bot' and this_game.ai_team == 'home') + return (this_play.inning_half == "Top" and this_game.ai_team == "away") or ( + this_play.inning_half == "Bot" and this_game.ai_team == "home" + ) db.create_tables([ManagerAi]) @@ -183,12 +181,10 @@ class Game(BaseModel): home_roster_num = IntegerField(null=True) first_message = IntegerField(null=True) ai_team = CharField(null=True) - game_type = CharField(default='minor-league') + game_type = CharField(default="minor-league") cardset_ids = CharField(null=True) backup_cardset_ids = CharField(null=True) - # TODO: add get_away_team and get_home_team that deals with SBa/PD and returns Team object - @dataclass class StratGame: @@ -211,6 +207,16 @@ class StratGame: cardset_ids: str = None backup_cardset_ids: str = None + async def get_away_team(self, skip_cache: bool = False) -> dict: + return await get_game_team( + self, team_id=self.away_team_id, skip_cache=skip_cache + ) + + async def get_home_team(self, skip_cache: bool = False) -> dict: + return await get_game_team( + self, team_id=self.home_team_id, skip_cache=skip_cache + ) + db.create_tables([Game]) @@ -227,9 +233,10 @@ db.create_tables([Game]) def count_team_games(team_id: int, active: bool = True): all_games = Game.select().where( - ((Game.away_team_id == team_id) | (Game.home_team_id == team_id)) & (Game.active == active) + ((Game.away_team_id == team_id) | (Game.home_team_id == team_id)) + & (Game.active == active) ) - return {'count': all_games.count(), 'games': [model_to_dict(x) for x in all_games]} + return {"count": all_games.count(), "games": [model_to_dict(x) for x in all_games]} def post_game(game_dict: dict): @@ -247,18 +254,39 @@ def post_game(game_dict: dict): new_game = Game.create(**game_dict) # return_game = model_to_dict(new_game) return_game = StratGame( - new_game.id, new_game.away_team_id, new_game.home_team_id, new_game.channel_id, new_game.season, - new_game.active, new_game.is_pd, new_game.ranked, new_game.short_game, new_game.week_num, new_game.game_num, - new_game.away_roster_num, new_game.home_roster_num, new_game.first_message, new_game.ai_team, - new_game.game_type, new_game.cardset_ids, new_game.backup_cardset_ids + new_game.id, + new_game.away_team_id, + new_game.home_team_id, + new_game.channel_id, + new_game.season, + new_game.active, + new_game.is_pd, + new_game.ranked, + new_game.short_game, + new_game.week_num, + new_game.game_num, + new_game.away_roster_num, + new_game.home_roster_num, + new_game.first_message, + new_game.ai_team, + new_game.game_type, + new_game.cardset_ids, + new_game.backup_cardset_ids, ) db.close() return return_game -def get_one_game(game_id=None, away_team_id=None, home_team_id=None, week_num=None, game_num=None, - channel_id=None, active=None) -> Optional[StratGame]: +def get_one_game( + game_id=None, + away_team_id=None, + home_team_id=None, + week_num=None, + game_num=None, + channel_id=None, + active=None, +) -> Optional[StratGame]: single_game, this_game = None, None if game_id is not None: single_game = Game.get_by_id(game_id) @@ -289,13 +317,21 @@ def get_one_game(game_id=None, away_team_id=None, home_team_id=None, week_num=No async def get_game_team( - game: StratGame, gm_id: int = None, team_abbrev: str = None, team_id: int = None, - skip_cache: bool = False) -> dict: + game: StratGame, + gm_id: int = None, + team_abbrev: str = None, + team_id: int = None, + skip_cache: bool = False, +) -> dict: if not gm_id and not team_abbrev and not team_id: - raise KeyError(f'get_game_team requires either one of gm_id, team_abbrev, or team_id to not be None') + raise KeyError( + f"get_game_team requires either one of gm_id, team_abbrev, or team_id to not be None" + ) - logger.debug(f'getting game team for game {game.id} / gm_id: {gm_id} / ' - f'tm_abbrev: {team_abbrev} / team_id: {team_id} / game: {game}') + logger.debug( + f"getting game team for game {game.id} / gm_id: {gm_id} / " + f"tm_abbrev: {team_abbrev} / team_id: {team_id} / game: {game}" + ) if game.is_pd: if team_id: return await get_pd_team(team_id, skip_cache=skip_cache) @@ -304,8 +340,10 @@ async def get_game_team( # t_query = await db_get('teams', params=[('season', PD_SEASON), ('gm_id', gm_id)]) # return t_query['teams'][0] else: - t_query = await db_get('teams', params=[('season', PD_SEASON), ('abbrev', team_abbrev)]) - return t_query['teams'][0] + t_query = await db_get( + "teams", params=[("season", PD_SEASON), ("abbrev", team_abbrev)] + ) + return t_query["teams"][0] else: if gm_id: return get_sba_team_by_owner(season=SBA_SEASON, owner_id=gm_id) @@ -316,9 +354,20 @@ async def get_game_team( def patch_game( - game_id, away_team_id=None, home_team_id=None, week_num=None, game_num=None, channel_id=None, active=None, - first_message=None, home_roster_num=None, away_roster_num=None, ai_team=None, cardset_ids=None, - backup_cardset_ids=None): + game_id, + away_team_id=None, + home_team_id=None, + week_num=None, + game_num=None, + channel_id=None, + active=None, + first_message=None, + home_roster_num=None, + away_roster_num=None, + ai_team=None, + cardset_ids=None, + backup_cardset_ids=None, +): this_game = Game.get_by_id(game_id) if away_team_id is not None: this_game.away_team_id = away_team_id @@ -347,10 +396,24 @@ def patch_game( this_game.save() # return_game = model_to_dict(this_game) return_game = StratGame( - this_game.id, this_game.away_team_id, this_game.home_team_id, this_game.channel_id, this_game.season, - this_game.active, this_game.is_pd, this_game.ranked, this_game.short_game, this_game.week_num, - this_game.game_num, this_game.away_roster_num, this_game.home_roster_num, this_game.first_message, - this_game.ai_team, this_game.game_type, this_game.cardset_ids, this_game.backup_cardset_ids + this_game.id, + this_game.away_team_id, + this_game.home_team_id, + this_game.channel_id, + this_game.season, + this_game.active, + this_game.is_pd, + this_game.ranked, + this_game.short_game, + this_game.week_num, + this_game.game_num, + this_game.away_roster_num, + this_game.home_roster_num, + this_game.first_message, + this_game.ai_team, + this_game.game_type, + this_game.cardset_ids, + this_game.backup_cardset_ids, ) db.close() return return_game @@ -402,7 +465,7 @@ class StratLineup: def convert_stratlineup(lineup: Lineup) -> StratLineup: lineup_dict = model_to_dict(lineup) - lineup_dict['game'] = StratGame(**lineup_dict['game']) + lineup_dict["game"] = StratGame(**lineup_dict["game"]) return StratLineup(**lineup_dict) @@ -410,28 +473,43 @@ db.create_tables([Lineup]) def get_one_lineup( - game_id: int, lineup_id: int = None, team_id: int = None, batting_order: int = None, position: str = None, - card_id: int = None, active: bool = True, as_obj: bool = False) -> Optional[StratLineup]: + game_id: int, + lineup_id: int = None, + team_id: int = None, + batting_order: int = None, + position: str = None, + card_id: int = None, + active: bool = True, + as_obj: bool = False, +) -> Optional[StratLineup]: if not batting_order and not position and not lineup_id and not card_id: - raise KeyError(f'One of batting_order, position, card_id , or lineup_id must not be None') + raise KeyError( + f"One of batting_order, position, card_id , or lineup_id must not be None" + ) if lineup_id: this_lineup = Lineup.get_by_id(lineup_id) elif card_id: this_lineup = Lineup.get_or_none( - Lineup.game_id == game_id, Lineup.card_id == card_id, Lineup.active == active + Lineup.game_id == game_id, + Lineup.card_id == card_id, + Lineup.active == active, ) elif batting_order: this_lineup = Lineup.get_or_none( - Lineup.game_id == game_id, Lineup.team_id == team_id, Lineup.batting_order == batting_order, - Lineup.active == active + Lineup.game_id == game_id, + Lineup.team_id == team_id, + Lineup.batting_order == batting_order, + Lineup.active == active, ) else: this_lineup = Lineup.get_or_none( - Lineup.game_id == game_id, Lineup.team_id == team_id, Lineup.position == position, - Lineup.active == active + Lineup.game_id == game_id, + Lineup.team_id == team_id, + Lineup.position == position, + Lineup.active == active, ) - logger.debug(f'get_one_lineup / this_lineup: {this_lineup}') + logger.debug(f"get_one_lineup / this_lineup: {this_lineup}") if as_obj: return this_lineup @@ -456,25 +534,32 @@ def get_one_lineup( async def get_team_lineups( - game_id: int, team_id: int, inc_inactive: bool = False, pitchers_only: bool = False, as_string: bool = True): - all_lineups = Lineup.select().where( - (Lineup.game_id == game_id) & (Lineup.team_id == team_id) - ).order_by(Lineup.batting_order) + game_id: int, + team_id: int, + inc_inactive: bool = False, + pitchers_only: bool = False, + as_string: bool = True, +): + all_lineups = ( + Lineup.select() + .where((Lineup.game_id == game_id) & (Lineup.team_id == team_id)) + .order_by(Lineup.batting_order) + ) if not inc_inactive: all_lineups = all_lineups.where(Lineup.active == True) if pitchers_only: - all_lineups = all_lineups.where(Lineup.position == 'P') + all_lineups = all_lineups.where(Lineup.position == "P") # if all_lineups.count() == 0: # return None if as_string: - l_string = '' + l_string = "" this_game = Game.get_by_id(game_id) for x in all_lineups: - l_string += f'{x.batting_order}. {player_link(this_game, await get_player(this_game, x))} - {x.position}\n' + l_string += f"{x.batting_order}. {player_link(this_game, await get_player(this_game, x))} - {x.position}\n" db.close() return l_string @@ -494,8 +579,13 @@ def post_lineups(lineups: list): db.close() -def patch_lineup(lineup_id, active: Optional[bool] = None, position: Optional[str] = None, - replacing_id: Optional[int] = None, is_fatigued: Optional[bool] = None) -> StratLineup: +def patch_lineup( + lineup_id, + active: Optional[bool] = None, + position: Optional[str] = None, + replacing_id: Optional[int] = None, + is_fatigued: Optional[bool] = None, +) -> StratLineup: this_lineup = Lineup.get_by_id(lineup_id) if active is not None: this_lineup.active = active @@ -516,45 +606,51 @@ def patch_lineup(lineup_id, active: Optional[bool] = None, position: Optional[st def make_sub(lineup_dict: dict): # Check for dupe player / card - this_game = Game.get_by_id(lineup_dict['game_id']) + this_game = Game.get_by_id(lineup_dict["game_id"]) if this_game.is_pd: player_conflict = Lineup.select().where( - (Lineup.game_id == lineup_dict['game_id']) & (Lineup.team_id == lineup_dict['team_id']) & - (Lineup.card_id == lineup_dict['card_id']) + (Lineup.game_id == lineup_dict["game_id"]) + & (Lineup.team_id == lineup_dict["team_id"]) + & (Lineup.card_id == lineup_dict["card_id"]) ) - db_error = f'This card is already in the lineup' + db_error = f"This card is already in the lineup" else: player_conflict = Lineup.select().where( - (Lineup.game_id == lineup_dict['game_id']) & (Lineup.team_id == lineup_dict['team_id']) & - (Lineup.player_id == lineup_dict['player_id']) + (Lineup.game_id == lineup_dict["game_id"]) + & (Lineup.team_id == lineup_dict["team_id"]) + & (Lineup.player_id == lineup_dict["player_id"]) ) - db_error = f'This player is already in the lineup' + db_error = f"This player is already in the lineup" if player_conflict.count(): db.close() raise DatabaseError(db_error) subbed_player = Lineup.get_or_none( - Lineup.game_id == lineup_dict['game_id'], Lineup.team_id == lineup_dict['team_id'], - Lineup.batting_order == lineup_dict['batting_order'], Lineup.active == True + Lineup.game_id == lineup_dict["game_id"], + Lineup.team_id == lineup_dict["team_id"], + Lineup.batting_order == lineup_dict["batting_order"], + Lineup.active == True, ) - logger.debug(f'subbed_player: {subbed_player}') + logger.debug(f"subbed_player: {subbed_player}") if subbed_player: subbed_player = patch_lineup(subbed_player.id, active=False) - lineup_dict['replacing_id'] = subbed_player.id + lineup_dict["replacing_id"] = subbed_player.id new_lineup = Lineup.create(**lineup_dict) # return_lineup = model_to_dict(new_lineup) return_value = convert_stratlineup(new_lineup) - curr_play = get_current_play(lineup_dict['game_id']) - logger.debug(f'\n\nreturn_value: {return_value}\n\ncurr_play: {curr_play}\n\n') + curr_play = get_current_play(lineup_dict["game_id"]) + logger.debug(f"\n\nreturn_value: {return_value}\n\ncurr_play: {curr_play}\n\n") # Check current play for updates if curr_play: - if (not curr_play.pitcher and curr_play.batter.team_id != return_value.team_id) or return_value.position == 'P': + if ( + not curr_play.pitcher and curr_play.batter.team_id != return_value.team_id + ) or return_value.position == "P": patch_play(curr_play.id, pitcher_id=return_value.id) if subbed_player: @@ -577,20 +673,24 @@ def make_sub(lineup_dict: dict): def undo_subs(game: StratGame, new_play_num: int): - logger.info(f'get new players') - new_players = Lineup.select().where((Lineup.game_id == game.id) & (Lineup.after_play > new_play_num)) - logger.info(f'new_player count: {new_players.count()}') + logger.info(f"get new players") + new_players = Lineup.select().where( + (Lineup.game_id == game.id) & (Lineup.after_play > new_play_num) + ) + logger.info(f"new_player count: {new_players.count()}") replacements = [(x.id, x.replacing_id) for x in new_players] for x in replacements: - logger.info(f'replacing {x[0]} with {x[1]}') + logger.info(f"replacing {x[0]} with {x[1]}") old_player = get_one_lineup(game_id=game.id, lineup_id=x[1]) - logger.info(f'old_player: {old_player}') + logger.info(f"old_player: {old_player}") patch_lineup(old_player.id, active=True) - logger.info(f'activated!') + logger.info(f"activated!") - logger.info(f'done activating old players') - Lineup.delete().where((Lineup.game_id == game.id) & (Lineup.after_play > new_play_num)).execute() + logger.info(f"done activating old players") + Lineup.delete().where( + (Lineup.game_id == game.id) & (Lineup.after_play > new_play_num) + ).execute() async def get_player(game, lineup_member, as_dict: bool = True): @@ -599,27 +699,31 @@ async def get_player(game, lineup_member, as_dict: bool = True): if isinstance(game, Game): if game.is_pd: - this_card = await db_get(f'cards', object_id=lineup_member.card_id) - player = this_card['player'] - player['name'] = player['p_name'] - player['team'] = this_card['team'] + this_card = await db_get(f"cards", object_id=lineup_member.card_id) + player = this_card["player"] + player["name"] = player["p_name"] + player["team"] = this_card["team"] return player else: return get_sba_player(lineup_member.player_id) elif isinstance(game, StratGame): if game.is_pd: # card_id = lineup_member.card_id if isinstance(lineup_member, Lineup) else lineup_member['card_id'] - card_id = lineup_member['card_id'] if isinstance(lineup_member, dict) else lineup_member.card_id - this_card = await db_get(f'cards', object_id=card_id) - player = this_card['player'] - player['name'] = player['p_name'] - player['team'] = this_card['team'] - logger.debug(f'player: {player}') + card_id = ( + lineup_member["card_id"] + if isinstance(lineup_member, dict) + else lineup_member.card_id + ) + this_card = await db_get(f"cards", object_id=card_id) + player = this_card["player"] + player["name"] = player["p_name"] + player["team"] = this_card["team"] + logger.debug(f"player: {player}") return player else: return get_sba_player(lineup_member.player_id) else: - raise TypeError(f'Cannot get player; game is not a valid object') + raise TypeError(f"Cannot get player; game is not a valid object") def player_link(game, player): @@ -634,14 +738,14 @@ def player_link(game, player): else: return get_player_url(player) else: - raise TypeError(f'Cannot get player link; game is not a valid object') + raise TypeError(f"Cannot get player link; game is not a valid object") class Play(BaseModel): game = ForeignKeyField(Game) play_num = IntegerField() batter = ForeignKeyField(Lineup) - batter_pos = CharField(default='DH') + batter_pos = CharField(default="DH") pitcher = ForeignKeyField(Lineup, null=True) on_base_code = IntegerField() inning_half = CharField() @@ -770,7 +874,7 @@ class StratPlay: is_new_inning: bool = False def ai_run_diff(self): - if self.game.ai_team == 'away': + if self.game.ai_team == "away": return self.away_score - self.home_score else: return self.home_score - self.away_score @@ -778,23 +882,23 @@ class StratPlay: def convert_stratplay(play: Play) -> StratPlay: play_dict = model_to_dict(play) - play_dict['game'] = StratGame(**play_dict['game']) - if play_dict['batter']: - play_dict['batter'] = convert_stratlineup(play.batter) - if play_dict['pitcher']: - play_dict['pitcher'] = convert_stratlineup(play.pitcher) - if play_dict['on_first']: - play_dict['on_first'] = convert_stratlineup(play.on_first) - if play_dict['on_second']: - play_dict['on_second'] = convert_stratlineup(play.on_second) - if play_dict['on_third']: - play_dict['on_third'] = convert_stratlineup(play.on_third) - if play_dict['catcher']: - play_dict['catcher'] = convert_stratlineup(play.catcher) - if play_dict['defender']: - play_dict['defender'] = convert_stratlineup(play.defender) - if play_dict['runner']: - play_dict['runner'] = convert_stratlineup(play.runner) + play_dict["game"] = StratGame(**play_dict["game"]) + if play_dict["batter"]: + play_dict["batter"] = convert_stratlineup(play.batter) + if play_dict["pitcher"]: + play_dict["pitcher"] = convert_stratlineup(play.pitcher) + if play_dict["on_first"]: + play_dict["on_first"] = convert_stratlineup(play.on_first) + if play_dict["on_second"]: + play_dict["on_second"] = convert_stratlineup(play.on_second) + if play_dict["on_third"]: + play_dict["on_third"] = convert_stratlineup(play.on_third) + if play_dict["catcher"]: + play_dict["catcher"] = convert_stratlineup(play.catcher) + if play_dict["defender"]: + play_dict["defender"] = convert_stratlineup(play.defender) + if play_dict["runner"]: + play_dict["runner"] = convert_stratlineup(play.runner) return StratPlay(**play_dict) @@ -803,7 +907,7 @@ db.create_tables([Play]) def post_play(play_dict: dict) -> StratPlay: - logger.debug(f'play_dict: {play_dict}') + logger.debug(f"play_dict: {play_dict}") new_play = Play.create(**play_dict) # return_play = model_to_dict(new_play) return_play = convert_stratplay(new_play) @@ -813,15 +917,52 @@ def post_play(play_dict: dict) -> StratPlay: def patch_play( - play_id, batter_id: int = None, pitcher_id: int = None, catcher_id: int = None, locked: bool = None, - pa: int = None, ab: int = None, hit: int = None, double: int = None, triple: int = None, homerun: int = None, - outs: int = None, so: int = None, bp1b: int = None, bplo: int = None, bphr: int = None, bpfo: int = None, - walk: int = None, hbp: int = None, ibb: int = None, sac: int = None, sb: int = None, is_go_ahead: bool = None, - defender_id: int = None, check_pos: str = None, error: int = None, play_num: int = None, cs: int = None, - on_first_id: int = None, on_first_final: int = None, on_second_id: int = None, on_second_final: int = None, - on_third_id: int = None, on_third_final: int = None, starting_outs: int = None, runner_id: int = None, - complete: bool = None, rbi: int = None, wp: int = None, pb: int = None, pick: int = None, balk: int = None, - is_new_inning: bool = None, batter_final: int = None, in_pow: bool = None): + play_id, + batter_id: int = None, + pitcher_id: int = None, + catcher_id: int = None, + locked: bool = None, + pa: int = None, + ab: int = None, + hit: int = None, + double: int = None, + triple: int = None, + homerun: int = None, + outs: int = None, + so: int = None, + bp1b: int = None, + bplo: int = None, + bphr: int = None, + bpfo: int = None, + walk: int = None, + hbp: int = None, + ibb: int = None, + sac: int = None, + sb: int = None, + is_go_ahead: bool = None, + defender_id: int = None, + check_pos: str = None, + error: int = None, + play_num: int = None, + cs: int = None, + on_first_id: int = None, + on_first_final: int = None, + on_second_id: int = None, + on_second_final: int = None, + on_third_id: int = None, + on_third_final: int = None, + starting_outs: int = None, + runner_id: int = None, + complete: bool = None, + rbi: int = None, + wp: int = None, + pb: int = None, + pick: int = None, + balk: int = None, + is_new_inning: bool = None, + batter_final: int = None, + in_pow: bool = None, +): this_play = Play.get_by_id(play_id) if batter_id is not None: @@ -890,7 +1031,7 @@ def patch_play( else: this_play.defender_id = defender_id if check_pos is not None: - if check_pos.lower() == 'false': + if check_pos.lower() == "false": this_play.check_pos = None else: this_play.check_pos = check_pos @@ -964,9 +1105,9 @@ def get_plays(game_id: int = None, pitcher_id: int = None): if pitcher_id is not None: all_plays = all_plays.where(Play.pitcher_id == pitcher_id) - return_plays = {'count': all_plays.count(), 'plays': []} + return_plays = {"count": all_plays.count(), "plays": []} for line in all_plays: - return_plays['plays'].append(convert_stratplay(line)) + return_plays["plays"].append(convert_stratplay(line)) db.close() return return_plays @@ -983,7 +1124,9 @@ def get_play_by_num(game_id, play_num: int): def get_latest_play(game_id): - latest_play = Play.select().where(Play.game_id == game_id).order_by(-Play.id).limit(1) + latest_play = ( + Play.select().where(Play.game_id == game_id).order_by(-Play.id).limit(1) + ) if not latest_play: return None @@ -995,7 +1138,7 @@ def get_latest_play(game_id): def undo_play(game_id): p_query = Play.delete().where(Play.game_id == game_id).order_by(-Play.id).limit(1) - logger.debug(f'p_query: {p_query}') + logger.debug(f"p_query: {p_query}") count = p_query.execute() db.close() @@ -1005,12 +1148,16 @@ def undo_play(game_id): def get_current_play(game_id) -> Optional[StratPlay]: curr_play = Play.get_or_none(Play.game_id == game_id, Play.complete == False) if not curr_play: - latest_play = Play.select().where(Play.game_id == game_id).order_by(-Play.id).limit(1) + latest_play = ( + Play.select().where(Play.game_id == game_id).order_by(-Play.id).limit(1) + ) if not latest_play: return None else: complete_play(latest_play[0].id, batter_to_base=latest_play[0].batter_final) - curr_play = Play.get_or_none(Play.game_id == game_id, Play.complete == False) + curr_play = Play.get_or_none( + Play.game_id == game_id, Play.complete == False + ) # return_play = model_to_dict(curr_play) return_play = convert_stratplay(curr_play) @@ -1019,9 +1166,15 @@ def get_current_play(game_id) -> Optional[StratPlay]: def get_last_inning_end_play(game_id, inning_half, inning_num): - this_play = Play.select().where( - (Play.game_id == game_id) & (Play.inning_half == inning_half) & (Play.inning_num == inning_num) - ).order_by(-Play.id) + this_play = ( + Play.select() + .where( + (Play.game_id == game_id) + & (Play.inning_half == inning_half) + & (Play.inning_num == inning_num) + ) + .order_by(-Play.id) + ) # return_play = model_to_dict(this_play[0]) if this_play.count() > 0: @@ -1036,7 +1189,7 @@ def add_run_last_player_ab(lineup: Lineup, is_erun: bool = True): try: last_ab = Play.select().where(Play.batter == lineup).order_by(-Play.id).get() except DoesNotExist as e: - logger.error(f'Unable to apply run to Lineup {lineup}') + logger.error(f"Unable to apply run to Lineup {lineup}") else: last_ab.run = 1 last_ab.e_run = 1 if is_erun else 0 @@ -1048,26 +1201,26 @@ def get_dbready_plays(game_id: int, db_game_id: int): prep_plays = [model_to_dict(x) for x in all_plays] db.close() - obc_list = ['000', '001', '010', '100', '011', '101', '110', '111'] + obc_list = ["000", "001", "010", "100", "011", "101", "110", "111"] for x in prep_plays: - x['pitcher_id'] = x['pitcher']['player_id'] - x['batter_id'] = x['batter']['player_id'] - x['batter_team_id'] = x['batter']['team_id'] - x['pitcher_team_id'] = x['pitcher']['team_id'] - if x['catcher'] is not None: - x['catcher_id'] = x['catcher']['player_id'] - x['catcher_team_id'] = x['catcher']['team_id'] - if x['defender'] is not None: - x['defender_id'] = x['defender']['player_id'] - x['defender_team_id'] = x['defender']['team_id'] - if x['runner'] is not None: - x['runner_id'] = x['runner']['player_id'] - x['runner_team_id'] = x['runner']['team_id'] - x['game_id'] = db_game_id - x['on_base_code'] = obc_list[x['on_base_code']] + x["pitcher_id"] = x["pitcher"]["player_id"] + x["batter_id"] = x["batter"]["player_id"] + x["batter_team_id"] = x["batter"]["team_id"] + x["pitcher_team_id"] = x["pitcher"]["team_id"] + if x["catcher"] is not None: + x["catcher_id"] = x["catcher"]["player_id"] + x["catcher_team_id"] = x["catcher"]["team_id"] + if x["defender"] is not None: + x["defender_id"] = x["defender"]["player_id"] + x["defender_team_id"] = x["defender"]["team_id"] + if x["runner"] is not None: + x["runner_id"] = x["runner"]["player_id"] + x["runner_team_id"] = x["runner"]["team_id"] + x["game_id"] = db_game_id + x["on_base_code"] = obc_list[x["on_base_code"]] - logger.debug(f'all_plays:\n\n{prep_plays}\n') + logger.debug(f"all_plays:\n\n{prep_plays}\n") return prep_plays @@ -1110,13 +1263,22 @@ def convert_bullpen_to_strat(bullpen: Bullpen) -> StratBullpen: def get_or_create_bullpen(ai_team, bot): - this_pen = Bullpen.get_or_none(Bullpen.ai_team_id == ai_team['id']) + this_pen = Bullpen.get_or_none(Bullpen.ai_team_id == ai_team["id"]) if this_pen: return convert_bullpen_to_strat(this_pen) - three_days_ago = int(datetime.datetime.timestamp(datetime.datetime.now() - datetime.timedelta(days=3))) * 1000 - logger.debug(f'3da: {three_days_ago} / last_up: {this_pen.last_updated} / L > 3: ' - f'{this_pen.last_updated > three_days_ago}') + three_days_ago = ( + int( + datetime.datetime.timestamp( + datetime.datetime.now() - datetime.timedelta(days=3) + ) + ) + * 1000 + ) + logger.debug( + f"3da: {three_days_ago} / last_up: {this_pen.last_updated} / L > 3: " + f"{this_pen.last_updated > three_days_ago}" + ) if this_pen and this_pen.last_updated > three_days_ago: return convert_bullpen_to_strat(this_pen) @@ -1124,33 +1286,35 @@ def get_or_create_bullpen(ai_team, bot): this_pen.delete_instance() sheets = get_sheets(bot) - this_sheet = sheets.open_by_key(ai_team['gsheet']) - r_sheet = this_sheet.worksheet_by_title('My Rosters') + this_sheet = sheets.open_by_key(ai_team["gsheet"]) + r_sheet = this_sheet.worksheet_by_title("My Rosters") - bullpen_range = f'N30:N41' + bullpen_range = f"N30:N41" raw_cells = r_sheet.range(bullpen_range) - logger.debug(f'raw_cells: {raw_cells}') + logger.debug(f"raw_cells: {raw_cells}") bullpen = Bullpen( - ai_team_id=ai_team['id'], + ai_team_id=ai_team["id"], closer_id=raw_cells[0][0].value, setup_id=raw_cells[1][0].value, - middle_one_id=raw_cells[2][0].value if raw_cells[2][0].value != '' else None, - middle_two_id=raw_cells[3][0].value if raw_cells[3][0].value != '' else None, - middle_three_id=raw_cells[4][0].value if raw_cells[4][0].value != '' else None, - long_one_id=raw_cells[5][0].value if raw_cells[5][0].value != '' else None, - long_two_id=raw_cells[6][0].value if raw_cells[6][0].value != '' else None, - long_three_id=raw_cells[7][0].value if raw_cells[7][0].value != '' else None, - long_four_id=raw_cells[8][0].value if raw_cells[8][0].value != '' else None, - last_updated=int(datetime.datetime.timestamp(datetime.datetime.now())*1000) + middle_one_id=raw_cells[2][0].value if raw_cells[2][0].value != "" else None, + middle_two_id=raw_cells[3][0].value if raw_cells[3][0].value != "" else None, + middle_three_id=raw_cells[4][0].value if raw_cells[4][0].value != "" else None, + long_one_id=raw_cells[5][0].value if raw_cells[5][0].value != "" else None, + long_two_id=raw_cells[6][0].value if raw_cells[6][0].value != "" else None, + long_three_id=raw_cells[7][0].value if raw_cells[7][0].value != "" else None, + long_four_id=raw_cells[8][0].value if raw_cells[8][0].value != "" else None, + last_updated=int(datetime.datetime.timestamp(datetime.datetime.now()) * 1000), ) bullpen.save() - logger.debug(f'bullpen: {bullpen}') + logger.debug(f"bullpen: {bullpen}") return convert_bullpen_to_strat(bullpen) -def advance_runners(play_id: int, num_bases: int, is_error: bool = False, only_forced: bool = False): +def advance_runners( + play_id: int, num_bases: int, is_error: bool = False, only_forced: bool = False +): """ Advances runners and tallies RBIs """ @@ -1272,13 +1436,21 @@ def complete_play(play_id, batter_to_base: int = None): this_play.complete = True this_play.save() - logger.debug(f'starting the inning calc') + logger.debug(f"starting the inning calc") new_inning_half = this_play.inning_half new_inning_num = this_play.inning_num - if this_play.runner or this_play.wild_pitch or this_play.passed_ball or this_play.pick_off or this_play.balk: + if ( + this_play.runner + or this_play.wild_pitch + or this_play.passed_ball + or this_play.pick_off + or this_play.balk + ): new_batting_order = this_play.batting_order else: - new_batting_order = this_play.batting_order + 1 if this_play.batting_order < 9 else 1 + new_batting_order = ( + this_play.batting_order + 1 if this_play.batting_order < 9 else 1 + ) new_bteam_id = this_play.batter.team_id new_pteam_id = this_play.pitcher.team_id new_starting_outs = this_play.starting_outs + this_play.outs @@ -1287,7 +1459,7 @@ def complete_play(play_id, batter_to_base: int = None): new_on_third = None # score_increment = this_play.homerun # patch to handle little league home runs TODO: standardize on just _on_final for these - logger.debug(f'complete_play - this_play: {this_play}') + logger.debug(f"complete_play - this_play: {this_play}") if this_play.batter_final == 4 or batter_to_base == 4: this_play.run = 1 score_increment = 1 @@ -1295,7 +1467,7 @@ def complete_play(play_id, batter_to_base: int = None): this_play.e_run = 1 else: score_increment = 0 - logger.debug(f'complete_play - score_increment: {score_increment}') + logger.debug(f"complete_play - score_increment: {score_increment}") if this_play.on_first_final == 99: this_play.on_first_final = None @@ -1324,33 +1496,40 @@ def complete_play(play_id, batter_to_base: int = None): if this_play.starting_outs + this_play.outs > 2: new_starting_outs = 0 new_obc = 0 - if this_play.inning_half == 'Top': - new_inning_half = 'Bot' + if this_play.inning_half == "Top": + new_inning_half = "Bot" new_bteam_id = this_play.game.home_team_id new_pteam_id = this_play.game.away_team_id else: - new_inning_half = 'Top' + new_inning_half = "Top" new_inning_num += 1 new_bteam_id = this_play.game.away_team_id new_pteam_id = this_play.game.home_team_id if new_inning_num > 1: - last_inning_play = get_last_inning_end_play(this_play.game.id, new_inning_half, new_inning_num - 1) + last_inning_play = get_last_inning_end_play( + this_play.game.id, new_inning_half, new_inning_num - 1 + ) if last_inning_play.runner or last_inning_play.pick_off: new_batting_order = last_inning_play.batting_order else: - new_batting_order = last_inning_play.batting_order + 1 if last_inning_play.batting_order < 9 else 1 + new_batting_order = ( + last_inning_play.batting_order + 1 + if last_inning_play.batting_order < 9 + else 1 + ) else: new_batting_order = 1 # Not an inning-ending play else: - logger.debug(f'starting the obc calc') + logger.debug(f"starting the obc calc") bases_occ = [False, False, False, False] # Set the occupied bases for the next play and lineup member occupying it for runner, base in [ - (this_play.on_first, this_play.on_first_final), (this_play.on_second, this_play.on_second_final), - (this_play.on_third, this_play.on_third_final) + (this_play.on_first, this_play.on_first_final), + (this_play.on_second, this_play.on_second_final), + (this_play.on_third, this_play.on_third_final), ]: if base: bases_occ[base - 1] = True @@ -1399,7 +1578,7 @@ def complete_play(play_id, batter_to_base: int = None): else: new_obc = 0 - if this_play.inning_half == 'Top': + if this_play.inning_half == "Top": new_away_score = this_play.away_score + score_increment new_home_score = this_play.home_score else: @@ -1408,22 +1587,28 @@ def complete_play(play_id, batter_to_base: int = None): # A team score if score_increment: - logger.debug(f'complete_play: \n\nscore_increment: {score_increment}\n\nnew home score: {new_home_score}\n\n' - f'new_away_score: {new_away_score}\n\nthis_play.away_score: {this_play.away_score}\n\n' - f'this_player.home_score: {this_play.home_score}') + logger.debug( + f"complete_play: \n\nscore_increment: {score_increment}\n\nnew home score: {new_home_score}\n\n" + f"new_away_score: {new_away_score}\n\nthis_play.away_score: {this_play.away_score}\n\n" + f"this_player.home_score: {this_play.home_score}" + ) # Game is now tied if new_home_score == new_away_score: - logger.debug(f'\n\nGame {this_play.game} is now tied\n\n') + logger.debug(f"\n\nGame {this_play.game} is now tied\n\n") this_play.is_tied = 1 # One team took the lead - elif (this_play.away_score <= this_play.home_score) and (new_away_score > new_home_score): - logger.debug(f'\n\nTeam {this_play.batter.team_id} took the lead\n\n') + elif (this_play.away_score <= this_play.home_score) and ( + new_away_score > new_home_score + ): + logger.debug(f"\n\nTeam {this_play.batter.team_id} took the lead\n\n") this_play.is_go_ahead = 1 this_play.save() - elif (this_play.home_score <= this_play.away_score) and (new_home_score > new_away_score): - logger.debug(f'\n\nteam {this_play.batter.team_id} took the lead\n\n') + elif (this_play.home_score <= this_play.away_score) and ( + new_home_score > new_away_score + ): + logger.debug(f"\n\nteam {this_play.batter.team_id} took the lead\n\n") this_play.is_go_ahead = 1 this_play.save() @@ -1436,37 +1621,45 @@ def complete_play(play_id, batter_to_base: int = None): 3: [1.340, 0.874, 0.287], 5: [1.687, 1.042, 0.406], 6: [1.973, 1.311, 0.448], - 7: [2.295, 1.440, 0.618] + 7: [2.295, 1.440, 0.618], } start_re24 = re_data[this_play.on_base_code][this_play.starting_outs] - end_re24 = 0 if this_play.starting_outs + this_play.outs == 3 else re_data[new_obc][new_starting_outs] + end_re24 = ( + 0 + if this_play.starting_outs + this_play.outs == 3 + else re_data[new_obc][new_starting_outs] + ) this_play.re24 = end_re24 - start_re24 + score_increment this_play.save() - batter = get_one_lineup(this_play.game.id, team_id=new_bteam_id, batting_order=new_batting_order) + batter = get_one_lineup( + this_play.game.id, team_id=new_bteam_id, batting_order=new_batting_order + ) batter_id = batter.id if batter else None - pitcher = get_one_lineup(this_play.game_id, team_id=new_pteam_id, position='P') + pitcher = get_one_lineup(this_play.game_id, team_id=new_pteam_id, position="P") pitcher_id = pitcher.id if pitcher else None - logger.debug(f'done the obc calc') - next_play = Play.create(**{ - 'game_id': this_play.game.id, - 'play_num': this_play.play_num + 1, - 'batter_id': batter_id, - 'pitcher_id': pitcher_id, - 'on_base_code': new_obc, - 'inning_half': new_inning_half, - 'inning_num': new_inning_num, - 'next_inning_num': new_inning_num, - 'batting_order': new_batting_order, - 'starting_outs': new_starting_outs, - 'away_score': new_away_score, - 'home_score': new_home_score, - 'on_first': new_on_first, - 'on_second': new_on_second, - 'on_third': new_on_third, - 'is_new_inning': 1 if new_inning_half != this_play.inning_half else 0 - }) + logger.debug(f"done the obc calc") + next_play = Play.create( + **{ + "game_id": this_play.game.id, + "play_num": this_play.play_num + 1, + "batter_id": batter_id, + "pitcher_id": pitcher_id, + "on_base_code": new_obc, + "inning_half": new_inning_half, + "inning_num": new_inning_num, + "next_inning_num": new_inning_num, + "batting_order": new_batting_order, + "starting_outs": new_starting_outs, + "away_score": new_away_score, + "home_score": new_home_score, + "on_first": new_on_first, + "on_second": new_on_second, + "on_third": new_on_third, + "is_new_inning": 1 if new_inning_half != this_play.inning_half else 0, + } + ) # return_play = model_to_dict(next_play) return_play = convert_stratplay(next_play) db.close() @@ -1474,55 +1667,67 @@ def complete_play(play_id, batter_to_base: int = None): def get_batting_stats(game_id, lineup_id: int = None, team_id: int = None): - batting_stats = Play.select( - Play.batter, - fn.SUM(Play.pa).over(partition_by=[Play.batter_id]).alias('pl_pa'), - fn.SUM(Play.ab).over(partition_by=[Play.batter_id]).alias('pl_ab'), - fn.SUM(Play.hit).over(partition_by=[Play.batter_id]).alias('pl_hit'), - fn.SUM(Play.rbi).over(partition_by=[Play.batter_id]).alias('pl_rbi'), - # fn.COUNT(Play.on_first_final).filter( - # Play.on_first_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_first'), - # fn.COUNT(Play.on_second_final).filter( - # Play.on_second_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_second'), - # fn.COUNT(Play.on_third_final).filter( - # Play.on_third_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_third'), - # fn.COUNT(Play.batter_final).filter( - # Play.batter_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_batter'), - fn.SUM(Play.double).over(partition_by=[Play.batter_id]).alias('pl_double'), - fn.SUM(Play.triple).over(partition_by=[Play.batter_id]).alias('pl_triple'), - fn.SUM(Play.homerun).over(partition_by=[Play.batter_id]).alias('pl_homerun'), - fn.SUM(Play.bb).over(partition_by=[Play.batter_id]).alias('pl_bb'), - fn.SUM(Play.so).over(partition_by=[Play.batter_id]).alias('pl_so'), - fn.SUM(Play.hbp).over(partition_by=[Play.batter_id]).alias('pl_hbp'), - fn.SUM(Play.sac).over(partition_by=[Play.batter_id]).alias('pl_sac'), - fn.SUM(Play.ibb).over(partition_by=[Play.batter_id]).alias('pl_ibb'), - fn.SUM(Play.gidp).over(partition_by=[Play.batter_id]).alias('pl_gidp'), - fn.SUM(Play.sb).over(partition_by=[Play.runner_id]).alias('pl_sb'), - fn.SUM(Play.cs).over(partition_by=[Play.runner_id]).alias('pl_cs'), - fn.SUM(Play.bphr).over(partition_by=[Play.batter_id]).alias('pl_bphr'), - fn.SUM(Play.bpfo).over(partition_by=[Play.batter_id]).alias('pl_bpfo'), - fn.SUM(Play.bp1b).over(partition_by=[Play.batter_id]).alias('pl_bp1b'), - fn.SUM(Play.bplo).over(partition_by=[Play.batter_id]).alias('pl_bplo'), - fn.SUM(Play.pa).over(partition_by=[Play.batter.team_id]).alias('tm_pa'), - fn.SUM(Play.ab).over(partition_by=[Play.batter.team_id]).alias('tm_ab'), - fn.SUM(Play.hit).over(partition_by=[Play.batter.team_id]).alias('tm_hit'), - fn.SUM(Play.rbi).over(partition_by=[Play.batter.team_id]).alias('tm_rbi'), - fn.SUM(Play.double).over(partition_by=[Play.batter.team_id]).alias('tm_double'), - fn.SUM(Play.triple).over(partition_by=[Play.batter.team_id]).alias('tm_triple'), - fn.SUM(Play.homerun).over(partition_by=[Play.batter.team_id]).alias('tm_homerun'), - fn.SUM(Play.bb).over(partition_by=[Play.batter.team_id]).alias('tm_bb'), - fn.SUM(Play.so).over(partition_by=[Play.batter.team_id]).alias('tm_so'), - fn.SUM(Play.hbp).over(partition_by=[Play.batter.team_id]).alias('tm_hbp'), - fn.SUM(Play.sac).over(partition_by=[Play.batter.team_id]).alias('tm_sac'), - fn.SUM(Play.ibb).over(partition_by=[Play.batter.team_id]).alias('tm_ibb'), - fn.SUM(Play.gidp).over(partition_by=[Play.batter.team_id]).alias('tm_gidp'), - fn.SUM(Play.sb).over(partition_by=[Play.batter.team_id]).alias('tm_sb'), - fn.SUM(Play.cs).over(partition_by=[Play.batter.team_id]).alias('tm_cs'), - fn.SUM(Play.bphr).over(partition_by=[Play.batter.team_id]).alias('tm_bphr'), - fn.SUM(Play.bpfo).over(partition_by=[Play.batter.team_id]).alias('tm_bpfo'), - fn.SUM(Play.bp1b).over(partition_by=[Play.batter.team_id]).alias('tm_bp1b'), - fn.SUM(Play.bplo).over(partition_by=[Play.batter.team_id]).alias('tm_bplo'), - ).join(Lineup, on=Play.batter).where(Play.game_id == game_id) + batting_stats = ( + Play.select( + Play.batter, + fn.SUM(Play.pa).over(partition_by=[Play.batter_id]).alias("pl_pa"), + fn.SUM(Play.ab).over(partition_by=[Play.batter_id]).alias("pl_ab"), + fn.SUM(Play.hit).over(partition_by=[Play.batter_id]).alias("pl_hit"), + fn.SUM(Play.rbi).over(partition_by=[Play.batter_id]).alias("pl_rbi"), + # fn.COUNT(Play.on_first_final).filter( + # Play.on_first_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_first'), + # fn.COUNT(Play.on_second_final).filter( + # Play.on_second_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_second'), + # fn.COUNT(Play.on_third_final).filter( + # Play.on_third_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_third'), + # fn.COUNT(Play.batter_final).filter( + # Play.batter_final == 4).over(partition_by=[Play.batter_id]).alias('pl_run_batter'), + fn.SUM(Play.double).over(partition_by=[Play.batter_id]).alias("pl_double"), + fn.SUM(Play.triple).over(partition_by=[Play.batter_id]).alias("pl_triple"), + fn.SUM(Play.homerun) + .over(partition_by=[Play.batter_id]) + .alias("pl_homerun"), + fn.SUM(Play.bb).over(partition_by=[Play.batter_id]).alias("pl_bb"), + fn.SUM(Play.so).over(partition_by=[Play.batter_id]).alias("pl_so"), + fn.SUM(Play.hbp).over(partition_by=[Play.batter_id]).alias("pl_hbp"), + fn.SUM(Play.sac).over(partition_by=[Play.batter_id]).alias("pl_sac"), + fn.SUM(Play.ibb).over(partition_by=[Play.batter_id]).alias("pl_ibb"), + fn.SUM(Play.gidp).over(partition_by=[Play.batter_id]).alias("pl_gidp"), + fn.SUM(Play.sb).over(partition_by=[Play.runner_id]).alias("pl_sb"), + fn.SUM(Play.cs).over(partition_by=[Play.runner_id]).alias("pl_cs"), + fn.SUM(Play.bphr).over(partition_by=[Play.batter_id]).alias("pl_bphr"), + fn.SUM(Play.bpfo).over(partition_by=[Play.batter_id]).alias("pl_bpfo"), + fn.SUM(Play.bp1b).over(partition_by=[Play.batter_id]).alias("pl_bp1b"), + fn.SUM(Play.bplo).over(partition_by=[Play.batter_id]).alias("pl_bplo"), + fn.SUM(Play.pa).over(partition_by=[Play.batter.team_id]).alias("tm_pa"), + fn.SUM(Play.ab).over(partition_by=[Play.batter.team_id]).alias("tm_ab"), + fn.SUM(Play.hit).over(partition_by=[Play.batter.team_id]).alias("tm_hit"), + fn.SUM(Play.rbi).over(partition_by=[Play.batter.team_id]).alias("tm_rbi"), + fn.SUM(Play.double) + .over(partition_by=[Play.batter.team_id]) + .alias("tm_double"), + fn.SUM(Play.triple) + .over(partition_by=[Play.batter.team_id]) + .alias("tm_triple"), + fn.SUM(Play.homerun) + .over(partition_by=[Play.batter.team_id]) + .alias("tm_homerun"), + fn.SUM(Play.bb).over(partition_by=[Play.batter.team_id]).alias("tm_bb"), + fn.SUM(Play.so).over(partition_by=[Play.batter.team_id]).alias("tm_so"), + fn.SUM(Play.hbp).over(partition_by=[Play.batter.team_id]).alias("tm_hbp"), + fn.SUM(Play.sac).over(partition_by=[Play.batter.team_id]).alias("tm_sac"), + fn.SUM(Play.ibb).over(partition_by=[Play.batter.team_id]).alias("tm_ibb"), + fn.SUM(Play.gidp).over(partition_by=[Play.batter.team_id]).alias("tm_gidp"), + fn.SUM(Play.sb).over(partition_by=[Play.batter.team_id]).alias("tm_sb"), + fn.SUM(Play.cs).over(partition_by=[Play.batter.team_id]).alias("tm_cs"), + fn.SUM(Play.bphr).over(partition_by=[Play.batter.team_id]).alias("tm_bphr"), + fn.SUM(Play.bpfo).over(partition_by=[Play.batter.team_id]).alias("tm_bpfo"), + fn.SUM(Play.bp1b).over(partition_by=[Play.batter.team_id]).alias("tm_bp1b"), + fn.SUM(Play.bplo).over(partition_by=[Play.batter.team_id]).alias("tm_bplo"), + ) + .join(Lineup, on=Play.batter) + .where(Play.game_id == game_id) + ) if lineup_id is not None: batting_stats = batting_stats.where(Play.batter_id == lineup_id) @@ -1533,60 +1738,68 @@ def get_batting_stats(game_id, lineup_id: int = None, team_id: int = None): return_batters = [] for x in batting_stats: if x.batter.id not in done_batters: - runs_scored = Play.select(Play.pa).where( - ((Play.on_first == x.batter) & (Play.on_first_final == 4)) | - ((Play.on_second == x.batter) & (Play.on_second_final == 4)) | - ((Play.on_third == x.batter) & (Play.on_third_final == 4)) | - ((Play.batter == x.batter) & (Play.batter_final == 4)) - ).count() - stolen_bases = Play.select(Play.pa).where( - (Play.runner == x.batter) & (Play.sb == 1) - ).count() - return_batters.append({ - 'batter_id': x.batter_id, - 'card_id': x.batter.card_id, - 'team_id': x.batter.team_id, - 'pos': x.batter.position, - 'pl_run': runs_scored, - 'pl_pa': x.pl_pa, - 'pl_ab': x.pl_ab, - 'pl_hit': x.pl_hit, - 'pl_rbi': x.pl_rbi, - 'pl_double': x.pl_double, - 'pl_triple': x.pl_triple, - 'pl_homerun': x.pl_homerun, - 'pl_bb': x.pl_bb, - 'pl_so': x.pl_so, - 'pl_hbp': x.pl_hbp, - 'pl_sac': x.pl_sac, - 'pl_ibb': x.pl_ibb, - 'pl_gidp': x.pl_gidp, - 'pl_sb': stolen_bases, - 'pl_cs': x.pl_cs, - 'pl_bphr': x.pl_bphr, - 'pl_bpfo': x.pl_bpfo, - 'pl_bp1b': x.pl_bp1b, - 'pl_bplo': x.pl_bplo, - 'tm_pa': x.tm_pa, - 'tm_ab': x.tm_ab, - 'tm_hit': x.tm_hit, - 'tm_rbi': x.tm_rbi, - 'tm_double': x.tm_double, - 'tm_triple': x.tm_triple, - 'tm_homerun': x.tm_homerun, - 'tm_bb': x.tm_bb, - 'tm_so': x.tm_so, - 'tm_hbp': x.tm_hbp, - 'tm_sac': x.tm_sac, - 'tm_ibb': x.tm_ibb, - 'tm_gidp': x.tm_gidp, - 'tm_sb': x.tm_sb, - 'tm_cs': x.tm_cs, - 'tm_bphr': x.tm_bphr, - 'tm_bpfo': x.tm_bpfo, - 'tm_bp1b': x.tm_bp1b, - 'tm_bplo': x.tm_bplo, - }) + runs_scored = ( + Play.select(Play.pa) + .where( + ((Play.on_first == x.batter) & (Play.on_first_final == 4)) + | ((Play.on_second == x.batter) & (Play.on_second_final == 4)) + | ((Play.on_third == x.batter) & (Play.on_third_final == 4)) + | ((Play.batter == x.batter) & (Play.batter_final == 4)) + ) + .count() + ) + stolen_bases = ( + Play.select(Play.pa) + .where((Play.runner == x.batter) & (Play.sb == 1)) + .count() + ) + return_batters.append( + { + "batter_id": x.batter_id, + "card_id": x.batter.card_id, + "team_id": x.batter.team_id, + "pos": x.batter.position, + "pl_run": runs_scored, + "pl_pa": x.pl_pa, + "pl_ab": x.pl_ab, + "pl_hit": x.pl_hit, + "pl_rbi": x.pl_rbi, + "pl_double": x.pl_double, + "pl_triple": x.pl_triple, + "pl_homerun": x.pl_homerun, + "pl_bb": x.pl_bb, + "pl_so": x.pl_so, + "pl_hbp": x.pl_hbp, + "pl_sac": x.pl_sac, + "pl_ibb": x.pl_ibb, + "pl_gidp": x.pl_gidp, + "pl_sb": stolen_bases, + "pl_cs": x.pl_cs, + "pl_bphr": x.pl_bphr, + "pl_bpfo": x.pl_bpfo, + "pl_bp1b": x.pl_bp1b, + "pl_bplo": x.pl_bplo, + "tm_pa": x.tm_pa, + "tm_ab": x.tm_ab, + "tm_hit": x.tm_hit, + "tm_rbi": x.tm_rbi, + "tm_double": x.tm_double, + "tm_triple": x.tm_triple, + "tm_homerun": x.tm_homerun, + "tm_bb": x.tm_bb, + "tm_so": x.tm_so, + "tm_hbp": x.tm_hbp, + "tm_sac": x.tm_sac, + "tm_ibb": x.tm_ibb, + "tm_gidp": x.tm_gidp, + "tm_sb": x.tm_sb, + "tm_cs": x.tm_cs, + "tm_bphr": x.tm_bphr, + "tm_bpfo": x.tm_bpfo, + "tm_bp1b": x.tm_bp1b, + "tm_bplo": x.tm_bplo, + } + ) done_batters.append(x.batter.id) db.close() @@ -1594,14 +1807,22 @@ def get_batting_stats(game_id, lineup_id: int = None, team_id: int = None): def get_fielding_stats(game_id, lineup_id: int = None, team_id: int = None): - fielding_stats = Play.select( - Play.defender, - Play.check_pos, - fn.SUM(Play.error).over(partition_by=[Play.defender_id]).alias('pl_error'), - fn.SUM(Play.hit).over(partition_by=[Play.defender_id]).alias('pl_xhit'), - fn.COUNT(Play.defender).over(partition_by=[Play.defender_id]).alias('pl_xch'), - fn.SUM(Play.error).over(partition_by=[Play.defender.team_id]).alias('tm_error'), - ).join(Lineup, on=Play.defender).where(Play.game_id == game_id) + fielding_stats = ( + Play.select( + Play.defender, + Play.check_pos, + fn.SUM(Play.error).over(partition_by=[Play.defender_id]).alias("pl_error"), + fn.SUM(Play.hit).over(partition_by=[Play.defender_id]).alias("pl_xhit"), + fn.COUNT(Play.defender) + .over(partition_by=[Play.defender_id]) + .alias("pl_xch"), + fn.SUM(Play.error) + .over(partition_by=[Play.defender.team_id]) + .alias("tm_error"), + ) + .join(Lineup, on=Play.defender) + .where(Play.game_id == game_id) + ) if lineup_id is not None: fielding_stats = fielding_stats.where(Play.defender_id == lineup_id) @@ -1613,26 +1834,34 @@ def get_fielding_stats(game_id, lineup_id: int = None, team_id: int = None): for x in fielding_stats: if x.defender.card_id not in added_card_ids: added_card_ids.append(x.defender.card_id) - all_stats.append({ - 'defender_id': x.defender_id, - 'card_id': x.defender.card_id, - 'team_id': x.defender.team_id, - 'pos': x.check_pos, - 'pl_error': x.pl_error, - 'pl_xhit': x.pl_xhit, - 'pl_xch': x.pl_xch, - 'tm_error': x.pl_error, - 'pl_pb': 0, - 'pl_sbc': 0, - 'pl_csc': 0 - }) + all_stats.append( + { + "defender_id": x.defender_id, + "card_id": x.defender.card_id, + "team_id": x.defender.team_id, + "pos": x.check_pos, + "pl_error": x.pl_error, + "pl_xhit": x.pl_xhit, + "pl_xch": x.pl_xch, + "tm_error": x.pl_error, + "pl_pb": 0, + "pl_sbc": 0, + "pl_csc": 0, + } + ) - catching_stats = Play.select( - Play.catcher, - fn.SUM(Play.passed_ball).over(partition_by=[Play.catcher_id]).alias('pl_pb'), - fn.SUM(Play.sb).over(partition_by=[Play.catcher_id]).alias('pl_sbc'), - fn.SUM(Play.cs).over(partition_by=[Play.catcher_id]).alias('pl_csc') - ).join(Lineup, on=Play.catcher).where(Play.game_id == game_id) + catching_stats = ( + Play.select( + Play.catcher, + fn.SUM(Play.passed_ball) + .over(partition_by=[Play.catcher_id]) + .alias("pl_pb"), + fn.SUM(Play.sb).over(partition_by=[Play.catcher_id]).alias("pl_sbc"), + fn.SUM(Play.cs).over(partition_by=[Play.catcher_id]).alias("pl_csc"), + ) + .join(Lineup, on=Play.catcher) + .where(Play.game_id == game_id) + ) if lineup_id is not None: catching_stats = catching_stats.where(Play.defender_id == lineup_id) @@ -1640,24 +1869,27 @@ def get_fielding_stats(game_id, lineup_id: int = None, team_id: int = None): catching_stats = catching_stats.where(Play.defender.team_id == team_id) for x in catching_stats: - all_stats.append({ - 'defender_id': x.catcher_id, - 'card_id': x.catcher.card_id, - 'team_id': x.catcher.team_id, - 'pos': 'C', - 'pl_error': 0, - 'pl_xhit': 0, - 'pl_xch': 0, - 'tm_error': 0, - 'pl_pb': x.pl_pb, - 'pl_sbc': x.pl_sbc, - 'pl_csc': x.pl_csc - }) + all_stats.append( + { + "defender_id": x.catcher_id, + "card_id": x.catcher.card_id, + "team_id": x.catcher.team_id, + "pos": "C", + "pl_error": 0, + "pl_xhit": 0, + "pl_xch": 0, + "tm_error": 0, + "pl_pb": x.pl_pb, + "pl_sbc": x.pl_sbc, + "pl_csc": x.pl_csc, + } + ) - logger.debug(f'fielding_stats: {all_stats}') + logger.debug(f"fielding_stats: {all_stats}") db.close() return all_stats + # def new_get_batting_stats(game_id, lineup_id: int = None, team_id: int = None): # return_stats = [] # @@ -1784,54 +2016,101 @@ def get_fielding_stats(game_id, lineup_id: int = None, team_id: int = None): def get_pitching_stats( - game_id, lineup_id: int = None, team_id: int = None, in_pow: bool = None, in_innings: list = None): + game_id, + lineup_id: int = None, + team_id: int = None, + in_pow: bool = None, + in_innings: list = None, +): if in_innings is None: in_innings = [x for x in range(1, 30)] - logger.info(f'db_calls_gameplay - get_pitching_stats - in_innings: {in_innings}') - pitching_stats = Play.select( - Play.pitcher, - fn.SUM(Play.outs).over(partition_by=[Play.pitcher_id]).alias('pl_outs'), - fn.SUM(Play.hit).over(partition_by=[Play.pitcher_id]).alias('pl_hit'), - fn.COUNT(Play.on_first_final).filter( - Play.on_first_final == 4).over(partition_by=[Play.pitcher_id]).alias('pl_run_first'), - fn.COUNT(Play.on_second_final).filter( - Play.on_second_final == 4).over(partition_by=[Play.pitcher_id]).alias('pl_run_second'), - fn.COUNT(Play.on_third_final).filter( - Play.on_third_final == 4).over(partition_by=[Play.pitcher_id]).alias('pl_run_third'), - fn.COUNT(Play.batter_final).filter( - Play.batter_final == 4).over(partition_by=[Play.pitcher_id]).alias('pl_run_batter'), - fn.COUNT(Play.on_first_final).filter( - (Play.on_first_final == 4) & (Play.inning_num << in_innings)).over(partition_by=[Play.pitcher_id]).alias('pl_in_run_first'), - fn.COUNT(Play.on_second_final).filter( - (Play.on_second_final == 4) & (Play.inning_num << in_innings)).over(partition_by=[Play.pitcher_id]).alias('pl_in_run_second'), - fn.COUNT(Play.on_third_final).filter( - (Play.on_third_final == 4) & (Play.inning_num << in_innings)).over(partition_by=[Play.pitcher_id]).alias('pl_in_run_third'), - fn.COUNT(Play.batter_final).filter( - (Play.batter_final == 4) & (Play.inning_num << in_innings)).over(partition_by=[Play.pitcher_id]).alias('pl_in_run_batter'), - fn.SUM(Play.so).over(partition_by=[Play.pitcher_id]).alias('pl_so'), - fn.SUM(Play.bb).over(partition_by=[Play.pitcher_id]).alias('pl_bb'), - fn.SUM(Play.hbp).over(partition_by=[Play.pitcher_id]).alias('pl_hbp'), - fn.SUM(Play.wild_pitch).over(partition_by=[Play.pitcher_id]).alias('pl_wild_pitch'), - fn.SUM(Play.balk).over(partition_by=[Play.pitcher_id]).alias('pl_balk'), - fn.SUM(Play.homerun).over(partition_by=[Play.pitcher_id]).alias('pl_homerun'), - fn.SUM(Play.outs).over(partition_by=[Play.pitcher.team_id]).alias('tm_outs'), - fn.SUM(Play.hit).over(partition_by=[Play.pitcher.team_id]).alias('tm_hit'), - fn.COUNT(Play.on_first_final).filter( - Play.on_first_final == 4).over(partition_by=[Play.pitcher.team_id]).alias('tm_run_first'), - fn.COUNT(Play.on_second_final).filter( - Play.on_second_final == 4).over(partition_by=[Play.pitcher.team_id]).alias('tm_run_second'), - fn.COUNT(Play.on_third_final).filter( - Play.on_third_final == 4).over(partition_by=[Play.pitcher.team_id]).alias('tm_run_third'), - fn.COUNT(Play.batter_final).filter( - Play.batter_final == 4).over(partition_by=[Play.pitcher.team_id]).alias('tm_run_batter'), - fn.SUM(Play.so).over(partition_by=[Play.pitcher.team_id]).alias('tm_so'), - fn.SUM(Play.bb).over(partition_by=[Play.pitcher.team_id]).alias('tm_bb'), - fn.SUM(Play.hbp).over(partition_by=[Play.pitcher.team_id]).alias('tm_hbp'), - fn.SUM(Play.wild_pitch).over(partition_by=[Play.pitcher.team_id]).alias('tm_wild_pitch'), - fn.SUM(Play.balk).over(partition_by=[Play.pitcher.team_id]).alias('tm_balk'), - fn.SUM(Play.homerun).over(partition_by=[Play.pitcher.team_id]).alias('tm_homerun'), - ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) - logger.debug(f'db_calls_gameplay - get_pitching_stats - pitching_stats: {pitching_stats}') + logger.info(f"db_calls_gameplay - get_pitching_stats - in_innings: {in_innings}") + pitching_stats = ( + Play.select( + Play.pitcher, + fn.SUM(Play.outs).over(partition_by=[Play.pitcher_id]).alias("pl_outs"), + fn.SUM(Play.hit).over(partition_by=[Play.pitcher_id]).alias("pl_hit"), + fn.COUNT(Play.on_first_final) + .filter(Play.on_first_final == 4) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_run_first"), + fn.COUNT(Play.on_second_final) + .filter(Play.on_second_final == 4) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_run_second"), + fn.COUNT(Play.on_third_final) + .filter(Play.on_third_final == 4) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_run_third"), + fn.COUNT(Play.batter_final) + .filter(Play.batter_final == 4) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_run_batter"), + fn.COUNT(Play.on_first_final) + .filter((Play.on_first_final == 4) & (Play.inning_num << in_innings)) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_in_run_first"), + fn.COUNT(Play.on_second_final) + .filter((Play.on_second_final == 4) & (Play.inning_num << in_innings)) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_in_run_second"), + fn.COUNT(Play.on_third_final) + .filter((Play.on_third_final == 4) & (Play.inning_num << in_innings)) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_in_run_third"), + fn.COUNT(Play.batter_final) + .filter((Play.batter_final == 4) & (Play.inning_num << in_innings)) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_in_run_batter"), + fn.SUM(Play.so).over(partition_by=[Play.pitcher_id]).alias("pl_so"), + fn.SUM(Play.bb).over(partition_by=[Play.pitcher_id]).alias("pl_bb"), + fn.SUM(Play.hbp).over(partition_by=[Play.pitcher_id]).alias("pl_hbp"), + fn.SUM(Play.wild_pitch) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_wild_pitch"), + fn.SUM(Play.balk).over(partition_by=[Play.pitcher_id]).alias("pl_balk"), + fn.SUM(Play.homerun) + .over(partition_by=[Play.pitcher_id]) + .alias("pl_homerun"), + fn.SUM(Play.outs) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_outs"), + fn.SUM(Play.hit).over(partition_by=[Play.pitcher.team_id]).alias("tm_hit"), + fn.COUNT(Play.on_first_final) + .filter(Play.on_first_final == 4) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_run_first"), + fn.COUNT(Play.on_second_final) + .filter(Play.on_second_final == 4) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_run_second"), + fn.COUNT(Play.on_third_final) + .filter(Play.on_third_final == 4) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_run_third"), + fn.COUNT(Play.batter_final) + .filter(Play.batter_final == 4) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_run_batter"), + fn.SUM(Play.so).over(partition_by=[Play.pitcher.team_id]).alias("tm_so"), + fn.SUM(Play.bb).over(partition_by=[Play.pitcher.team_id]).alias("tm_bb"), + fn.SUM(Play.hbp).over(partition_by=[Play.pitcher.team_id]).alias("tm_hbp"), + fn.SUM(Play.wild_pitch) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_wild_pitch"), + fn.SUM(Play.balk) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_balk"), + fn.SUM(Play.homerun) + .over(partition_by=[Play.pitcher.team_id]) + .alias("tm_homerun"), + ) + .join(Lineup, on=Play.pitcher) + .where(Play.game_id == game_id) + ) + logger.debug( + f"db_calls_gameplay - get_pitching_stats - pitching_stats: {pitching_stats}" + ) # This is counging plays with multiple runs scored on 1 ER and the rest unearned # earned_runs_pl = Play.select().where( @@ -1840,18 +2119,30 @@ def get_pitching_stats( # ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) # logger.info(f'earned_runs: {earned_runs_pl}') - er_first = Play.select().where( - (Play.on_first_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) - er_second = Play.select().where( - (Play.on_second_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) - er_third = Play.select().where( - (Play.on_third_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) - er_batter = Play.select().where( - (Play.batter_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) + er_first = ( + Play.select() + .where((Play.on_first_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) + ) + er_second = ( + Play.select() + .where((Play.on_second_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) + ) + er_third = ( + Play.select() + .where((Play.on_third_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) + ) + er_batter = ( + Play.select() + .where((Play.batter_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where((Play.game_id == game_id) & (Play.pitcher_id == lineup_id)) + ) # earned_runs_tm = Play.select().where( # ((Play.on_first_final == 4) | (Play.on_second_final == 4) | (Play.on_third_final == 4) | @@ -1871,18 +2162,30 @@ def get_pitching_stats( tm_earned_runs = None if team_id is not None: - tm_er_first = Play.select().where( - (Play.on_first_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) - tm_er_second = Play.select().where( - (Play.on_second_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) - tm_er_third = Play.select().where( - (Play.on_third_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) - tm_er_batter = Play.select().where( - (Play.batter_final == 4) & (Play.error == 0) - ).join(Lineup, on=Play.pitcher).where(Play.game_id == game_id) + tm_er_first = ( + Play.select() + .where((Play.on_first_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where(Play.game_id == game_id) + ) + tm_er_second = ( + Play.select() + .where((Play.on_second_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where(Play.game_id == game_id) + ) + tm_er_third = ( + Play.select() + .where((Play.on_third_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where(Play.game_id == game_id) + ) + tm_er_batter = ( + Play.select() + .where((Play.batter_final == 4) & (Play.error == 0)) + .join(Lineup, on=Play.pitcher) + .where(Play.game_id == game_id) + ) # er_first = er_first.where(Play.pitcher.team_id == team_id) # er_second = er_second.where(Play.pitcher.team_id == team_id) @@ -1896,45 +2199,63 @@ def get_pitching_stats( tm_er_third = tm_er_third.where(Play.pitcher.team_id == team_id) tm_er_batter = tm_er_batter.where(Play.pitcher.team_id == team_id) - tm_earned_runs = tm_er_first.count() + tm_er_second.count() + tm_er_third.count() + tm_er_batter.count() + tm_earned_runs = ( + tm_er_first.count() + + tm_er_second.count() + + tm_er_third.count() + + tm_er_batter.count() + ) - pl_earned_runs = er_first.count() + er_second.count() + er_third.count() + er_batter.count() + pl_earned_runs = ( + er_first.count() + er_second.count() + er_third.count() + er_batter.count() + ) done_pitchers = [] return_pitchers = [] for x in pitching_stats: if x.pitcher.id not in done_pitchers: - return_pitchers.append({ - 'pitcher_id': x.pitcher_id, - 'card_id': x.pitcher.card_id, - 'team_id': x.pitcher.team_id, - 'pl_outs': x.pl_outs, - 'pl_hit': x.pl_hit, - 'pl_eruns': pl_earned_runs, - 'pl_runs': x.pl_run_first + x.pl_run_second + x.pl_run_third + x.pl_run_batter, - 'pl_in_runs': x.pl_in_run_first + x.pl_in_run_second + x.pl_in_run_third + x.pl_in_run_batter, - 'pl_so': x.pl_so, - 'pl_bb': x.pl_bb, - 'pl_hbp': x.pl_hbp, - 'pl_homerun': x.pl_homerun, - 'pl_wild_pitch': x.pl_wild_pitch, - 'pl_balk': x.pl_balk, - 'tm_outs': x.tm_outs, - 'tm_hit': x.tm_hit, - 'tm_eruns': tm_earned_runs, - 'tm_runs': x.tm_run_first + x.tm_run_second + x.tm_run_third + x.tm_run_batter, - 'tm_so': x.tm_so, - 'tm_bb': x.tm_bb, - 'tm_hbp': x.tm_hbp, - 'tm_homerun': x.tm_homerun, - 'tm_wild_pitch': x.tm_wild_pitch, - 'tm_balk': x.tm_balk, - 'pl_gs': 1 if x.pitcher.after_play == 0 else 0 - }) + return_pitchers.append( + { + "pitcher_id": x.pitcher_id, + "card_id": x.pitcher.card_id, + "team_id": x.pitcher.team_id, + "pl_outs": x.pl_outs, + "pl_hit": x.pl_hit, + "pl_eruns": pl_earned_runs, + "pl_runs": x.pl_run_first + + x.pl_run_second + + x.pl_run_third + + x.pl_run_batter, + "pl_in_runs": x.pl_in_run_first + + x.pl_in_run_second + + x.pl_in_run_third + + x.pl_in_run_batter, + "pl_so": x.pl_so, + "pl_bb": x.pl_bb, + "pl_hbp": x.pl_hbp, + "pl_homerun": x.pl_homerun, + "pl_wild_pitch": x.pl_wild_pitch, + "pl_balk": x.pl_balk, + "tm_outs": x.tm_outs, + "tm_hit": x.tm_hit, + "tm_eruns": tm_earned_runs, + "tm_runs": x.tm_run_first + + x.tm_run_second + + x.tm_run_third + + x.tm_run_batter, + "tm_so": x.tm_so, + "tm_bb": x.tm_bb, + "tm_hbp": x.tm_hbp, + "tm_homerun": x.tm_homerun, + "tm_wild_pitch": x.tm_wild_pitch, + "tm_balk": x.tm_balk, + "pl_gs": 1 if x.pitcher.after_play == 0 else 0, + } + ) done_pitchers.append(x.pitcher_id) db.close() - logger.debug(f'pitching stats: {return_pitchers}') + logger.debug(f"pitching stats: {return_pitchers}") return return_pitchers @@ -1946,7 +2267,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): # home_pitchers = [] # [(pitcher, first_play), (pitcher2, their_first_play)] # last_play = get_current_play(game.id) - logger.debug(f'this game: {game}') + logger.debug(f"this game: {game}") winner = None loser = None save = None @@ -1955,10 +2276,18 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): holds = [] # Get starting pitchers and update this as a pointer for the play crawl - away_pitcher = Lineup.get(Lineup.game_id == game.id, Lineup.team_id == game.away_team_id, Lineup.position == 'P') - home_pitcher = Lineup.get(Lineup.game_id == game.id, Lineup.team_id == game.home_team_id, Lineup.position == 'P') + away_pitcher = Lineup.get( + Lineup.game_id == game.id, + Lineup.team_id == game.away_team_id, + Lineup.position == "P", + ) + home_pitcher = Lineup.get( + Lineup.game_id == game.id, + Lineup.team_id == game.home_team_id, + Lineup.position == "P", + ) gs.extend([away_pitcher.card_id, home_pitcher.card_id]) - logger.debug(f'SPs: {away_pitcher} / {home_pitcher}') + logger.debug(f"SPs: {away_pitcher} / {home_pitcher}") decisions = { away_pitcher.player_id: DecisionModel( @@ -1967,7 +2296,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): week=game.week_num, pitcher_id=away_pitcher.player_id, pitcher_team_id=away_pitcher.team_id, - is_start=True + is_start=True, ), home_pitcher.player_id: DecisionModel( game_id=db_game_id, @@ -1975,13 +2304,13 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): week=game.week_num, pitcher_id=home_pitcher.player_id, pitcher_team_id=home_pitcher.team_id, - is_start=True - ) + is_start=True, + ), } # { : DecisionModel } for x in Play.select().where(Play.game_id == game.id): - logger.debug(f'checking play num {x.play_num}') - if x.inning_half == 'Top' and home_pitcher != x.pitcher: + logger.debug(f"checking play num {x.play_num}") + if x.inning_half == "Top" and home_pitcher != x.pitcher: if save == home_pitcher: if x.home_score > x.away_score: holds.append(save) @@ -1994,7 +2323,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): if x.home_score > x.away_score and x.home_score - x.away_score <= 3: save = home_pitcher - elif x.inning_half == 'Bot' and away_pitcher != x.pitcher: + elif x.inning_half == "Bot" and away_pitcher != x.pitcher: if save == away_pitcher: if x.away_score > x.home_score: holds.append(save) @@ -2008,7 +2337,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): save = away_pitcher if x.is_go_ahead: - logger.debug(f'is go ahead: {x}') + logger.debug(f"is go ahead: {x}") if x.on_third_final == 4: # winning_run = x.on_third # @@ -2021,7 +2350,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): if save == loser: b_save.append(save) save = None - winner = home_pitcher if x.inning_half == 'Bot' else away_pitcher + winner = home_pitcher if x.inning_half == "Bot" else away_pitcher elif x.on_second_final == 4: # winning_run = x.on_second @@ -2035,7 +2364,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): if save == loser: b_save.append(save) save = None - winner = home_pitcher if x.inning_half == 'Bot' else away_pitcher + winner = home_pitcher if x.inning_half == "Bot" else away_pitcher elif x.on_first_final == 4: # winning_run = x.on_first @@ -2049,7 +2378,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): if save == loser: b_save.append(save) save = None - winner = home_pitcher if x.inning_half == 'Bot' else away_pitcher + winner = home_pitcher if x.inning_half == "Bot" else away_pitcher elif x.batter_final == 4: # winning_run = x.batter @@ -2063,10 +2392,10 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): if save == loser: b_save.append(save) save = None - winner = home_pitcher if x.inning_half == 'Bot' else away_pitcher + winner = home_pitcher if x.inning_half == "Bot" else away_pitcher if x.is_tied: - logger.debug(f'is tied: {x}') + logger.debug(f"is tied: {x}") winner, loser = None, None if save: b_save.append(save) @@ -2078,7 +2407,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): season=game.season, week=game.week_num, pitcher_id=home_pitcher.player_id, - pitcher_team_id=home_pitcher.team_id + pitcher_team_id=home_pitcher.team_id, ) if away_pitcher.player_id not in decisions: @@ -2087,7 +2416,7 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): season=game.season, week=game.week_num, pitcher_id=away_pitcher.player_id, - pitcher_team_id=away_pitcher.team_id + pitcher_team_id=away_pitcher.team_id, ) decisions[winner.player_id].win = 1 @@ -2102,17 +2431,19 @@ def get_pitching_decisions(game: StratGame, db_game_id: int): return [x.dict() for x in decisions.values()] - logger.debug(f'\n\nWin: {winner}\nLose: {loser}\nSave: {save}\nBlown Save: {b_save}\nHolds: {holds}') + logger.debug( + f"\n\nWin: {winner}\nLose: {loser}\nSave: {save}\nBlown Save: {b_save}\nHolds: {holds}" + ) return { - 'winner': winner.card_id, - 'loser': loser.card_id, - 'save': save.card_id if save else None, - 'b_save': b_save, - 'holds': holds, - 'starters': gs, - 'w_lineup': winner, - 'l_lineup': loser, - 's_lineup': save + "winner": winner.card_id, + "loser": loser.card_id, + "save": save.card_id if save else None, + "b_save": b_save, + "holds": holds, + "starters": gs, + "w_lineup": winner, + "l_lineup": loser, + "s_lineup": save, } # for count, pit_pair in enumerate(away_pitchers): @@ -2221,11 +2552,11 @@ class StratManagerAi(pydantic.BaseModel): def check_jump(self, to_base: int, outs: int) -> Optional[str]: """Returns a string to be appended to the AI note""" - steal_base = f'attempt to steal' + steal_base = f"attempt to steal" if to_base == 2 or to_base == 3: if self.steal == 10: if to_base == 2: - return f'{steal_base} second if the runner has an ***** auto-jump or the safe range is 13+' + return f"{steal_base} second if the runner has an ***** auto-jump or the safe range is 13+" else: steal_range = 13 elif self.steal >= 8: @@ -2250,7 +2581,7 @@ class StratManagerAi(pydantic.BaseModel): def tag_from_second(self, outs: int) -> str: """Returns a string to be posted ahead of tag up message""" - tag_base = f'attempt to tag up if their safe range is' + tag_base = f"attempt to tag up if their safe range is" if self.running >= 8: tag_range = 5 elif self.running >= 5: @@ -2263,12 +2594,12 @@ class StratManagerAi(pydantic.BaseModel): elif outs == 0: tag_range -= 2 - return f'{tag_base} {tag_range}+' + return f"{tag_base} {tag_range}+" def tag_from_third(self, outs: int) -> str: """Returns a string to be posted with the tag up message""" - tag_base = f'attempt to tag up if their safe range is' + tag_base = f"attempt to tag up if their safe range is" if self.running >= 8: tag_range = 8 elif self.running >= 5: @@ -2281,12 +2612,12 @@ class StratManagerAi(pydantic.BaseModel): elif outs == 0: tag_range += 2 - return f'{tag_base} {tag_range}+' + return f"{tag_base} {tag_range}+" def uncapped_advance(self, to_base: int, outs: int) -> str: """Returns a string to be posted with the advancement message""" - advance_base = f'attempt to advance if their safe range is' + advance_base = f"attempt to advance if their safe range is" if to_base == 3: if self.uncapped_third >= 8: @@ -2294,7 +2625,7 @@ class StratManagerAi(pydantic.BaseModel): elif self.uncapped_third >= 5: advance_range = 18 else: - return f'not attempt to advance' + return f"not attempt to advance" if outs == 2: advance_range += 2 @@ -2312,27 +2643,26 @@ class StratManagerAi(pydantic.BaseModel): elif outs == 0: advance_range += 3 - return f'{advance_base} {advance_range}+' + return f"{advance_base} {advance_range}+" # def uncapped_advance_runner(self, this_play: StratPlay, to_base: int, runner: BattingCard, defender_pos: CardPosition, modifier: int = -1): # total_mod = modifier + defender_pos.arm # if to_base == 3: - def trail_advance(self, to_base: int, outs: int, sent_home: bool = False) -> str: """Returns a string to be posted with the advancement message""" - advance_base = f'attempt to advance if their safe range is' + advance_base = f"attempt to advance if their safe range is" if sent_home: if self.uncapped_trail >= 8: - return 'attempt to advance' + return "attempt to advance" elif self.uncapped_trail >= 5: if outs == 2: - return 'attempt to advance' + return "attempt to advance" else: advance_range = 14 else: - return 'not attempt to advance' + return "not attempt to advance" else: if self.uncapped_trail >= 8: @@ -2340,25 +2670,25 @@ class StratManagerAi(pydantic.BaseModel): else: advance_range = 16 - return f'{advance_base} {advance_range}+' + return f"{advance_base} {advance_range}+" def throw_lead_runner(self, to_base: int, outs: int) -> str: """Returns a string to be posted with the throw message""" - return 'throw for the lead runner' + return "throw for the lead runner" def throw_which_runner(self, to_base: int, outs: int) -> str: """Returns a string to be posted with the throw message""" if to_base == 4: - return 'throw for the lead runner' + return "throw for the lead runner" else: - return 'throw for the lead runner if their safe range is 14-' + return "throw for the lead runner if their safe range is 14-" def gb_decide_advance(self, starting_outs: int, run_lead: int): """Returns a string to be posted with the advancement message""" - advance_base = f'attempt to advance if their safe range is' + advance_base = f"attempt to advance if their safe range is" if self.running >= 8: advance_range = 10 elif self.running >= 5: @@ -2374,12 +2704,12 @@ class StratManagerAi(pydantic.BaseModel): elif run_lead < 0: advance_range += 3 - return f'{advance_base} {min(advance_range, 20)}+' + return f"{advance_base} {min(advance_range, 20)}+" def gb_decide_throw(self, starting_outs: int, run_lead: int): """Returns a string to be posted with the advancement message""" - throw_base = f'throw for the lead runner if their safe range is' + throw_base = f"throw for the lead runner if their safe range is" if self.decide_throw >= 8: throw_range = 13 elif self.decide_throw >= 5: @@ -2395,50 +2725,78 @@ class StratManagerAi(pydantic.BaseModel): elif run_lead < 0: throw_range += 3 - return f'{throw_base} {max(throw_range, 0)}-' + return f"{throw_base} {max(throw_range, 0)}-" def go_to_reliever( - self, this_play, tot_allowed: int, is_starter: bool = False) -> bool: + self, this_play, tot_allowed: int, is_starter: bool = False + ) -> bool: run_lead = this_play.ai_run_diff() obc = this_play.on_base_code - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: ' - f'outs: {this_play.starting_outs}, obc: {obc}, run_lead: {run_lead}, ' - f'tot_allowed: {tot_allowed}') + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: " + f"outs: {this_play.starting_outs}, obc: {obc}, run_lead: {run_lead}, " + f"tot_allowed: {tot_allowed}" + ) lead_target = run_lead if is_starter else 3 # AI up big if tot_allowed < 5 and is_starter: - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 1') + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 1" + ) return False elif run_lead > 5 or (run_lead > 2 and self.ahead_aggression > 5): - if tot_allowed <= lead_target or obc <= 3 or (this_play.starting_outs == 2 and not is_starter): - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 2') + if ( + tot_allowed <= lead_target + or obc <= 3 + or (this_play.starting_outs == 2 and not is_starter) + ): + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 2" + ) return False elif run_lead > 2 or (run_lead >= 0 and self.ahead_aggression > 5): - if tot_allowed < lead_target or obc <= 1 or (this_play.starting_outs == 2 and not is_starter): - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 3') + if ( + tot_allowed < lead_target + or obc <= 1 + or (this_play.starting_outs == 2 and not is_starter) + ): + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 3" + ) return False elif run_lead >= 0 or (run_lead >= -2 and self.behind_aggression > 5): - if tot_allowed < 5 or obc <= run_lead or (this_play.starting_outs == 2 and not is_starter): - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 4') + if ( + tot_allowed < 5 + or obc <= run_lead + or (this_play.starting_outs == 2 and not is_starter) + ): + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 4" + ) return False elif run_lead >= -3 and self.behind_aggression > 5: if tot_allowed < 5 and obc <= 1: - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 5') + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 5" + ) return False elif run_lead <= -5: if is_starter and this_play.inning_num <= 3: - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 6') + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 6" + ) return False if this_play.starting_outs != 0: - logger.info(f'db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 7') + logger.info( + f"db_calls_gameplay - StratManagerAi - ID: {self.id} - go_to_reliever: False / code 7" + ) return False return True - def convert_strat_manager(manager: ManagerAi) -> StratManagerAi: manager_dict = model_to_dict(manager) return StratManagerAi(**manager_dict) @@ -2450,21 +2808,20 @@ def get_manager(game) -> Optional[StratManagerAi]: # manager_ai_id = game.home_team_id if game.ai_team == 'home' else game.away_team_id # manager_ai_id = 1 - team_id = game.home_team_id if game.ai_team == 'home' else game.away_team_id + team_id = game.home_team_id if game.ai_team == "home" else game.away_team_id manager_ai_id = ((datetime.datetime.now().day * team_id) % 3) + 1 if manager_ai_id > 3 or manager_ai_id < 1: manager_ai_id = 1 - logger.debug(f'manager id: {manager_ai_id} for game {game}') + logger.debug(f"manager id: {manager_ai_id} for game {game}") try: this_manager = ManagerAi.get_by_id(manager_ai_id) except Exception as e: - e_message = f'Could not find manager id {manager_ai_id}' - logger.error(f'{e_message}: {type(e)}: {e}') - raise KeyError(f'Could not find this AI manager\'s playbook') + e_message = f"Could not find manager id {manager_ai_id}" + logger.error(f"{e_message}: {type(e)}: {e}") + raise KeyError(f"Could not find this AI manager's playbook") return convert_strat_manager(this_manager) db.close() - -- 2.25.1