datafc 2.2.0__tar.gz → 2.3.0__tar.gz

{datafc-2.2.0 → datafc-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datafc
-Version: 2.2.0
+Version: 2.3.0
 Summary: Fetch, process, and export structured football data.
 Author-email: Uraz Akgül <urazdev@gmail.com>
 License: MIT
@@ -24,7 +24,7 @@ Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.12; extra == "dev"
 Dynamic: license-file
 
-# datafc v2.2.0
+# datafc v2.3.0
 
 ## Overview
 
@@ -916,6 +916,13 @@ Columns: `referee_id`, `referee_name`, `tournament_id`, `tournament_name`, `stat
 
 ## Changelog
 
+### v2.3.0
+
+- **Fixed `match_data` for World Cup knockout stages across all seasons.** Round numbers are now resolved automatically from the API instead of being hardcoded, so older seasons work correctly.
+- **Fixed `standings_data` for tournament-format competitions.** Calling this function for World Cup, Euro, or similar tournaments no longer raises an error. Only the available categories are returned.
+
+---
+
 ### v2.2.0
 
 - Added `tournament_type="world_cup"` support to `match_data` and `past_matches_data` for FIFA World Cup competitions. Knockout stage rounds are fixed internally; only `group_stage_week` requires `week_number`.

{datafc-2.2.0 → datafc-2.3.0}/README.md

@@ -1,4 +1,4 @@
-# datafc v2.2.0
+# datafc v2.3.0
 
 ## Overview
 
@@ -890,6 +890,13 @@ Columns: `referee_id`, `referee_name`, `tournament_id`, `tournament_name`, `stat
 
 ## Changelog
 
+### v2.3.0
+
+- **Fixed `match_data` for World Cup knockout stages across all seasons.** Round numbers are now resolved automatically from the API instead of being hardcoded, so older seasons work correctly.
+- **Fixed `standings_data` for tournament-format competitions.** Calling this function for World Cup, Euro, or similar tournaments no longer raises an error. Only the available categories are returned.
+
+---
+
 ### v2.2.0
 
 - Added `tournament_type="world_cup"` support to `match_data` and `past_matches_data` for FIFA World Cup competitions. Knockout stage rounds are fixed internally; only `group_stage_week` requires `week_number`.

{datafc-2.2.0 → datafc-2.3.0}/datafc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 
 from .sofascore import *
 from .exceptions import (

{datafc-2.2.0 → datafc-2.3.0}/datafc/sofascore/aio.py

@@ -35,7 +35,7 @@ import pandas as pd
 
 from datafc.utils._async_client import AsyncSofascoreClient
 from datafc.utils._cache import DiskCache
-from datafc.utils._config import API_URLS, WWW_URLS
+from datafc.utils._config import API_URLS, WWW_URLS, WORLD_CUP_KNOCKOUT_SLUGS
 from datafc.utils._validate import validate_source, validate_df, build_tournament_url
 from datafc.utils._save_files import save_json, save_excel
 from datafc.utils._tournament_info import resolve_tournament_season
@@ -89,6 +89,28 @@ async def match_data(
 ) -> pd.DataFrame:
     """Async version of match_data(). See sync docstring for full parameter docs."""
     validate_source(data_source)
+
+    if (
+        tournament_type == "world_cup"
+        and tournament_stage in WORLD_CUP_KNOCKOUT_SLUGS
+        and week_number is None
+    ):
+        target_slug = WORLD_CUP_KNOCKOUT_SLUGS[tournament_stage]
+        rounds_url = (
+            f"{API_URLS[data_source]}/api/v1/unique-tournament/{tournament_id}"
+            f"/season/{season_id}/rounds"
+        )
+        async with AsyncSofascoreClient(rate_limit=rate_limit, cache=cache) as client:
+            rounds_data = await client.get(rounds_url)
+        rounds = rounds_data.get("rounds") or rounds_data.get("currentRounds") or []
+        matched = next((r for r in rounds if r.get("slug") == target_slug), None)
+        if matched is None:
+            raise DataNotAvailableError(
+                f"Could not find round with slug '{target_slug}' for "
+                f"tournament_id={tournament_id}, season_id={season_id}."
+            )
+        week_number = matched["round"]
+
     url = build_tournament_url(
         API_URLS[data_source], tournament_id, season_id, week_number,
         tournament_type, tournament_stage,
@@ -649,8 +671,11 @@ async def standings_data(
             f"{API_URLS[data_source]}/api/v1/unique-tournament/{tournament_id}"
             f"/season/{season_id}/standings/{category}"
         )
-        data = await client.get(url)
-        return parse_standings_rows(data, category, tournament_id, season_id)
+        try:
+            data = await client.get(url)
+            return parse_standings_rows(data, category, tournament_id, season_id)
+        except APIError:
+            return []
 
     async with AsyncSofascoreClient(rate_limit=rate_limit, cache=cache) as client:
         batches = await asyncio.gather(*[_fetch(client, cat) for cat in ("total", "home", "away")])

{datafc-2.2.0 → datafc-2.3.0}/datafc/sofascore/fetch_match_data.py

@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Optional
 import pandas as pd
 from datafc.utils._client import SofascoreClient
 from datafc.utils._save_files import save_json, save_excel
-from datafc.utils._config import API_URLS
+from datafc.utils._config import API_URLS, WORLD_CUP_KNOCKOUT_SLUGS
 from datafc.utils._validate import validate_source, build_tournament_url
 from datafc.sofascore._parsers import parse_match_events
 from datafc.exceptions import DataNotAvailableError
@@ -49,6 +49,28 @@ def match_data(
         APIError: On HTTP errors from the Sofascore API.
     """
     validate_source(data_source)
+
+    if (
+        tournament_type == "world_cup"
+        and tournament_stage in WORLD_CUP_KNOCKOUT_SLUGS
+        and week_number is None
+    ):
+        target_slug = WORLD_CUP_KNOCKOUT_SLUGS[tournament_stage]
+        rounds_url = (
+            f"{API_URLS[data_source]}/api/v1/unique-tournament/{tournament_id}"
+            f"/season/{season_id}/rounds"
+        )
+        with SofascoreClient(rate_limit=rate_limit, cache=cache) as client:
+            rounds_data = client.get(rounds_url)
+        rounds = rounds_data.get("rounds") or rounds_data.get("currentRounds") or []
+        matched = next((r for r in rounds if r.get("slug") == target_slug), None)
+        if matched is None:
+            raise DataNotAvailableError(
+                f"Could not find round with slug '{target_slug}' for "
+                f"tournament_id={tournament_id}, season_id={season_id}."
+            )
+        week_number = matched["round"]
+
     url = build_tournament_url(
         API_URLS[data_source], tournament_id, season_id, week_number,
         tournament_type, tournament_stage,

{datafc-2.2.0 → datafc-2.3.0}/datafc/sofascore/fetch_standings_data.py

@@ -6,7 +6,7 @@ from datafc.utils._config import API_URLS
 from datafc.utils._validate import validate_source
 from datafc.utils._tournament_info import resolve_tournament_season
 from datafc.sofascore._parsers import parse_standings_rows
-from datafc.exceptions import DataNotAvailableError
+from datafc.exceptions import APIError, DataNotAvailableError
 
 if TYPE_CHECKING:
     from datafc.utils._cache import DiskCache
@@ -51,8 +51,11 @@ def standings_data(
                 f"{API_URLS[data_source]}/api/v1/unique-tournament/{tournament_id}"
                 f"/season/{season_id}/standings/{category}"
             )
-            data = client.get(url)
-            rows.extend(parse_standings_rows(data, category, tournament_id, season_id))
+            try:
+                data = client.get(url)
+                rows.extend(parse_standings_rows(data, category, tournament_id, season_id))
+            except APIError:
+                pass
 
     result_df = pd.DataFrame(rows)
     if result_df.empty:

{datafc-2.2.0 → datafc-2.3.0}/datafc/utils/_config.py

@@ -42,15 +42,26 @@ TOURNAMENT_URL_PATTERNS = {
     },
     "world_cup": {
         "group_stage_week": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}",
-        "round_of_32": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/6/slug/round-of-32",
-        "round_of_16": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/5/slug/round-of-16",
-        "quarterfinals": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/27/slug/quarterfinals",
-        "semifinals": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/28/slug/semifinals",
-        "match_for_3rd_place": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/50/slug/match-for-3rd-place",
-        "final": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/29/slug/final",
+        "round_of_32": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/round-of-32",
+        "round_of_16": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/round-of-16",
+        "quarterfinals": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/quarterfinals",
+        "semifinals": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/semifinals",
+        "match_for_3rd_place": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/match-for-3rd-place",
+        "final": "{base_url}/api/v1/unique-tournament/{tournament_id}/season/{season_id}/events/round/{week_number}/slug/final",
     },
 }
 
+# Slug used in the API URL for each world_cup knockout stage.
+# Used to auto-resolve the season-specific round number via the /rounds endpoint.
+WORLD_CUP_KNOCKOUT_SLUGS: dict[str, str] = {
+    "round_of_32": "round-of-32",
+    "round_of_16": "round-of-16",
+    "quarterfinals": "quarterfinals",
+    "semifinals": "semifinals",
+    "match_for_3rd_place": "match-for-3rd-place",
+    "final": "final",
+}
+
 # ---------------------------------------------------------------------------
 # Runtime-overridable pattern registry
 # ---------------------------------------------------------------------------

{datafc-2.2.0 → datafc-2.3.0}/datafc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datafc
-Version: 2.2.0
+Version: 2.3.0
 Summary: Fetch, process, and export structured football data.
 Author-email: Uraz Akgül <urazdev@gmail.com>
 License: MIT
@@ -24,7 +24,7 @@ Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.12; extra == "dev"
 Dynamic: license-file
 
-# datafc v2.2.0
+# datafc v2.3.0
 
 ## Overview
 
@@ -916,6 +916,13 @@ Columns: `referee_id`, `referee_name`, `tournament_id`, `tournament_name`, `stat
 
 ## Changelog
 
+### v2.3.0
+
+- **Fixed `match_data` for World Cup knockout stages across all seasons.** Round numbers are now resolved automatically from the API instead of being hardcoded, so older seasons work correctly.
+- **Fixed `standings_data` for tournament-format competitions.** Calling this function for World Cup, Euro, or similar tournaments no longer raises an error. Only the available categories are returned.
+
+---
+
 ### v2.2.0
 
 - Added `tournament_type="world_cup"` support to `match_data` and `past_matches_data` for FIFA World Cup competitions. Knockout stage rounds are fixed internally; only `group_stage_week` requires `week_number`.

{datafc-2.2.0 → datafc-2.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datafc"
-version = "2.2.0"
+version = "2.3.0"
 description = "Fetch, process, and export structured football data."
 readme = "README.md"
 license = { text = "MIT" }