berryworld 1.0.0.194849__py3-none-any.whl → 1.0.0.195284__py3-none-any.whl

berryworld/sharepoint_con.py

@@ -1,4 +1,5 @@
 import os
+import ast
 import msal
 import urllib
 import requests
@@ -462,6 +463,8 @@ class SharepointConn:
         """
         if os.environ.get(f"SHAREPOINT-{env_name.upper()}") is None:
             raise ValueError(f'Sharepoint environment {env_name} not found in the environment variables')
+        else:
+            sp_creds = ast.literal_eval(os.environ.get(f"SHAREPOINT-{env_name.upper()}"))
 
         if api_version is None:
             self.api_version = 'v1.0'
@@ -469,15 +472,27 @@ class SharepointConn:
             self.api_version = api_version
 
         try:
-            self.client_id = os.environ.get(f"SHAREPOINT-AUTH").split(' ')[0]
-            self.organisation_id = os.environ.get(f"SHAREPOINT-AUTH").split(' ')[1]
+            self.client_id = sp_creds['client_id']
+            self.organisation_id = sp_creds['organization_id']
         except Exception as e:
             print(e)
-            raise ValueError(f"Sharepoint Auth not found in the environment variables")
+            raise ValueError(f"Auth not found in {env_name.upper()} SharePoint variable")
+
+        if 'site_name' not in sp_creds.keys():
+            raise ValueError(f"Site Name not provided for {env_name.upper()} SharePoint variable")
+        else:
+            self.env_name = sp_creds['site_name']
+
+        if 'user_name' not in sp_creds.keys():
+            raise ValueError(f"User Name not provided for {env_name.upper()} SharePoint variable")
+        else:
+            self.username = sp_creds['user_name']
+
+        if 'pwd' not in sp_creds.keys():
+            raise ValueError(f"Password not provided for {env_name.upper()} SharePoint variable")
+        else:
+            self.password = sp_creds['pwd']
 
-        self.env_name = os.environ.get(f"SHAREPOINT-{env_name.upper()}").split(' ')[0]
-        self.username = os.environ.get(f"SHAREPOINT-{env_name.upper()}").split(' ')[1]
-        self.password = os.environ.get(f"SHAREPOINT-{env_name.upper()}").split(' ')[2]
         self.scopes = ['Sites.ReadWrite.All', 'Files.ReadWrite.All']
 
         self.graph_url = f'https://graph.microsoft.com/{self.api_version}'

berryworld/snowflake_conn.py

@@ -1,4 +1,5 @@
 import os
+import ast
 import pandas as pd
 import snowflake.connector
 
@@ -16,29 +17,35 @@ class SnowflakeConn:
         self.server = server
 
         try:
-            snowflake_ref = os.environ.get("SNOWFLAKE-" + self.db_reference.upper() + '-' + self.server.upper())
-        except Exception:
-            raise Exception(f"Snowflake reference {self.db_reference} not found in the environment variables")
+            server_creds = os.environ.get(f"SQL-{self.db_reference.upper()}")
+            server_creds = ast.literal_eval(server_creds)
+        except Exception as e:
+            raise ValueError(f'Snowflake DB reference: {self.db_reference} not found. ERROR: {e}')
 
         try:
-            self.account = snowflake_ref.split(' ')[0]
-        except Exception:
-            raise Exception(f"Snowflake account not provided for Reference {self.db_reference}")
+            server_creds = server_creds[self.server.lower()]
+        except Exception as e:
+            raise ValueError(f'Server: {self.server} not found for Snowflake DB reference: {self.db_reference}. ERROR: {e}')
 
-        try:
-            self.db_name = snowflake_ref.split(' ')[1]
-        except Exception:
-            raise Exception(f"Snowflake db name not provided for Reference {self.db_reference}")
+        if 'server_name' not in server_creds.keys():
+            raise ValueError(f"Server name not provided for Snowflake {self.db_reference} on {self.server.upper()} server")
+        else:
+            self.account = server_creds['server_name']
 
-        try:
-            self.user_name = snowflake_ref.split(' ')[2]
-        except Exception:
-            raise Exception(f"Snowflake username not provided for Reference {self.db_reference}")
+        if 'db_name' not in server_creds.keys():
+            raise ValueError(f"Database name not provided for Snowflake {self.db_reference} on {self.server.upper()} server")
+        else:
+            self.db_name = server_creds['db_name']
 
-        try:
-            self.pw = snowflake_ref.split(' ')[3]
-        except Exception:
-            raise Exception(f"Snowflake password not provided for Reference {self.db_reference}")
+        if 'user_name' not in server_creds.keys():
+            raise ValueError(f"User name not provided for Snowflake {self.db_reference} on {self.server.upper()} server")
+        else:
+            self.user_name = server_creds['user_name']
+
+        if 'pwd' not in server_creds.keys():
+            raise ValueError(f"Password not provided for Snowflake {self.db_reference} on {self.server.upper()} server")
+        else:
+            self.pwd = server_creds['pwd']
 
         self.connect()
 
@@ -46,7 +53,7 @@ class SnowflakeConn:
         """ Open the connection to Snowflake """
         self.conn = snowflake.connector.connect(
             user=self.user_name,
-            password=self.pw,
+            password=self.pwd,
             account=self.account,
             database=self.db_name)
 

berryworld/sql_connenction.py

@@ -1,5 +1,6 @@
 import os
 import re
+import ast
 import math
 import pyodbc
 import traceback
@@ -75,24 +76,36 @@ class SQLConnection:
         """ Return the credentials used to connect to the SQL Server
         :return: Dictionary with the credentials used to connect to the SQL Server
         """
-        server_creds = os.environ.get(f"SQL-{self.db_reference.upper()}-{self.server.upper()}")
-        server_creds = server_creds.split(' ') if server_creds is not None else None
-        if server_creds is None:
-            raise ValueError(f"Credentials not registered for {self.db_reference} on {self.server.upper()} server")
-
-        server_name = server_creds[0]
-        if len(server_creds) > 1:
-            db_name = server_creds[1]
+        try:
+            server_creds = os.environ.get(f"SQL-{self.db_reference.upper()}")
+            server_creds = ast.literal_eval(server_creds)
+        except Exception as e:
+            raise ValueError(f'DB reference: {self.db_reference} not found. ERROR: {e}')
+
+        try:
+            server_creds = server_creds[self.server.lower()]
+        except Exception as e:
+            raise ValueError(f'Server: {self.server} not found for DB reference: {self.db_reference}. ERROR: {e}')
+
+        if 'server_name' not in server_creds.keys():
+            raise ValueError(f"Server name not provided for {self.db_reference} on {self.server.upper()} server")
         else:
+            server_name = server_creds['server_name']
+
+        if 'db_name' not in server_creds.keys():
             raise ValueError(f"Database name not provided for {self.db_reference} on {self.server.upper()} server")
-        if len(server_creds) > 2:
-            user_name = server_creds[2]
         else:
+            db_name = server_creds['db_name']
+
+        if 'user_name' not in server_creds.keys():
             raise ValueError(f"User name not provided for {self.db_reference} on {self.server.upper()} server")
-        if len(server_creds) > 3:
-            password = server_creds[3]
         else:
+            user_name = server_creds['user_name']
+
+        if 'pwd' not in server_creds.keys():
             raise ValueError(f"Password not provided for {self.db_reference} on {self.server.upper()} server")
+        else:
+            password = server_creds['pwd']
 
         return re.sub(r'(\\)\1*', r'\1', server_name), db_name, user_name, password
 

{berryworld-1.0.0.194849.dist-info → berryworld-1.0.0.195284.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.194849
+Version: 1.0.0.195284
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.194849.dist-info → berryworld-1.0.0.195284.dist-info}/RECORD

@@ -16,22 +16,22 @@ berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA
 berryworld/persistent_storage.py,sha256=L15kLyzN42T6UB1WAg8rFXJq3Mdb1M8Sw4P5YQaUN84,8711
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
 berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,27912
-berryworld/sharepoint_con.py,sha256=DSGiS1J_c2PHtGNaC6XkgY8WAFU3KMD6Wx-d723XOHU,44522
-berryworld/snowflake_conn.py,sha256=hhh8pxN3TSg3baJ61olC_oEROSE-yp3MKsG50llLglc,2708
+berryworld/sharepoint_con.py,sha256=nmyZJIcaAKJ6Y-ti4gQbvzA_rRbrMGIxTDXe4eP-tiI,44950
+berryworld/snowflake_conn.py,sha256=o0IQCfVM-xkVL9zI3i95hqH2Yw8PqmbwZLNS0wj50rU,3155
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=96df9s8C8OLKSUsWVChNiNUCRHHeas3Q-UnGoPmy7g8,48426
+berryworld/sql_connenction.py,sha256=FPlhDxy7Pp5caGoFcSi2fV32P58YCSzAqKimAHfUNkU,48862
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,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.194849.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.195284.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.194849.dist-info/METADATA,sha256=RXqIEQVv6XxS79EdDdmmP-KS_w-KGs0IUWemI9oTqsE,1445
-berryworld-1.0.0.194849.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.194849.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.194849.dist-info/RECORD,,
+berryworld-1.0.0.195284.dist-info/METADATA,sha256=68eicTgRce_a3WgLVZkuRvRTis2uf-2HLEwFJ6QlXU0,1445
+berryworld-1.0.0.195284.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.195284.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.195284.dist-info/RECORD,,