hockey-blast-common-lib 0.1.37__tar.gz → 0.1.39__tar.gz

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/PKG-INFO

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

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib/aggregate_goalie_stats.py

@@ -15,22 +15,20 @@ from hockey_blast_common_lib.utils import get_org_id_from_alias, get_human_ids_b
 from hockey_blast_common_lib.utils import assign_ranks
 from sqlalchemy import func, case, and_
 from collections import defaultdict
+from hockey_blast_common_lib.stats_utils import ALL_ORGS_ID
 
 def aggregate_goalie_stats(session, aggregation_type, aggregation_id, names_to_filter_out, debug_human_id=None, aggregation_window=None):
     human_ids_to_filter = get_human_ids_by_names(session, names_to_filter_out)
 
     # Get the name of the aggregation, for debug purposes
     if aggregation_type == 'org':
-        aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+        if aggregation_id == ALL_ORGS_ID:
+            aggregation_name = "All Orgs"
+            filter_condition = sqlalchemy.true()  # No filter for organization
+        else:
+            aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+            filter_condition = Game.org_id == aggregation_id
         print(f"Aggregating goalie stats for {aggregation_name} with window {aggregation_window}...")
-    elif aggregation_type == 'division':
-        aggregation_name = session.query(Division).filter(Division.id == aggregation_id).first().level
-    elif aggregation_type == 'level':
-        aggregation_name = session.query(Level).filter(Level.id == aggregation_id).first().level_name
-    else:
-        aggregation_name = "Unknown"
-
-    if aggregation_type == 'org':
         if aggregation_window == 'Daily':
             StatsModel = OrgStatsDailyGoalie
         elif aggregation_window == 'Weekly':
@@ -38,7 +36,6 @@ def aggregate_goalie_stats(session, aggregation_type, aggregation_id, names_to_f
         else:
             StatsModel = OrgStatsGoalie
         min_games = MIN_GAMES_FOR_ORG_STATS
-        filter_condition = Game.org_id == aggregation_id
     elif aggregation_type == 'division':
         if aggregation_window == 'Daily':
             StatsModel = DivisionStatsDailyGoalie

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib/aggregate_human_stats.py

@@ -14,13 +14,19 @@ from hockey_blast_common_lib.options import parse_args, MIN_GAMES_FOR_ORG_STATS,
 from hockey_blast_common_lib.utils import get_fake_human_for_stats, get_org_id_from_alias, get_human_ids_by_names, get_division_ids_for_last_season_in_all_leagues, get_all_division_ids_for_org
 from hockey_blast_common_lib.utils import assign_ranks
 from hockey_blast_common_lib.utils import get_start_datetime
+from hockey_blast_common_lib.stats_utils import ALL_ORGS_ID
 
 def aggregate_human_stats(session, aggregation_type, aggregation_id, names_to_filter_out, human_id_filter=None, aggregation_window=None):
     human_ids_to_filter = get_human_ids_by_names(session, names_to_filter_out)
 
     if aggregation_type == 'org':
-        aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
-        print(f"Aggregating goalie stats for {aggregation_name} with window {aggregation_window}...")
+        if aggregation_id == ALL_ORGS_ID:
+            aggregation_name = "All Orgs"
+            filter_condition = sqlalchemy.true()  # No filter for organization
+        else:
+            aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+            filter_condition = Game.org_id == aggregation_id
+        print(f"Aggregating human stats for {aggregation_name} with window {aggregation_window}...")
         if aggregation_window == 'Daily':
             StatsModel = OrgStatsDailyHuman
         elif aggregation_window == 'Weekly':
@@ -28,7 +34,6 @@ def aggregate_human_stats(session, aggregation_type, aggregation_id, names_to_fi
         else:
             StatsModel = OrgStatsHuman
         min_games = MIN_GAMES_FOR_ORG_STATS
-        filter_condition = Game.org_id == aggregation_id
     elif aggregation_type == 'division':
         if aggregation_window == 'Daily':
             StatsModel = DivisionStatsDailyHuman
@@ -417,7 +422,7 @@ def run_aggregate_human_stats():
     org_ids = session.query(Organization.id).all()
     org_ids = [org_id[0] for org_id in org_ids]
 
-    for org_id in org_ids:
+    for org_id in [-1]:#org_ids:
         division_ids = get_all_division_ids_for_org(session, org_id)
         print(f"Aggregating human stats for {len(division_ids)} divisions in org_id {org_id}...")
         total_divisions = len(division_ids)
@@ -435,17 +440,17 @@ def run_aggregate_human_stats():
         aggregate_human_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug, aggregation_window='Daily')
         
         # Aggregate by level
-    level_ids = session.query(Division.level_id).distinct().all()
-    level_ids = [level_id[0] for level_id in level_ids]
-    total_levels = len(level_ids)
-    processed_levels = 0
-    for level_id in level_ids:
-        if level_id is None:
-            continue
-        if human_id_to_debug is None:
-            print(f"\rProcessed {processed_levels}/{total_levels} levels ({(processed_levels/total_levels)*100:.2f}%)", end="")
-        processed_levels += 1
-        aggregate_human_stats(session, aggregation_type='level', aggregation_id=level_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug)
+    # level_ids = session.query(Division.level_id).distinct().all()
+    # level_ids = [level_id[0] for level_id in level_ids]
+    # total_levels = len(level_ids)
+    # processed_levels = 0
+    # for level_id in level_ids:
+    #     if level_id is None:
+    #         continue
+    #     if human_id_to_debug is None:
+    #         print(f"\rProcessed {processed_levels}/{total_levels} levels ({(processed_levels/total_levels)*100:.2f}%)", end="")
+    #     processed_levels += 1
+    #     aggregate_human_stats(session, aggregation_type='level', aggregation_id=level_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug)
 
 if __name__ == "__main__":
     run_aggregate_human_stats()

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib/aggregate_referee_stats.py

@@ -14,12 +14,18 @@ from hockey_blast_common_lib.options import parse_args, MIN_GAMES_FOR_ORG_STATS,
 from hockey_blast_common_lib.utils import get_org_id_from_alias, get_human_ids_by_names, get_division_ids_for_last_season_in_all_leagues, get_all_division_ids_for_org
 from hockey_blast_common_lib.utils import assign_ranks
 from hockey_blast_common_lib.utils import get_start_datetime
+from hockey_blast_common_lib.stats_utils import ALL_ORGS_ID
 
 def aggregate_referee_stats(session, aggregation_type, aggregation_id, names_to_filter_out, aggregation_window=None):
     human_ids_to_filter = get_human_ids_by_names(session, names_to_filter_out)
 
     if aggregation_type == 'org':
-        aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+        if aggregation_id == ALL_ORGS_ID:
+            aggregation_name = "All Orgs"
+            filter_condition = sqlalchemy.true()  # No filter for organization
+        else:
+            aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+            filter_condition = Game.org_id == aggregation_id
         print(f"Aggregating referee stats for {aggregation_name} with window {aggregation_window}...")
         if aggregation_window == 'Daily':
             StatsModel = OrgStatsDailyReferee
@@ -28,7 +34,6 @@ def aggregate_referee_stats(session, aggregation_type, aggregation_id, names_to_
         else:
             StatsModel = OrgStatsReferee
         min_games = MIN_GAMES_FOR_ORG_STATS
-        filter_condition = Game.org_id == aggregation_id
     elif aggregation_type == 'division':
         if aggregation_window == 'Daily':
             StatsModel = DivisionStatsDailyReferee

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib/aggregate_skater_stats.py

@@ -15,16 +15,21 @@ from hockey_blast_common_lib.utils import get_org_id_from_alias, get_human_ids_b
 from hockey_blast_common_lib.utils import get_start_datetime
 from sqlalchemy import func, case, and_
 from collections import defaultdict
+from hockey_blast_common_lib.stats_utils import ALL_ORGS_ID
 
 def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_filter_out, debug_human_id=None, aggregation_window=None):
     human_ids_to_filter = get_human_ids_by_names(session, names_to_filter_out)
 
     # Get the name of the aggregation, for debug purposes
     if aggregation_type == 'org':
-        aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+        if aggregation_id == ALL_ORGS_ID:
+            aggregation_name = "All Orgs"
+            filter_condition = sqlalchemy.true()  # No filter for organization
+        else:
+            aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
+            filter_condition = Game.org_id == aggregation_id
         print(f"Aggregating skater stats for {aggregation_name} with window {aggregation_window}...")
 
-        aggregation_name = session.query(Organization).filter(Organization.id == aggregation_id).first().organization_name
     elif aggregation_type == 'division':
         aggregation_name = session.query(Division).filter(Division.id == aggregation_id).first().level
     elif aggregation_type == 'level':
@@ -40,7 +45,6 @@ def aggregate_skater_stats(session, aggregation_type, aggregation_id, names_to_f
         else:
             StatsModel = OrgStatsSkater
         min_games = MIN_GAMES_FOR_ORG_STATS
-        filter_condition = Game.org_id == aggregation_id
     elif aggregation_type == 'division':
         if aggregation_window == 'Daily':
             StatsModel = DivisionStatsDailySkater
@@ -278,7 +282,7 @@ def run_aggregate_skater_stats():
         aggregate_skater_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, debug_human_id=human_id_to_debug, aggregation_window='Weekly')
         aggregate_skater_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, debug_human_id=human_id_to_debug, aggregation_window='Daily')
         
-        # Aggregate by level
+    # Aggregate by level
     level_ids = session.query(Division.level_id).distinct().all()
     level_ids = [level_id[0] for level_id in level_ids]
     total_levels = len(level_ids)

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib/models.py

@@ -350,6 +350,7 @@ class RequestLog(db.Model):
     client_ip = db.Column(db.String, nullable=False)
     path = db.Column(db.String, nullable=False)
     timestamp = db.Column(db.DateTime, nullable=False)
+    cgi_params = db.Column(db.String, nullable=True)
 
 # # MANUAL AMENDS HAPPEN HERE :)
 # from db_connection import create_session

hockey_blast_common_lib-0.1.39/hockey_blast_common_lib/stats_utils.py

@@ -0,0 +1,6 @@
+def assign_ranks(stats_dict, field, reverse_rank=False):
+    sorted_stats = sorted(stats_dict.items(), key=lambda x: x[1][field], reverse=not reverse_rank)
+    for rank, (key, stat) in enumerate(sorted_stats, start=1):
+        stats_dict[key][f'{field}_rank'] = rank
+
+ALL_ORGS_ID = -1

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/hockey_blast_common_lib.egg-info/PKG-INFO

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

{hockey_blast_common_lib-0.1.37 → hockey_blast_common_lib-0.1.39}/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.37',
+    version='0.1.39',
     description='Common library for shared functionality and DB models',
     author='Pavel Kletskov',
     author_email='kletskov@gmail.com',