berryworld 1.0.0.194033__py3-none-any.whl → 1.0.0.194147__py3-none-any.whl

berryworld/__init__.py

@@ -5,8 +5,8 @@ from .allocation_solver import AllocationSolver
 from .pickle_management import PickleManagement
 from .email_logging import EmailLogging
 from .verify_keys import Verify
-from .credentials import SnowflakeCredentials, SQLCredentials, BCCredentials, CDSCredentials, SharePointCredentials, \
-    WebServiceCredentials, MicrosoftTeamsCredentials
+from .credentials import SnowflakeCredentials, SQLCredentials, BCCredentials, WebServiceCredentials, \
+    MicrosoftTeamsCredentials
 from .persistent_storage import PersistentStorage
 from .generate_env import EnvVariables
 from .sharepoint_con import SharepointConnection

berryworld/credentials.py

@@ -97,73 +97,6 @@ class BCCredentials:
             raise ValueError("Variable %s not found" % str(e))
 
 
-class CDSCredentials:
-    def __init__(self, env_name, webhook=False, auth=False):
-        self.env_name = env_name
-        self.webhook = webhook
-        self.auth = auth
-
-    def simple_creds(self):
-        try:
-            if self.auth:
-                scope = os.environ.get("CDS_AUTH_SCOPE")
-                client_id = os.environ.get("CDS_AUTH_CLIENT_ID")
-                client_secret = os.environ.get("CDS_AUTH_CLIENT_SECRET")
-
-                return {'scope': scope,
-                        'client_id': client_id,
-                        'client_secret': client_secret}
-            else:
-                server = os.environ.get(f"CDS_ENV_SERVER_{self.env_name.upper()}")
-                organisation_id = os.environ.get(f"CDS_ENV_ORG_{self.env_name.upper()}")
-                environment_prefix = os.environ.get(f"CDS_ENV_PREFIX_{self.env_name.upper()}")
-                environment_url = os.environ.get(f"CDS_ENV_URL_{self.env_name.upper()}")
-                if self.webhook:
-                    environment_name = os.environ.get(f"CDS_ENV_NAME_{self.env_name.upper()}")
-                else:
-                    environment_name = self.env_name
-
-                return {'server': server,
-                        'environment_name': environment_name,
-                        'organisation_id': organisation_id,
-                        'environment_prefix': environment_prefix,
-                        'environment_url': environment_url}
-
-        except ValueError as e:
-            raise ValueError("Variable %s not found" % str(e))
-
-
-class SharePointCredentials:
-    def __init__(self, site=None):
-        self.site = site
-
-    def simple_creds(self):
-        try:
-            if self.site is None:
-                raise ValueError("Please provide a value for site")
-
-            client_id = os.environ.get(f"SHAREPOINT_CLIENT_ID_{self.site.upper()}")
-            scopes = os.environ.get(f"SHAREPOINT_SCOPES_{self.site.upper()}")
-            organisation_id = os.environ.get(f"SHAREPOINT_ORG_{self.site.upper()}")
-            username = os.environ.get(f"SHAREPOINT_USER_{self.site.upper()}")
-            password = os.environ.get(f"SHAREPOINT_PASSWORD_{self.site.upper()}")
-            site_id = os.environ.get(f"SHAREPOINT_SITE_ID_{self.site.upper()}")
-            site_name = os.environ.get(f"SHAREPOINT_SITE_NAME_{self.site.upper()}")
-            api_version = os.environ.get(f"SHAREPOINT_API_VERSION_{self.site.upper()}")
-
-            return {'client_id': client_id,
-                    'scopes': scopes,
-                    'organisation_id': organisation_id,
-                    'username': username,
-                    'password': password,
-                    'site_id': site_id,
-                    'site_name': site_name,
-                    'api_version': api_version}
-
-        except ValueError as e:
-            raise ValueError("Variable %s not found" % str(e))
-
-
 class WebServiceCredentials:
     def __init__(self, service=None):
         self.service = service

berryworld/sharepoint_con.py

@@ -29,10 +29,10 @@ class SharepointConnection:
                 self.api_version = api_version
 
             self.env_name = env_name
-            self.client_id = os.environ.get(f"SHAREPOINT_CLIENT_ID")
-            self.organisation_id = os.environ.get(f"SHAREPOINT_ORG_ID")
-            self.username = os.environ.get(f"SHAREPOINT_USER")
-            self.password = os.environ.get(f"SHAREPOINT_PASSWORD")
+            self.client_id = os.environ.get(f"SHAREPOINT-CLIENT-ID")
+            self.organisation_id = os.environ.get(f"SHAREPOINT-ORG-ID")
+            self.username = os.environ.get(f"SHAREPOINT-USER")
+            self.password = os.environ.get(f"SHAREPOINT-PASSWORD")
             self.scopes = ['Sites.ReadWrite.All', 'Files.ReadWrite.All']
 
         except ValueError as e:

berryworld/sql_connenction.py

@@ -13,8 +13,8 @@ from numbers import Number
 class SQLConnection:
     """ Connect to Microsoft SQL """
 
-    def __init__(self, db_reference, server, master=False, trusted_certificate=True, azure=False, encrypt=True,
-                 multi_db=False):
+    def __init__(self, db_reference, server, db_server=None, master=False, trusted_certificate=True, azure=False,
+                 encrypt=True, multi_db=False):
         """ Initialize the class
         It requires the
         SQL-DBREFERENCE-DBNAME = 'db name'
@@ -36,8 +36,9 @@ class SQLConnection:
         :param encrypt: Indicate whether the connection will use SSL/TLS encryption
         :param multi_db: Indicate whether the connection will be done to a specific database or to multiple databases
         """
-        self.db_reference = db_reference
+        self.db_reference = db_reference.replace("_", "") if "_" in db_reference else db_reference
         self.server = server
+        self.db_server = db_server
         if self.server is None:
             raise ValueError("Please provide a value for server parameter")
 
@@ -84,10 +85,13 @@ class SQLConnection:
         """ Return the credentials used to connect to the SQL Server
         :return: Dictionary with the credentials used to connect to the SQL Server
         """
-        if self.azure:
-            server_name = os.environ.get(f"SQL-{self.server.upper()}")
+        if self.db_server is not None:
+            server_name = self.db_server
         else:
-            server_name = os.environ.get(f"SQL-ONPREM-{self.server.upper()}")
+            if self.azure:
+                server_name = os.environ.get(f"SQL-{self.server.upper()}")
+            else:
+                server_name = os.environ.get(f"SQL-ONPREM-{self.server.upper()}")
 
         if os.environ.get("SQL-" + self.db_reference.upper() + '-DBNAME-' + self.server.upper()) is not None:
             db_name = os.environ.get("SQL-" + self.db_reference.upper() + '-DBNAME-' + self.server.upper())

{berryworld-1.0.0.194033.dist-info → berryworld-1.0.0.194147.dist-info}/METADATA

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

{berryworld-1.0.0.194033.dist-info → berryworld-1.0.0.194147.dist-info}/RECORD

@@ -1,10 +1,10 @@
-berryworld/__init__.py,sha256=-441T8nq6t3cSYeHweND8HAttfEcBfqij3PdbhhvoUw,1163
+berryworld/__init__.py,sha256=UEj9fbma07Y_b75dJIYMHcalwYuW7a5h7dxxb6mTINI,1124
 berryworld/aks_logs.py,sha256=Gb2_cokiZbEX01Yoptd0MxpDociaug-GrXdwliyxFBo,2293
 berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_ttQ,8513
 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=jJENjLE-qxR0yBtZPMPEOJ6H83bZeo4hI265AerwcUI,9540
+berryworld/credentials.py,sha256=Pc5HPJCI9G4MS9gUsXFBAQdLo8GJ_2jXuXIKrJ8sdaY,6649
 berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
 berryworld/email_con.py,sha256=uSBzs_Ijz9pUPWt9e7U3TCB7i6q7hU1bB5vhsTB_tmw,14448
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
@@ -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=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
+berryworld/sharepoint_con.py,sha256=_P9m6OydNbm7tCtdMGfF5KRif2eooCcSW3tKbdYr2R4,22254
 berryworld/snowflake_conn.py,sha256=go5ZJjnhz5SkG83B0G0XZSwKgU6tg7AFTBso59oRG5M,2434
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=iFGQHs3QQ7jnLwmhPpnFqI7DFHHE5UuWCfq_QW3SM7U,48349
+berryworld/sql_connenction.py,sha256=qdR2ar9z1cJfSL84kYhvUkzHi7Gc91y9ctGWwFX3Dow,48568
 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.194033.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.194147.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.194033.dist-info/METADATA,sha256=kI9FpxxzWBgrbA2HblYhdaf_8WEZeO7ybxESqGnRDKA,1445
-berryworld-1.0.0.194033.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.194033.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.194033.dist-info/RECORD,,
+berryworld-1.0.0.194147.dist-info/METADATA,sha256=nyHuqH2vicEcwtzowLxm2MEmnD8wok3x1J5LzHC5gnc,1445
+berryworld-1.0.0.194147.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.194147.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.194147.dist-info/RECORD,,