hockey-blast-common-lib 0.1.57__py3-none-any.whl → 0.1.59__py3-none-any.whl

hockey_blast_common_lib/aggregate_scorekeeper_stats.py

@@ -52,13 +52,14 @@ def calculate_quality_score(avg_max_saves_5sec, avg_max_saves_20sec, peak_max_sa
     return round(score, 2)
 
 def aggregate_scorekeeper_stats(session, aggregation_type, aggregation_id, names_to_filter_out, aggregation_window=None):
+    # Only process scorekeeper stats for ALL_ORGS_ID - skip individual organizations
+    # This prevents redundant processing when upstream logic calls with all organization IDs
+    if aggregation_type == 'org' and aggregation_id != ALL_ORGS_ID:
+        return  # Do nothing for individual organization IDs
+
     human_ids_to_filter = get_human_ids_by_names(session, names_to_filter_out)
 
     if aggregation_type == 'org':
-        # Only process scorekeeper stats for ALL_ORGS_ID - skip individual organizations
-        if aggregation_id != ALL_ORGS_ID:
-            return  # Skip processing for individual organization IDs
-
         aggregation_name = "All Orgs"
         filter_condition = sqlalchemy.true()  # No filter for organization
         print(f"Aggregating scorekeeper stats for {aggregation_name} with window {aggregation_window}...")
@@ -162,7 +163,6 @@ def aggregate_scorekeeper_stats(session, aggregation_type, aggregation_id, names
     assign_ranks(stats_dict, 'quality_score', reverse_rank=True)  # Lower is better (less problematic)
 
     # Insert aggregated stats into the appropriate table with progress output
-    total_items = len(stats_dict)
     batch_size = 1000
     for i, (key, stat) in enumerate(stats_dict.items(), 1):
         aggregation_id, human_id = key
@@ -203,20 +203,29 @@ def run_aggregate_scorekeeper_stats():
     session = create_session("boss")
     human_id_to_debug = None
 
-    # Process ALL_ORGS scorekeeper stats only (cross-organizational)
-    # Scorekeeper quality should be measured across all organizations they work for
-    if human_id_to_debug is None:
-        org_progress = create_progress_tracker(3, f"Processing cross-organizational scorekeeper stats")
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names)
-        org_progress.update(1)
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names, aggregation_window='Weekly')
-        org_progress.update(2)
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names, aggregation_window='Daily')
-        org_progress.update(3)
-    else:
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names)
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names, aggregation_window='Weekly')
-        aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=ALL_ORGS_ID, names_to_filter_out=not_human_names, aggregation_window='Daily')
+    # Get all org_id present in the Organization table (following goalie stats pattern)
+    # Individual org calls will be skipped by early exit, only ALL_ORGS_ID will process
+    from hockey_blast_common_lib.models import Organization
+    org_ids = session.query(Organization.id).all()
+    org_ids = [org_id[0] for org_id in org_ids]
+
+    # Add ALL_ORGS_ID to the list so it gets processed
+    org_ids.append(ALL_ORGS_ID)
+
+    for org_id in org_ids:
+        if human_id_to_debug is None:
+            org_name = "All Organizations" if org_id == ALL_ORGS_ID else session.query(Organization.organization_name).filter(Organization.id == org_id).scalar() or f"org_id {org_id}"
+            org_progress = create_progress_tracker(3, f"Processing scorekeeper stats for {org_name}")
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names)
+            org_progress.update(1)
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, aggregation_window='Weekly')
+            org_progress.update(2)
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, aggregation_window='Daily')
+            org_progress.update(3)
+        else:
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names)
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, aggregation_window='Weekly')
+            aggregate_scorekeeper_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, aggregation_window='Daily')
 
 if __name__ == "__main__":
     run_aggregate_scorekeeper_stats()

{hockey_blast_common_lib-0.1.57.dist-info → hockey_blast_common_lib-0.1.59.dist-info}/METADATA

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

{hockey_blast_common_lib-0.1.57.dist-info → hockey_blast_common_lib-0.1.59.dist-info}/RECORD

@@ -5,13 +5,13 @@ hockey_blast_common_lib/aggregate_h2h_stats.py,sha256=dC5TcJZGkpIQTiq3z40kOX6EjE
 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_scorekeeper_stats.py,sha256=bE7pjSgMi35r9hX6qqsH_r38zJ0DXSr9unb1nyL2Jlw,11722
+hockey_blast_common_lib/aggregate_scorekeeper_stats.py,sha256=Y0SSCBoujXNMs1_f-zn6odbLIrdTTkzOCpUyH40WBVs,12288
 hockey_blast_common_lib/aggregate_skater_stats.py,sha256=pA_2pDOGcJyEywISg2ySG8gFCuoLWwqw6a3Gm2wHLyo,23302
 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=B7MqFsTHYSi1HTIb5jV7xuIu1TTFlvoeMu7_lC-6n9E,4648905
+hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=AA_o6pBHsZy3WHVcnWkV8OTSLY2Iuw7Dzwt5sUDmWtE,4648908
 hockey_blast_common_lib/models.py,sha256=JMwQE1QgNkuWuKakxuHIlbEHfk8Z7GAYktCppCWA6LE,18928
 hockey_blast_common_lib/options.py,sha256=rQaLRYYcaxXrpZoXfUpmvsahC23oVGPEOzEpqtthbIQ,1794
 hockey_blast_common_lib/progress_utils.py,sha256=H_zRFOsb2qQQpGw56wJghZ1nUe_m6zqGeR9hZ33Y1Uo,3229
@@ -22,7 +22,7 @@ hockey_blast_common_lib/stats_models.py,sha256=64sUq_iWhNXi_b_V_1INuQ1RusKaTASju
 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.57.dist-info/METADATA,sha256=JDBDQSrlR8qwho-9RInI8J9XosXE_D5ZlISRqfyhSlU,318
-hockey_blast_common_lib-0.1.57.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.57.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.57.dist-info/RECORD,,
+hockey_blast_common_lib-0.1.59.dist-info/METADATA,sha256=HDEyhq9ACXCGaOUe5hBtvLUiEeMU1Ux1Ob78N_X18CE,318
+hockey_blast_common_lib-0.1.59.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.59.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.59.dist-info/RECORD,,