berryworld 1.0.0.185313__py3-none-any.whl → 1.0.0.188285__py3-none-any.whl

berryworld/credentials.py

@@ -6,7 +6,7 @@ load_dotenv(os.path.join(os.getcwd(), '.env'))
 
 
 class SQLCredentials:
-    def __init__(self, db_name, server_type=None, azure=None):
+    def __init__(self, db_name, server_type=None, azure=False):
         if db_name is None:
             raise ValueError("Please provide a value for db_name")
         self.db_name = db_name
@@ -18,21 +18,21 @@ class SQLCredentials:
             raise ValueError("Please provide a value for server_type")
 
         try:
-            if self.azure is not None:
-                if self.azure:
-                    server_name = os.environ.get(f"SQL_AZURE_{self.server_type.upper()}")
-                else:
-                    server_name = os.environ.get(f"SQL_ONPREM_{self.server_type.upper()}")
+            if self.azure is True:
+                server_name = os.environ["SQL_" + self.db_name.upper() + '_' + self.server_type.upper()]
+                db_name = os.environ["SQL_" + self.db_name.upper() + '_DB_NAME']
+                user_name = os.environ["SQL_" + self.db_name.upper() + '_USER_NAME']
+                password = os.environ["SQL_" + self.db_name.upper() + '_PASSWORD']
             else:
                 server_name = os.environ.get("SQL_" + self.db_name.upper() + '_' + self.server_type.upper())
 
-            if os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME_' + self.server_type.upper()) is not None:
-                db_name = os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME_' + self.server_type.upper())
-            else:
-                db_name = os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME')
+                if os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME_' + self.server_type.upper()) is not None:
+                    db_name = os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME_' + self.server_type.upper())
+                else:
+                    db_name = os.environ.get("SQL_" + self.db_name.upper() + '_DB_NAME')
 
-            user_name = os.environ.get("SQL_" + self.db_name.upper() + '_USER_NAME')
-            password = os.environ.get("SQL_" + self.db_name.upper() + '_PASSWORD')
+                user_name = os.environ.get("SQL_" + self.db_name.upper() + '_USER_NAME')
+                password = os.environ.get("SQL_" + self.db_name.upper() + '_PASSWORD')
 
             return {'server_name': re.sub(r'(\\)\1*', r'\1', server_name),
                     'db_name': db_name,

berryworld/sql_conn.py

@@ -48,7 +48,8 @@ class SQLConn:
             try:
                 db = kwargs['db_name']
                 server = kwargs['server_type']
-                server_creds = SQLCredentials(db, server_type=server).simple_creds()
+                azure = kwargs['azure'] if 'azure' in kwargs else False
+                server_creds = SQLCredentials(db, server_type=server, azure=azure).simple_creds()
             except KeyError:
                 raise KeyError('Please provide a valid db_name and server_type')
 

{berryworld-1.0.0.185313.dist-info → berryworld-1.0.0.188285.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.185313
+Version: 1.0.0.188285
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd
@@ -35,6 +35,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{berryworld-1.0.0.185313.dist-info → berryworld-1.0.0.188285.dist-info}/RECORD

@@ -4,7 +4,7 @@ berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_t
 berryworld/app_logs.py,sha256=MKzKPYd3JuPfOQNAapIgaeZeFHw1z_w2mbn9I6QCADE,4180
 berryworld/app_logs_query.py,sha256=U94b-z3X9cuY_KFozupUcfaYciXWBn7p_RHkoRsfROU,4376
 berryworld/cache_data.py,sha256=AWAhV4PPkilZ4Xb1pUXuuu6UdHICAx8QqDtb9rVnjDM,2254
-berryworld/credentials.py,sha256=L70ZzSNaS2mbHtSS8lb3iesd1XSwZNnUzGznlEKxlJY,11018
+berryworld/credentials.py,sha256=kt29wwzHn58diM98cs8S3o8C_tECBg1dsNfITKq3znM,11159
 berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
 berryworld/email_con.py,sha256=uSBzs_Ijz9pUPWt9e7U3TCB7i6q7hU1bB5vhsTB_tmw,14448
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
@@ -19,19 +19,19 @@ berryworld/postgres_connection.py,sha256=whKDnchd5Feqpmxpoh2vlyn36EKHR-dVEULYq0N
 berryworld/power_automate.py,sha256=Y11GoeDEwd3Y2RdvtPPhBSFK65APEceAQKtNo4gVLK4,26464
 berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/snowflake_conn.py,sha256=52ugfkyVCbR_Xr8YiZtNwPrwe93_1uE9uRy_VNPT6Gs,2428
-berryworld/sql_conn.py,sha256=3_uPrn3rJjVr7-9wcXkh0CSitFD2ncQGGZjttFl6ELM,47803
+berryworld/sql_conn.py,sha256=EMTYScZlDihMJvSWqKFqSLu9PUFUofaORW4nWrL2E6g,47888
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,4356
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
+berryworld-1.0.0.188285.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.185313.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
-berryworld-1.0.0.185313.dist-info/METADATA,sha256=55rXTm94wS30gdv7yrlGhfPCe2agFXxSAWNrFbYIKEc,1371
-berryworld-1.0.0.185313.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-berryworld-1.0.0.185313.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.185313.dist-info/RECORD,,
+berryworld-1.0.0.188285.dist-info/METADATA,sha256=Q1UIs8crwjsr3i5Y4c9sIuHXi8VZ2imzzIcV4EVo2wY,1393
+berryworld-1.0.0.188285.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+berryworld-1.0.0.188285.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.188285.dist-info/RECORD,,

{berryworld-1.0.0.185313.dist-info → berryworld-1.0.0.188285.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any