hockey-blast-common-lib 0.1.49__tar.gz → 0.1.50__tar.gz

{hockey_blast_common_lib-0.1.49 → hockey_blast_common_lib-0.1.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hockey-blast-common-lib
-Version: 0.1.49
+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.49 → hockey_blast_common_lib-0.1.50}/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-0.1.49 → hockey_blast_common_lib-0.1.50}/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-0.1.49 → hockey_blast_common_lib-0.1.50}/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-0.1.49 → hockey_blast_common_lib-0.1.50}/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-0.1.49 → hockey_blast_common_lib-0.1.50}/hockey_blast_common_lib/utils.py

@@ -85,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.49 → hockey_blast_common_lib-0.1.50}/hockey_blast_common_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hockey-blast-common-lib
-Version: 0.1.49
+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.49 → hockey_blast_common_lib-0.1.50}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hockey-blast-common-lib',  # The name of your package
-    version='0.1.49',
+    version='0.1.50',
     description='Common library for shared functionality and DB models',
     author='Pavel Kletskov',
     author_email='kletskov@gmail.com',