fpl-mcp-server 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

src/tools/gameweeks.py

@@ -6,7 +6,6 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from ..client import FPLClient
 from ..constants import CHARACTER_LIMIT
-from ..formatting import format_gameweek_details
 from ..state import store
 from ..utils import (
     ResponseFormat,
@@ -14,14 +13,8 @@ from ..utils import (
     format_json_response,
     handle_api_error,
 )
-
-# Import shared mcp instance
 from . import mcp
 
-# =============================================================================
-# Pydantic Input Models
-# =============================================================================
-
 
 class GetCurrentGameweekInput(BaseModel):
     """Input model for getting current gameweek."""
@@ -34,34 +27,6 @@ class GetCurrentGameweekInput(BaseModel):
     )
 
 
-class GetGameweekInfoInput(BaseModel):
-    """Input model for getting specific gameweek information."""
-
-    model_config = ConfigDict(str_strip_whitespace=True, validate_assignment=True)
-
-    gameweek_number: int = Field(..., description="Gameweek number (1-38)", ge=1, le=38)
-    response_format: ResponseFormat = Field(
-        default=ResponseFormat.MARKDOWN,
-        description="Output format: 'markdown' for human-readable or 'json' for machine-readable",
-    )
-
-
-class ListAllGameweeksInput(BaseModel):
-    """Input model for listing all gameweeks."""
-
-    model_config = ConfigDict(str_strip_whitespace=True, validate_assignment=True)
-
-    response_format: ResponseFormat = Field(
-        default=ResponseFormat.MARKDOWN,
-        description="Output format: 'markdown' for human-readable or 'json' for machine-readable",
-    )
-
-
-# =============================================================================
-# Helper Functions
-# =============================================================================
-
-
 async def _create_client():
     """Create an unauthenticated FPL client for public API access and ensure data is loaded."""
     client = FPLClient(store=store)
@@ -70,11 +35,6 @@ async def _create_client():
     return client
 
 
-# =============================================================================
-# MCP Tools
-# =============================================================================
-
-
 @mcp.tool(
     name="fpl_get_current_gameweek",
     annotations={
@@ -232,161 +192,3 @@ async def fpl_get_current_gameweek(params: GetCurrentGameweekInput) -> str:
 
     except Exception as e:
         return handle_api_error(e)
-
-
-@mcp.tool(
-    name="fpl_get_gameweek_info",
-    annotations={
-        "title": "Get FPL Gameweek Information",
-        "readOnlyHint": True,
-        "destructiveHint": False,
-        "idempotentHint": True,
-        "openWorldHint": True,
-    },
-)
-async def fpl_get_gameweek_info(params: GetGameweekInfoInput) -> str:
-    """
-    Get detailed information about a specific Fantasy Premier League gameweek.
-
-    Returns comprehensive gameweek data including deadline, scores, top players, most
-    captained players, and statistics. Useful for analyzing past performance or planning
-    for future gameweeks.
-
-    Args:
-        params (GetGameweekInfoInput): Validated input parameters containing:
-            - gameweek_number (int): Gameweek number between 1-38
-            - response_format (ResponseFormat): 'markdown' or 'json' (default: markdown)
-
-    Returns:
-        str: Detailed gameweek information with statistics and top performers
-
-    Examples:
-        - Check GW1 results: gameweek_number=1
-        - Plan for GW10: gameweek_number=10
-        - Get as JSON: gameweek_number=5, response_format="json"
-
-    Error Handling:
-        - Returns error if gameweek number invalid (must be 1-38)
-        - Returns error if gameweek not found
-        - Returns formatted error message if data unavailable
-    """
-    try:
-        await _create_client()
-        if not store.bootstrap_data or not store.bootstrap_data.events:
-            return "Error: Gameweek data not available. Please try again later."
-
-        gameweek = next(
-            (e for e in store.bootstrap_data.events if e.id == params.gameweek_number),
-            None,
-        )
-        if not gameweek:
-            return f"Error: Gameweek {params.gameweek_number} not found. Please use a number between 1-38."
-
-        if params.response_format == ResponseFormat.JSON:
-            return format_json_response(gameweek.model_dump())
-        else:
-            result = format_gameweek_details(gameweek)
-
-            # Add top element info manually since it differs from basic details
-            if gameweek.top_element_info:
-                top_player = store.get_player_by_id(gameweek.top_element_info.id)
-                top_player_name = (
-                    top_player.web_name if top_player else f"ID {gameweek.top_element_info.id}"
-                )
-                result += (
-                    f"\n**Top Player:** {top_player_name} ({gameweek.top_element_info.points} pts)"
-                )
-
-            truncated, _ = check_and_truncate(result, CHARACTER_LIMIT)
-            return truncated
-
-    except Exception as e:
-        return handle_api_error(e)
-
-
-@mcp.tool(
-    name="fpl_list_all_gameweeks",
-    annotations={
-        "title": "List All FPL Gameweeks",
-        "readOnlyHint": True,
-        "destructiveHint": False,
-        "idempotentHint": True,
-        "openWorldHint": True,
-    },
-)
-async def fpl_list_all_gameweeks(params: ListAllGameweeksInput) -> str:
-    """
-    List all Fantasy Premier League gameweeks with their status.
-
-    Returns all 38 gameweeks showing which are finished, current, or upcoming. Includes
-    deadlines and average scores for finished gameweeks. Useful for getting a season
-    overview and planning long-term strategy.
-
-    Args:
-        params (ListAllGameweeksInput): Validated input parameters containing:
-            - response_format (ResponseFormat): 'markdown' or 'json' (default: markdown)
-
-    Returns:
-        str: Complete list of all gameweeks with status and scores
-
-    Examples:
-        - View all gameweeks: response_format="markdown"
-        - Get season overview: response_format="json"
-
-    Error Handling:
-        - Returns error if gameweek data unavailable
-        - Returns formatted error message if API fails
-    """
-    try:
-        await _create_client()
-        if not store.bootstrap_data or not store.bootstrap_data.events:
-            return "Error: Gameweek data not available. Please try again later."
-
-        if params.response_format == ResponseFormat.JSON:
-            result = {
-                "total_gameweeks": len(store.bootstrap_data.events),
-                "gameweeks": [
-                    {
-                        "id": event.id,
-                        "name": event.name,
-                        "deadline_time": event.deadline_time,
-                        "is_current": event.is_current,
-                        "is_previous": event.is_previous,
-                        "is_next": event.is_next,
-                        "finished": event.finished,
-                        "average_entry_score": event.average_entry_score,
-                    }
-                    for event in store.bootstrap_data.events
-                ],
-            }
-            return format_json_response(result)
-        else:
-            output = ["**All Gameweeks:**\n"]
-
-            for event in store.bootstrap_data.events:
-                status = []
-                if event.is_current:
-                    status.append("CURRENT")
-                if event.is_previous:
-                    status.append("PREVIOUS")
-                if event.is_next:
-                    status.append("NEXT")
-                if event.finished:
-                    status.append("FINISHED")
-
-                status_str = f" [{', '.join(status)}]" if status else ""
-                avg_score = (
-                    f" | Avg: {event.average_entry_score}" if event.average_entry_score else ""
-                )
-
-                output.append(
-                    f"GW{event.id}: {event.name}{status_str} | "
-                    f"Deadline: {event.deadline_time[:10]}{avg_score}"
-                )
-
-            result = "\n".join(output)
-            truncated, _ = check_and_truncate(result, CHARACTER_LIMIT)
-            return truncated
-
-    except Exception as e:
-        return handle_api_error(e)

src/tools/leagues.py

@@ -12,14 +12,8 @@ from ..utils import (
     format_json_response,
     handle_api_error,
 )
-
-# Import shared mcp instance
 from . import mcp
 
-# =============================================================================
-# Pydantic Input Models
-# =============================================================================
-
 
 class GetLeagueStandingsInput(BaseModel):
     """Input model for getting league standings."""
@@ -99,9 +93,45 @@ class GetManagerSquadInput(BaseModel):
     )
 
 
-# =============================================================================
-# Helper Functions
-# =============================================================================
+class GetManagerByTeamIdInput(BaseModel):
+    """Input model for getting manager profile by team ID."""
+
+    model_config = ConfigDict(str_strip_whitespace=True, validate_assignment=True)
+
+    team_id: int = Field(
+        ...,
+        description="Manager's team ID (entry ID)",
+        ge=1,
+    )
+    gameweek: int | None = Field(
+        default=None,
+        description="Gameweek number (1-38). If not provided, uses current gameweek",
+        ge=1,
+        le=38,
+    )
+    response_format: ResponseFormat = Field(
+        default=ResponseFormat.MARKDOWN,
+        description="Output format: 'markdown' for human-readable or 'json' for machine-readable",
+    )
+
+
+class AnalyzeRivalInput(BaseModel):
+    """Input model for analyzing a rival manager."""
+
+    model_config = ConfigDict(str_strip_whitespace=True, validate_assignment=True)
+
+    my_team_id: int = Field(..., description="Your team ID", ge=1)
+    rival_team_id: int = Field(..., description="Rival's team ID", ge=1)
+    gameweek: int | None = Field(
+        default=None,
+        description="Gameweek to analyze (defaults to current)",
+        ge=1,
+        le=38,
+    )
+    response_format: ResponseFormat = Field(
+        default=ResponseFormat.MARKDOWN,
+        description="Output format: 'markdown' or 'json'",
+    )
 
 
 async def _create_client():
@@ -112,11 +142,6 @@ async def _create_client():
     return client
 
 
-# =============================================================================
-# MCP Tools
-# =============================================================================
-
-
 @mcp.tool(
     name="fpl_get_league_standings",
     annotations={
@@ -588,3 +613,329 @@ async def fpl_get_manager_squad(params: GetManagerSquadInput) -> str:
 
     except Exception as e:
         return handle_api_error(e)
+
+
+@mcp.tool(
+    name="fpl_get_manager_by_team_id",
+    annotations={
+        "title": "Get Manager Profile by Team ID",
+        "readOnlyHint": True,
+        "destructiveHint": False,
+        "idempotentHint": True,
+        "openWorldHint": True,
+    },
+)
+async def fpl_get_manager_by_team_id(params: GetManagerByTeamIdInput) -> str:
+    """
+    Get manager profile and squad information using team ID directly.
+
+    This tool provides the same functionality as fpl_get_manager_squad but with
+    a name that better reflects its purpose - getting manager information without
+    requiring league context. Shows the 15 players picked, captain/vice-captain
+    choices, formation, points scored, transfers made, and automatic substitutions.
+
+    Args:
+        params (GetManagerByTeamIdInput): Validated input parameters containing:
+            - team_id (int): Manager's team ID (entry ID)
+            - gameweek (int | None): Gameweek number (1-38), defaults to current GW
+            - response_format (ResponseFormat): 'markdown' or 'json' (default: markdown)
+
+    Returns:
+        str: Complete manager profile with squad, statistics, and team info
+
+    Examples:
+        - View current squad: team_id=123456
+        - View specific gameweek: team_id=123456, gameweek=20
+        - Get as JSON: team_id=123456, response_format="json"
+
+    Error Handling:
+        - Returns error if team ID not found (404)
+        - Returns error if gameweek not started yet
+        - Returns formatted error message if API fails
+    """
+    try:
+        client = await _create_client()
+
+        # Fetch manager entry to get team name and player name
+        try:
+            entry_data = await client.get_manager_entry(params.team_id)
+        except Exception:
+            return (
+                f"Manager with team ID {params.team_id} not found. Verify the team ID is correct."
+            )
+
+        team_name = entry_data.get("name", "Unknown Team")
+        player_name = f"{entry_data.get('player_first_name', '')} {entry_data.get('player_last_name', '')}".strip()
+
+        # Determine which gameweek to use
+        gameweek = params.gameweek
+        if gameweek is None:
+            current_gw = store.get_current_gameweek()
+            if not current_gw:
+                return (
+                    "Error: Could not determine current gameweek. Please specify a gameweek number."
+                )
+            gameweek = current_gw.id
+
+        # Fetch gameweek picks from API
+        picks_data = await client.get_manager_gameweek_picks(params.team_id, gameweek)
+
+        picks = picks_data.get("picks", [])
+        entry_history = picks_data.get("entry_history", {})
+        auto_subs = picks_data.get("automatic_subs", [])
+
+        if not picks:
+            return f"No team data found for team ID {params.team_id} in gameweek {gameweek}. Gameweek {gameweek} may not have started yet. Please choose an earlier gameweek or wait until GW{gameweek} begins."
+
+        # Rehydrate player names
+        element_ids = [pick["element"] for pick in picks]
+        players_info = store.rehydrate_player_names(element_ids)
+
+        if params.response_format == ResponseFormat.JSON:
+            starting_xi = [p for p in picks if p["position"] <= 11]
+            bench = [p for p in picks if p["position"] > 11]
+
+            result = {
+                "team_id": params.team_id,
+                "team_name": team_name,
+                "player_name": player_name,
+                "gameweek": gameweek,
+                "stats": {
+                    "points": entry_history.get("points", 0),
+                    "total_points": entry_history.get("total_points", 0),
+                    "overall_rank": entry_history.get("overall_rank"),
+                    "team_value": entry_history.get("value", 0) / 10,
+                    "bank": entry_history.get("bank", 0) / 10,
+                    "transfers": entry_history.get("event_transfers", 0),
+                    "transfer_cost": entry_history.get("event_transfers_cost", 0),
+                    "points_on_bench": entry_history.get("points_on_bench", 0),
+                },
+                "active_chip": picks_data.get("active_chip"),
+                "starting_xi": [
+                    {
+                        "position": pick["position"],
+                        "player_name": players_info.get(pick["element"], {}).get(
+                            "web_name", "Unknown"
+                        ),
+                        "team": players_info.get(pick["element"], {}).get("team", "UNK"),
+                        "player_position": players_info.get(pick["element"], {}).get(
+                            "position", "UNK"
+                        ),
+                        "price": players_info.get(pick["element"], {}).get("price", 0),
+                        "is_captain": pick["is_captain"],
+                        "is_vice_captain": pick["is_vice_captain"],
+                        "multiplier": pick["multiplier"],
+                    }
+                    for pick in starting_xi
+                ],
+                "bench": [
+                    {
+                        "position": pick["position"],
+                        "player_name": players_info.get(pick["element"], {}).get(
+                            "web_name", "Unknown"
+                        ),
+                        "team": players_info.get(pick["element"], {}).get("team", "UNK"),
+                        "player_position": players_info.get(pick["element"], {}).get(
+                            "position", "UNK"
+                        ),
+                        "price": players_info.get(pick["element"], {}).get("price", 0),
+                    }
+                    for pick in bench
+                ],
+                "automatic_subs": [
+                    {
+                        "player_out": store.get_player_name(sub["element_out"]),
+                        "player_in": store.get_player_name(sub["element_in"]),
+                    }
+                    for sub in auto_subs
+                ],
+            }
+            return format_json_response(result)
+        else:
+            result = format_manager_squad(
+                team_name=team_name,
+                player_name=player_name,
+                team_id=params.team_id,
+                gameweek=gameweek,
+                entry_history=entry_history,
+                picks=picks,
+                players_info=players_info,
+                active_chip=picks_data.get("active_chip"),
+            )
+
+            if auto_subs:
+                result += "\n\n**Automatic Substitutions:**"
+                for sub in auto_subs:
+                    player_out = store.get_player_name(sub["element_out"])
+                    player_in = store.get_player_name(sub["element_in"])
+                    result += f"\n├─ {player_out} → {player_in}"
+
+            truncated, _ = check_and_truncate(result, CHARACTER_LIMIT)
+            return truncated
+
+    except Exception as e:
+        return handle_api_error(e)
+
+
+@mcp.tool(
+    name="fpl_analyze_rival",
+    annotations={
+        "title": "Analyze FPL Rival",
+        "readOnlyHint": True,
+        "destructiveHint": False,
+        "idempotentHint": True,
+        "openWorldHint": True,
+    },
+)
+async def fpl_analyze_rival(params: AnalyzeRivalInput) -> str:
+    """
+    Compare your team against a specific rival manager.
+
+    Provides a comprehensive head-to-head analysis including:
+    - Points and Rank comparison
+    - Chip usage history
+    - Captaincy comparison
+    - Key Differentials (players they own that you don't)
+
+    Args:
+        params (AnalyzeRivalInput): Validated input parameters containing:
+            - my_team_id (int): Your team ID
+            - rival_team_id (int): Rival's team ID
+            - gameweek (int | None): Gameweek number (defaults to current)
+
+    Returns:
+        str: Detailed rival analysis and threat assessment
+
+    Examples:
+        - Compare me vs rival: my_team_id=123, rival_team_id=456
+        - Analyze past GW: my_team_id=123, rival_team_id=456, gameweek=10
+
+    Error Handling:
+        - Returns error if either team ID invalid
+        - Returns formatted error message if API fails
+    """
+    try:
+        client = await _create_client()
+
+        # Determine gameweek
+        gameweek = params.gameweek
+        if not gameweek:
+            current = store.get_current_gameweek()
+            if not current:
+                return "Error: Could not determine current gameweek."
+            gameweek = current.id
+
+        # Fetch data for both managers
+        try:
+            my_entry = await client.get_manager_entry(params.my_team_id)
+            rival_entry = await client.get_manager_entry(params.rival_team_id)
+        except Exception:
+            return "Error: Could not retrieve manager details. Check Team IDs."
+
+        my_picks_data = await client.get_manager_gameweek_picks(params.my_team_id, gameweek)
+        rival_picks_data = await client.get_manager_gameweek_picks(params.rival_team_id, gameweek)
+
+        my_name = f"{my_entry.get('player_first_name')} {my_entry.get('player_last_name')}"
+        rival_name = f"{rival_entry.get('player_first_name')} {rival_entry.get('player_last_name')}"
+
+        my_team_name = my_entry.get("name")
+        rival_team_name = rival_entry.get("name")
+
+        # Extract picks (Starting XI + Bench)
+        my_picks = my_picks_data.get("picks", [])
+        rival_picks = rival_picks_data.get("picks", [])
+
+        # Helper to get active players (Starting XI - first 11)
+        # Note: Position 1-11 are starters, 12-15 bench
+        my_starters = {p["element"] for p in my_picks if p["position"] <= 11}
+        rival_starters = {p["element"] for p in rival_picks if p["position"] <= 11}
+
+        # Differentials (My unique vs Rival unique)
+        my_unique = my_starters - rival_starters
+        rival_unique = rival_starters - my_starters
+        common = my_starters & rival_starters
+
+        # Captains
+        my_cap = next((p for p in my_picks if p["is_captain"]), None)
+        rival_cap = next((p for p in rival_picks if p["is_captain"]), None)
+
+        my_cap_name = store.get_player_name(my_cap["element"]) if my_cap else "None"
+        rival_cap_name = store.get_player_name(rival_cap["element"]) if rival_cap else "None"
+
+        # Stats
+        my_history = my_picks_data.get("entry_history", {})
+        rival_history = rival_picks_data.get("entry_history", {})
+
+        if params.response_format == ResponseFormat.JSON:
+            result = {
+                "gameweek": gameweek,
+                "managers": {
+                    "me": {
+                        "name": my_name,
+                        "team": my_team_name,
+                        "points": my_history.get("points"),
+                        "rank": my_history.get("overall_rank"),
+                    },
+                    "rival": {
+                        "name": rival_name,
+                        "team": rival_team_name,
+                        "points": rival_history.get("points"),
+                        "rank": rival_history.get("overall_rank"),
+                    },
+                },
+                "comparison": {
+                    "common_players_count": len(common),
+                    "differentials_count": len(rival_unique),
+                    "points_diff": my_history.get("points", 0) - rival_history.get("points", 0),
+                },
+                "captains": {"me": my_cap_name, "rival": rival_cap_name},
+                "rival_differentials": [store.get_player_name(pid) for pid in rival_unique],
+            }
+            return format_json_response(result)
+
+        # Markdown Output
+        output = [
+            f"## Rival Analysis: {my_name} vs {rival_name}",
+            f"**Gameweek {gameweek}**",
+            "",
+            "### 🏆 Performance & Rank",
+            f"| Metric | 👤 You ({my_team_name}) | 🆚 Rival ({rival_team_name}) | Diff |",
+            "| :--- | :--- | :--- | :--- |",
+            f"| **GW Points** | {my_history.get('points', 0)} | {rival_history.get('points', 0)} | {my_history.get('points', 0) - rival_history.get('points', 0):+d} |",
+            f"| **Total Pts** | {my_history.get('total_points', 0)} | {rival_history.get('total_points', 0)} | {my_history.get('total_points', 0) - rival_history.get('total_points', 0):+d} |",
+            f"| **Rank** | {my_history.get('overall_rank', 0):,} | {rival_history.get('overall_rank', 0):,} | --- |",
+            f"| **Captain** | {my_cap_name} | {rival_cap_name} | {'✅ Same' if my_cap['element'] == rival_cap['element'] else '⚠️ Diff'} |",
+            f"| **Chip** | {my_picks_data.get('active_chip') or 'None'} | {rival_picks_data.get('active_chip') or 'None'} | --- |",
+            "",
+            "### ⚠️ Threat Assessment (Differentials)",
+            "Players in their starting XI that you DO NOT have:",
+            "",
+        ]
+
+        if rival_unique:
+            for pid in rival_unique:
+                p_name = store.get_player_name(pid)
+                # Get live points if possible
+                p_data = next((p for p in store.bootstrap_data.elements if p.id == pid), None)
+                points = p_data.event_points if p_data else "?"
+                output.append(f"- **{p_name}** ({points} pts)")
+        else:
+            output.append("No starting XI differentials! You have a full template match.")
+
+        output.append("")
+        output.append("### 🛡️ Your Advantages")
+        output.append("Players you have that they don't:")
+
+        if my_unique:
+            for pid in my_unique:
+                p_name = store.get_player_name(pid)
+                p_data = next((p for p in store.bootstrap_data.elements if p.id == pid), None)
+                points = p_data.event_points if p_data else "?"
+                output.append(f"- **{p_name}** ({points} pts)")
+        else:
+            output.append("No unique players.")
+
+        return "\n".join(output)
+
+    except Exception as e:
+        return handle_api_error(e)