hockey-blast-common-lib 0.1.18__tar.gz → 0.1.20__tar.gz

{hockey_blast_common_lib-0.1.18 → hockey_blast_common_lib-0.1.20}/PKG-INFO

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

hockey_blast_common_lib-0.1.20/hockey_blast_common_lib/db_connection.py

@@ -0,0 +1,44 @@
+import os
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+# Database connection parameters per organization
+DB_PARAMS = {
+    "frontend": {
+        "dbname": os.getenv("DB_NAME", "hockey_blast"),
+        "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))
+    },
+
+    "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))
+    },
+
+# 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? 
+    "boss": {
+        "dbname": os.getenv("DB_NAME_BOSS", "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))
+    },
+}
+
+def get_db_params(config_name):
+    if config_name not in DB_PARAMS:
+        raise ValueError(f"Invalid organization: {config_name}")
+    return DB_PARAMS[config_name]
+
+def create_session(config_name):
+    db_params = get_db_params(config_name)
+    db_url = f"postgresql://{db_params['user']}:{db_params['password']}@{db_params['host']}:{db_params['port']}/{db_params['dbname']}"
+    engine = create_engine(db_url)
+    Session = sessionmaker(bind=engine)
+    return Session()

{hockey_blast_common_lib-0.1.18 → hockey_blast_common_lib-0.1.20}/hockey_blast_common_lib/utils.py

@@ -82,8 +82,8 @@ def get_fake_human_for_stats(session):
 
     return human.id
 
-# TEST DB CONNECTION, PERMISSIONS...
+#TEST DB CONNECTION, PERMISSIONS...
 # from hockey_blast_common_lib.db_connection import create_session
-# session = create_session("hockey-blast-radonly")
+# session = create_session("frontend")
 # human_id = get_fake_human_for_stats(session)
 # print(f"Human ID: {human_id}")

{hockey_blast_common_lib-0.1.18 → hockey_blast_common_lib-0.1.20}/hockey_blast_common_lib.egg-info/PKG-INFO

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

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

hockey_blast_common_lib-0.1.18/hockey_blast_common_lib/db_connection.py

@@ -1,43 +0,0 @@
-# import psycopg2
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
-# Database connection parameters per organization
-DB_PARAMS = {
-    "frontend": {
-        "dbname": "hockey_blast",
-        "user": "frontend_user",
-        "password": "hockey-blast",
-        "host": "localhost",
-        "port": 5432
-    },
-
-    "frontend-sample-db": {
-        "dbname": "hockey_blast_sample",
-        "user": "frontend_user",
-        "password": "hockey-blast",
-        "host": "localhost",
-        "port": 5432
-    },
-
-    "boss": {
-        "dbname": "hockey_blast",
-        "user": "boss",
-        "password": "WrongPassword",
-        "host": "localhost",
-        "port": 5432
-    },
-
-}
-
-def get_db_params(config_name):
-    if config_name not in DB_PARAMS:
-        raise ValueError(f"Invalid organization: {config_name}")
-    return DB_PARAMS[config_name]
-
-def create_session(config_name):
-    db_params = get_db_params(config_name)
-    db_url = f"postgresql://{db_params['user']}:{db_params['password']}@{db_params['host']}:{db_params['port']}/{db_params['dbname']}"
-    engine = create_engine(db_url)
-    Session = sessionmaker(bind=engine)
-    return Session()