hockey-blast-common-lib 0.1.40__py3-none-any.whl → 0.1.41__py3-none-any.whl

hockey_blast_common_lib/aggregate_skater_stats.py

@@ -135,6 +135,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
                 'points_per_game': 0.0,
                 'assists_per_game': 0.0,
                 'penalties_per_game': 0.0,
+                'gm_penalties_per_game': 0.0,  # Initialize GM penalties per game
                 'game_ids': [],
                 'first_game_id': None,
                 'last_game_id': None
@@ -176,6 +177,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
             stat['points_per_game'] = stat['points'] / stat['games_played']
             stat['assists_per_game'] = stat['assists'] / stat['games_played']
             stat['penalties_per_game'] = stat['penalties'] / stat['games_played']
+            stat['gm_penalties_per_game'] = stat['gm_penalties'] / stat['games_played']  # Calculate GM penalties per game
 
     # Ensure all keys have valid human_id values
     stats_dict = {key: value for key, value in stats_dict.items() if key[1] is not None}
@@ -208,6 +210,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
     assign_ranks(stats_dict, 'points_per_game')
     assign_ranks(stats_dict, 'assists_per_game')
     assign_ranks(stats_dict, 'penalties_per_game')
+    assign_ranks(stats_dict, 'gm_penalties_per_game')  # Assign ranks for GM penalties per game
 
     # Debug output for specific human
     if debug_human_id:
@@ -229,6 +232,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
         points_per_game = (stat['goals'] + stat['assists']) / stat['games_played'] if stat['games_played'] > 0 else 0.0
         assists_per_game = stat['assists'] / stat['games_played'] if stat['games_played'] > 0 else 0.0
         penalties_per_game = stat['penalties'] / stat['games_played'] if stat['games_played'] > 0 else 0.0
+        gm_penalties_per_game = stat['gm_penalties'] / stat['games_played'] if stat['games_played'] > 0 else 0.0  # Calculate GM penalties per game
         skater_stat = StatsModel(
             aggregation_id=aggregation_id,
             human_id=human_id,
@@ -242,6 +246,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
             points_per_game=points_per_game,
             assists_per_game=assists_per_game,
             penalties_per_game=penalties_per_game,
+            gm_penalties_per_game=gm_penalties_per_game,  # Include GM penalties per game
             games_played_rank=stat['games_played_rank'],
             goals_rank=stat['goals_rank'],
             assists_rank=stat['assists_rank'],
@@ -252,6 +257,7 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
             points_per_game_rank=stat['points_per_game_rank'],
             assists_per_game_rank=stat['assists_per_game_rank'],
             penalties_per_game_rank=stat['penalties_per_game_rank'],
+            gm_penalties_per_game_rank=stat['gm_penalties_per_game_rank'],  # Include GM penalties per game rank
             total_in_rank=total_in_rank,
             first_game_id=stat['first_game_id'],
             last_game_id=stat['last_game_id']

hockey_blast_common_lib/stats_models.py

@@ -72,6 +72,8 @@ class BaseStatsSkater(db.Model):
     assists_per_game_rank = db.Column(db.Integer, default=0)
     penalties_per_game = db.Column(db.Float, default=0.0)
     penalties_per_game_rank = db.Column(db.Integer, default=0)
+    gm_penalties_per_game = db.Column(db.Float, default=0.0)
+    gm_penalties_per_game_rank = db.Column(db.Integer, default=0)
     total_in_rank = db.Column(db.Integer, default=0)
     first_game_id = db.Column(db.Integer, db.ForeignKey('games.id'))
     last_game_id = db.Column(db.Integer, db.ForeignKey('games.id'))
@@ -84,6 +86,7 @@ class BaseStatsSkater(db.Model):
             db.Index(f'idx_{cls.aggregation_type}_points_per_game3', cls.get_aggregation_column(), 'points_per_game'),
             db.Index(f'idx_{cls.aggregation_type}_assists_per_game3', cls.get_aggregation_column(), 'assists_per_game'),
             db.Index(f'idx_{cls.aggregation_type}_penalties_per_game3', cls.get_aggregation_column(), 'penalties_per_game'),
+            db.Index(f'idx_{cls.aggregation_type}_gm_penalties_per_game3', cls.get_aggregation_column(), 'gm_penalties_per_game'),
             db.Index(f'idx_{cls.aggregation_type}_games_played3', cls.get_aggregation_column(), 'games_played')
         )
 

{hockey_blast_common_lib-0.1.40.dist-info → hockey_blast_common_lib-0.1.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hockey-blast-common-lib
-Version: 0.1.40
+Version: 0.1.41
 Summary: Common library for shared functionality and DB models
 Author: Pavel Kletskov
 Author-email: kletskov@gmail.com

{hockey_blast_common_lib-0.1.40.dist-info → hockey_blast_common_lib-0.1.41.dist-info}/RECORD

@@ -3,21 +3,21 @@ hockey_blast_common_lib/aggregate_all_stats.py,sha256=MUjT23mdOMfCTx-kRSY-LGrLHZ
 hockey_blast_common_lib/aggregate_goalie_stats.py,sha256=FcYL40NP0-sPY7UI7F8Ny_RaPKz3mfkmhQnPVbeRtOc,12178
 hockey_blast_common_lib/aggregate_human_stats.py,sha256=6cDoiJ0xZ3aQ4wjEAP_Jgu2aNEicnuU-a22BncSFtRo,23920
 hockey_blast_common_lib/aggregate_referee_stats.py,sha256=FszWLTygddDQNcUgbmevQ-eGPrW8Y0nXpRvUluPRKnU,11920
-hockey_blast_common_lib/aggregate_skater_stats.py,sha256=JK_JnmsNHecpMOng3pV_cf03tjIsUS-uGt0G9MPCrbM,16547
+hockey_blast_common_lib/aggregate_skater_stats.py,sha256=FBc6enJNnFXYg7mVPiXssleTA1vZRAXCTFUa-3eOGdo,17199
 hockey_blast_common_lib/assign_skater_skill.py,sha256=p-0fbodGpM8BCjKHDpxNb7BH2FcIlBsJwON844KNrUY,1817
 hockey_blast_common_lib/db_connection.py,sha256=HvPxDvOj7j5H85RfslGvHVNevfg7mKCd0syJ6NX21mU,1890
 hockey_blast_common_lib/dump_sample_db.sh,sha256=MHPA-Ciod7wsvAlMbRtXFiyajgnEqU1xR59sJQ9UWR0,738
-hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=uU1QOjEWNMji7TP5YhILFKZptRoR-1HcjBBw7mX4kI4,51
+hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=TWtisyYlIRkQCKfyXRS_iYKq_8qDb6KHQEg020FkKrM,51
 hockey_blast_common_lib/models.py,sha256=xne38KwdBDcWvzdLyU6toozqkuatB9wiQhyiQ4xvAgU,16413
 hockey_blast_common_lib/options.py,sha256=6na8fo-5A2RBPpd_h-7dsqetOLSLoNEJg1QMYgl4jNs,792
 hockey_blast_common_lib/restore_sample_db.sh,sha256=u2zKazC6vNMULkpYzI64nlneCWaGUtDHPBAU-gWgRbw,1861
 hockey_blast_common_lib/skills_in_divisions.py,sha256=m-UEwMwn1KM7wOYvDstgsOEeH57M9V6yrkBoghzGYKE,7005
 hockey_blast_common_lib/skills_propagation.py,sha256=x6yy7fJ6IX3YiHqiP_v7-p_S2Expb8JJ-mWuajEFBdY,16388
-hockey_blast_common_lib/stats_models.py,sha256=__BtG0LtSZ2yWHU_fCh7-RVyjO0EhDNMctOW2cAzjnk,25294
+hockey_blast_common_lib/stats_models.py,sha256=NWigeIowIJU6o1Sk1cP08kEy4t594LZpecKUnl-O6as,25552
 hockey_blast_common_lib/stats_utils.py,sha256=DXsPO4jw8XsdRUN46TGF_IiBAfz3GCIVBswCGp5ELDk,284
 hockey_blast_common_lib/utils.py,sha256=Sy5Pk40Tk3gsMrhMsUMlBD7i7jiVZmWLUBc94qI3zOA,5235
 hockey_blast_common_lib/wsgi.py,sha256=7LGUzioigviJp-EUhSEaQcd4jBae0mxbkyBscQfZhlc,730
-hockey_blast_common_lib-0.1.40.dist-info/METADATA,sha256=c1tQbNlrUW8MNh2f0Z7MVmwolW4HMgmGvH6v7YHicaI,318
-hockey_blast_common_lib-0.1.40.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.40.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.40.dist-info/RECORD,,
+hockey_blast_common_lib-0.1.41.dist-info/METADATA,sha256=r0-HHK9qO6fisdLkPOc4pDRMEfobEu4D4sstUM1-gsw,318
+hockey_blast_common_lib-0.1.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.41.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.41.dist-info/RECORD,,