hockey-blast-common-lib 0.1.44__py3-none-any.whl → 0.1.46__py3-none-any.whl

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/dump_sample_db.sh

@@ -14,6 +14,10 @@ export PGPASSWORD=$DB_PASSWORD
 
 # Dump the database schema and data
 pg_dump --username=$DB_USER --host=$DB_HOST --port=$DB_PORT --format=custom --file=$DUMP_FILE $DB_NAME
+if [ $? -ne 0 ]; then
+  echo "Error: Database dump failed."
+  exit 1
+fi
 
 # Compress the backup file
 gzip -c $DUMP_FILE > $COMPRESSED_DUMP_FILE

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.44.dist-info → hockey_blast_common_lib-0.1.46.dist-info}/METADATA

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

{hockey_blast_common_lib-0.1.44.dist-info → hockey_blast_common_lib-0.1.46.dist-info}/RECORD

@@ -1,23 +1,23 @@
 hockey_blast_common_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hockey_blast_common_lib/aggregate_all_stats.py,sha256=MUjT23mdOMfCTx-kRSY-LGrLHZ9HNlR6OMqv5KLdzR4,1056
 hockey_blast_common_lib/aggregate_goalie_stats.py,sha256=FcYL40NP0-sPY7UI7F8Ny_RaPKz3mfkmhQnPVbeRtOc,12178
-hockey_blast_common_lib/aggregate_human_stats.py,sha256=6cDoiJ0xZ3aQ4wjEAP_Jgu2aNEicnuU-a22BncSFtRo,23920
+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/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=MHPA-Ciod7wsvAlMbRtXFiyajgnEqU1xR59sJQ9UWR0,738
-hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=-2Bb7gCHENn3iWQtSWv6_WSVPBp8TxhGKRPfRjRoolg,51
+hockey_blast_common_lib/dump_sample_db.sh,sha256=MY3lnzTXBoWd76-ZlZr9nWsKMEVgyRsUn-LZ2d1JWZs,810
+hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=EqpH7UlG-5L4FXnMDNpafIZbwUpDPPr3uIIJipBV880,1256779
 hockey_blast_common_lib/models.py,sha256=xne38KwdBDcWvzdLyU6toozqkuatB9wiQhyiQ4xvAgU,16413
 hockey_blast_common_lib/options.py,sha256=ejwDM2LVzeARlE5UwUNDt2Zzolat7OkXddhOZpzn1bw,823
-hockey_blast_common_lib/restore_sample_db.sh,sha256=-Bl0QUhJrGtwpPE646AVe3y9vON8hiNdYNoulhi7wgA,1872
+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/wsgi.py,sha256=7LGUzioigviJp-EUhSEaQcd4jBae0mxbkyBscQfZhlc,730
-hockey_blast_common_lib-0.1.44.dist-info/METADATA,sha256=aPLkaerjW5lrzwEBD5xqfqNfXp1fTolx_iyawCKKMG4,318
-hockey_blast_common_lib-0.1.44.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.44.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.44.dist-info/RECORD,,
+hockey_blast_common_lib-0.1.46.dist-info/METADATA,sha256=mcYIRcZadOh_NKp-NXSx6rn5FZ2jEDNApYB8IfaUmHI,318
+hockey_blast_common_lib-0.1.46.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.46.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.46.dist-info/RECORD,,