hockey-blast-common-lib 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

hockey_blast_common_lib/db_connection.py

@@ -1,6 +1,10 @@
 import os
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
+from dotenv import load_dotenv
+
+# Load environment variables from .env file in the root directory of THE PROJECT (not this library)
+load_dotenv()
 
 # Database connection parameters per organization
 DB_PARAMS = {
@@ -14,20 +18,20 @@ DB_PARAMS = {
 
     "frontend-sample-db": {
         "dbname": os.getenv("DB_NAME_SAMPLE", "hockey_blast_sample"),
-        "user": os.getenv("DB_USER_SAMPLE", "frontend_user"),
-        "password": os.getenv("DB_PASSWORD_SAMPLE", "hockey-blast"),
-        "host": os.getenv("DB_HOST_SAMPLE", "localhost"),
-        "port": int(os.getenv("DB_PORT_SAMPLE", 5432))
+        "user": os.getenv("DB_USER", "frontend_user"),
+        "password": os.getenv("DB_PASSWORD", "hockey-blast"),
+        "host": os.getenv("DB_HOST", "localhost"),
+        "port": int(os.getenv("DB_PORT", 5432))
     },
 
-# TODO - the section below is just to handle recovery of sample DB where boss user is present
-# Maybe figure out a way to do backup without it and make frontend_user own the sample? 
+# The section below is to handle recovery of sample DB where boss user is present, to avoid warnings and errors
+# TODO: Maybe figure out a way to do backup without it and make frontend_user own the sample? 
     "boss": {
-        "dbname": os.getenv("DB_NAME_BOSS", "hockey_blast"),
+        "dbname": os.getenv("DB_NAME", "hockey_blast"),
         "user": os.getenv("DB_USER_BOSS", "boss"),
         "password": os.getenv("DB_PASSWORD_BOSS", "boss"),
-        "host": os.getenv("DB_HOST_BOSS", "localhost"),
-        "port": int(os.getenv("DB_PORT_BOSS", 5432))
+        "host": os.getenv("DB_HOST", "localhost"),
+        "port": int(os.getenv("DB_PORT", 5432))
     },
 }
 

{hockey_blast_common_lib-0.1.23.dist-info → hockey_blast_common_lib-0.1.25.dist-info}/METADATA

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

{hockey_blast_common_lib-0.1.23.dist-info → hockey_blast_common_lib-0.1.25.dist-info}/RECORD

@@ -3,7 +3,7 @@ hockey_blast_common_lib/aggregate_goalie_stats.py,sha256=d2qav46Rg2DNIYRj_Ubj1kp
 hockey_blast_common_lib/aggregate_human_stats.py,sha256=88OMhTgQjzc9xIakf6kW9_lZwbSXkpsZy8C0pX-Wlq8,14229
 hockey_blast_common_lib/aggregate_referee_stats.py,sha256=A0PTyEbPUjqfXxlJCDOVioFaQk9AyjjhiWEuRuu35v0,11036
 hockey_blast_common_lib/aggregate_skater_stats.py,sha256=37fhgej9trukr8cGaK7DT1HoxBcp95qwsypYCCziqqc,15563
-hockey_blast_common_lib/db_connection.py,sha256=9jRHXXQr1KLIsV416O0uVrJTmhXPAVBCQ8Vxt55Hfus,1763
+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=JIk9FeWrEqHvmTLeueJtSkK2mNpg_xtonAMHDKlYe-4,1033693
 hockey_blast_common_lib/models.py,sha256=GqQIGpanmFub97BoYCuaqDov2MxM4LMesUTxZ2edpvw,15393
@@ -12,7 +12,7 @@ hockey_blast_common_lib/restore_sample_db.sh,sha256=u2zKazC6vNMULkpYzI64nlneCWaG
 hockey_blast_common_lib/stats_models.py,sha256=PI-mL1jmjCHLAvaATxSsjHEn05g9L_reA_YpsITPWjQ,21047
 hockey_blast_common_lib/utils.py,sha256=odDJWCK0BgbResXeoUzxbVChjaxcXr168ZxbrAw3L_8,3752
 hockey_blast_common_lib/wsgi.py,sha256=wl1gf3KtaGSnYbCF5Z2xWwRXNSTQp43HoyhCAKJibI4,750
-hockey_blast_common_lib-0.1.23.dist-info/METADATA,sha256=I6TpCdJkFk3KhF_ymFJlm_hFgjh7al98vMa3TPEN_tw,318
-hockey_blast_common_lib-0.1.23.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.23.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.23.dist-info/RECORD,,
+hockey_blast_common_lib-0.1.25.dist-info/METADATA,sha256=0gW2JaFkqrFFyaNeaMRsKYxRWMkI_rdzf7oxF1vN_mk,318
+hockey_blast_common_lib-0.1.25.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.25.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.25.dist-info/RECORD,,