hockey-blast-common-lib 0.1.45__tar.gz → 0.1.47__tar.gz

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/PKG-INFO

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

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib/aggregate_all_stats.py

@@ -9,18 +9,18 @@ from hockey_blast_common_lib.aggregate_goalie_stats import run_aggregate_goalie_
 from hockey_blast_common_lib.aggregate_referee_stats import run_aggregate_referee_stats
 
 if __name__ == "__main__":
-    print("Running aggregate_human_stats...")
-    run_aggregate_human_stats()
-    print("Finished running aggregate_human_stats\n")
-
-    print("Running aggregate_skater_stats...")
+    print("Running aggregate_skater_stats...", flush=True)
     run_aggregate_skater_stats()
     print("Finished running aggregate_skater_stats\n")
 
-    print("Running aggregate_goalie_stats...")
+    print("Running aggregate_goalie_stats...", flush=True)
     run_aggregate_goalie_stats()
     print("Finished running aggregate_goalie_stats\n")
 
-    print("Running aggregate_referee_stats...")
+    print("Running aggregate_referee_stats...", flush=True)
     run_aggregate_referee_stats()
     print("Finished running aggregate_referee_stats\n")
+
+    print("Running aggregate_human_stats...", flush=True)
+    run_aggregate_human_stats()
+    print("Finished running aggregate_human_stats\n")

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib/aggregate_human_stats.py

@@ -440,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.47/hockey_blast_common_lib/find_leagues_seasons.py

@@ -0,0 +1,53 @@
+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")

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib/models.py

@@ -18,7 +18,7 @@ class Division(db.Model):
     league_number = db.Column(db.Integer) # TODO: Deprecate usage and remove (get this info through Season->League)
     season_number = db.Column(db.Integer) # TODO: Deprecate usage and remove (get this info from Season by season_id)
     season_id = db.Column(db.Integer, db.ForeignKey('seasons.id'))
-    level = db.Column(db.String(100)) # Obsolete, use skill_id instead
+    level = db.Column(db.String(100)) # Used to display original level name, however level_id may combine some levels with different name!
     level_id = db.Column(db.Integer, db.ForeignKey('levels.id')) # New field
     org_id = db.Column(db.Integer, db.ForeignKey('organizations.id'), nullable=False)
     __table_args__ = (

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib/restore_sample_db.sh

@@ -9,15 +9,22 @@ DB_PORT=${DB_PORT:-"5432"}
 COMPRESSED_DUMP_FILE="hockey_blast_sample_backup.sql.gz"
 
 # Superuser credentials
-SUPERUSER="boss"
-SUPERUSER_PASSWORD=${DB_PASSWORD_BOSS:-"your_superuser_password"}
+SUPERUSER="your_superuser"
+SUPERUSER_PASSWORD="your_superuser_password"
 
 # Export PGPASSWORD to avoid password prompt
 export PGPASSWORD=$SUPERUSER_PASSWORD
 
-# Drop the existing database if it exists
-psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$DB_NAME' AND pid <> pg_backend_pid();"
-psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="DROP DATABASE IF EXISTS $DB_NAME"
+# Generate a unique timestamp
+TIMESTAMP=$(date +%Y%m%d%H%M%S)
+BACKUP_DB_NAME="${DB_NAME}_backup_${TIMESTAMP}"
+
+# Check if the database exists and rename it if it does
+DB_EXISTS=$(psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --tuples-only --command="SELECT 1 FROM pg_database WHERE datname = '$DB_NAME'")
+if [ "$DB_EXISTS" = "1" ]; then
+  psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$DB_NAME' AND pid <> pg_backend_pid();"
+  psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="ALTER DATABASE $DB_NAME RENAME TO $BACKUP_DB_NAME"
+fi
 
 # Create a new database
 psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="CREATE DATABASE $DB_NAME OWNER $SUPERUSER"

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib.egg-info/PKG-INFO

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

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.47}/hockey_blast_common_lib.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ hockey_blast_common_lib/aggregate_skater_stats.py
 hockey_blast_common_lib/assign_skater_skill.py
 hockey_blast_common_lib/db_connection.py
 hockey_blast_common_lib/dump_sample_db.sh
+hockey_blast_common_lib/find_leagues_seasons.py
 hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz
 hockey_blast_common_lib/models.py
 hockey_blast_common_lib/options.py

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