X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fplayer.py;h=d773e134efd849017869e2c4069b0e65e19f7b80;hb=ed32fac23d415ca3f50cb2f6f0bc1049a509f7c9;hp=b7512996155997b26841d15c0fce2e5c13871941;hpb=2e96bc5fea7cfccb4079fd582b32e2050430a187;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/player.py b/xonstat/views/player.py index b751299..d773e13 100644 --- a/xonstat/views/player.py +++ b/xonstat/views/player.py @@ -1,16 +1,19 @@ import datetime import json import logging +import pyramid.httpexceptions import re import sqlalchemy as sa import sqlalchemy.sql.functions as func import time -from pyramid.response import Response +from calendar import timegm +from collections import namedtuple from pyramid.url import current_route_url from sqlalchemy import desc, distinct from webhelpers.paginate import Page, PageURL from xonstat.models import * -from xonstat.util import page_url +from xonstat.util import page_url, to_json, pretty_date +from xonstat.views.helpers import RecentGame, recent_games_q log = logging.getLogger(__name__) @@ -52,144 +55,367 @@ def player_index_json(request): return [{'status':'not implemented'}] -def _get_games_played(player_id): +def get_games_played(player_id): """ Provides a breakdown by gametype of the games played by player_id. - Returns a tuple containing (total_games, games_breakdown), where - total_games is the absolute number of games played by player_id - and games_breakdown is an array containing (game_type_cd, # games) + Returns a list of namedtuples with the following members: + - game_type_cd + - games + - wins + - losses + - win_pct + + The list itself is ordered by the number of games played """ - games_played = DBSession.query(Game.game_type_cd, func.count()).\ - filter(Game.game_id == PlayerGameStat.game_id).\ - filter(PlayerGameStat.player_id == player_id).\ - group_by(Game.game_type_cd).\ - order_by(func.count().desc()).all() + GamesPlayed = namedtuple('GamesPlayed', ['game_type_cd', 'games', 'wins', + 'losses', 'win_pct']) + + raw_games_played = DBSession.query('game_type_cd', 'wins', 'losses').\ + from_statement( + "SELECT game_type_cd, " + "SUM(win) wins, " + "SUM(loss) losses " + "FROM (SELECT g.game_id, " + "g.game_type_cd, " + "CASE " + "WHEN g.winner = pgs.team THEN 1 " + "WHEN pgs.rank = 1 THEN 1 " + "ELSE 0 " + "END win, " + "CASE " + "WHEN g.winner = pgs.team THEN 0 " + "WHEN pgs.rank = 1 THEN 0 " + "ELSE 1 " + "END loss " + "FROM games g, " + "player_game_stats pgs " + "WHERE g.game_id = pgs.game_id " + "AND pgs.player_id = :player_id) win_loss " + "GROUP BY game_type_cd " + ).params(player_id=player_id).all() + + games_played = [] + overall_games = 0 + overall_wins = 0 + overall_losses = 0 + for row in raw_games_played: + games = row.wins + row.losses + overall_games += games + overall_wins += row.wins + overall_losses += row.losses + win_pct = float(row.wins)/games * 100 + + games_played.append(GamesPlayed(row.game_type_cd, games, row.wins, + row.losses, win_pct)) + + try: + overall_win_pct = float(overall_wins)/overall_games * 100 + except: + overall_win_pct = 0.0 + + games_played.append(GamesPlayed('overall', overall_games, overall_wins, + overall_losses, overall_win_pct)) + + # sort the resulting list by # of games played + games_played = sorted(games_played, key=lambda x:x.games) + games_played.reverse() + return games_played + + +def get_overall_stats(player_id): + """ + Provides a breakdown of stats by gametype played by player_id. + + Returns a dictionary of namedtuples with the following members: + - total_kills + - total_deaths + - k_d_ratio + - last_played (last time the player played the game type) + - last_played_epoch (same as above, but in seconds since epoch) + - last_played_fuzzy (same as above, but in relative date) + - total_playing_time (total amount of time played the game type) + - total_pickups (ctf only) + - total_captures (ctf only) + - cap_ratio (ctf only) + - total_carrier_frags (ctf only) + - game_type_cd + + The key to the dictionary is the game type code. There is also an + "overall" game_type_cd which sums the totals and computes the total ratios. + """ + OverallStats = namedtuple('OverallStats', ['total_kills', 'total_deaths', + 'k_d_ratio', 'last_played', 'last_played_epoch', 'last_played_fuzzy', + 'total_playing_time', 'total_pickups', 'total_captures', 'cap_ratio', + 'total_carrier_frags', 'game_type_cd']) + + raw_stats = DBSession.query('game_type_cd', 'total_kills', + 'total_deaths', 'last_played', 'total_playing_time', + 'total_pickups', 'total_captures', 'total_carrier_frags').\ + from_statement( + "SELECT g.game_type_cd, " + "Sum(pgs.kills) total_kills, " + "Sum(pgs.deaths) total_deaths, " + "Max(pgs.create_dt) last_played, " + "Sum(pgs.alivetime) total_playing_time, " + "Sum(pgs.pickups) total_pickups, " + "Sum(pgs.captures) total_captures, " + "Sum(pgs.carrier_frags) total_carrier_frags " + "FROM games g, " + "player_game_stats pgs " + "WHERE g.game_id = pgs.game_id " + "AND pgs.player_id = :player_id " + "GROUP BY g.game_type_cd " + ).params(player_id=player_id).all() + + # to be indexed by game_type_cd + overall_stats = {} + + # sums for the "overall" game type (which is fake) + overall_kills = 0 + overall_deaths = 0 + overall_last_played = None + overall_playing_time = datetime.timedelta(seconds=0) + overall_carrier_frags = 0 + + for row in raw_stats: + # running totals or mins + overall_kills += row.total_kills or 0 + overall_deaths += row.total_deaths or 0 + + if overall_last_played is None or row.last_played > overall_last_played: + overall_last_played = row.last_played + + overall_playing_time += row.total_playing_time + + # individual gametype ratio calculations + try: + k_d_ratio = float(row.total_kills)/row.total_deaths + except: + k_d_ratio = None + + try: + cap_ratio = float(row.total_captures)/row.total_pickups + except: + cap_ratio = None + + overall_carrier_frags += row.total_carrier_frags or 0 + + # everything else is untouched or "raw" + os = OverallStats(total_kills=row.total_kills, + total_deaths=row.total_deaths, + k_d_ratio=k_d_ratio, + last_played=row.last_played, + last_played_epoch=timegm(row.last_played.timetuple()), + last_played_fuzzy=pretty_date(row.last_played), + total_playing_time=row.total_playing_time, + total_pickups=row.total_pickups, + total_captures=row.total_captures, + cap_ratio=cap_ratio, + total_carrier_frags=row.total_carrier_frags, + game_type_cd=row.game_type_cd) + + overall_stats[row.game_type_cd] = os + + # and lastly, the overall stuff + try: + overall_k_d_ratio = float(overall_kills)/overall_deaths + except: + overall_k_d_ratio = None + + os = OverallStats(total_kills=overall_kills, + total_deaths=overall_deaths, + k_d_ratio=overall_k_d_ratio, + last_played=overall_last_played, + last_played_epoch=timegm(overall_last_played.timetuple()), + last_played_fuzzy=pretty_date(overall_last_played), + total_playing_time=overall_playing_time, + total_pickups=None, + total_captures=None, + cap_ratio=None, + total_carrier_frags=overall_carrier_frags, + game_type_cd='overall') - total = 0 - for (game_type_cd, games) in games_played: - total += games + overall_stats['overall'] = os - return (total, games_played) + return overall_stats -# TODO: should probably factor the above function into this one such that -# total_stats['ctf_games'] is the count of CTF games and so on... -def _get_total_stats(player_id): +def get_fav_maps(player_id, game_type_cd=None): """ - Provides aggregated stats by player_id. + Provides a breakdown of favorite maps by gametype. - Returns a dict with the keys 'kills', 'deaths', 'alivetime'. + Returns a dictionary of namedtuples with the following members: + - game_type_cd + - map_name (map name) + - map_id + - times_played - kills = how many kills a player has over all games - deaths = how many deaths a player has over all games - alivetime = how long a player has played over all games + The favorite map is defined as the map you've played the most + for the given game_type_cd. - If any of the above are None, they are set to 0. + The key to the dictionary is the game type code. There is also an + "overall" game_type_cd which is the overall favorite map. This is + defined as the favorite map of the game type you've played the + most. The input parameter game_type_cd is for this. """ - total_stats = {} - (total_stats['kills'], total_stats['deaths'], total_stats['alivetime']) = DBSession.\ - query("total_kills", "total_deaths", "total_alivetime").\ + FavMap = namedtuple('FavMap', ['map_name', 'map_id', 'times_played', 'game_type_cd']) + + raw_favs = DBSession.query('game_type_cd', 'map_name', + 'map_id', 'times_played').\ from_statement( - "select sum(kills) total_kills, " - "sum(deaths) total_deaths, " - "sum(alivetime) total_alivetime " - "from player_game_stats " - "where player_id=:player_id" - ).params(player_id=player_id).one() - - (total_stats['wins'],) = DBSession.\ - query("total_wins").\ + "SELECT game_type_cd, " + "name map_name, " + "map_id, " + "times_played " + "FROM (SELECT g.game_type_cd, " + "m.name, " + "m.map_id, " + "Count(*) times_played, " + "Row_number() " + "OVER ( " + "partition BY g.game_type_cd " + "ORDER BY Count(*) DESC, m.map_id ASC) rank " + "FROM games g, " + "player_game_stats pgs, " + "maps m " + "WHERE g.game_id = pgs.game_id " + "AND g.map_id = m.map_id " + "AND pgs.player_id = :player_id " + "GROUP BY g.game_type_cd, " + "m.map_id, " + "m.name) most_played " + "WHERE rank = 1 " + "ORDER BY times_played desc " + ).params(player_id=player_id).all() + + fav_maps = {} + overall_fav = None + for row in raw_favs: + fv = FavMap(map_name=row.map_name, + map_id=row.map_id, + times_played=row.times_played, + game_type_cd=row.game_type_cd) + + # if we aren't given a favorite game_type_cd + # then the overall favorite is the one we've + # played the most + if overall_fav is None: + fav_maps['overall'] = fv + overall_fav = fv.game_type_cd + + # otherwise it is the favorite map from the + # favorite game_type_cd (provided as a param) + # and we'll overwrite the first dict entry + if game_type_cd == fv.game_type_cd: + fav_maps['overall'] = fv + + fav_maps[row.game_type_cd] = fv + + return fav_maps + + +def get_ranks(player_id): + """ + Provides a breakdown of the player's ranks by game type. + + Returns a dictionary of namedtuples with the following members: + - game_type_cd + - rank + - max_rank + + The key to the dictionary is the game type code. There is also an + "overall" game_type_cd which is the overall best rank. + """ + Rank = namedtuple('Rank', ['rank', 'max_rank', 'percentile', 'game_type_cd']) + + raw_ranks = DBSession.query("game_type_cd", "rank", "max_rank").\ from_statement( - "select count(*) total_wins " - "from games g, player_game_stats pgs " - "where g.game_id = pgs.game_id " - "and player_id=:player_id " - "and (g.winner = pgs.team or pgs.rank = 1)" - ).params(player_id=player_id).one() + "select pr.game_type_cd, pr.rank, overall.max_rank " + "from player_ranks pr, " + "(select game_type_cd, max(rank) max_rank " + "from player_ranks " + "group by game_type_cd) overall " + "where pr.game_type_cd = overall.game_type_cd " + "and player_id = :player_id " + "order by rank").\ + params(player_id=player_id).all() + + ranks = {} + found_top_rank = False + for row in raw_ranks: + rank = Rank(rank=row.rank, + max_rank=row.max_rank, + percentile=100 - 100*float(row.rank)/row.max_rank, + game_type_cd=row.game_type_cd) - for (key,value) in total_stats.items(): - if value == None: - total_stats[key] = 0 - return total_stats + if not found_top_rank: + ranks['overall'] = rank + found_top_rank = True + elif rank.percentile > ranks['overall'].percentile: + ranks['overall'] = rank + ranks[row.game_type_cd] = rank -def _get_fav_map(player_id): + return ranks; + + +def get_elos(player_id): """ - Get the player's favorite map. The favorite map is defined - as the map that he or she has played the most in the past - 90 days. + Provides a breakdown of the player's elos by game type. + + Returns a dictionary of namedtuples with the following members: + - player_id + - game_type_cd + - games + - elo - Returns a dictionary with keys for the map's name and id. + The key to the dictionary is the game type code. There is also an + "overall" game_type_cd which is the overall best rank. """ - # 90 day window - back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90) + raw_elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\ + order_by(PlayerElo.elo.desc()).all() - raw_fav_map = DBSession.query(Map.name, Map.map_id).\ - filter(Game.game_id == PlayerGameStat.game_id).\ - filter(Game.map_id == Map.map_id).\ - filter(PlayerGameStat.player_id == player_id).\ - filter(PlayerGameStat.create_dt > back_then).\ - group_by(Map.name, Map.map_id).\ - order_by(func.count().desc()).\ - limit(1).one() + elos = {} + found_max_elo = False + for row in raw_elos: + if not found_max_elo: + elos['overall'] = row + found_max_elo = True - fav_map = {} - fav_map['name'] = raw_fav_map[0] - fav_map['id'] = raw_fav_map[1] + elos[row.game_type_cd] = row - return fav_map + return elos -def _get_fav_weapon(player_id): +def get_recent_games(player_id): """ - Get the player's favorite weapon. The favorite weapon is defined - as the weapon that he or she has employed the most in the past - 90 days. - - Returns a sequence of dictionaries with keys for the weapon's name and id. - The sequence holds the most-used weapons in decreasing order. + Provides a list of recent games for a player. Uses the recent_games_q helper. """ - # 90 day window - back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90) - - raw_fav_weapon = DBSession.query(Weapon.descr, Weapon.weapon_cd).\ - filter(Game.game_id == PlayerGameStat.game_id).\ - filter(PlayerWeaponStat.weapon_cd == Weapon.weapon_cd).\ - filter(PlayerGameStat.player_id == player_id).\ - filter(PlayerGameStat.create_dt > back_then).\ - group_by(Weapon.descr, Weapon.weapon_cd).\ - order_by(func.count().desc()).\ - all() + # recent games played in descending order + rgs = recent_games_q(player_id=player_id).limit(10).all() + recent_games = [RecentGame(row) for row in rgs] - fav_weapon = [] - for wpn in raw_fav_weapon: - entry = {} - entry['name'] = wpn[0] - entry['id'] = wpn[1] - fav_weapon.append(entry) + return recent_games - return fav_weapon - -def _get_rank(player_id): +def get_recent_weapons(player_id): """ - Get the player's rank as well as the total number of ranks. + Returns the weapons that have been used in the past 90 days + and also used in 5 games or more. """ - rank = DBSession.query("game_type_cd", "rank", "max_rank").\ - from_statement( - "select pr.game_type_cd, pr.rank, overall.max_rank " - "from player_ranks pr, " - "(select game_type_cd, max(rank) max_rank " - "from player_ranks " - "group by game_type_cd) overall " - "where pr.game_type_cd = overall.game_type_cd " - "and player_id = :player_id " - "order by rank").\ - params(player_id=player_id).all() + cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=90) + recent_weapons = [] + for weapon in DBSession.query(PlayerWeaponStat.weapon_cd, func.count()).\ + filter(PlayerWeaponStat.player_id == player_id).\ + filter(PlayerWeaponStat.create_dt > cutoff).\ + group_by(PlayerWeaponStat.weapon_cd).\ + having(func.count() > 4).\ + all(): + recent_weapons.append(weapon[0]) - return rank; + return recent_weapons def get_accuracy_stats(player_id, weapon_cd, games): @@ -282,87 +508,32 @@ def player_info_data(request): player = DBSession.query(Player).filter_by(player_id=player_id).\ filter(Player.active_ind == True).one() - # games played, alivetime, wins, kills, deaths - total_stats = _get_total_stats(player.player_id) - - # games breakdown - N games played (X ctf, Y dm) etc - (total_games, games_breakdown) = _get_games_played(player.player_id) - - # favorite map from the past 90 days - try: - fav_map = _get_fav_map(player.player_id) - except: - fav_map = None - - # favorite weapon from the past 90 days - try: - fav_weapon = _get_fav_weapon(player.player_id) - except: - fav_weapon = None - - # friendly display of elo information and preliminary status - elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\ - filter(PlayerElo.game_type_cd.in_(['ctf','duel','dm'])).\ - order_by(PlayerElo.elo.desc()).all() - - elos_display = [] - for elo in elos: - if elo.games > 32: - str = "{0} ({1})" - else: - str = "{0}* ({1})" - - elos_display.append(str.format(round(elo.elo, 3), - elo.game_type_cd)) - - # get current rank information - ranks = _get_rank(player_id) - ranks_display = ', '.join(["{1} of {2} ({0})".format(gtc, rank, - max_rank) for gtc, rank, max_rank in ranks]) - - - # which weapons have been used in the past 90 days - # and also, used in 5 games or more? - back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90) - recent_weapons = [] - for weapon in DBSession.query(PlayerWeaponStat.weapon_cd, func.count()).\ - filter(PlayerWeaponStat.player_id == player_id).\ - filter(PlayerWeaponStat.create_dt > back_then).\ - group_by(PlayerWeaponStat.weapon_cd).\ - having(func.count() > 4).\ - all(): - recent_weapons.append(weapon[0]) - - # recent games table, all data - recent_games = DBSession.query(PlayerGameStat, Game, Server, Map).\ - filter(PlayerGameStat.player_id == player_id).\ - filter(PlayerGameStat.game_id == Game.game_id).\ - filter(Game.server_id == Server.server_id).\ - filter(Game.map_id == Map.map_id).\ - order_by(Game.game_id.desc())[0:10] + games_played = get_games_played(player_id) + overall_stats = get_overall_stats(player_id) + fav_maps = get_fav_maps(player_id) + elos = get_elos(player_id) + ranks = get_ranks(player_id) + recent_games = get_recent_games(player_id) + recent_weapons = get_recent_weapons(player_id) except Exception as e: - player = None - elos_display = None - total_stats = None - recent_games = None - total_games = None - games_breakdown = None + player = None + games_played = None + overall_stats = None + fav_maps = None + elos = None + ranks = None + recent_games = None recent_weapons = [] - fav_map = None - fav_weapon = None - ranks_display = None; return {'player':player, - 'elos_display':elos_display, + 'games_played':games_played, + 'overall_stats':overall_stats, + 'fav_maps':fav_maps, + 'elos':elos, + 'ranks':ranks, 'recent_games':recent_games, - 'total_stats':total_stats, - 'total_games':total_games, - 'games_breakdown':games_breakdown, - 'recent_weapons':recent_weapons, - 'fav_map':fav_map, - 'fav_weapon':fav_weapon, - 'ranks_display':ranks_display, + 'recent_weapons':recent_weapons } @@ -377,7 +548,50 @@ def player_info_json(request): """ Provides detailed information on a specific player. JSON. """ - return [{'status':'not implemented'}] + + # All player_info fields are converted into JSON-formattable dictionaries + player_info = player_info_data(request) + + player = player_info['player'].to_dict() + + games_played = {} + for game in player_info['games_played']: + games_played[game.game_type_cd] = to_json(game) + + overall_stats = {} + for gt,stats in player_info['overall_stats'].items(): + overall_stats[gt] = to_json(stats) + + elos = {} + for gt,elo in player_info['elos'].items(): + elos[gt] = to_json(elo.to_dict()) + + ranks = {} + for gt,rank in player_info['ranks'].items(): + ranks[gt] = to_json(rank) + + fav_maps = {} + for gt,mapinfo in player_info['fav_maps'].items(): + fav_maps[gt] = to_json(mapinfo) + + recent_games = [] + for game in player_info['recent_games']: + recent_games.append(to_json(game)) + + #recent_weapons = player_info['recent_weapons'] + + return [{ + 'player': player, + 'games_played': games_played, + 'overall_stats': overall_stats, + 'fav_maps': fav_maps, + 'elos': elos, + 'ranks': ranks, + 'recent_games': recent_games, + # 'recent_weapons': recent_weapons, + 'recent_weapons': ['not implemented'], + }] + #return [{'status':'not implemented'}] def player_game_index_data(request): @@ -389,29 +603,25 @@ def player_game_index_data(request): current_page = 1 try: - games_q = DBSession.query(Game, Server, Map).\ - filter(PlayerGameStat.game_id == Game.game_id).\ - filter(PlayerGameStat.player_id == player_id).\ - filter(Game.server_id == Server.server_id).\ - filter(Game.map_id == Map.map_id).\ - order_by(Game.game_id.desc()) - - games = Page(games_q, current_page, items_per_page=10, url=page_url) - - pgstats = {} - for (game, server, map) in games: - pgstats[game.game_id] = DBSession.query(PlayerGameStat).\ - filter(PlayerGameStat.game_id == game.game_id).\ - order_by(PlayerGameStat.rank).\ - order_by(PlayerGameStat.score).all() + player = DBSession.query(Player).filter_by(player_id=player_id).\ + filter(Player.active_ind == True).one() + + rgs_q = recent_games_q(player_id=player.player_id) + + games = Page(rgs_q, current_page, items_per_page=10, url=page_url) + + # replace the items in the canned pagination class with more rich ones + games.items = [RecentGame(row) for row in games.items] except Exception as e: player = None games = None - return {'player_id':player_id, + return { + 'player_id':player.player_id, + 'player':player, 'games':games, - 'pgstats':pgstats} + } def player_game_index(request): @@ -537,3 +747,112 @@ def player_damage_json(request): games = over how many games to display damage. Can be up to 50. """ return player_damage_data(request) + + +def player_hashkey_info_data(request): + hashkey = request.matchdict['hashkey'] + try: + player = DBSession.query(Player).\ + filter(Player.player_id == Hashkey.player_id).\ + filter(Player.active_ind == True).\ + filter(Hashkey.hashkey == hashkey).one() + + games_played = get_games_played(player.player_id) + overall_stats = get_overall_stats(player.player_id) + fav_maps = get_fav_maps(player.player_id) + elos = get_elos(player.player_id) + ranks = get_ranks(player.player_id) + + except Exception as e: + raise e + player = None + games_played = None + overall_stats = None + fav_maps = None + elos = None + ranks = None + + return {'player':player, + 'games_played':games_played, + 'overall_stats':overall_stats, + 'fav_maps':fav_maps, + 'elos':elos, + 'ranks':ranks, + } + + +def player_hashkey_info_json(request): + """ + Provides detailed information on a specific player. JSON. + """ + + # All player_info fields are converted into JSON-formattable dictionaries + player_info = player_hashkey_info_data(request) + + player = player_info['player'].to_dict() + + games_played = {} + for game in player_info['games_played']: + games_played[game.game_type_cd] = to_json(game) + + overall_stats = {} + for gt,stats in player_info['overall_stats'].items(): + overall_stats[gt] = to_json(stats) + + elos = {} + for gt,elo in player_info['elos'].items(): + elos[gt] = to_json(elo.to_dict()) + + ranks = {} + for gt,rank in player_info['ranks'].items(): + ranks[gt] = to_json(rank) + + fav_maps = {} + for gt,mapinfo in player_info['fav_maps'].items(): + fav_maps[gt] = to_json(mapinfo) + + return [{ + 'version': 1, + 'player': player, + 'games_played': games_played, + 'overall_stats': overall_stats, + 'fav_maps': fav_maps, + 'elos': elos, + 'ranks': ranks, + }] + + +def player_elo_info_data(request): + """ + Provides elo information on a specific player. Raw data is returned. + """ + hashkey = request.matchdict['hashkey'] + try: + player = DBSession.query(Player).\ + filter(Player.player_id == Hashkey.player_id).\ + filter(Player.active_ind == True).\ + filter(Hashkey.hashkey == hashkey).one() + + elos = get_elos(player.player_id) + + except Exception as e: + log.debug(e) + raise pyramid.httpexceptions.HTTPNotFound + + return {'elos':elos} + + +def player_elo_info_json(request): + """ + Provides elo information on a specific player. JSON. + """ + elo_info = player_elo_info_data(request) + + elos = {} + for gt, elo in elo_info['elos'].items(): + elos[gt] = to_json(elo.to_dict()) + + return [{ + 'version': 1, + 'elos': elos, + }]