python-ballchasing 0.4.1__py3-none-any.whl → 0.5.1__py3-none-any.whl

ballchasing/api.py

@@ -1,17 +1,20 @@
 import os
 import time
+from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
 from pathlib import Path
-from typing import Optional, Union, List, BinaryIO, Iterator
+from typing import BinaryIO, Iterator
 from urllib.parse import parse_qs, urlparse
 
-from requests import sessions, Response, ConnectionError, HTTPError
+from requests import sessions, Response, ConnectionError
 
-from ballchasing.constants import GroupSortBy, SortDir, AnyPlaylist, AnyMap, AnySeason, AnyRank, AnyReplaySortBy, \
-    AnySortDir, AnyVisibility, AnyGroupSortBy, AnyPlayerIdentification, AnyTeamIdentification, AnyMatchResult
+from ballchasing.constants import GroupSortBy, SortDir, AnySeason, AnyRank, AnyReplaySortBy, AnySortDir, \
+    AnyVisibility, AnyGroupSortBy, AnyPlayerIdentification, AnyTeamIdentification, AnyMatchResult, NoneOrMore
 from ballchasing.typed import DeepReplay, ShallowReplay, DeepGroup, ShallowGroup
 from .typed.shared import BaseGroup, BasicGroup
-from .util import to_rfc3339, parse_replay_stats
+from .util.dates import to_rfc3339
+from .util.iterators import deduplicate as deduplicator
+from .util.stats import parse_replay_stats
 
 DEFAULT_URL = "https://ballchasing.com/api"
 
@@ -25,11 +28,11 @@ class BallchasingApi:
             self,
             auth_key: str,
             *,
-            sleep_time_on_rate_limit: Optional[float] = None,
+            sleep_time_on_rate_limit: float | None = None,
             print_on_rate_limit: bool = False,
-            base_url=None,
-            do_initial_ping=True,
-            typed=False,
+            base_url: str | None = None,
+            do_initial_ping: bool = True,
+            typed: bool = False,
     ):
         """
 
@@ -117,6 +120,8 @@ class BallchasingApi:
                         time.sleep(retry_after)
                     elif self.sleep_time_on_rate_limit:
                         time.sleep(self.sleep_time_on_rate_limit)
+                elif r.status_code == 504:
+                    raise ConnectionError("Gateway Timeout. The server did not respond in time.")
                 else:
                     r.raise_for_status()  # Raise an error for any other status code'
             except ConnectionError as e:
@@ -141,58 +146,69 @@ class BallchasingApi:
         self._ping_result = result
         return result
 
-    def _iterable_from_request(self, url, params):
-        # Shared by get_replays and get_groups
+    def _iterable_from_request(self, url, params, prefetch=True):
+        # Shared by get_replays and get_groups.
+        # When prefetch=True, the next page is requested in a background
+        # thread *before* yielding, so network I/O overlaps with the
+        # consumer processing items.  When prefetch=False (e.g. deep mode
+        # where the consumer also makes API calls), the next request is
+        # submitted *after* yielding to avoid doubling the request rate.
         remaining = params["count"]
-        # return_length = True
-        while remaining > 0:
-            request_count = min(remaining, 200)
-            params["count"] = request_count
-            try:
-                d = self._request(url, "GET", params=params).json()
-            except HTTPError as e:
-                if e.response.status_code == 504:
-                    # Gateway Timeout, retry
-                    time.sleep(5)
-                    continue
-                else:
-                    raise e
 
-            batch = d["list"][:request_count]
-            yield from batch
+        def fetch_page(p):
+            return self._request(url, "GET", params=p).json()
+
+        with ThreadPoolExecutor(max_workers=1) as executor:
+            params["count"] = min(remaining, 200)
+            future = executor.submit(fetch_page, dict(params))
 
-            if "next" not in d:
-                break
+            while remaining > 0:
+                d = future.result()
+                batch = d["list"][:min(remaining, 200)]
+                remaining -= len(batch)
 
-            next_url = d["next"]
-            remaining -= len(batch)
-            params["after"] = parse_qs(urlparse(next_url).query)["after"][0]
+                has_next = "next" in d and remaining > 0
+                if has_next:
+                    next_url = d["next"]
+                    params["after"] = parse_qs(urlparse(next_url).query)["after"][0]
+                    params["count"] = min(remaining, 200)
+                    if prefetch:
+                        future = executor.submit(fetch_page, dict(params))
+
+                yield from batch
+
+                if not has_next:
+                    break
+                if not prefetch:
+                    future = executor.submit(fetch_page, dict(params))
 
     def get_replays(
             self,
             *,
-            title: Optional[str] = None,
-            player_name: Optional[Union[str, List[str]]] = None,
-            player_id: Optional[Union[str, List[str]]] = None,
-            playlist: Optional[Union[AnyPlaylist, List[AnyPlaylist]]] = None,
-            season: Optional[Union[AnySeason, List[AnySeason]]] = None,
-            match_result: Optional[Union[AnyMatchResult, List[AnyMatchResult]]] = None,
-            min_rank: Optional[AnyRank] = None,
-            max_rank: Optional[AnyRank] = None,
-            pro: Optional[bool] = None,
-            uploader: Optional[str] = None,
-            group_id: Optional[Union[str, List[str]]] = None,
-            map_id: Optional[Union[AnyMap, List[AnyMap]]] = None,
-            created_before: Optional[Union[str, datetime]] = None,
-            created_after: Optional[Union[str, datetime]] = None,
-            replay_after: Optional[Union[str, datetime]] = None,
-            replay_before: Optional[Union[str, datetime]] = None,
+            title: NoneOrMore[str] = None,
+            player_name: NoneOrMore[str] = None,
+            player_id: NoneOrMore[str] = None,
+            playlist: NoneOrMore[str] = None,
+            season: NoneOrMore[AnySeason] = None,
+            match_result: NoneOrMore[AnyMatchResult] = None,
+            min_rank: AnyRank | None = None,
+            max_rank: AnyRank | None = None,
+            pro: bool | None = None,
+            uploader: str | None = None,
+            group_id: NoneOrMore[str] = None,
+            map_id: NoneOrMore[str] = None,
+            created_before: str | datetime | None = None,
+            created_after: str | datetime | None = None,
+            replay_after: str | datetime | None = None,
+            replay_before: str | datetime | None = None,
             count: int = 150,
-            sort_by: Optional[AnyReplaySortBy] = None,
+            sort_by: AnyReplaySortBy | None = None,
             sort_dir: AnySortDir = SortDir.DESCENDING,
             deep: bool = False,
-            typed: Optional[bool] = None,
-    ) -> Iterator[Union[dict, ShallowReplay, DeepReplay]]:
+            typed: bool | None = None,
+            deduplicate: bool = False,
+            disable_prefetch: bool | None = None,
+    ) -> Iterator[dict | ShallowReplay | DeepReplay]:
         """
         This endpoint lets you filter and retrieve replays. The implementation returns an iterator.
 
@@ -226,12 +242,15 @@ class BallchasingApi:
         :param sort_dir: sort direction
         :param deep: whether to get full stats for each replay (will be much slower).
         :param typed: whether to return a typed object (default is self.typed).
+        :param deduplicate: whether to deduplicate replays that seem to be the same game.
+        :param disable_prefetch: whether to disable prefetching replays.
         :return: an iterator over the replays returned by the API.
         """
         url = f"{self.base_url}/replays"
         params = {"title": title, "player-name": player_name, "player-id": player_id, "playlist": playlist,
                   "season": season, "match-result": match_result, "min-rank": min_rank, "max-rank": max_rank,
-                  "pro": pro, "uploader": uploader, "group": group_id, "map": map_id,
+                  "pro": str(pro).lower() if isinstance(pro, bool) else pro, "uploader": uploader, "group": group_id,
+                  "map": map_id,
                   "created-before": to_rfc3339(created_before), "created-after": to_rfc3339(created_after),
                   "replay-date-after": to_rfc3339(replay_after), "replay-date-before": to_rfc3339(replay_before),
                   "count": count, "sort-by": sort_by, "sort-dir": sort_dir}
@@ -239,14 +258,23 @@ class BallchasingApi:
         if typed is None:
             typed = self.typed
 
-        iterator = self._iterable_from_request(url, params)
+        if disable_prefetch is None:
+            disable_prefetch = deep
+
+        iterator = self._iterable_from_request(url, params, prefetch=not disable_prefetch)
         if deep:
-            iterator = (self.get_replay(r["id"], typed=typed) for r in iterator)
-        elif typed:
-            iterator = (ShallowReplay(**r) for r in iterator)
+            iterator = (self.get_replay(r["id"]) for r in iterator)
+        if deduplicate:
+            # Deep replays have match and replay IDs to deduplicate with. For shallow replays we check dates.
+            iterator = deduplicator(iterator, check_dates=not deep)
+        if typed:
+            if deep:
+                iterator = (DeepReplay(**r) for r in iterator)
+            else:
+                iterator = (ShallowReplay(**r) for r in iterator)
         yield from iterator
 
-    def get_replay(self, replay_id: str, *, typed: Optional[bool] = None) -> Union[dict, DeepReplay]:
+    def get_replay(self, replay_id: str, *, typed: bool | None = None) -> dict | DeepReplay:
         """
         Retrieve a given replay’s details and stats.
 
@@ -272,10 +300,10 @@ class BallchasingApi:
 
     def upload_replay(
             self,
-            replay_file: Union[str, Path, BinaryIO],
+            replay_file: str | Path | BinaryIO,
             *,
-            visibility: Optional[AnyVisibility] = None,
-            group: Optional[str] = None
+            visibility: AnyVisibility | None = None,
+            group: str | None = None
     ) -> dict:
         """
         Use this API to upload a replay file to ballchasing.com.
@@ -303,17 +331,18 @@ class BallchasingApi:
     def get_groups(
             self,
             *,
-            name: Optional[str] = None,
-            creator: Optional[str] = None,
-            group: Optional[str] = None,
-            created_before: Optional[Union[str, datetime]] = None,
-            created_after: Optional[Union[str, datetime]] = None,
+            name: str | None = None,
+            creator: str | None = None,
+            group: str | None = None,
+            created_before: str | datetime | None = None,
+            created_after: str | datetime | None = None,
             count: int = 200,
             sort_by: AnyGroupSortBy = GroupSortBy.CREATED,
             sort_dir: AnySortDir = SortDir.DESCENDING,
             deep: bool = False,
-            typed: bool = None,
-    ) -> Iterator[Union[dict, ShallowGroup, DeepGroup]]:
+            typed: bool | None = None,
+            disable_prefetch: bool | None = None,
+    ) -> Iterator[dict | ShallowGroup | DeepGroup]:
         """
         This endpoint lets you filter and retrieve replay groups.
 
@@ -331,12 +360,17 @@ class BallchasingApi:
         :param sort_dir: Sort direction.
         :param deep: whether to get full stats for each group (will be much slower).
         :param typed: whether to return a typed object (default is self.typed).
+        :param disable_prefetch: whether to disable prefetching.
         :return: an iterator over the groups returned by the API.
         """
         url = f"{self.base_url}/groups/"
         params = {"name": name, "creator": creator, "group": group, "created-before": to_rfc3339(created_before),
                   "created-after": to_rfc3339(created_after), "count": count, "sort-by": sort_by, "sort-dir": sort_dir}
-        iterator = self._iterable_from_request(url, params)
+
+        if disable_prefetch is None:
+            disable_prefetch = deep
+
+        iterator = self._iterable_from_request(url, params, prefetch=not disable_prefetch)
         if typed is None:
             typed = self.typed
         if deep:
@@ -351,7 +385,7 @@ class BallchasingApi:
             name: str,
             player_identification: AnyPlayerIdentification,
             team_identification: AnyTeamIdentification,
-            parent: Optional[str] = None
+            parent: str | None = None
     ) -> dict:
         """
         Use this API to create a new replay group.
@@ -376,8 +410,8 @@ class BallchasingApi:
             self,
             group_id: str,
             *,
-            typed: Optional[bool] = None
-    ) -> Union[dict, DeepGroup]:
+            typed: bool | None = None
+    ) -> dict | DeepGroup:
         """
         This endpoint retrieves a specific replay group info and stats given its id.
 
@@ -412,11 +446,11 @@ class BallchasingApi:
 
     def get_group_replays(
             self,
-            group: Union[str, dict, BasicGroup],
+            group: str | dict | BasicGroup,
             *,
             deep: bool = False,
-            typed: Optional[bool] = None
-    ) -> Iterator[Union[dict, ShallowReplay, DeepReplay]]:
+            typed: bool | None = None
+    ) -> Iterator[dict | ShallowReplay | DeepReplay]:
         """
         Finds all replays in a group, including child groups.
 
@@ -425,35 +459,36 @@ class BallchasingApi:
         :param typed: whether to return a typed object (default is self.typed).
         :return: an iterator over all the replays in the group.
         """
-        for path in self.get_group_tree(group, deep=deep, typed=typed):
-            group, replay = path
+        for path, replay in self.get_group_tree(group, deep=deep, typed=typed):
             yield replay
 
     def get_group_tree(
             self,
-            group: Union[str, dict, BaseGroup],
+            group: str | dict | BaseGroup,
             *,
             deep: bool = False,
-            typed: Optional[bool] = None
-    ):
+            typed: bool | None = None
+    ) -> Iterator[tuple[list[str], dict | ShallowReplay | DeepReplay]]:
         """
-        Finds all replays in a group, and includes the groups leading up to the replays.
+        Finds all replays in a group, and includes the group path leading up to each replay.
+
         :param group: the group id or a group dict.
         :param deep: whether to get full stats for each replay and group (will be much slower).
         :param typed: whether to return a typed object (default is self.typed).
+        :return: an iterator of (path, replay) tuples, where path is a list of group ids.
         """
         if isinstance(group, str):
-            group = self.get_group(group)
-        if isinstance(group, BasicGroup):
+            group_id = group
+        elif isinstance(group, BasicGroup):
             group_id = group.id
         else:
             group_id = group["id"]
         child_groups = self.get_groups(group=group_id, typed=typed)
         for child in child_groups:
-            for path in self.get_group_tree(child, deep=deep, typed=typed):
-                yield group_id, *path
+            for path, replay in self.get_group_tree(child, deep=deep, typed=typed):
+                yield [group_id] + path, replay
         for replay in self.get_replays(group_id=group_id, deep=deep, typed=typed):
-            yield group_id, replay
+            yield [group_id], replay
 
     def download_replay(self, replay_id: str, path: str):
         """
@@ -496,7 +531,7 @@ class BallchasingApi:
         res = self._request("/maps", "GET").json()
         return res
 
-    def get_stats(self, replay: Union[dict, str]):
+    def get_stats(self, replay: dict | str):
         """
         Gets stats for players, teams and replay info.
 

ballchasing/constants.py

@@ -1,22 +1,24 @@
-from typing import Literal, get_args, AnyStr, Union
-
-AnyPlaylist = Union[
-    AnyStr,
-    Literal[
-        "unranked-duels", "unranked-doubles", "unranked-standard", "unranked-chaos",
-        "private", "season", "offline", "local-lobby",
-        "ranked-duels", "ranked-doubles", "ranked-solo-standard", "ranked-standard",
-        "snowday", "rocketlabs", "hoops", "rumble", "tournament", "dropshot",
-        "ranked-hoops", "ranked-rumble", "ranked-dropshot", "ranked-snowday",
-        "dropshot-rumble", "heatseeker", "gridiron", "spooky-cube"
-    ]
-]
+from typing import Literal, get_args, TypeAlias, TypeVar, Sequence
 
 
 def _get_literals(type_):
     return get_args(get_args(type_)[1])
 
 
+T = TypeVar('T')
+OneOrMore: TypeAlias = T | Sequence[T]
+NoneOrMore: TypeAlias = OneOrMore[T] | None
+
+AnyPlaylist: TypeAlias = str | Literal[
+    "unranked-duels", "unranked-doubles", "unranked-standard", "unranked-chaos",
+    "private", "season", "offline", "local-lobby",
+    "ranked-duels", "ranked-doubles", "ranked-solo-standard", "ranked-standard",
+    "snowday", "rocketlabs", "hoops", "rumble", "tournament", "dropshot",
+    "ranked-hoops", "ranked-rumble", "ranked-dropshot", "ranked-snowday",
+    "dropshot-rumble", "heatseeker", "gridiron", "spooky-cube"
+]
+
+
 class Playlist:
     ALL = (UNRANKED_DUELS, UNRANKED_DOUBLES, UNRANKED_STANDARD, UNRANKED_CHAOS, PRIVATE, SEASON, OFFLINE, LOCAL_LOBBY,
            RANKED_DUELS, RANKED_DOUBLES, RANKED_SOLO_STANDARD, RANKED_STANDARD, SNOWDAY, ROCKETLABS, HOOPS, RUMBLE,
@@ -31,20 +33,17 @@ class Playlist:
     MISC = (PRIVATE, SEASON, OFFLINE, LOCAL_LOBBY)
 
 
-AnyRank = Union[
-    AnyStr,
-    Literal[
-        "unranked",
-        "bronze-1", "bronze-2", "bronze-3",
-        "silver-1", "silver-2", "silver-3",
-        "gold-1", "gold-2", "gold-3",
-        "platinum-1", "platinum-2", "platinum-3",
-        "diamond-1", "diamond-2", "diamond-3",
-        "champion-1", "champion-2", "champion-3",
-        "grand-champion",  # Legacy. Seems to be interchangeable with "grand-champion-1"
-        "grand-champion-1", "grand-champion-2", "grand-champion-3",
-        "supersonic-legend"
-    ],
+AnyRank: TypeAlias = str | Literal[
+    "unranked",
+    "bronze-1", "bronze-2", "bronze-3",
+    "silver-1", "silver-2", "silver-3",
+    "gold-1", "gold-2", "gold-3",
+    "platinum-1", "platinum-2", "platinum-3",
+    "diamond-1", "diamond-2", "diamond-3",
+    "champion-1", "champion-2", "champion-3",
+    "grand-champion",  # Legacy. Seems to be interchangeable with "grand-champion-1"
+    "grand-champion-1", "grand-champion-2", "grand-champion-3",
+    "supersonic-legend"
 ]
 
 
@@ -70,13 +69,11 @@ class Rank:
     GRAND_CHAMPION = (GRAND_CHAMPION_1, GRAND_CHAMPION_2, GRAND_CHAMPION_3)
 
 
-AnySeason = Union[
-    AnyStr,
-    Literal[
-        "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14",
-        "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
-        "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19"
-    ]
+AnySeason: TypeAlias = str | Literal[
+    "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14",
+    "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
+    "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19",
+    "f20", "f21", "f22"
 ]
 
 
@@ -87,79 +84,81 @@ class Season:
         SEASON_13_LEGACY, SEASON_14_LEGACY,
         SEASON_1_FTP, SEASON_2_FTP, SEASON_3_FTP, SEASON_4_FTP, SEASON_5_FTP, SEASON_6_FTP, SEASON_7_FTP,
         SEASON_8_FTP, SEASON_9_FTP, SEASON_10_FTP, SEASON_11_FTP, SEASON_12_FTP, SEASON_13_FTP, SEASON_14_FTP,
-        SEASON_15_FTP, SEASON_16_FTP, SEASON_17_FTP, SEASON_18_FTP, SEASON_19_FTP
+        SEASON_15_FTP, SEASON_16_FTP, SEASON_17_FTP, SEASON_18_FTP, SEASON_19_FTP, SEASON_20_FTP, SEASON_21_FTP,
+        SEASON_22_FTP
     ) = _get_literals(AnySeason)
     LEGACY = ALL[:14]
     FREE_TO_PLAY = ALL[14:]
 
 
-AnyMatchResult = Union[AnyStr, Literal["win", "loss"]]
+AnyMatchResult: TypeAlias = str | Literal["win", "loss"]
 
 
 class MatchResult:
     WIN, LOSS = _get_literals(AnyMatchResult)
 
 
-AnyReplaySortBy = Union[AnyStr, Literal["replay-date", "upload-date"]]
+AnyReplaySortBy: TypeAlias = str | Literal["replay-date", "upload-date"]
 
 
 class ReplaySortBy:
     REPLAY_DATE, UPLOAD_DATE = _get_literals(AnyReplaySortBy)
 
 
-AnyGroupSortBy = Union[AnyStr, Literal["created", "name"]]
+AnyGroupSortBy: TypeAlias = str | Literal["created", "name"]
 
 
 class GroupSortBy:
     CREATED, NAME = _get_literals(AnyGroupSortBy)
 
 
-AnySortDir = Union[AnyStr, Literal["asc", "desc"]]
+AnySortDir: TypeAlias = str | Literal["asc", "desc"]
 
 
 class SortDir:
     ASCENDING, DESCENDING = ASC, DESC = _get_literals(AnySortDir)
 
 
-AnyVisibility = Union[AnyStr, Literal["public", "unlisted", "private"]]
+AnyVisibility: TypeAlias = str | Literal["public", "unlisted", "private"]
 
 
 class Visibility:
     PUBLIC, UNLISTED, PRIVATE = _get_literals(AnyVisibility)
 
 
-AnyPlayerIdentification = Union[AnyStr, Literal["by-id", "by-name"]]
+AnyPlayerIdentification: TypeAlias = str | Literal["by-id", "by-name"]
 
 
 class PlayerIdentification:
     BY_ID, BY_NAME = _get_literals(AnyPlayerIdentification)
 
 
-AnyTeamIdentification = Union[AnyStr, Literal["by-distinct-players", "by-player-clusters"]]
+AnyTeamIdentification: TypeAlias = str | Literal["by-distinct-players", "by-player-clusters"]
 
 
 class TeamIdentification:
     BY_DISTINCT_PLAYERS, BY_PLAYER_CLUSTERS = _get_literals(AnyTeamIdentification)
 
 
-AnyMap = Union[AnyStr, Literal[
+AnyMap: TypeAlias = str | Literal[
     "arc_darc_p", "arc_p", "arc_standard_p", "bb_p", "beach_night_grs_p", "beach_night_p", "beach_p", "beachvolley",
     "chn_stadium_day_p", "chn_stadium_p", "cs_day_p", "cs_hw_p", "cs_p", "eurostadium_dusk_p", "eurostadium_night_p",
     "eurostadium_p", "eurostadium_rainy_p", "eurostadium_snownight_p", "farm_grs_p", "farm_hw_p", "farm_night_p",
     "farm_p", "farm_upsidedown_p", "ff_dusk_p", "fni_stadium_p", "haunted_trainstation_p", "hoopsstadium_p",
-    "hoopsstreet_p", "ko_calavera_p", "ko_carbon_p", "ko_quadron_p", "labs_basin_p", "labs_circlepillars_p",
+    "hoopsstreet_p", "ko_calavera_p", "ko_carbon_p", "ko_quadron_p", "labs_4v4_arena15_blackout_p",
+    "labs_4v4_arena15_eurostadium_night_p", "labs_4v4_arena15_retro_p", "labs_basin_p", "labs_circlepillars_p",
     "labs_corridor_p", "labs_cosmic_p", "labs_cosmic_v4_p", "labs_doublegoal_p", "labs_doublegoal_v2_p",
     "labs_galleon_mast_p", "labs_galleon_p", "labs_holyfield_p", "labs_holyfield_space_p", "labs_octagon_02_p",
-    "labs_octagon_p", "labs_pillarglass_p", "labs_pillarheat_p", "labs_pillarwings_p", "labs_underpass_p",
-    "labs_underpass_v0_p", "labs_utopia_p", "music_p", "neotokyo_arcade_p", "neotokyo_hax_p", "neotokyo_p",
-    "neotokyo_standard_p", "neotokyo_toon_p", "outlaw_oasis_p", "outlaw_p", "park_bman_p", "park_night_p", "park_p",
-    "park_rainy_p", "park_snowy_p", "shattershot_p", "stadium_10a_p", "stadium_day_p", "stadium_foggy_p", "stadium_p",
-    "stadium_race_day_p", "stadium_winter_p", "street_p", "swoosh_p", "throwbackhockey_p", "throwbackstadium_p",
-    "trainstation_dawn_p", "trainstation_night_p", "trainstation_p", "trainstation_spooky_p", "uf_day_p",
-    "underwater_grs_p", "underwater_p", "utopiastadium_dusk_p", "utopiastadium_lux_p", "utopiastadium_p",
-    "utopiastadium_snow_p", "wasteland_grs_p", "wasteland_night_p", "wasteland_night_s_p", "wasteland_p",
-    "wasteland_s_p", "woods_night_p", "woods_p"
-]]
+    "labs_octagon_b2b_02_p", "labs_octagon_p", "labs_pillarglass_p", "labs_pillarheat_p", "labs_pillarwings_p",
+    "labs_underpass_p", "labs_underpass_v0_p", "labs_utopia_p", "mall_day_p", "music_p", "neotokyo_arcade_p",
+    "neotokyo_hax_p", "neotokyo_p", "neotokyo_standard_p", "neotokyo_toon_p", "outlaw_oasis_p", "outlaw_p",
+    "paname_dusk_p", "park_bman_p", "park_night_p", "park_p", "park_rainy_p", "park_snowy_p", "shattershot_p",
+    "stadium_10a_p", "stadium_day_p", "stadium_foggy_p", "stadium_p", "stadium_race_day_p", "stadium_winter_p",
+    "street_p", "swoosh_p", "throwbackhockey_p", "throwbackstadium_p", "trainstation_dawn_p", "trainstation_night_p",
+    "trainstation_p", "trainstation_spooky_p", "uf_day_p", "underwater_grs_p", "underwater_p", "utopiastadium_dusk_p",
+    "utopiastadium_lux_p", "utopiastadium_p", "utopiastadium_snow_p", "wasteland_grs_p", "wasteland_night_p",
+    "wasteland_night_s_p", "wasteland_p", "wasteland_s_p", "woods_night_p", "woods_p"
+]
 
 
 class Map:
@@ -168,17 +167,18 @@ class Map:
         CHN_STADIUM_DAY_P, CHN_STADIUM_P, CS_DAY_P, CS_HW_P, CS_P, EUROSTADIUM_DUSK_P, EUROSTADIUM_NIGHT_P,
         EUROSTADIUM_P, EUROSTADIUM_RAINY_P, EUROSTADIUM_SNOWNIGHT_P, FARM_GRS_P, FARM_HW_P, FARM_NIGHT_P, FARM_P,
         FARM_UPSIDEDOWN_P, FF_DUSK_P, FNI_STADIUM_P, HAUNTED_TRAINSTATION_P, HOOPSSTADIUM_P, HOOPSSTREET_P,
-        KO_CALAVERA_P, KO_CARBON_P, KO_QUADRON_P, LABS_BASIN_P, LABS_CIRCLEPILLARS_P, LABS_CORRIDOR_P, LABS_COSMIC_P,
-        LABS_COSMIC_V4_P, LABS_DOUBLEGOAL_P, LABS_DOUBLEGOAL_V2_P, LABS_GALLEON_MAST_P, LABS_GALLEON_P,
-        LABS_HOLYFIELD_P, LABS_HOLYFIELD_SPACE_P, LABS_OCTAGON_02_P, LABS_OCTAGON_P, LABS_PILLARGLASS_P,
-        LABS_PILLARHEAT_P, LABS_PILLARWINGS_P, LABS_UNDERPASS_P, LABS_UNDERPASS_V0_P, LABS_UTOPIA_P, MUSIC_P,
-        NEOTOKYO_ARCADE_P, NEOTOKYO_HAX_P, NEOTOKYO_P, NEOTOKYO_STANDARD_P, NEOTOKYO_TOON_P, OUTLAW_OASIS_P, OUTLAW_P,
-        PARK_BMAN_P, PARK_NIGHT_P, PARK_P, PARK_RAINY_P, PARK_SNOWY_P, SHATTERSHOT_P, STADIUM_10A_P, STADIUM_DAY_P,
-        STADIUM_FOGGY_P, STADIUM_P, STADIUM_RACE_DAY_P, STADIUM_WINTER_P, STREET_P, SWOOSH_P, THROWBACKHOCKEY_P,
-        THROWBACKSTADIUM_P, TRAINSTATION_DAWN_P, TRAINSTATION_NIGHT_P, TRAINSTATION_P, TRAINSTATION_SPOOKY_P, UF_DAY_P,
-        UNDERWATER_GRS_P, UNDERWATER_P, UTOPIASTADIUM_DUSK_P, UTOPIASTADIUM_LUX_P, UTOPIASTADIUM_P,
-        UTOPIASTADIUM_SNOW_P, WASTELAND_GRS_P, WASTELAND_NIGHT_P, WASTELAND_NIGHT_S_P, WASTELAND_P, WASTELAND_S_P,
-        WOODS_NIGHT_P, WOODS_P
+        KO_CALAVERA_P, KO_CARBON_P, KO_QUADRON_P, LABS_4V4_ARENA15_BLACKOUT_P, LABS_4V4_ARENA15_EUROSTADIUM_NIGHT_P,
+        LABS_4V4_ARENA15_RETRO_P, LABS_BASIN_P, LABS_CIRCLEPILLARS_P, LABS_CORRIDOR_P, LABS_COSMIC_P, LABS_COSMIC_V4_P,
+        LABS_DOUBLEGOAL_P, LABS_DOUBLEGOAL_V2_P, LABS_GALLEON_MAST_P, LABS_GALLEON_P, LABS_HOLYFIELD_P,
+        LABS_HOLYFIELD_SPACE_P, LABS_OCTAGON_02_P, LABS_OCTAGON_B2B_02_P, LABS_OCTAGON_P, LABS_PILLARGLASS_P,
+        LABS_PILLARHEAT_P, LABS_PILLARWINGS_P, LABS_UNDERPASS_P, LABS_UNDERPASS_V0_P, LABS_UTOPIA_P, MALL_DAY_P,
+        MUSIC_P, NEOTOKYO_ARCADE_P, NEOTOKYO_HAX_P, NEOTOKYO_P, NEOTOKYO_STANDARD_P, NEOTOKYO_TOON_P, OUTLAW_OASIS_P,
+        OUTLAW_P, PANAME_DUSK_P, PARK_BMAN_P, PARK_NIGHT_P, PARK_P, PARK_RAINY_P, PARK_SNOWY_P, SHATTERSHOT_P,
+        STADIUM_10A_P, STADIUM_DAY_P, STADIUM_FOGGY_P, STADIUM_P, STADIUM_RACE_DAY_P, STADIUM_WINTER_P, STREET_P,
+        SWOOSH_P, THROWBACKHOCKEY_P, THROWBACKSTADIUM_P, TRAINSTATION_DAWN_P, TRAINSTATION_NIGHT_P, TRAINSTATION_P,
+        TRAINSTATION_SPOOKY_P, UF_DAY_P, UNDERWATER_GRS_P, UNDERWATER_P, UTOPIASTADIUM_DUSK_P, UTOPIASTADIUM_LUX_P,
+        UTOPIASTADIUM_P, UTOPIASTADIUM_SNOW_P, WASTELAND_GRS_P, WASTELAND_NIGHT_P, WASTELAND_NIGHT_S_P, WASTELAND_P,
+        WASTELAND_S_P, WOODS_NIGHT_P, WOODS_P
     ) = _get_literals(AnyMap)
     NAMES = (
         "Starbase ARC (Aftermath)", "Starbase ARC", "Starbase ARC (Standard)", "Champions Field (NFL)",
@@ -187,12 +187,13 @@ class Map:
         "Mannfield (Dusk)", "Mannfield (Night)", "Mannfield", "Mannfield (Stormy)", "Mannfield (Snowy)",
         "Farmstead (Pitched)", "Farmstead (Spooky)", "Farmstead (Night)", "Farmstead", "Farmstead (The Upside Down)",
         "Estadio Vida (Dusk)", "Forbidden Temple (Fire & Ice)", "Urban Central (Haunted)", "Dunk House",
-        "The Block (Dusk)", "Calavera", "Carbon", "Quadron", "Basin", "Pillars", "Corridor", "Cosmic", "Cosmic",
-        "Double Goal", "Double Goal", "Galleon Retro", "Galleon", "Loophole", "Holyfield", "Octagon", "Octagon",
-        "Hourglass", "Barricade", "Colossus", "Underpass", "Underpass", "Utopia Retro", "Neon Fields",
+        "The Block (Dusk)", "Calavera", "Carbon", "Quadron", "Midnight Metro (Quads)", "Mannfield (Quads)",
+        "Sunset Dunes (Quads)", "Basin", "Pillars", "Corridor", "Cosmic", "Cosmic", "Double Goal", "Double Goal",
+        "Galleon Retro", "Galleon", "Loophole", "Holyfield", "Octagon", "Roadblock", "Octagon", "Hourglass",
+        "Barricade", "Colossus", "Underpass", "Underpass", "Utopia Retro", "Boostfield Mall", "Neon Fields",
         "Neo Tokyo (Arcade)", "Neo Tokyo (Hacked)", "Neo Tokyo", "Neo Tokyo (Standard)", "Neo Tokyo (Comic)",
-        "Deadeye Canyon (Oasis)", "Deadeye Canyon", "Beckwith Park (Night)", "Beckwith Park (Midnight)",
-        "Beckwith Park", "Beckwith Park (Stormy)", "Beckwith Park (Snowy)", "Core 707",
+        "Deadeye Canyon (Oasis)", "Deadeye Canyon", "Parc De Paris", "Beckwith Park (Night)",
+        "Beckwith Park (Midnight)", "Beckwith Park", "Beckwith Park (Stormy)", "Beckwith Park (Snowy)", "Core 707",
         "DFH Stadium (10th Anniversary)", "DFH Stadium (Day)", "DFH Stadium (Stormy)", "DFH Stadium",
         "DFH Stadium (Circuit)", "DFH Stadium (Snowy)", "Sovereign Heights (Dusk)", "Champions Field (Nike FC)",
         "Throwback Stadium (Snowy)", "Throwback Stadium", "Urban Central (Dawn)", "Urban Central (Night)",
@@ -205,19 +206,21 @@ class Map:
     STANDARD_MAPS = (
         ARC_DARC_P, ARC_STANDARD_P, BEACH_NIGHT_GRS_P, BEACH_NIGHT_P, BEACH_P, CHN_STADIUM_DAY_P, CHN_STADIUM_P,
         CS_DAY_P, CS_HW_P, CS_P, EUROSTADIUM_DUSK_P, EUROSTADIUM_NIGHT_P, EUROSTADIUM_P, EUROSTADIUM_RAINY_P,
-        EUROSTADIUM_SNOWNIGHT_P, FARM_GRS_P, FARM_NIGHT_P, FARM_P, FARM_UPSIDEDOWN_P, FF_DUSK_P, FNI_STADIUM_P, MUSIC_P,
-        NEOTOKYO_ARCADE_P, NEOTOKYO_HAX_P, NEOTOKYO_STANDARD_P, OUTLAW_OASIS_P, OUTLAW_P, PARK_NIGHT_P, PARK_P,
-        PARK_RAINY_P, PARK_SNOWY_P, STADIUM_10A_P, STADIUM_DAY_P, STADIUM_FOGGY_P, STADIUM_P, STADIUM_RACE_DAY_P,
-        STADIUM_WINTER_P, STREET_P, TRAINSTATION_DAWN_P, TRAINSTATION_NIGHT_P, TRAINSTATION_P, UF_DAY_P,
-        UNDERWATER_GRS_P, UNDERWATER_P, UTOPIASTADIUM_DUSK_P, UTOPIASTADIUM_LUX_P, UTOPIASTADIUM_P,
-        UTOPIASTADIUM_SNOW_P, WASTELAND_GRS_P, WASTELAND_NIGHT_P, WASTELAND_NIGHT_S_P, WASTELAND_P, WASTELAND_S_P,
-        WOODS_NIGHT_P, WOODS_P
+        EUROSTADIUM_SNOWNIGHT_P, FARM_GRS_P, FARM_NIGHT_P, FARM_P, FARM_UPSIDEDOWN_P, FF_DUSK_P, FNI_STADIUM_P,
+        MALL_DAY_P, MUSIC_P, NEOTOKYO_ARCADE_P, NEOTOKYO_HAX_P, NEOTOKYO_STANDARD_P, OUTLAW_OASIS_P, OUTLAW_P,
+        PANAME_DUSK_P, PARK_NIGHT_P, PARK_P, PARK_RAINY_P, PARK_SNOWY_P, STADIUM_10A_P, STADIUM_DAY_P, STADIUM_FOGGY_P,
+        STADIUM_P, STADIUM_RACE_DAY_P, STADIUM_WINTER_P, STREET_P, TRAINSTATION_DAWN_P, TRAINSTATION_NIGHT_P,
+        TRAINSTATION_P, UF_DAY_P, UNDERWATER_GRS_P, UNDERWATER_P, UTOPIASTADIUM_DUSK_P, UTOPIASTADIUM_LUX_P,
+        UTOPIASTADIUM_P, UTOPIASTADIUM_SNOW_P, WASTELAND_GRS_P, WASTELAND_NIGHT_P, WASTELAND_NIGHT_S_P, WASTELAND_P,
+        WASTELAND_S_P, WOODS_NIGHT_P, WOODS_P
     )
     NON_STANDARD_MAPS = (
         ARC_P, BB_P, BEACHVOLLEY, FARM_HW_P, HAUNTED_TRAINSTATION_P, HOOPSSTADIUM_P, HOOPSSTREET_P, KO_CALAVERA_P,
-        KO_CARBON_P, KO_QUADRON_P, LABS_BASIN_P, LABS_CIRCLEPILLARS_P, LABS_CORRIDOR_P, LABS_COSMIC_P, LABS_COSMIC_V4_P,
+        KO_CARBON_P, KO_QUADRON_P, LABS_4V4_ARENA15_BLACKOUT_P, LABS_4V4_ARENA15_EUROSTADIUM_NIGHT_P,
+        LABS_4V4_ARENA15_RETRO_P, LABS_BASIN_P, LABS_CIRCLEPILLARS_P, LABS_CORRIDOR_P, LABS_COSMIC_P, LABS_COSMIC_V4_P,
         LABS_DOUBLEGOAL_P, LABS_DOUBLEGOAL_V2_P, LABS_GALLEON_MAST_P, LABS_GALLEON_P, LABS_HOLYFIELD_P,
-        LABS_HOLYFIELD_SPACE_P, LABS_OCTAGON_02_P, LABS_OCTAGON_P, LABS_PILLARGLASS_P, LABS_PILLARHEAT_P,
-        LABS_PILLARWINGS_P, LABS_UNDERPASS_P, LABS_UNDERPASS_V0_P, LABS_UTOPIA_P, NEOTOKYO_P, NEOTOKYO_TOON_P,
-        PARK_BMAN_P, SHATTERSHOT_P, SWOOSH_P, THROWBACKHOCKEY_P, THROWBACKSTADIUM_P, TRAINSTATION_SPOOKY_P
+        LABS_HOLYFIELD_SPACE_P, LABS_OCTAGON_02_P, LABS_OCTAGON_B2B_02_P, LABS_OCTAGON_P, LABS_PILLARGLASS_P,
+        LABS_PILLARHEAT_P, LABS_PILLARWINGS_P, LABS_UNDERPASS_P, LABS_UNDERPASS_V0_P, LABS_UTOPIA_P, NEOTOKYO_P,
+        NEOTOKYO_TOON_P, PARK_BMAN_P, SHATTERSHOT_P, SWOOSH_P, THROWBACKHOCKEY_P, THROWBACKSTADIUM_P,
+        TRAINSTATION_SPOOKY_P
     )