hockey-blast-common-lib 0.1.50__py3-none-any.whl → 0.1.53__py3-none-any.whl

hockey_blast_common_lib/skills_propagation.py

@@ -9,6 +9,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from hockey_blast_common_lib.models import Level, Division
 from hockey_blast_common_lib.stats_models import LevelsGraphEdge, LevelStatsSkater, SkillValuePPGRatio
 from hockey_blast_common_lib.db_connection import create_session
+from hockey_blast_common_lib.progress_utils import create_progress_tracker
 from sqlalchemy import func
 
 import numpy as np
@@ -56,10 +57,11 @@ def reset_skill_values_in_divisions():
             # If no match found, check each alternative name individually
             skills = session.query(Level).filter(Level.org_id == division.org_id).all()
             for s in skills:
-                alternative_names = s.level_alternative_name.split(',')
-                if div_level in alternative_names:
-                    level = s
-                    break
+                if s.level_alternative_name:  # Check if not None
+                    alternative_names = s.level_alternative_name.split(',')
+                    if div_level in alternative_names:
+                        level = s
+                        break
 
         if level:
             # Assign the skill_value and set skill_propagation_sequence to 0
@@ -70,19 +72,30 @@ def reset_skill_values_in_divisions():
                 level.skill_propagation_sequence = -1
                 level.skill_value = -1
         else:
-            # Add new Skill with values previously used for division
-            new_level = Level(
-                org_id=division.org_id,
-                skill_value=-1,
-                level_name=division.level,
-                level_alternative_name='',
-                is_seed=False,
-                skill_propagation_sequence=-1
-            )
-            session.add(new_level)
-            session.commit()
-            division.skill_id = new_level.id
-            print(f"Created new Level for Division {division.level}")
+            # Check if level already exists with this org_id/level_name combination
+            existing_level = session.query(Level).filter(
+                Level.org_id == division.org_id,
+                Level.level_name == division.level
+            ).first()
+            
+            if existing_level:
+                # Use existing level
+                division.level_id = existing_level.id
+                print(f"Using existing Level for Division {division.level}")
+            else:
+                # Add new Skill with values previously used for division
+                new_level = Level(
+                    org_id=division.org_id,
+                    skill_value=-1,
+                    level_name=division.level,
+                    level_alternative_name='',
+                    is_seed=False,
+                    skill_propagation_sequence=-1
+                )
+                session.add(new_level)
+                session.commit()
+                division.level_id = new_level.id
+                print(f"Created new Level for Division {division.level}")
 
         # Commit the changes to the Division
         session.commit()
@@ -113,14 +126,20 @@ def build_levels_graph_edges():
     # Dictionary to store edges
     edges = {}
 
-    # Build edges
+    # Build edges - batch load all levels first for performance
+    all_level_ids = list(level_human_stats.keys())
+    levels_dict = {level.id: level for level in session.query(Level).filter(Level.id.in_(all_level_ids)).all()}
+    
     total_levels = len(level_human_stats)
+    progress = create_progress_tracker(total_levels, "Building level graph edges")
     processed_levels = 0
     for from_level_id, from_humans in level_human_stats.items():
-        from_level = session.query(Level).filter_by(id=from_level_id).first()
+        from_level = levels_dict.get(from_level_id)
+        if not from_level:
+            continue
         for to_level_id, to_humans in level_human_stats.items():
-            to_level = session.query(Level).filter_by(id=to_level_id).first()
-            if from_level.id >= to_level.id:
+            to_level = levels_dict.get(to_level_id)
+            if not to_level or from_level.id >= to_level.id:
                 continue
 
             common_humans = set(from_humans.keys()) & set(to_humans.keys())
@@ -171,7 +190,7 @@ def build_levels_graph_edges():
             edges[(from_level_id, to_level_id)] = edge
 
         processed_levels += 1
-        print(f"\rProcessed {processed_levels}/{total_levels} levels ({(processed_levels/total_levels)*100:.2f}%)", end="")
+        progress.update(processed_levels)
 
     # Insert edges into the database
     for edge in edges.values():
@@ -313,12 +332,12 @@ def propagate_skill_levels(propagation_sequence):
                         # First confirm which way are we going here
                         if (ppg_ratio_edge < 1 and correlation.ppg_ratio > 1) or (ppg_ratio_edge > 1 and correlation.ppg_ratio < 1):
                             # Reverse the correlation
-                            from_skill_value=correlation.to_skill_value
-                            to_skill_value=correlation.from_skill_value
+                            from_skill_value = correlation.to_skill_value
+                            to_skill_value = correlation.from_skill_value
                             ppg_ratio_range = 1 / correlation.ppg_ratio
                         else:
-                            from_skill_value=correlation.from_skill_value
-                            to_skill_value=correlation.to_skill_value
+                            from_skill_value = correlation.from_skill_value
+                            to_skill_value = correlation.to_skill_value
                             ppg_ratio_range = correlation.ppg_ratio
 
                         # Now both ratios are either < 1 or > 1
@@ -345,6 +364,7 @@ def propagate_skill_levels(propagation_sequence):
                     suggested_skill_values[target_level_id].append(weighted_avg_skill_value)
 
     # Update skill values for target levels
+    session.flush()  # Ensure all previous changes are flushed before updates
     for target_level_id, skill_values in suggested_skill_values.items():
         skill_values = Config.discard_outliers(np.array(skill_values))
         if len(skill_values) > 0:
@@ -352,10 +372,16 @@ def propagate_skill_levels(propagation_sequence):
             avg_skill_value = max(avg_skill_value, 9.6)
             if avg_skill_value < min_skill_value:
                 avg_skill_value = min_skill_value - 0.01
-            session.query(Level).filter_by(id=target_level_id).update({
-                'skill_value': avg_skill_value,
-                'skill_propagation_sequence': propagation_sequence + 1
-            })
+            try:
+                session.query(Level).filter_by(id=target_level_id).update({
+                    'skill_value': avg_skill_value,
+                    'skill_propagation_sequence': propagation_sequence + 1
+                })
+                session.flush()  # Flush each update individually
+            except Exception as e:
+                print(f"Error updating level {target_level_id}: {e}")
+                session.rollback()
+                continue
     session.commit()
 
     print(f"Skill levels have been propagated for sequence {propagation_sequence}.")

hockey_blast_common_lib/stats_models.py

@@ -75,6 +75,10 @@ class BaseStatsSkater(db.Model):
     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)
+    current_point_streak = db.Column(db.Integer, default=0)
+    current_point_streak_rank = db.Column(db.Integer, default=0)
+    current_point_streak_avg_points = db.Column(db.Float, default=0.0)
+    current_point_streak_avg_points_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'))
 
@@ -87,6 +91,8 @@ class BaseStatsSkater(db.Model):
             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}_current_point_streak3', cls.get_aggregation_column(), 'current_point_streak'),
+            db.Index(f'idx_{cls.aggregation_type}_current_point_streak_avg_points3', cls.get_aggregation_column(), 'current_point_streak_avg_points'),
             db.Index(f'idx_{cls.aggregation_type}_games_played3', cls.get_aggregation_column(), 'games_played')
         )
 

hockey_blast_common_lib/wsgi.py

@@ -6,6 +6,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from flask_migrate import Migrate
 from flask import Flask
 from hockey_blast_common_lib.models import *
+from hockey_blast_common_lib.h2h_models import *
 from hockey_blast_common_lib.stats_models import *
 from hockey_blast_common_lib.stats_models import db
 from hockey_blast_common_lib.db_connection import get_db_params

{hockey_blast_common_lib-0.1.50.dist-info → hockey_blast_common_lib-0.1.53.dist-info}/METADATA

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

hockey_blast_common_lib-0.1.53.dist-info/RECORD

@@ -0,0 +1,27 @@
+hockey_blast_common_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hockey_blast_common_lib/aggregate_all_stats.py,sha256=2bOj2BW0k3ZPQR1NH04upnkIfO9SastzTz7XwO3ujYo,1104
+hockey_blast_common_lib/aggregate_goalie_stats.py,sha256=0pJOT6nKgFYmSTWA3HY-BKARgc7l6czqvzWfwNQMad0,14346
+hockey_blast_common_lib/aggregate_h2h_stats.py,sha256=dC5TcJZGkpIQTiq3z40kOX6EjEhFbGv5EL0P1EClBQ0,11117
+hockey_blast_common_lib/aggregate_human_stats.py,sha256=ku42TAjUIj49822noM8fEeB8GS4vFeCCNrLupTWmqzg,26043
+hockey_blast_common_lib/aggregate_referee_stats.py,sha256=mUcTVQH9K4kwmIfgfGsnh_3AqX6Ia3RjfukkYuQas3I,13938
+hockey_blast_common_lib/aggregate_s2s_stats.py,sha256=urYN0Q06twwLO-XWGlSMVAVOTVR_D2AWdmoGsxIYHXE,6737
+hockey_blast_common_lib/aggregate_skater_stats.py,sha256=pA_2pDOGcJyEywISg2ySG8gFCuoLWwqw6a3Gm2wHLyo,23302
+hockey_blast_common_lib/assign_skater_skill.py,sha256=8gAiqQm14QMFJNmdKb2jjaGyQlhzvVhXrqVvaZ84KDM,2499
+hockey_blast_common_lib/db_connection.py,sha256=HvPxDvOj7j5H85RfslGvHVNevfg7mKCd0syJ6NX21mU,1890
+hockey_blast_common_lib/dump_sample_db.sh,sha256=MY3lnzTXBoWd76-ZlZr9nWsKMEVgyRsUn-LZ2d1JWZs,810
+hockey_blast_common_lib/h2h_models.py,sha256=0st4xoJO0U6ONfx3BV03BQvHjZE31e_PqZfphAJMoSU,7968
+hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=AIB10IouLiSrxfaUZUN0zFjF_TzZ2D-Rjde9_yGTUTQ,4648897
+hockey_blast_common_lib/models.py,sha256=PTIWyl7ygVQ_hbooqFWmnpOIKcJyyyTew_433IAMIFM,16559
+hockey_blast_common_lib/options.py,sha256=2L4J9rKCKr58om34259D3_s7kbPdknMSwoo6IwTNnx0,849
+hockey_blast_common_lib/progress_utils.py,sha256=H_zRFOsb2qQQpGw56wJghZ1nUe_m6zqGeR9hZ33Y1Uo,3229
+hockey_blast_common_lib/restore_sample_db.sh,sha256=7W3lzRZeu9zXIu1Bvtnaw8EHc1ulHmFM4mMh86oUQJo,2205
+hockey_blast_common_lib/skills_in_divisions.py,sha256=m-UEwMwn1KM7wOYvDstgsOEeH57M9V6yrkBoghzGYKE,7005
+hockey_blast_common_lib/skills_propagation.py,sha256=CYpnjcJit01-QxkvVstNx1DhUo5ljZB_-o31vGzPT-A,17668
+hockey_blast_common_lib/stats_models.py,sha256=uBNQSqCMXurzS-tD13OoV5WqurYYGHMZMHk1CeA5jgI,26104
+hockey_blast_common_lib/stats_utils.py,sha256=DXsPO4jw8XsdRUN46TGF_IiBAfz3GCIVBswCGp5ELDk,284
+hockey_blast_common_lib/utils.py,sha256=PduHp6HoI4sfr5HvJfQAaz7170dy5kTFVdIfWvBR-Jg,5874
+hockey_blast_common_lib/wsgi.py,sha256=y3NxoJfWjdzX3iP7RGvDEer6zcnPyCanpqSgW1BlXgg,779
+hockey_blast_common_lib-0.1.53.dist-info/METADATA,sha256=gQutIQ7tPRkjSSi-AcdJwikZt900Vhja3qU-owRdurI,318
+hockey_blast_common_lib-0.1.53.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.53.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.53.dist-info/RECORD,,

hockey_blast_common_lib-0.1.50.dist-info/RECORD

@@ -1,23 +0,0 @@
-hockey_blast_common_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hockey_blast_common_lib/aggregate_all_stats.py,sha256=2bOj2BW0k3ZPQR1NH04upnkIfO9SastzTz7XwO3ujYo,1104
-hockey_blast_common_lib/aggregate_goalie_stats.py,sha256=_9lP5xNX_QcIge-sHbqIlt7mKcFJBGVBbr33Rtf3LAY,12365
-hockey_blast_common_lib/aggregate_human_stats.py,sha256=uBNzXbFsK5PhPg-5wjH2iuJ7VPpA7MWKFHx90rMbhjQ,24084
-hockey_blast_common_lib/aggregate_referee_stats.py,sha256=dSl0LEpCzyzpD_tv8yw07NLBImo2RP_xuUQZK_p5kFs,12189
-hockey_blast_common_lib/aggregate_skater_stats.py,sha256=MU4ICUUtDDKhdeb4sc0UPzjREwSB0rFZuJqRtIDedDU,17393
-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=MY3lnzTXBoWd76-ZlZr9nWsKMEVgyRsUn-LZ2d1JWZs,810
-hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=Mg0lpOPFHwm8DnyiVEiLq3UbWa0eDan1ltV9ieFlyAc,4648905
-hockey_blast_common_lib/models.py,sha256=nbJjypa2OBO5_fwjAbWVgBp4WDCuE-RtaELzJ9cvqB4,16468
-hockey_blast_common_lib/options.py,sha256=2L4J9rKCKr58om34259D3_s7kbPdknMSwoo6IwTNnx0,849
-hockey_blast_common_lib/restore_sample_db.sh,sha256=7W3lzRZeu9zXIu1Bvtnaw8EHc1ulHmFM4mMh86oUQJo,2205
-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=NWigeIowIJU6o1Sk1cP08kEy4t594LZpecKUnl-O6as,25552
-hockey_blast_common_lib/stats_utils.py,sha256=DXsPO4jw8XsdRUN46TGF_IiBAfz3GCIVBswCGp5ELDk,284
-hockey_blast_common_lib/utils.py,sha256=PduHp6HoI4sfr5HvJfQAaz7170dy5kTFVdIfWvBR-Jg,5874
-hockey_blast_common_lib/wsgi.py,sha256=7LGUzioigviJp-EUhSEaQcd4jBae0mxbkyBscQfZhlc,730
-hockey_blast_common_lib-0.1.50.dist-info/METADATA,sha256=fd7SwCTv4w-PgDhuALLALEsq_w3nJXgy_RhD_APV9pE,318
-hockey_blast_common_lib-0.1.50.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.50.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.50.dist-info/RECORD,,