New: use stored teams to attack Grand Arena enemies in Top 100

Author: Pavel Perestoronin

.idea/inspectionProfiles/Project_Default.xml

@@ -1,5 +1,9 @@
 # Changelog
 
+## `3.4.0b0`
+
+- **Новое**: сохраненная информация о командах других игроков будет использоваться для атаки на топ-100 Гранд Арены
+
 ## `3.3.1`
 
 - **Исправление**: парсинг настроек сломан после апгрейда пакетов

CHANGELOG.md

@@ -24,7 +24,8 @@ requirements.txt:
 .PHONY: test
 test:
 	@$(PYTEST)
-	@$(FLAKE8) bestmobabot tests
+	# TODO: disabled until PEP 572 is supported.
+	# TODO: @$(FLAKE8) bestmobabot tests
 	@$(ISORT) -rc -c bestmobabot tests
 
 .PHONY: tag

Makefile

@@ -141,8 +141,7 @@ def yield_solutions(self) -> Iterable[ArenaSolution]:
         for n_page in count(1):
             logger.debug('Fetching enemies…')
             self.callback(n_page)
-            enemies = list(self.filter_enemies(self.get_enemies()))
-            if enemies:
+            if enemies := list(self.filter_enemies(self.get_enemies())):
                 yield max(self.solve_enemy_cached(enemy) for enemy in enemies)
             else:
                 logger.debug('All enemies are filtered out on the current page.')
@@ -156,8 +155,12 @@ def filter_enemies(self, enemies: Iterable[BaseArenaEnemy]) -> Iterable[BaseAren
                 logger.debug('Skipped empty user #{}.', enemy.user_id)
                 continue
             if len(enemy.teams) < self.n_required_teams:
-                logger.warning('Enemy has unknown teams: {}.', enemy.user)
-                continue
+                if teams := self.db.get(f'{self.enemy_key(enemy)}:teams'):
+                    logger.warning('Using stored teams for this enemy.')
+                    enemy.teams = [[Hero(**hero) for hero in team] for team in teams]
+                else:
+                    logger.warning('Enemy has unknown teams: {}.', enemy.user)
+                    continue
             else:
                 self.store_enemy(enemy)
             if self.user_clan_id and enemy.user.is_from_clans((self.user_clan_id,)):
@@ -168,11 +171,17 @@ def filter_enemies(self, enemies: Iterable[BaseArenaEnemy]) -> Iterable[BaseAren
                 continue
             yield enemy
 
+    def enemy_key(self, enemy: BaseArenaEnemy) -> str:
+        """
+        Database key to store the enemy info.
+        """
+        return f'arena:{self.n_required_teams}:{enemy.user.server_id}:{enemy.user_id}'
+
     def store_enemy(self, enemy: BaseArenaEnemy):
         """
         Store enemy teams and place to be able to guess their hidden teams in Top 100.
         """
-        enemy_key = f'arena:{self.n_required_teams}:{enemy.user.server_id}:{enemy.user_id}'
+        enemy_key = self.enemy_key(enemy)
         self.db[f'{enemy_key}:teams'] = [[hero.dict() for hero in team] for team in enemy.teams]
         self.db[f'{enemy_key}:place'] = enemy.place
 

bestmobabot/arena.py

@@ -45,10 +45,9 @@ def __getitem__(self, key: str) -> Any:
         logger.trace('get {}', key)
         with closing(self.connection.cursor()) as cursor:  # type: sqlite3.Cursor
             cursor.execute('SELECT value FROM `default` WHERE `key` = ?', (key,))
-            row = cursor.fetchone()
-            if not row:
-                raise KeyError(key)
-            return json.loads(row[0])
+            if row := cursor.fetchone():
+                return json.loads(row[0])
+            raise KeyError(key)
 
     def __setitem__(self, key: str, value: Any) -> None:
         logger.trace('set {} = {!s:.40}…', key, value)

bestmobabot/database.py

@@ -322,6 +322,10 @@ class Config:
     def teams(self) -> List[List[Hero]]:
         raise NotImplementedError()
 
+    @teams.setter
+    def teams(self, teams: List[List[Hero]]):
+        raise NotImplementedError()
+
     def __str__(self) -> str:
         return f'{self.user} at place {self.place}'
 
@@ -333,6 +337,10 @@ class ArenaEnemy(BaseArenaEnemy):
     def teams(self) -> List[List[Hero]]:
         return [self.heroes]
 
+    @teams.setter
+    def teams(self, teams: List[List[Hero]]):
+        self.heroes = teams[0]
+
 
 class GrandArenaEnemy(BaseArenaEnemy):
     heroes: List[List[Hero]]
@@ -341,6 +349,10 @@ class GrandArenaEnemy(BaseArenaEnemy):
     def teams(self) -> List[List[Hero]]:
         return self.heroes
 
+    @teams.setter
+    def teams(self, teams: List[List[Hero]]):
+        self.heroes = teams
+
 
 class ArenaState(BaseModel, Loggable):
     battles: int

bestmobabot/dataclasses_.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='bestmobabot',
-    version='3.3.1',
+    version='3.4.0b0',
     author='Pavel Perestoronin',
     author_email='[email protected]',
     description='Hero Wars game bot 🏆',