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

hockey_blast_common_lib/assign_skater_skill.py

@@ -26,7 +26,7 @@ def calculate_skater_skill_value(session, level_stats):
         
         # Apply skill adjustment: range from 0.8 to 1.2 of level base skill
         # Since lower skill_value is better: Best player gets 0.8x (closer to better levels), worst gets 1.2x
-        skill_adjustment = 1.2 - 0.4 * ppg_skill_factor
+        skill_adjustment = 1.3 - 0.2 * ppg_skill_factor
         skill_value = level_skill_value * skill_adjustment
         
         # Take the minimum skill value across all levels the player has played in (lower is better)
@@ -43,15 +43,26 @@ def assign_skater_skill_values():
     # Create progress tracker
     progress = create_progress_tracker(total_humans, "Assigning skater skill values")
 
+    batch_size = 1000
+    updates_count = 0
+
     for i, human in enumerate(humans):
         level_stats = session.query(LevelStatsSkater).filter(LevelStatsSkater.human_id == human.id).all()
         if level_stats:
             skater_skill_value = calculate_skater_skill_value(session, level_stats)
             human.skater_skill_value = skater_skill_value
+            updates_count += 1
+
+        # Commit in batches
+        if updates_count % batch_size == 0:
             session.commit()
 
         progress.update(i + 1)
 
+    # Commit any remaining updates
+    if updates_count % batch_size != 0:
+        session.commit()
+
     print("Skater skill values have been assigned to all humans.")
 
 if __name__ == "__main__":

hockey_blast_common_lib/models.py

@@ -52,6 +52,8 @@ class Game(db.Model):
     home_period_1_score = db.Column(db.Integer)
     home_period_2_score = db.Column(db.Integer)
     home_period_3_score = db.Column(db.Integer)
+    home_ot_score = db.Column(db.Integer, default=0)
+    visitor_ot_score = db.Column(db.Integer, default=0)
     game_type = db.Column(db.String(50))
     went_to_ot = db.Column(db.Boolean, default=False)
     home_period_1_shots = db.Column(db.Integer)
@@ -92,6 +94,7 @@ class Goal(db.Model):
     goal_scorer_id = db.Column(db.Integer, db.ForeignKey('humans.id'))
     assist_1_id = db.Column(db.Integer, db.ForeignKey('humans.id'))
     assist_2_id = db.Column(db.Integer, db.ForeignKey('humans.id'))
+    goalie_id = db.Column(db.Integer, db.ForeignKey('humans.id'), nullable=True)  # Goalie who allowed the goal (can be "Empty Net" special human)
     special_condition = db.Column(db.String(50))  # e.g., PP (power play), SH (short-handed)
     sequence_number = db.Column(db.Integer)
     __table_args__ = (
@@ -322,7 +325,11 @@ class Shootout(db.Model):
 class Team(db.Model):
     __tablename__ = 'teams'
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(100), unique=True, nullable=False)
+    name = db.Column(db.String(100), nullable=False)
+    org_id = db.Column(db.Integer, db.ForeignKey('organizations.id'), nullable=False)
+    __table_args__ = (
+        db.UniqueConstraint('org_id', 'name', name='_org_team_name_uc'),
+    )
 
 class TeamDivision(db.Model):
     __tablename__ = 'teams_divisions'
@@ -353,6 +360,31 @@ class RequestLog(db.Model):
     cgi_params = db.Column(db.String, nullable=True)
     response_time_ms = db.Column(db.Float, nullable=True)  # Response time in milliseconds
 
+class GoalieSaves(db.Model):
+    __tablename__ = 'goalie_saves'
+    id = db.Column(db.Integer, primary_key=True)
+    game_id = db.Column(db.Integer, db.ForeignKey('games.id'), nullable=False)
+    goalie_id = db.Column(db.Integer, db.ForeignKey('humans.id'), nullable=False)
+    saves_count = db.Column(db.Integer, nullable=False, default=0)
+    shots_against = db.Column(db.Integer, nullable=False, default=0)
+    goals_allowed = db.Column(db.Integer, nullable=False, default=0)
+    __table_args__ = (
+        db.UniqueConstraint('game_id', 'goalie_id', name='_game_goalie_saves_uc'),
+    )
+
+class ScorekeeperSaveQuality(db.Model):
+    __tablename__ = 'scorekeeper_save_quality'
+    id = db.Column(db.Integer, primary_key=True)
+    game_id = db.Column(db.Integer, db.ForeignKey('games.id'), nullable=False)
+    scorekeeper_id = db.Column(db.Integer, db.ForeignKey('humans.id'), nullable=False)
+    total_saves_recorded = db.Column(db.Integer, nullable=False, default=0)
+    max_saves_per_5sec = db.Column(db.Integer, nullable=False, default=0)  # Highest saves in any 5-second window
+    max_saves_per_20sec = db.Column(db.Integer, nullable=False, default=0)  # Highest saves in any 20-second window
+    saves_timestamps = db.Column(db.JSON, nullable=True)  # JSONB with home_saves/away_saves arrays of decisecond timestamps
+    __table_args__ = (
+        db.UniqueConstraint('game_id', 'scorekeeper_id', name='_game_scorekeeper_quality_uc'),
+    )
+
 # # MANUAL AMENDS HAPPEN HERE :)
 # from db_connection import create_session
 # session = create_session("sharksice")

hockey_blast_common_lib/options.py

@@ -1,4 +1,5 @@
 import argparse
+from .models import Human
 
 MAX_HUMAN_SEARCH_RESULTS = 25
 MAX_TEAM_SEARCH_RESULTS = 25
@@ -23,3 +24,30 @@ def parse_args():
     parser.add_argument("--reprocess", action="store_true", help="Reprocess existing data.")
     parser.add_argument("--pre_process", action="store_true", help="Pre-Process existing data.")
     return parser.parse_args()
+
+def get_or_create_empty_net_human(session, game_date):
+    """Get or create the special 'Empty Net' human record for tracking pulled goalies.
+    
+    Args:
+        session: Database session
+        game_date: Date of the game (used for first_date/last_date if creating)
+    
+    Returns:
+        int: The human_id of the Empty Net special record
+    """
+    empty_net_human = session.query(Human).filter_by(
+        first_name="Empty", middle_name="", last_name="Net"
+    ).first()
+    
+    if not empty_net_human:
+        empty_net_human = Human(
+            first_name="Empty", 
+            middle_name="", 
+            last_name="Net",
+            first_date=game_date,
+            last_date=game_date
+        )
+        session.add(empty_net_human)
+        session.commit()
+    
+    return empty_net_human.id

hockey_blast_common_lib/skills_propagation.py

@@ -11,6 +11,7 @@ from hockey_blast_common_lib.stats_models import LevelsGraphEdge, LevelStatsSkat
 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
+from sqlalchemy.exc import IntegrityError
 
 import numpy as np
 
@@ -93,9 +94,22 @@ def reset_skill_values_in_divisions():
                     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}")
+                try:
+                    session.commit()
+                    division.level_id = new_level.id
+                    print(f"Created new Level for Division {division.level}")
+                except IntegrityError:
+                    session.rollback()
+                    # Another process created this level, query for it
+                    existing_level = session.query(Level).filter(
+                        Level.org_id == division.org_id,
+                        Level.level_name == division.level
+                    ).first()
+                    if existing_level:
+                        division.level_id = existing_level.id
+                        print(f"Race condition resolved - using existing Level for Division {division.level}")
+                    else:
+                        raise RuntimeError(f"Unable to create or find level: {division.level} for org_id: {division.org_id}")
 
         # Commit the changes to the Division
         session.commit()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hockey-blast-common-lib
-Version: 0.1.53
+Version: 0.1.55
 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 → hockey_blast_common_lib-0.1.55.dist-info}/RECORD

@@ -6,22 +6,22 @@ hockey_blast_common_lib/aggregate_human_stats.py,sha256=ku42TAjUIj49822noM8fEeB8
 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/assign_skater_skill.py,sha256=Asq6iRMPsCMDnvuNSd-M3s4Gee4kDocP9Eznwju_9kA,2749
 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/hockey_blast_sample_backup.sql.gz,sha256=hWju95cPNMukwns66g0CTK3XUFShrMDN-FzRjpzqLPQ,4648902
+hockey_blast_common_lib/models.py,sha256=NBF0u4wTAwxFe5UaUObFo-L9Az2jLPXbKejtcJRuGQ0,18440
+hockey_blast_common_lib/options.py,sha256=alOXCYF7Jmw4Z97ae6tAsDIS0VNideV_-GKJ4-v4Pjo,1689
 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/skills_propagation.py,sha256=nUxntyK8M4xWjHpkfze8f0suaBeunxicgDCduGmNJ-A,18468
 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.55.dist-info/METADATA,sha256=fl85rh700VSbNViKgFuvQFhsvJbJUq3BwYlzQeTzko8,318
+hockey_blast_common_lib-0.1.55.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.55.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.55.dist-info/RECORD,,