mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-10-11 17:43:04 -07:00
black-sliverandFabian Dill
5442df64fd
* MultiServer, customserver: move data package handling Create a new class that handles conversion worlds+embedded -> context data. Create a derived class that uses static_server_data+pony instead. There is also a not very efficient feature to deduplicate strings (may need perf testing). By moving code around, we can simplify a lot of the world loading. Where code lines were touched, some typing and some reformatting was added. The back compat for GetDataPackage without games was finally dropped. This was done as a cleanup because the refactoring touched those lines anyway. Also reworked the per-context dicts and the RoomInfo to hopefully be more efficient by ignoring unused games. (Generating the list of used games was required for the new code anyway.) Side effect of the MultiServer cache: we now load worlds lazily (but still all at once) and don't modify the games package in place. If needed we create copies. This almost gets us to the point where MultiServer doesn't need worlds - it still needs them for the forbidden items. There is a bonus optimization that deduplicates strings in name_groups that may have bad performance and may need some perf testing if we run into issues. * MultiServer: fix string deduplication in data package cache * MultiServer, customserver: minor formatting fixes * MultiServer: fix data package cache for missing checksum case * MultiServer: improve string deduplication in games package cache * customserver: handle missing checksum in datapackage cache * customserver: typing cleanup in games package cache * Test, MultiServer, customser: add tests for games package cache * Test, MultiServer: reorder imports Hopefully this fixes the random test failures with pytest-xdist * customserver: make WebHost import lazy in games package cache and fix test * customserver: games package cache: fix py3.11 compat * MultiServer, customserver: cache: typing improvements * customserver: cache: reformat * Test: move customserver tests to not interfere with webhost * MultiServer, customserver: cache: rename module * Multiserver: better error message for missing Datapackage * customserver: cache: invert if for readability * customserver: optimize non_hintable_names * Use an empty frozenset singleton * Only include non-empty sets in static_server_data * Only prefill dict with played games This should save ~2-4KB per room and slightly speedup lookup. --------- Co-authored-by: Fabian Dill <[email protected]>
43 lines
1.8 KiB
Python
43 lines
1.8 KiB
Python
from typing_extensions import override
|
|
|
|
from NetUtils import GamesPackage
|
|
from Utils import restricted_loads
|
|
from apmw.multiserver.gamespackagecache import GamesPackageCache, ItemNameGroups, LocationNameGroups
|
|
|
|
|
|
class DBGamesPackageCache(GamesPackageCache):
|
|
_static: dict[str, tuple[GamesPackage, ItemNameGroups, LocationNameGroups]]
|
|
|
|
def __init__(self, static_games_package: dict[str, GamesPackage]) -> None:
|
|
super().__init__()
|
|
self._static = {
|
|
game: GamesPackageCache.get(self, game, games_package)
|
|
for game, games_package in static_games_package.items()
|
|
}
|
|
|
|
@override
|
|
def get(
|
|
self,
|
|
game: str,
|
|
full_games_package: GamesPackage,
|
|
) -> tuple[GamesPackage, ItemNameGroups, LocationNameGroups]:
|
|
# for games started on webhost, full_games_package is likely unpopulated and only has the checksum field
|
|
cache_key = (game, full_games_package.get("checksum", None))
|
|
cached = self._get(cache_key)
|
|
if all(value is not None for value in cached):
|
|
return cached # type: ignore # mypy doesn't understand all value is not None
|
|
|
|
if "checksum" not in full_games_package:
|
|
return super().get(game, full_games_package) # no checksum, assume fully populated
|
|
|
|
from WebHostLib.models import GameDataPackage
|
|
|
|
row: GameDataPackage | None = GameDataPackage.get(checksum=full_games_package["checksum"])
|
|
if row: # None if rolled on >= 0.3.9 but uploaded to <= 0.3.8 ...
|
|
return super().get(game, restricted_loads(row.data))
|
|
return super().get(game, full_games_package) # ... in which case full_games_package should be populated
|
|
|
|
@override
|
|
def get_static(self, game: str) -> tuple[GamesPackage, ItemNameGroups, LocationNameGroups]:
|
|
return self._static[game]
|