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

hockey_blast_common_lib/aggregate_goalie_stats.py

@@ -56,6 +56,10 @@ def aggregate_goalie_stats(session, aggregation_type, aggregation_id, names_to_f
     else:
         raise ValueError("Invalid aggregation type")
 
+    # Delete existing items from the stats table
+    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
+    session.commit()
+
     # Apply aggregation window filter
     if aggregation_window:
         last_game_datetime_str = session.query(func.max(func.concat(Game.date, ' ', Game.time))).filter(filter_condition, Game.status.like('Final%')).scalar()
@@ -63,10 +67,10 @@ def aggregate_goalie_stats(session, aggregation_type, aggregation_id, names_to_f
         if start_datetime:
             game_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP).between(start_datetime, last_game_datetime_str)
             filter_condition = filter_condition & game_window_filter
+        else:
+            #print(f"Warning: No valid start datetime for aggregation window '{aggregation_window}' for {aggregation_name}. No games will be included.")
+            return
 
-    # Delete existing items from the stats table
-    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
-    session.commit()
 
     # Filter for specific human_id if provided
     human_filter = []

hockey_blast_common_lib/aggregate_human_stats.py

@@ -54,6 +54,10 @@ def aggregate_human_stats(session, aggregation_type, aggregation_id, names_to_fi
     else:
         raise ValueError("Invalid aggregation type")
 
+    # Delete existing items from the stats table
+    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
+    session.commit()
+
     # Apply aggregation window filter
     if aggregation_window:
         last_game_datetime_str = session.query(func.max(func.concat(Game.date, ' ', Game.time))).filter(filter_condition, Game.status.like('Final%')).scalar()
@@ -61,10 +65,9 @@ def aggregate_human_stats(session, aggregation_type, aggregation_id, names_to_fi
         if start_datetime:
             game_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP).between(start_datetime, last_game_datetime_str)
             filter_condition = filter_condition & game_window_filter
-
-    # Delete existing items from the stats table
-    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
-    session.commit()
+        else:
+            #print(f"Warning: No valid start datetime for aggregation window '{aggregation_window}' for {aggregation_name}. No games will be included.")
+            return
 
     # Filter for specific human_id if provided
     human_filter = []

hockey_blast_common_lib/aggregate_referee_stats.py

@@ -48,12 +48,16 @@ def aggregate_referee_stats(session, aggregation_type, aggregation_id, names_to_
         min_games = MIN_GAMES_FOR_LEVEL_STATS
         filter_condition = Division.level_id == aggregation_id
         # Add filter to only include games for the last 5 years
-        five_years_ago = datetime.now() - timedelta(days=5*365)
-        level_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP) >= five_years_ago
-        filter_condition = filter_condition & level_window_filter
+        # five_years_ago = datetime.now() - timedelta(days=5*365)
+        # level_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP) >= five_years_ago
+        # filter_condition = filter_condition & level_window_filter
     else:
         raise ValueError("Invalid aggregation type")
 
+    # Delete existing items from the stats table
+    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
+    session.commit()
+
     # Apply aggregation window filter
     if aggregation_window:
         last_game_datetime_str = session.query(func.max(func.concat(Game.date, ' ', Game.time))).filter(filter_condition, Game.status.like('Final%')).scalar()
@@ -61,11 +65,11 @@ def aggregate_referee_stats(session, aggregation_type, aggregation_id, names_to_
         if start_datetime:
             game_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP).between(start_datetime, last_game_datetime_str)
             filter_condition = filter_condition & game_window_filter
+        else:
+            #print(f"Warning: No valid start datetime for aggregation window '{aggregation_window}' for {aggregation_name}. No games will be included.")
+            return
 
-    # Delete existing items from the stats table
-    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
-    session.commit()
-
+    filter_condition = filter_condition & (Division.id == Game.division_id)
     # Aggregate games reffed for each referee
     games_reffed_stats = session.query(
         Game.referee_1_id.label('human_id'),
@@ -239,4 +243,4 @@ def run_aggregate_referee_stats():
         aggregate_referee_stats(session, aggregation_type='level', aggregation_id=level_id, names_to_filter_out=not_human_names)
 
 if __name__ == "__main__":
-    run_aggregate_referee_stats()
+    run_aggregate_referee_stats()

hockey_blast_common_lib/aggregate_skater_stats.py

@@ -65,6 +65,10 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
     else:
         raise ValueError("Invalid aggregation type")
 
+    # Delete existing items from the stats table
+    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
+    session.commit()
+
     # Apply aggregation window filter
     if aggregation_window:
         last_game_datetime_str = session.query(func.max(func.concat(Game.date, ' ', Game.time))).filter(filter_condition, Game.status.like('Final%')).scalar()
@@ -72,11 +76,10 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
         if start_datetime:
             game_window_filter = func.cast(func.concat(Game.date, ' ', Game.time), sqlalchemy.types.TIMESTAMP).between(start_datetime, last_game_datetime_str)
             filter_condition = filter_condition & game_window_filter
-
-    # Delete existing items from the stats table
-    session.query(StatsModel).filter(StatsModel.aggregation_id == aggregation_id).delete()
-    session.commit()
-
+        else:
+            #print(f"Warning: No valid start datetime for aggregation window '{aggregation_window}' for {aggregation_name}. No games will be included.")
+            return
+        
     # Filter for specific human_id if provided
     human_filter = []
     # if debug_human_id:

hockey_blast_common_lib/options.py

@@ -9,6 +9,7 @@ MIN_GAMES_FOR_LEVEL_STATS = 1
 orgs = {'caha', 'sharksice', 'tvice'}
 
 not_human_names = [
+    ("Home", None, None),
     ("Away", None, None),
     (None, "Unknown", None),
     ("Not", None , None),

hockey_blast_common_lib/utils.py

@@ -14,7 +14,8 @@ def get_org_id_from_alias(session, org_alias):
     predefined_organizations = [
         {"id": 1, "organization_name": "Sharks Ice", "alias": "sharksice", "website": "https://www.sharksice.com"},
         {"id": 2, "organization_name": "TriValley Ice", "alias": "tvice", "website": "https://www.trivalleyice.com"},
-        {"id": 3, "organization_name": "CAHA", "alias": "caha", "website": "https://www.caha.com"}
+        {"id": 3, "organization_name": "CAHA", "alias": "caha", "website": "https://www.caha.com"},
+        {"id": 4, "organization_name": "Tacoma Twin Rinks", "alias": "ttr", "website": "https://psicesports.com"},
     ]
 
     # Check if the organization exists
@@ -84,13 +85,22 @@ def get_fake_human_for_stats(session):
     return human.id
 
 def get_start_datetime(last_game_datetime_str, aggregation_window):
+    if aggregation_window == 'Weekly':
+        if last_game_datetime_str:
+            last_game_datetime = datetime.strptime(last_game_datetime_str, '%Y-%m-%d %H:%M:%S')
+            # Check if the last game datetime is over 1 week from now
+            if datetime.now() - last_game_datetime > timedelta(weeks=1):
+                return None
+        # Use current time as the start of the weekly window
+        return datetime.now() - timedelta(weeks=1)
     if last_game_datetime_str:
         last_game_datetime = datetime.strptime(last_game_datetime_str, '%Y-%m-%d %H:%M:%S')
         if aggregation_window == 'Daily':
+            # Check if the last game datetime is over 24 hours from now
+            if datetime.now() - last_game_datetime > timedelta(hours=24):
+                return None
             # From 10AM till midnight, 14 hours to avoid last day games
             return last_game_datetime - timedelta(hours=14)
-        elif aggregation_window == 'Weekly':
-            return last_game_datetime - timedelta(weeks=1)
     return None
 
 def assign_ranks(stats_dict, field, reverse_rank=False):

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

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

{hockey_blast_common_lib-0.1.48.dist-info → hockey_blast_common_lib-0.1.50.dist-info}/RECORD

@@ -1,24 +1,23 @@
 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=FcYL40NP0-sPY7UI7F8Ny_RaPKz3mfkmhQnPVbeRtOc,12178
-hockey_blast_common_lib/aggregate_human_stats.py,sha256=VmUAMbqtWRPFM64V8ECJ3eJjRXvblNbeVU9HFYNoPp0,23898
-hockey_blast_common_lib/aggregate_referee_stats.py,sha256=FszWLTygddDQNcUgbmevQ-eGPrW8Y0nXpRvUluPRKnU,11920
-hockey_blast_common_lib/aggregate_skater_stats.py,sha256=FBc6enJNnFXYg7mVPiXssleTA1vZRAXCTFUa-3eOGdo,17199
+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/find_leagues_seasons.py,sha256=abjzVsnaXXCLhzbTy7-6pDV_0LvXCJexuZVdIvc_DbI,2373
-hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=aueh_CTlfYKoztGlzGVWRgaEYQ4GsyMmmYOxxkdDHIE,1256769
+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=ejwDM2LVzeARlE5UwUNDt2Zzolat7OkXddhOZpzn1bw,823
+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=Sy5Pk40Tk3gsMrhMsUMlBD7i7jiVZmWLUBc94qI3zOA,5235
+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.48.dist-info/METADATA,sha256=tHKz1KFr43yKZLDk8zSEknKFrQeGRC7RJpRV2SfXu_o,318
-hockey_blast_common_lib-0.1.48.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.48.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.48.dist-info/RECORD,,
+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,,

hockey_blast_common_lib/find_leagues_seasons.py

@@ -1,53 +0,0 @@
-import time
-import json
-import os
-import requests
-from bs4 import BeautifulSoup
-
-def probe_leagues_and_seasons(min_league, max_league, min_season, max_season, interval_seconds, output_file):
-    results = []
-
-    for league_id in range(min_league, max_league + 1):
-        league_data = {"league": league_id, "seasons": set()}
-        for season_id in range(min_season, max_season + 1):
-            url = f"https://stats.sharksice.timetoscore.com/display-schedule.php?stat_class=1&league={league_id}&season={season_id}"
-            print(f"Probing URL: {url}")
-
-            try:
-                response = requests.get(url, timeout=10)
-                response.raise_for_status()
-                schedule_html = response.text
-
-                # Parse the schedule page to find all game links
-                soup = BeautifulSoup(schedule_html, "html.parser")
-                tables = soup.find_all('table')
-                top_level_tables = [table for table in tables if table.find_parent('table') is None]
-
-                if len(top_level_tables) > 0:
-                    print(f"Data found for league {league_id}, season {season_id}")
-                    league_data["seasons"].add(season_id)
-
-                    # Save the fetched HTML to a subfolder
-                    folder_path = os.path.join("schedules", f"league={league_id}", f"season={season_id}")
-                    os.makedirs(folder_path, exist_ok=True)
-                    with open(os.path.join(folder_path, "schedule.html"), "w") as f:
-                        f.write(schedule_html)
-                else:
-                    print(f"No data for league {league_id}, season {season_id}")
-            except Exception as e:
-                print(f"Error probing URL {url}: {e}")
-
-            # Wait for the specified interval before the next request
-            time.sleep(interval_seconds)
-
-        if league_data["seasons"]:
-            league_data["seasons"] = list(league_data["seasons"])  # Convert set to list for JSON serialization
-            results.append(league_data)
-
-    # Save results to a JSON file
-    with open(output_file, "w") as f:
-        json.dump(results, f, indent=4)
-    print(f"Results saved to {output_file}")
-
-# Example usage
-probe_leagues_and_seasons(min_league=1, max_league=70, min_season=1, max_season=70, interval_seconds=9, output_file="leagues_seasons_2_70_1_70.json")