vlrdevapi 2.3.0__tar.gz → 2.4.0__tar.gz

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/CHANGELOG.md

@@ -5,6 +5,92 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [2.4.0] - 2026-08-19
+
+### Added
+
+- **Bo1 series support** — single-map series now resolve games from
+  `.vm-stats-game` containers when nav tabs are absent. `resolve_game_id`
+  raises `ParsingError` instead of silently returning wrong data on
+  out-of-range or empty game lists.
+- **Event region resolution** — `_parse_breadcrumb` resolves `subregion=`
+  breadcrumb links (e.g. "Japan", "North America") to their parent region
+  via `commons.regions.resolve_subregion_to_region`. A new
+  `EventRegion.subregion` field preserves the original subregion name
+  (e.g. `"Japan"`); `None` for `region=` links.
+- **Event country-to-region fallback** — when no breadcrumb region is
+  present, the `region_location` country flag is resolved via
+  `resolve_country_to_region` to infer the parent region.
+- **Event region deduplication** — duplicate region entries (from both
+  `region=` and `subregion=` breadcrumbs for the same parent region)
+  are collapsed, preferring the entry that carries a subregion name.
+- **`commons.regions` module** — new shared utilities for region
+  resolution: `VALID_REGIONS`, `SUBREGION_TO_REGION` (17 VCL/GC
+  subregions), `COUNTRY_TO_REGION` (~100+ countries),
+  `resolve_subregion_to_region`, and `resolve_country_to_region`.
+- **`commons.__init__` re-exports** — `resolve_subregion_to_region`,
+  `resolve_country_to_region`, `VALID_REGIONS`, `SUBREGION_TO_REGION`,
+  and `COUNTRY_TO_REGION` are now re-exported from `vlrdevapi.commons`.
+- **Series forfeit detection** — new `ForfeitInfo` model on
+  `SeriesInfo.forfeit` exposes `forfeited`, `team`, `team_id`, and
+  `reason` fields. Parser detects `"forfeited by TEAM"` in the
+  `match-header-vs-note` element and maps the team name to the
+  corresponding `team1`/`team2` for ID resolution. Note-level
+  forfeit text (e.g. "Blind Esports Forfeit Map 2") is also parsed.
+- **Series match notes** — new `SeriesInfo.notes` list captures
+  non-veto `match-header-note` text such as technical pause warnings
+  and lobby remake notices.
+
+### Changed
+
+- **Series economy enrichment** — team matching now tries abbreviation
+  names from `.ovw-player-tag` elements first (e.g. "SEN"), then falls
+  back to full team names. This fixes mismatches where the economy tab
+  shows a different abbreviation than the overview header.
+- **Series rounds enrichment** — same abbreviation-first matching
+  strategy as economy.
+- **Series info veto parsing** — Bo1 veto fallback now handles the
+  "bans + decider" pattern (e.g. `"Ban1 remains"`) in addition to
+  pick/ban. The PICK badge is excluded from map names via
+  `span.text(deep=False)`.
+- **Series info notes parsing** — the parser now iterates all
+  `match-header-note` elements instead of only the first. This
+  correctly separates forfeit reasons, informational notes, and
+  map veto text when multiple notes are present.
+
+### Fixed
+
+- **Economy bank/spend parsing** — `int()` calls on `.rnd-sq` `title`
+  attributes and `.rnd-num` text are wrapped in `try/except ValueError`;
+  malformed values default to `0` instead of crashing the parser.
+- **Event region from location country** — events that only have a
+  "Location" label with a flag (no separate "Region" label) now resolve
+  the region from `location.country` via `resolve_country_to_region`.
+  Previously the country-to-region fallback only checked `region_location`.
+- **Phantom pagination in matches** — terminal pages no longer report
+  `has_next_page = True` (from DaviAlcanfor PR #50).
+
+### Documentation
+
+- **Event info reference** — `EventRegion` fields table now documents
+  the `subregion` field. Region example demonstrates subregion access.
+  `regions` field description explains deduplication and International
+  collapse.
+- **Series info reference** — `ForfeitInfo` fields table documents the
+  new `forfeit` nested model. `notes` field description explains the
+  distinction between forfeit reasons and informational notes.
+- **Series economy reference** — docstrings reference correct model
+  types (`RoundEconomyData`, `bank_team1`).
+- **Series rounds reference** — docstrings reference correct model
+  types (`RoundData`, `winner_team_name`).
+- **`commons.regions` module** — docstrings describe all mapping
+  dictionaries and resolution functions.
+- **Project structure** — contributing guide updated with actual
+  underscore-prefixed directory names and new modules (`_news/`,
+  `_utils/`, `commons/regions.py`).
+- **Module docstrings** — added to `economy/parser.py`,
+  `rounds/parser.py`, and `commons/__init__.py`.
+
 ## [2.3.0] - 2026-08-11
 
 ### Added
@@ -193,6 +279,7 @@ The API surface, module structure, and type system are all new.
 - `aiohttp` and `asyncio` dependencies.
 - v1.x match/event/team parsing modules.
 
+[2.4.0]: https://github.com/Vanshbordia/vlrdevapi/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/Vanshbordia/vlrdevapi/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/Vanshbordia/vlrdevapi/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/Vanshbordia/vlrdevapi/compare/v2.0.1...v2.1.0

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: vlrdevapi
-Version: 2.3.0
+Version: 2.4.0
 Summary: A Python library to scrape data from vlr.gg
 Project-URL: Homepage, https://vlrdevapi.pages.dev/
 Project-URL: Repository, https://github.com/Vanshbordia/vlrdevapi

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vlrdevapi"
-version = "2.3.0"
+version = "2.4.0"
 description = "A Python library to scrape data from vlr.gg"
 readme = "README.md"
 requires-python = ">=3.11"

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/scripts/download_fixtures.py

@@ -33,8 +33,7 @@ ROUTES += [
 ROUTES += [
     ("/news", "news/news.html", {}),
     ("/news/?page=2", "news/news_page2.html", {}),
-    ("/news/?page=126", "news/news_page126.html", {}),
-    ("/news/?page=176", "news/news_page176.html", {}),
+    ("/news/?page=300", "news/news_page300.html", {}),
     ("/734100", "news/article_734100.html", {}),
     ("/720033/americas-recent-victors-start-strong-in-week-1", "news/article_720033.html", {}),
 ]
@@ -110,6 +109,9 @@ ADDITIONAL_EVENTS = [
     (2949, "gameon-productivity-and-technology-tournament-2026"),
     (2847, "challengers-2026-japan-split-1"),
     (58, "100t-x-cashapp-gamers-for-equality"),
+    (2763, "tesfed-turkish-cup-2025"),
+    (2544, "morocco-gaming-expo-2025"),
+    (3074, "raidiant-academy-2026"),
 ]
 
 for _eid, _eslug in ADDITIONAL_EVENTS:
@@ -128,8 +130,8 @@ ROUTES += [
 
 # ── Event standings pages (for standings filtering tests) ──────
 ROUTES += [
-    ("/event/2283", "event/2283/overview.html", {}),
-    ("/event/2682", "event/2682_americas_kickoff/overview.html", {}),
+    ("/event/2283/valorant-champions-2025", "event/2283_valorant-champions-2025/overview.html", {}),
+    ("/event/2682/vct-2026-americas-kickoff", "event/2682_vct-2026-americas-kickoff/overview.html", {}),
 ]
 
 # ── Event matches pages ─────────────────────────────────────────
@@ -321,10 +323,153 @@ ROUTES += [
 ]
 
 
+# ── Series 704037 Bo1 (single-map game, no nav tabs, no veto) ─
+SERIES_ID_BO1 = 704037
+SERIES_SLUG_BO1 = "mushoku-vs-fallen-angels-game-changers-2026-emea-stage-2-promotion-relegation-r1"
+GAME_ID_BO1 = 274641
+
+ROUTES += [
+    (
+        f"/{SERIES_ID_BO1}/{SERIES_SLUG_BO1}",
+        f"series/{SERIES_ID_BO1}/overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1}?game={GAME_ID_BO1}&tab=overview",
+        f"series/{SERIES_ID_BO1}/game_{GAME_ID_BO1}_overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1}?game={GAME_ID_BO1}&tab=performance",
+        f"series/{SERIES_ID_BO1}/game_{GAME_ID_BO1}_performance.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1}?game={GAME_ID_BO1}&tab=economy",
+        f"series/{SERIES_ID_BO1}/game_{GAME_ID_BO1}_economy.html",
+        {},
+    ),
+]
+
+# ── Series 64819 Bo1 (single-map, bans + decider veto) ────────
+SERIES_ID_BO1_VETO = 64819
+GAME_ID_BO1_VETO = 65212
+
+ROUTES += [
+    (
+        f"/{SERIES_ID_BO1_VETO}",
+        f"series/{SERIES_ID_BO1_VETO}/overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_VETO}?game={GAME_ID_BO1_VETO}&tab=overview",
+        f"series/{SERIES_ID_BO1_VETO}/game_{GAME_ID_BO1_VETO}_overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_VETO}?game={GAME_ID_BO1_VETO}&tab=performance",
+        f"series/{SERIES_ID_BO1_VETO}/game_{GAME_ID_BO1_VETO}_performance.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_VETO}?game={GAME_ID_BO1_VETO}&tab=economy",
+        f"series/{SERIES_ID_BO1_VETO}/game_{GAME_ID_BO1_VETO}_economy.html",
+        {},
+    ),
+]
+
+# ── Series 30788 Bo1 (single-map, pick veto) ──────────────────
+SERIES_ID_BO1_PICK = 30788
+GAME_ID_BO1_PICK = 47971
+
+ROUTES += [
+    (
+        f"/{SERIES_ID_BO1_PICK}",
+        f"series/{SERIES_ID_BO1_PICK}/overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_PICK}?game={GAME_ID_BO1_PICK}&tab=overview",
+        f"series/{SERIES_ID_BO1_PICK}/game_{GAME_ID_BO1_PICK}_overview.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_PICK}?game={GAME_ID_BO1_PICK}&tab=performance",
+        f"series/{SERIES_ID_BO1_PICK}/game_{GAME_ID_BO1_PICK}_performance.html",
+        {},
+    ),
+    (
+        f"/{SERIES_ID_BO1_PICK}?game={GAME_ID_BO1_PICK}&tab=economy",
+        f"series/{SERIES_ID_BO1_PICK}/game_{GAME_ID_BO1_PICK}_economy.html",
+        {},
+    ),
+]
+
+# ── Series: forfeit and notes parsing ───────────────────────
+SERIES_FORFEIT_NOTES = [
+    (477343, "shopify-rebellion-gold-vs-yfp-x-game-changers-2025-north-america-stage-1-r3"),
+    (67357, "t1-vs-tsm-champions-tour-north-america-stage-1-challengers-lr4"),
+    (155313, "blind-esports-vs-onlyfriends-nsg-yuddha-phase-2-all-india-championship-playoffs-lr1"),
+    (459856, "team-liquid-vs-karmine-corp-champions-tour-2025-emea-stage-1-w5"),
+    (715117, "shopify-rebellion-black-vs-2game-esports-vcl-26-americas-last-chance-qualifier-main-event-gf"),
+]
+
+for _sid, _sslug in SERIES_FORFEIT_NOTES:
+    ROUTES.append((f"/{_sid}/{_sslug}", f"series/{_sid}/overview.html", {}))
+
+
+def _parse_last_page(html: str) -> int | None:
+    """Parse the highest page number from vlr.gg pagination controls."""
+    from selectolax.parser import HTMLParser
+
+    doc = HTMLParser(html)
+    pagination = doc.css_first("div.action-container-pages")
+    if pagination is None:
+        return None
+    max_page = 0
+    for el in pagination.css("a.btn.mod-page, span.btn.mod-page"):
+        try:
+            num = int(el.text(strip=True))
+            if num > max_page:
+                max_page = num
+        except ValueError:
+            continue
+    return max_page if max_page > 0 else None
+
+
+async def _download_news_last_page(client: httpx.AsyncClient) -> None:
+    """Dynamically determine and download the last news page."""
+    out = FIXTURES_DIR / "news" / "news_last_page.html"
+    out.parent.mkdir(parents=True, exist_ok=True)
+    if out.exists():
+        print("SKIP (exists) news/news_last_page.html")
+        return
+
+    print("GET /news (to find last page number)")
+    try:
+        resp = await client.get("/news")
+        resp.raise_for_status()
+        last_page = _parse_last_page(resp.text)
+        if last_page is None:
+            print("         WARNING: could not parse last page number")
+            return
+
+        last_path = f"/news/?page={last_page}"
+        print(f"GET {BASE_URL}{last_path}")
+        resp2 = await client.get(last_path)
+        resp2.raise_for_status()
+        out.write_text(resp2.text, encoding="utf-8")
+        print(f"         -> {out.relative_to(FIXTURES_DIR.parent)}")
+    except (httpx.HTTPStatusError, httpx.RequestError) as e:
+        print(f"         ERROR {e}")
+
+
 async def download_all():
     async with httpx.AsyncClient(
         base_url=BASE_URL, headers=HEADERS, follow_redirects=True, timeout=30
     ) as client:
+        await _download_news_last_page(client)
+
         total = len(ROUTES)
         for i, (path, filename, cookies) in enumerate(ROUTES, 1):
             out = FIXTURES_DIR / filename

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/__init__.py

@@ -54,7 +54,7 @@ if TYPE_CHECKING:
     news: NewsNamespace
     client: type[VLRClient]
 
-__version__ = "2.3.0"
+__version__ = "2.4.0"
 
 _default_client: "VLRClient | None" = None
 

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_event/info/models.py

@@ -63,6 +63,10 @@ class EventRegion(BaseModel):
         default="",
         description="Region name (e.g., 'EMEA', 'Pacific', 'Americas', 'China', 'International')",
     )
+    subregion: str | None = Field(
+        default=None,
+        description="Subregion name if parsed from a subregion= breadcrumb (e.g., 'Japan', 'North America'); None for region= links",
+    )
     href: str = Field(default="", description="Relative path (e.g., '/vct/?region=27')")
 
 

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_event/info/parser.py

@@ -16,12 +16,25 @@ from vlrdevapi._event.info.models import (
 )
 from vlrdevapi.commons.countries import get_country_name
 from vlrdevapi.commons.prizes import parse_prize_amount
+from vlrdevapi.commons.regions import resolve_country_to_region, resolve_subregion_to_region
 import contextlib
 
 
 def parse_event_info(html: HTMLParser, event_id: int) -> EventInfo:
     """Parse event info from the event page HTML.
 
+    After basic parsing the region list is post-processed:
+
+    1. Duplicates (same region name from ``region=`` and ``subregion=``
+       breadcrumbs) are collapsed; the entry carrying a ``subregion``
+       value is kept.
+    2. Two or more distinct regions collapse to a single
+       ``EventRegion(name="International")``.
+    3. When no breadcrumb region was found, the ``region_location``
+       country is tried first; if absent, ``location.country`` is
+       tried.  Either is resolved via ``resolve_country_to_region``
+       to infer the parent region.
+
     Args:
         html: Parsed HTML from the event page.
         event_id: Unique event identifier on vlr.gg.
@@ -42,6 +55,28 @@ def parse_event_info(html: HTMLParser, event_id: int) -> EventInfo:
     _parse_title(header, event)
     _parse_desc_items(header, event)
 
+    seen: dict[str, EventRegion] = {}
+    for r in event.regions:
+        if r.name not in seen:
+            seen[r.name] = r
+        elif r.subregion and not seen[r.name].subregion:
+            seen[r.name] = r
+    event.regions = list(seen.values())
+
+    if len(event.regions) > 1:
+        event.regions = [EventRegion(name="International")]
+
+    if not event.regions:
+        country = None
+        if event.region_location and event.region_location.country:
+            country = event.region_location.country
+        elif event.location and event.location.country:
+            country = event.location.country
+        if country:
+            parent = resolve_country_to_region(country)
+            if parent:
+                event.regions = [EventRegion(name=parent)]
+
     return event
 
 
@@ -62,7 +97,14 @@ def _parse_image(header: Node, event: EventInfo) -> None:
 
 
 def _parse_breadcrumb(header: Node, event: EventInfo) -> None:
-    """Parse breadcrumb links (series, stage, regions) from the header.
+    """Parse breadcrumb links (series, stage, regions/subregions) from the header.
+
+    Region resolution priority:
+
+    1. ``region=`` links are stored directly.
+    2. ``subregion=`` links are resolved to their parent region via
+       ``resolve_subregion_to_region``; the original subregion name is
+       preserved in ``EventRegion.subregion``.
 
     Args:
         header: The event-header root node.
@@ -93,10 +135,12 @@ def _parse_breadcrumb(header: Node, event: EventInfo) -> None:
 
         if "stage=" in href:
             event.stage = EventStageTag(name=name, href=href)
+        elif "subregion=" in href:
+            parent = resolve_subregion_to_region(name)
+            if parent:
+                event.regions.append(EventRegion(name=parent, subregion=name, href=href))
         elif "region=" in href:
             event.regions.append(EventRegion(name=name, href=href))
-        else:
-            event.regions.append(EventRegion(name=name, href=href))
 
 
 def _parse_title(header: Node, event: EventInfo) -> None:

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_matches/common.py

@@ -1,6 +1,8 @@
 """Shared utilities for match enrichment and parsing across live/upcoming/completed modules."""
 
+import contextlib
 import logging
+import re
 from collections.abc import Callable
 from datetime import date, datetime, tzinfo
 from typing import Any, Protocol
@@ -55,20 +57,42 @@ def parse_date_header(text: str) -> date | None:
 
 
 def check_pagination(html: HTMLParser) -> bool:
-    """Check whether the page has pagination links to additional pages.
+    """Check whether a page after the current one exists.
+
+    The active page is rendered as a ``mod-active`` span while other pages
+    are anchor links. A terminal page still links back to earlier pages, so
+    the mere presence of page links does not imply a next page. Compare the
+    active page number against the highest page number offered instead.
 
     Args:
         html: Parsed HTML document.
 
     Returns:
-        ``True`` if at least one page link exists, ``False`` otherwise.
+        ``True`` if a page after the active one exists, ``False`` otherwise.
 
     """
     pagination_el = html.css_first("div.action-container-pages")
-    if pagination_el:
-        page_links = pagination_el.css("a.btn.mod-page")
-        return len(page_links) > 0
-    return False
+    if pagination_el is None:
+        return False
+
+    current_page = 1
+    active = pagination_el.css_first(".btn.mod-page.mod-active")
+    if active:
+        with contextlib.suppress(ValueError):
+            current_page = int(active.text(strip=True))
+
+    max_page = current_page
+    for btn in pagination_el.css(".btn.mod-page"):
+        text = btn.text(strip=True)
+        try:
+            max_page = max(max_page, int(text))
+        except ValueError:
+            href = btn.attributes.get("href") or ""
+            page_match = re.search(r"page=(\d+)", href)
+            if page_match:
+                max_page = max(max_page, int(page_match.group(1)))
+
+    return current_page < max_page
 
 
 # ---------------------------------------------------------------------------

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_series/_utils.py

@@ -2,6 +2,31 @@
 
 from selectolax.parser import HTMLParser
 
+from vlrdevapi.exceptions import ParsingError
+
+
+def _extract_team_abbreviations(html: HTMLParser) -> tuple[str, str]:
+    """Extract short team names from ``.ovw-player-tag`` in overview tables.
+
+    The series overview page renders two ``.ovw-table`` elements per
+    section (current-map and series), one for each team.  The first
+    table always belongs to **team 1** and the second to **team 2**.
+
+    Args:
+        html: Parsed series overview page.
+
+    Returns:
+        ``(team1_abbreviation, team2_abbreviation)`` — empty strings when
+        the expected structure is missing.
+
+    """
+    tables = html.css("div.ovw-table")
+    if len(tables) < 2:
+        return "", ""
+    t1_el = tables[0].css_first(".ovw-player-tag")
+    t2_el = tables[1].css_first(".ovw-player-tag")
+    return (t1_el.text(strip=True) if t1_el else ""), (t2_el.text(strip=True) if t2_el else "")
+
 
 def _ordered_game_ids(html: HTMLParser) -> list[str]:
     """Return the real VLR game IDs in map order from the series nav tabs.
@@ -10,6 +35,10 @@ def _ordered_game_ids(html: HTMLParser) -> list[str]:
     "All Maps" item (``mod-all``), followed by each map in play order.
     Each item carries the real VLR ``data-game-id``.
 
+    For single-map (Bo1) series, VLR omits the nav tabs entirely.
+    In that case the IDs are discovered from the ``.vm-stats-game``
+    content containers instead.
+
     Args:
         html: Parsed series stats page (overview, performance, or economy).
 
@@ -24,6 +53,15 @@ def _ordered_game_ids(html: HTMLParser) -> list[str]:
         gid = (el.attributes.get("data-game-id") or "").strip()
         if gid:
             ids.append(gid)
+
+    if ids:
+        return ids
+
+    for el in html.css(".vm-stats-game[data-game-id]"):
+        gid = (el.attributes.get("data-game-id") or "").strip()
+        if gid and gid != "all":
+            ids.append(gid)
+
     return ids
 
 
@@ -34,9 +72,11 @@ def resolve_game_id(html: HTMLParser, game_id: int | str) -> str:
 
     - ``"all"``: aggregate across the whole series (returned unchanged).
     - A 1-based game number (e.g. ``1``): the first map played in the
-      series, resolved from the stats nav tabs.
+      series, resolved from the stats nav tabs or game containers.
     - A real VLR game ID (e.g. ``"233478"``): passed through unchanged.
 
+    Raises ``ParsingError`` when the identifier cannot be resolved.
+
     Args:
         html: Parsed series stats page containing the game nav tabs.
         game_id: User-supplied game identifier.
@@ -44,6 +84,11 @@ def resolve_game_id(html: HTMLParser, game_id: int | str) -> str:
     Returns:
         str: Real VLR game ID (or ``"all"``) to use for selectors/URLs.
 
+    Raises:
+        ParsingError: If ``game_id`` is a positional index that exceeds
+            the number of games found, or if no games can be discovered
+            at all.
+
     """
     as_str = str(game_id).strip()
     if as_str.lower() == "all":
@@ -61,7 +106,16 @@ def resolve_game_id(html: HTMLParser, game_id: int | str) -> str:
     if 1 <= index <= len(real_ids):
         return real_ids[index - 1]
 
-    return as_str
+    if not real_ids:
+        raise ParsingError(
+            f"Cannot resolve game_id={game_id!r}: no games found on the page. "
+            "The series page may have an unexpected structure."
+        )
+
+    raise ParsingError(
+        f"Cannot resolve game_id={game_id!r}: index out of range. "
+        f"Series has {len(real_ids)} game(s) (IDs: {real_ids})."
+    )
 
 
 class PlayerMap:

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_series/economy/namespace.py

@@ -7,6 +7,7 @@ import httpx
 from selectolax.parser import HTMLParser
 
 from vlrdevapi._base import SyncNamespace
+from vlrdevapi._series._utils import _extract_team_abbreviations
 from vlrdevapi._series.economy.models import EconomyData
 from vlrdevapi._series.economy.parser import parse_economy_data
 from vlrdevapi._series.info.parser import parse_series_info
@@ -46,7 +47,7 @@ class SeriesEconomyNamespace:
 
         Returns:
             EconomyData: Economy data including ``rounds`` (list of
-            ``EconomyRound`` with purchases, remaining credits, and
+            ``RoundEconomyData`` with purchases, remaining credits, and
             team spending per round), ``team1`` and ``team2`` names,
             and enriched team IDs.
 
@@ -60,8 +61,8 @@ class SeriesEconomyNamespace:
 
         Examples:
             >>> econ = vlrdevapi.series.economy(series_id=12345, game_id=1)
-            >>> econ.rounds[0].team1_creds
-            24000
+            >>> econ.rounds[0].bank_team1
+            24000.0
             >>> econ.rounds[0].winner.name
             'FNATIC'
 
@@ -77,20 +78,32 @@ class SeriesEconomyNamespace:
 
 
 def _enrich_economy(result: EconomyData, html_series: HTMLParser) -> EconomyData:
-    """Enrich economy data with team IDs from the series info.
+    """Enrich economy data with team IDs and round winners from the series info.
+
+    Team matching first tries abbreviation-level names extracted from
+    ``.ovw-player-tag`` elements (e.g. "SEN"), then falls back to full
+    team names from the series header.  Round winners are resolved from
+    the stored ``_temp_winner`` tag set during parsing.
 
     Args:
         result: The EconomyData to enrich.
         html_series: HTML of the series page for team info parsing.
 
     Returns:
-        EconomyData: Enriched economy data with team IDs.
+        EconomyData: Enriched economy data with team IDs and round winners.
 
     """
     series_info = parse_series_info(html_series)
-    if series_info.team1 and series_info.team1.tag == result.team1:
+    team1_abbr, team2_abbr = _extract_team_abbreviations(html_series)
+
+    if team1_abbr == result.team1:
+        result.team1_id = series_info.team1.id
+    elif result.team1 and series_info.team1.name == result.team1:
         result.team1_id = series_info.team1.id
-    if series_info.team2 and series_info.team2.tag == result.team2:
+
+    if team2_abbr == result.team2:
+        result.team2_id = series_info.team2.id
+    elif result.team2 and series_info.team2.name == result.team2:
         result.team2_id = series_info.team2.id
 
     for round_data in result.rounds:

{vlrdevapi-2.3.0 → vlrdevapi-2.4.0}/src/vlrdevapi/_series/economy/parser.py

@@ -1,3 +1,5 @@
+"""Series economy parser — extracts per-round bank and spend data."""
+
 from selectolax.parser import HTMLParser
 
 from vlrdevapi._series._utils import resolve_game_id
@@ -101,8 +103,11 @@ def parse_economy_data(html: HTMLParser, game_id: int | str = "all") -> EconomyD
         sq1 = rnd_sqs[0]  # team1
         sq2 = rnd_sqs[1]  # team2
 
-        spent_team1 = int(sq1.attributes.get("title") or "0")
-        spent_team2 = int(sq2.attributes.get("title") or "0")
+        try:
+            spent_team1 = int(sq1.attributes.get("title") or "0")
+            spent_team2 = int(sq2.attributes.get("title") or "0")
+        except ValueError:
+            continue
 
         buy_type_team1 = _get_buy_type(sq1.text(strip=True))
         buy_type_team2 = _get_buy_type(sq2.text(strip=True))