universal-mcp-applications 0.1.32__py3-none-any.whl → 0.1.36rc2__py3-none-any.whl

universal_mcp/applications/fpl/utils/fixtures.py

@@ -9,9 +9,7 @@ from .api import api
 logger = logging.getLogger("fpl-mcp-server.fixtures")
 
 
-def get_fixtures_resource(
-    gameweek_id: int | None = None, team_name: str | None = None
-) -> list[dict[str, Any]]:
+def get_fixtures_resource(gameweek_id: int | None = None, team_name: str | None = None) -> list[dict[str, Any]]:
     """Get fixtures from the FPL API with optional filtering by gameweek or team
 
     Args:
@@ -68,9 +66,7 @@ def get_fixtures_resource(
 
     # Apply gameweek filter if provided
     if gameweek_id is not None:
-        formatted_fixtures = [
-            f for f in formatted_fixtures if f["gameweek"] == gameweek_id
-        ]
+        formatted_fixtures = [f for f in formatted_fixtures if f["gameweek"] == gameweek_id]
 
     # Apply team filter if provided
     if team_name is not None:
@@ -109,9 +105,7 @@ def get_player_fixtures(player_id: int, num_fixtures: int = 5) -> list[dict[str,
     Returns:
         List of upcoming fixtures for the player
     """
-    logger.info(
-        f"Getting player fixtures (player_id={player_id}, num_fixtures={num_fixtures})"
-    )
+    logger.info(f"Getting player fixtures (player_id={player_id}, num_fixtures={num_fixtures})")
 
     # Get player data to find their team
     players_data = api.get_players()
@@ -190,9 +184,7 @@ def get_player_fixtures(player_id: int, num_fixtures: int = 5) -> list[dict[str,
         opponent_team = team_map.get(opponent_id, {})
 
         # Determine difficulty - higher is more difficult
-        difficulty = fixture.get(
-            "team_h_difficulty" if is_home else "team_a_difficulty", 3
-        )
+        difficulty = fixture.get("team_h_difficulty" if is_home else "team_a_difficulty", 3)
 
         formatted_fixture = {
             "gameweek": fixture.get("event"),
@@ -218,9 +210,7 @@ def analyze_player_fixtures(player_id: int, num_fixtures: int = 5) -> dict[str,
     Returns:
         Analysis of player's upcoming fixtures with difficulty ratings
     """
-    logger.info(
-        f"Analyzing player fixtures (player_id={player_id}, num_fixtures={num_fixtures})"
-    )
+    logger.info(f"Analyzing player fixtures (player_id={player_id}, num_fixtures={num_fixtures})")
 
     # Get player data
     players_data = api.get_players()
@@ -258,9 +248,7 @@ def analyze_player_fixtures(player_id: int, num_fixtures: int = 5) -> dict[str,
     position_info = position_map.get(position_id, {})
     position_code = position_info.get("singular_name_short", "Unknown position")
 
-    logger.info(
-        "Player %s plays as %s for %s", player.get("web_name"), position_code, team_name
-    )
+    logger.info("Player %s plays as %s for %s", player.get("web_name"), position_code, team_name)
 
     # Make sure position is one of GK, DEF, MID, FWD
     position_mapping = {"GKP": "GK", "DEF": "DEF", "MID": "MID", "FWD": "FWD"}
@@ -360,11 +348,7 @@ def get_blank_gameweeks(num_gameweeks: int = 5) -> list[dict[str, Any]]:
     current_gw_id = current_gw["id"]
 
     # Limit to specified number of upcoming gameweeks
-    upcoming_gameweeks = [
-        gw
-        for gw in all_gameweeks
-        if gw["id"] >= current_gw_id and gw["id"] < current_gw_id + num_gameweeks
-    ]
+    upcoming_gameweeks = [gw for gw in all_gameweeks if gw["id"] >= current_gw_id and gw["id"] < current_gw_id + num_gameweeks]
 
     # Map team IDs to names
     team_map = {t["id"]: t for t in team_data}
@@ -439,11 +423,7 @@ def get_double_gameweeks(num_gameweeks: int = 5) -> list[dict[str, Any]]:
     current_gw_id = current_gw["id"]
 
     # Limit to specified number of upcoming gameweeks
-    upcoming_gameweeks = [
-        gw
-        for gw in all_gameweeks
-        if gw["id"] >= current_gw_id and gw["id"] < current_gw_id + num_gameweeks
-    ]
+    upcoming_gameweeks = [gw for gw in all_gameweeks if gw["id"] >= current_gw_id and gw["id"] < current_gw_id + num_gameweeks]
 
     # Map team IDs to names
     team_map = {t["id"]: t for t in team_data}
@@ -495,9 +475,7 @@ def get_double_gameweeks(num_gameweeks: int = 5) -> list[dict[str, Any]]:
     return double_gameweeks
 
 
-def get_player_gameweek_history(
-    player_ids: list[int], num_gameweeks: int = 5
-) -> dict[str, Any]:
+def get_player_gameweek_history(player_ids: list[int], num_gameweeks: int = 5) -> dict[str, Any]:
     """Get recent gameweek history for multiple players.
 
     Args:
@@ -508,9 +486,7 @@ def get_player_gameweek_history(
         Dictionary mapping player IDs to their gameweek histories
     """
     logger = logging.getLogger(__name__)
-    logger.info(
-        f"Getting gameweek history for {len(player_ids)} players, {num_gameweeks} gameweeks"
-    )
+    logger.info(f"Getting gameweek history for {len(player_ids)} players, {num_gameweeks} gameweeks")
 
     # Get current gameweek to determine range
     gameweeks = api.get_gameweeks()
@@ -571,28 +547,18 @@ def get_player_gameweek_history(
                             # Added additional stats as requested
                             "expected_goals": entry.get("expected_goals", 0),
                             "expected_assists": entry.get("expected_assists", 0),
-                            "expected_goal_involvements": entry.get(
-                                "expected_goal_involvements", 0
-                            ),
-                            "expected_goals_conceded": entry.get(
-                                "expected_goals_conceded", 0
-                            ),
+                            "expected_goal_involvements": entry.get("expected_goal_involvements", 0),
+                            "expected_goals_conceded": entry.get("expected_goals_conceded", 0),
                             "transfers_in": entry.get("transfers_in", 0),
                             "transfers_out": entry.get("transfers_out", 0),
                             "selected": entry.get("selected", 0),
-                            "value": entry.get("value", 0) / 10.0
-                            if "value" in entry
-                            else 0,
+                            "value": entry.get("value", 0) / 10.0 if "value" in entry else 0,
                             "team_score": entry.get(
-                                "team_h_score"
-                                if entry.get("was_home")
-                                else "team_a_score",
+                                "team_h_score" if entry.get("was_home") else "team_a_score",
                                 0,
                             ),
                             "opponent_score": entry.get(
-                                "team_a_score"
-                                if entry.get("was_home")
-                                else "team_h_score",
+                                "team_a_score" if entry.get("was_home") else "team_h_score",
                                 0,
                             ),
                         }

universal_mcp/applications/fpl/utils/helper.py

@@ -8,9 +8,7 @@ from .api import api
 # Resources
 
 
-def get_players_resource(
-    name_filter: str | None = None, team_filter: str | None = None
-) -> list[dict[str, Any]]:
+def get_players_resource(name_filter: str | None = None, team_filter: str | None = None) -> list[dict[str, Any]]:
     """
     Format player data for the MCP resource.
 
@@ -83,9 +81,7 @@ def get_players_resource(
             # Expected stats (if available)
             "expected_goals": player.get("expected_goals", "N/A"),
             "expected_assists": player.get("expected_assists", "N/A"),
-            "expected_goal_involvements": player.get(
-                "expected_goal_involvements", "N/A"
-            ),
+            "expected_goal_involvements": player.get("expected_goal_involvements", "N/A"),
             "expected_goals_conceded": player.get("expected_goals_conceded", "N/A"),
             # Ownership & transfers
             "selected_by_percent": player["selected_by_percent"],
@@ -281,17 +277,10 @@ def find_players_by_name(name: str, limit: int = 5) -> list[dict[str, Any]]:
             scored_players.append((total_score, player))
 
     # Sort by score (highest first)
-    sorted_players = [
-        player for _, player in sorted(scored_players, key=lambda x: x[0], reverse=True)
-    ]
+    sorted_players = [player for _, player in sorted(scored_players, key=lambda x: x[0], reverse=True)]
     # If no matches with good confidence, fall back to simple contains match
     if not sorted_players or (sorted_players and scored_players[0][0] < 30):
-        fallback_players = [
-            p
-            for p in all_players
-            if search_term in p["name"].lower()
-            or search_term in p.get("web_name", "").lower()
-        ]
+        fallback_players = [p for p in all_players if search_term in p["name"].lower() or search_term in p.get("web_name", "").lower()]
         # Sort fallback by points
         fallback_players.sort(key=lambda p: float(p["points"]), reverse=True)
 
@@ -338,9 +327,7 @@ def get_current_gameweek_resource() -> dict[str, Any]:
 
     # Format deadline time to be more readable
     try:
-        deadline = datetime.datetime.strptime(
-            current_gw["deadline_time"], "%Y-%m-%dT%H:%M:%SZ"
-        )
+        deadline = datetime.datetime.strptime(current_gw["deadline_time"], "%Y-%m-%dT%H:%M:%SZ")
         gw_data["deadline_formatted"] = deadline.strftime("%A, %d %B %Y at %H:%M UTC")
 
         # Calculate time until deadline
@@ -419,9 +406,7 @@ def get_player_fixtures(player_id: int, num_fixtures: int = 5) -> list[dict[str,
     Returns:
         List of upcoming fixtures for the player
     """
-    logger.info(
-        f"Getting player fixtures (player_id={player_id}, num_fixtures={num_fixtures})"
-    )
+    logger.info(f"Getting player fixtures (player_id={player_id}, num_fixtures={num_fixtures})")
 
     # Get player data to find their team
     players_data = api.get_players()
@@ -500,9 +485,7 @@ def get_player_fixtures(player_id: int, num_fixtures: int = 5) -> list[dict[str,
         opponent_team = team_map.get(opponent_id, {})
 
         # Determine difficulty - higher is more difficult
-        difficulty = fixture.get(
-            "team_h_difficulty" if is_home else "team_a_difficulty", 3
-        )
+        difficulty = fixture.get("team_h_difficulty" if is_home else "team_a_difficulty", 3)
 
         formatted_fixture = {
             "gameweek": fixture.get("event"),
@@ -518,9 +501,7 @@ def get_player_fixtures(player_id: int, num_fixtures: int = 5) -> list[dict[str,
     return formatted_fixtures
 
 
-def get_player_gameweek_history(
-    player_ids: list[int], num_gameweeks: int = 5
-) -> dict[str, Any]:
+def get_player_gameweek_history(player_ids: list[int], num_gameweeks: int = 5) -> dict[str, Any]:
     """Get recent gameweek history for multiple players.
 
     Args:
@@ -531,9 +512,7 @@ def get_player_gameweek_history(
         Dictionary mapping player IDs to their gameweek histories
     """
     logger = logging.getLogger(__name__)
-    logger.info(
-        f"Getting gameweek history for {len(player_ids)} players, {num_gameweeks} gameweeks"
-    )
+    logger.info(f"Getting gameweek history for {len(player_ids)} players, {num_gameweeks} gameweeks")
 
     # Get current gameweek to determine range
     gameweeks = api.get_gameweeks()
@@ -594,28 +573,18 @@ def get_player_gameweek_history(
                             # Added additional stats as requested
                             "expected_goals": entry.get("expected_goals", 0),
                             "expected_assists": entry.get("expected_assists", 0),
-                            "expected_goal_involvements": entry.get(
-                                "expected_goal_involvements", 0
-                            ),
-                            "expected_goals_conceded": entry.get(
-                                "expected_goals_conceded", 0
-                            ),
+                            "expected_goal_involvements": entry.get("expected_goal_involvements", 0),
+                            "expected_goals_conceded": entry.get("expected_goals_conceded", 0),
                             "transfers_in": entry.get("transfers_in", 0),
                             "transfers_out": entry.get("transfers_out", 0),
                             "selected": entry.get("selected", 0),
-                            "value": entry.get("value", 0) / 10.0
-                            if "value" in entry
-                            else 0,
+                            "value": entry.get("value", 0) / 10.0 if "value" in entry else 0,
                             "team_score": entry.get(
-                                "team_h_score"
-                                if entry.get("was_home")
-                                else "team_a_score",
+                                "team_h_score" if entry.get("was_home") else "team_a_score",
                                 0,
                             ),
                             "opponent_score": entry.get(
-                                "team_a_score"
-                                if entry.get("was_home")
-                                else "team_h_score",
+                                "team_a_score" if entry.get("was_home") else "team_h_score",
                                 0,
                             ),
                         }
@@ -738,11 +707,7 @@ def get_player_info(
     # Include gameweek history if requested
     if include_history and "history" in player:
         # Filter history by gameweek range
-        filtered_history = [
-            gw
-            for gw in player.get("history", [])
-            if start_gameweek <= gw.get("round", 0) <= end_gameweek
-        ]
+        filtered_history = [gw for gw in player.get("history", []) if start_gameweek <= gw.get("round", 0) <= end_gameweek]
 
         # Get detailed gameweek history
         player_id_value = player.get("id")
@@ -765,11 +730,7 @@ def get_player_info(
                     gw_num = gw_data.get("round")
                     # Find matching detailed gameweek
                     matching_detailed = next(
-                        (
-                            gw
-                            for gw in detailed_history
-                            if gw.get("round") == gw_num or gw.get("gameweek") == gw_num
-                        ),
+                        (gw for gw in detailed_history if gw.get("round") == gw_num or gw.get("gameweek") == gw_num),
                         None,
                     )
 
@@ -825,11 +786,7 @@ def get_player_info(
 
             # Calculate average fixture difficulty
             difficulty_values = [f.get("difficulty", 3) for f in fixtures_data]
-            avg_difficulty = (
-                sum(difficulty_values) / len(difficulty_values)
-                if difficulty_values
-                else 3
-            )
+            avg_difficulty = sum(difficulty_values) / len(difficulty_values) if difficulty_values else 3
 
             # Convert to a 1-10 scale where 10 is best (easiest fixtures)
             fixture_score = (6 - avg_difficulty) * 2
@@ -837,18 +794,12 @@ def get_player_info(
             result["fixture_analysis"] = {
                 "difficulty_score": round(fixture_score, 1),
                 "fixtures_analyzed": len(fixtures_data),
-                "home_matches": sum(
-                    1 for f in fixtures_data if f.get("location") == "home"
-                ),
-                "away_matches": sum(
-                    1 for f in fixtures_data if f.get("location") == "away"
-                ),
+                "home_matches": sum(1 for f in fixtures_data if f.get("location") == "home"),
+                "away_matches": sum(1 for f in fixtures_data if f.get("location") == "away"),
             }
 
             # Add fixture difficulty assessment
-            if "fixture_analysis" in result and isinstance(
-                result["fixture_analysis"], dict
-            ):
+            if "fixture_analysis" in result and isinstance(result["fixture_analysis"], dict):
                 fixture_analysis = result["fixture_analysis"]
                 if fixture_score >= 8:
                     fixture_analysis["assessment"] = "Excellent fixtures"
@@ -862,9 +813,7 @@ def get_player_info(
     return result
 
 
-def search_players(
-    query: str, position: str | None = None, team: str | None = None, limit: int = 5
-) -> dict[str, Any]:
+def search_players(query: str, position: str | None = None, team: str | None = None, limit: int = 5) -> dict[str, Any]:
     """
     Search for players by name with optional filtering by position and team.
 
@@ -881,9 +830,7 @@ def search_players(
     logger.info(f"Searching players: query={query}, position={position}, team={team}")
 
     # Find players by name
-    matches = find_players_by_name(
-        query, limit=limit * 2
-    )  # Get more than needed for filtering
+    matches = find_players_by_name(query, limit=limit * 2)  # Get more than needed for filtering
 
     # Apply position filter if specified
     if position and matches:
@@ -891,12 +838,7 @@ def search_players(
 
     # Apply team filter if specified
     if team and matches:
-        matches = [
-            p
-            for p in matches
-            if team.lower() in p.get("team", "").lower()
-            or team.lower() in p.get("team_short", "").lower()
-        ]
+        matches = [p for p in matches if team.lower() in p.get("team", "").lower() or team.lower() in p.get("team_short", "").lower()]
 
     # Limit results
     matches = matches[:limit]
@@ -965,18 +907,12 @@ def get_team_by_name(name: str) -> dict[str, Any] | None:
 
     # Try exact match first
     for team in teams:
-        if (
-            team["name"].lower() == name_lower
-            or team["short_name"].lower() == name_lower
-        ):
+        if team["name"].lower() == name_lower or team["short_name"].lower() == name_lower:
             return team
 
     # Then try partial match
     for team in teams:
-        if (
-            name_lower in team["name"].lower()
-            or name_lower in team["short_name"].lower()
-        ):
+        if name_lower in team["name"].lower() or name_lower in team["short_name"].lower():
             return team
 
     return None

universal_mcp/applications/fpl/utils/league_utils.py

@@ -20,12 +20,8 @@ def parse_league_standings(data: dict[str, Any]) -> dict[str, Any]:
         "id": data.get("league", {}).get("id"),
         "name": data.get("league", {}).get("name"),
         "created": data.get("league", {}).get("created"),
-        "type": "Public"
-        if data.get("league", {}).get("league_type") == "s"
-        else "Private",
-        "scoring": "Classic"
-        if data.get("league", {}).get("scoring") == "c"
-        else "Head-to-Head",
+        "type": "Public" if data.get("league", {}).get("league_type") == "s" else "Private",
+        "scoring": "Classic" if data.get("league", {}).get("scoring") == "c" else "Head-to-Head",
         "admin_entry": data.get("league", {}).get("admin_entry"),
         "start_event": data.get("league", {}).get("start_event"),
     }
@@ -66,9 +62,7 @@ def parse_league_standings(data: dict[str, Any]) -> dict[str, Any]:
     return response
 
 
-def get_teams_historical_data(
-    team_ids: list[int], api, start_gw: int | None = None, end_gw: int | None = None
-) -> dict[str, Any]:
+def get_teams_historical_data(team_ids: list[int], api, start_gw: int | None = None, end_gw: int | None = None) -> dict[str, Any]:
     """Get historical data for multiple teams"""
     results = {}
     errors = {}
@@ -114,11 +108,7 @@ def get_teams_historical_data(
             history_data = api._make_request(f"entry/{team_id}/history/")
 
             if "current" in history_data:
-                current = [
-                    gw
-                    for gw in history_data["current"]
-                    if start_gw <= gw.get("event", 0) <= end_gw
-                ]
+                current = [gw for gw in history_data["current"] if start_gw <= gw.get("event", 0) <= end_gw]
 
                 filtered_data = {
                     "current": current,
@@ -158,12 +148,8 @@ def _get_league_standings(league_id: int, api) -> dict[str, Any]:
         "id": data.get("league", {}).get("id"),
         "name": data.get("league", {}).get("name"),
         "created": data.get("league", {}).get("created"),
-        "type": "Public"
-        if data.get("league", {}).get("league_type") == "s"
-        else "Private",
-        "scoring": "Classic"
-        if data.get("league", {}).get("scoring") == "c"
-        else "Head-to-Head",
+        "type": "Public" if data.get("league", {}).get("league_type") == "s" else "Private",
+        "scoring": "Classic" if data.get("league", {}).get("scoring") == "c" else "Head-to-Head",
         "admin_entry": data.get("league", {}).get("admin_entry"),
         "start_event": data.get("league", {}).get("start_event"),
     }
@@ -247,9 +233,7 @@ def _get_league_historical_performance(
             if gw_data:
                 points_series.append(gw_data.get("points", 0))
                 rank_series.append(gw_data.get("overall_rank", 0))
-                value_series.append(
-                    gw_data.get("value", 0) / 10.0 if gw_data.get("value") else 0
-                )
+                value_series.append(gw_data.get("value", 0) / 10.0 if gw_data.get("value") else 0)
             else:
                 points_series.append(0)
                 rank_series.append(0)
@@ -292,9 +276,7 @@ def _get_league_historical_performance(
 
         if valid_ranks:
             mean_rank = sum(valid_ranks) / len(valid_ranks)
-            rank_variance = sum((r - mean_rank) ** 2 for r in valid_ranks) / len(
-                valid_ranks
-            )
+            rank_variance = sum((r - mean_rank) ** 2 for r in valid_ranks) / len(valid_ranks)
             consistency_score = 10.0 - min(10.0, (rank_variance / 1000000) * 10)
             team["consistency_score"] = round(consistency_score, 1)
         else:
@@ -381,9 +363,7 @@ def _get_league_team_composition(
     team_values = {}
 
     for team_id, team_data in teams_data.items():
-        team_info = next(
-            (t for t in league_data["standings"] if t["team_id"] == team_id), None
-        )
+        team_info = next((t for t in league_data["standings"] if t["team_id"] == team_id), None)
         if not team_info:
             continue
 
@@ -415,16 +395,10 @@ def _get_league_team_composition(
                     "full_name": full_name.strip() or "Unknown",
                     "position": position,
                     "team": player_data.get("team_short", "UNK"),
-                    "price": player_data.get("now_cost", 0) / 10.0
-                    if player_data.get("now_cost")
-                    else 0,
-                    "form": float(player_data.get("form", "0.0"))
-                    if player_data.get("form")
-                    else 0,
+                    "price": player_data.get("now_cost", 0) / 10.0 if player_data.get("now_cost") else 0,
+                    "form": float(player_data.get("form", "0.0")) if player_data.get("form") else 0,
                     "total_points": player_data.get("total_points", 0),
-                    "points_per_game": float(player_data.get("points_per_game", "0.0"))
-                    if player_data.get("points_per_game")
-                    else 0,
+                    "points_per_game": float(player_data.get("points_per_game", "0.0")) if player_data.get("points_per_game") else 0,
                     "ownership_count": 0,
                     "ownership_percent": 0,
                     "captain_count": 0,
@@ -465,9 +439,7 @@ def _get_league_team_composition(
 
     team_count = len(teams_data)
     for player_id, player in player_ownership.items():
-        player["ownership_percent"] = round(
-            (player["ownership_count"] / team_count) * 100, 1
-        )
+        player["ownership_percent"] = round((player["ownership_count"] / team_count) * 100, 1)
 
     players_by_ownership = sorted(
         player_ownership.values(),
@@ -478,27 +450,15 @@ def _get_league_team_composition(
     template_threshold = 30.0
     differential_threshold = 10.0
 
-    template_players = [
-        p for p in players_by_ownership if p["ownership_percent"] > template_threshold
-    ]
-    differential_players = [
-        p
-        for p in players_by_ownership
-        if 0 < p["ownership_percent"] < differential_threshold
-    ]
+    template_players = [p for p in players_by_ownership if p["ownership_percent"] > template_threshold]
+    differential_players = [p for p in players_by_ownership if 0 < p["ownership_percent"] < differential_threshold]
 
     position_order = {"GKP": 1, "DEF": 2, "MID": 3, "FWD": 4, "UNK": 5}
-    template_players.sort(
-        key=lambda p: (position_order.get(p["position"], 5), -p["ownership_percent"])
-    )
-    differential_players.sort(
-        key=lambda p: (position_order.get(p["position"], 5), -p["total_points"])
-    )
+    template_players.sort(key=lambda p: (position_order.get(p["position"], 5), -p["ownership_percent"]))
+    differential_players.sort(key=lambda p: (position_order.get(p["position"], 5), -p["total_points"]))
 
     captain_data = []
-    for player_id, count in sorted(
-        captain_picks.items(), key=lambda x: x[1], reverse=True
-    ):
+    for player_id, count in sorted(captain_picks.items(), key=lambda x: x[1], reverse=True):
         if player_id in player_ownership:
             player = player_ownership[player_id]
             captain_data.append(
@@ -522,9 +482,7 @@ def _get_league_team_composition(
             "team_value": value_data["value"],
         }
 
-    sorted_value_stats = sorted(
-        value_stats.values(), key=lambda v: v["team_value"], reverse=True
-    )
+    sorted_value_stats = sorted(value_stats.values(), key=lambda v: v["team_value"], reverse=True)
 
     PLAYER_LIMIT = 25
 
@@ -536,9 +494,7 @@ def _get_league_team_composition(
             "all_players": players_by_ownership[:PLAYER_LIMIT],
             "template_players": template_players[:PLAYER_LIMIT],
             "differential_players": differential_players[:PLAYER_LIMIT],
-            "captain_picks": captain_data[:PLAYER_LIMIT]
-            if len(captain_data) > PLAYER_LIMIT
-            else captain_data,
+            "captain_picks": captain_data[:PLAYER_LIMIT] if len(captain_data) > PLAYER_LIMIT else captain_data,
         },
         "team_values": sorted_value_stats,
         "errors": errors,