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

berryworld/__init__.py

@@ -3,10 +3,9 @@ from .handy_mix import HandyMix, URLResolver
 from .transportation_solver import TransportationAlgorithm
 from .allocation_solver import AllocationSolver
 from .pickle_management import PickleManagement
-from .postgres_connection import Postgresql
 from .email_logging import EmailLogging
 from .verify_keys import Verify
-from .credentials import PostgresCredentials, SnowflakeCredentials, SQLCredentials, BCCredentials, CDSCredentials, SharePointCredentials, \
+from .credentials import SnowflakeCredentials, SQLCredentials, BCCredentials, CDSCredentials, SharePointCredentials, \
     WebServiceCredentials, MicrosoftTeamsCredentials
 from .persistent_storage import PersistentStorage
 from .generate_env import EnvVariables

berryworld/credentials.py

@@ -71,40 +71,6 @@ class SQLCredentials:
             raise ValueError("Variable %s not found" % str(e))
 
 
-class PostgresCredentials:
-    def __init__(self, db_name, server_type=None):
-        if db_name is None:
-            raise ValueError("Please provide a value for db_name")
-        self.db_name = db_name
-        self.server_type = server_type
-
-    def simple_creds(self):
-        if self.server_type is None:
-            raise ValueError("Please provide a value for server_type")
-
-        try:
-            if os.name == 'nt':
-                server_name = os.environ.get(
-                    "POSTGRESQL_" + self.db_name.upper() + '_' + self.server_type.upper() + '_LOCAL_SERVER_NAME')
-            else:
-                server_name = os.environ.get(
-                    "POSTGRESQL_" + self.db_name.upper() + '_' + self.server_type.upper() + '_SERVER_NAME')
-
-            db_name = os.environ.get(
-                "POSTGRESQL_" + self.db_name.upper() + '_' + self.server_type.upper() + '_DB_NAME')
-            user_name = os.environ.get(
-                "POSTGRESQL_" + self.db_name.upper() + '_' + self.server_type.upper() + '_USER_NAME')
-            password = os.environ.get(
-                "POSTGRESQL_" + self.db_name.upper() + '_' + self.server_type.upper() + '_PASSWORD')
-
-            return {'server_name': re.sub(r'(\\)\1*', r'\1', server_name),
-                    'db_name': db_name,
-                    'user_name': user_name,
-                    'password': password}
-        except ValueError as e:
-            raise ValueError("Variable %s not found" % str(e))
-
-
 class BCCredentials:
     def __init__(self, db_name=None, auth=False):
         self.db_name = db_name

{berryworld-1.0.0.185313.dist-info → berryworld-1.0.0.188349.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.188349
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd
@@ -17,7 +17,6 @@ Requires-Dist: numpy>=1.25.2
 Requires-Dist: opencensus>=0.11.0
 Requires-Dist: opencensus_ext_azure>=1.1.7
 Requires-Dist: pandas>=1.4.2
-Requires-Dist: psycopg2>=2.8.6
 Requires-Dist: pyodbc>=4.0.39
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: PyYAML>=6.0
@@ -35,6 +34,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.188349.dist-info}/RECORD

@@ -1,10 +1,10 @@
-berryworld/__init__.py,sha256=FxoH2n864zRK6cVG47s8ciwDldfMB3zVzfa3ZRwtLWk,1185
+berryworld/__init__.py,sha256=WJKsOTkpDuQqBU-MppW2YNdRLnEZ8Q7giOvNI4orCi0,1120
 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=L70ZzSNaS2mbHtSS8lb3iesd1XSwZNnUzGznlEKxlJY,11018
+berryworld/credentials.py,sha256=jJENjLE-qxR0yBtZPMPEOJ6H83bZeo4hI265AerwcUI,9540
 berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
 berryworld/email_con.py,sha256=uSBzs_Ijz9pUPWt9e7U3TCB7i6q7hU1bB5vhsTB_tmw,14448
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
@@ -15,7 +15,6 @@ berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,1459
 berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA,16030
 berryworld/persistent_storage.py,sha256=KQA57ez8eVTUCtudYkHPg_S5lcOEa_E7xXcaN1DYMMc,8601
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
-berryworld/postgres_connection.py,sha256=whKDnchd5Feqpmxpoh2vlyn36EKHR-dVEULYq0N_4wA,8287
 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
@@ -26,12 +25,12 @@ berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,435
 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.188349.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.188349.dist-info/METADATA,sha256=IQNILK3na6R8NKy5LsS7k4mRTciBjh9mJjsdlVI-Sv0,1362
+berryworld-1.0.0.188349.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+berryworld-1.0.0.188349.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.188349.dist-info/RECORD,,

{berryworld-1.0.0.185313.dist-info → berryworld-1.0.0.188349.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
 

berryworld/postgres_connection.py

@@ -1,205 +0,0 @@
-import re
-import pandas as pd
-import psycopg2
-from .credentials import PostgresCredentials
-
-
-class Postgresql:
-    def __init__(self, server_creds=None, elastic_pool=False, sslrootcert=None, **kwargs):
-        """ Initialize the class
-        -----------------------------
-        server_creds = {
-                        "server_name": "",
-                        "db_name": "",
-                        "user_name": "",
-                        "password": ""
-                        }
-
-        con_ = SQLConnection(server_creds)
-        -----------------------------
-        :param server_creds: Dictionary containing the info to connect to the Postgres Server
-        :param elastic_pool: Connection to the Elastic Pool in the service or local connection
-        :param sslrootcert: Path to local ssl root certificate
-        :param kwargs: Additional parameters to be passed to the connection
-        """
-        if (kwargs == {}) & (server_creds is None):
-            raise ValueError('Please provide a valid server_creds or kwargs')
-
-        if elastic_pool:
-            self.sslmode = None
-        else:
-            self.sslmode = 'require'
-
-        self.sslrootcert = sslrootcert
-        self.conn_str = None
-        self.conn = None
-        self.cur = None
-
-        if kwargs != {}:
-            try:
-                db = kwargs['db_name']
-                server = kwargs['server_type']
-                server_creds = PostgresCredentials(db, server_type=server).simple_creds()
-            except KeyError:
-                raise KeyError('Please provide a valid db_name and server_type')
-
-        self.server = server_creds['server_name']
-        self.db = server_creds['db_name']
-        self.user = server_creds['user_name']
-        self.pw = server_creds['password']
-
-    def connect(self):
-        """ Open the connection to Postgresql """
-        """
-        If sslmode is required connect direct to the server with ssl certificate, else connect to Postgres Elasticpool
-        without specifying sslmode as the certificate is defined within the kubernetes env with server_tls_sslmode 
-        """
-        if self.sslmode:
-            if self.sslrootcert:
-                self.conn_str = "dbname='%s' user='%s' host='%s' password='%s' port='5432' " \
-                                "sslmode='%s' sslrootcert='%s' " % (
-                                    self.db, self.user, self.server, self.pw, self.sslmode, self.sslrootcert)
-
-            else:
-                self.conn_str = "dbname='%s' user='%s' host='%s' password='%s' port='5432' sslmode='%s' " % (
-                    self.db, self.user, self.server, self.pw, self.sslmode)
-
-        else:
-            self.conn_str = "dbname='%s' user='%s' host='%s' password='%s' port='5432' " % (
-                self.db, self.user, self.server, self.pw)
-
-        self.conn = psycopg2.connect(self.conn_str)
-
-    def close(self):
-        """ Close the connection to Postgresql """
-        self.conn.close()
-
-    @staticmethod
-    def _chunker(seq, size):
-        """ Split the data set in chunks to be sent to SQL
-        :param seq: Sequence of records to be split
-        :param size: Size of any of the chunks to split the data
-        :return: The DataFrame divided in chunks
-        """
-        return (seq[pos:pos + size] for pos in range(0, len(seq), size))
-
-    @staticmethod
-    def convert_decimal_str(string):
-        """ Method to parse the Decimal type in python
-        :param string: String variable to parse
-        """
-        string = re.sub("'\)(?!(,[ ]+\())(?=([^$]))", "", string)
-        return re.sub("Decimal\('", "", string)
-
-    def query(self, sql_query):
-        """ Read data from Postgres SQL according to the sql_query
-        -----------------------------
-        query_str = "SELECT * FROM %s" & table
-        con_.query(query_str)
-        -----------------------------
-        :param sql_query: Query to be sent to SQL
-        :return: DataFrame gathering the requested data
-        """
-        cursor = None
-        self.connect()
-        try:
-            cursor = self.conn.cursor()
-            cursor.execute(sql_query)
-            rows = cursor.fetchall()
-            col_names = [desc[0] for desc in cursor.description]
-            result = pd.DataFrame(rows, columns=col_names)
-            return result
-        except Exception as e:
-            raise Exception(e)
-        finally:
-            if cursor:
-                cursor.close()
-            self.close()
-
-    def run_statement(self, statement):
-        """ Execute SQL statement
-        -----------------------------
-        query_str = "DELETE FROM %s WHERE Id > 100" & table
-        con_.run_statement(query_str)
-        -----------------------------
-        :param statement: Statement as string to be run in Postgres SQL
-        :return: Print the number of rows affected
-        """
-        cursor = None
-        self.connect()
-        try:
-            cursor = self.conn.cursor()
-            cursor.execute(statement)
-            self.conn.commit()
-        except Exception as e:
-            raise Exception(e)
-        finally:
-            if cursor:
-                cursor.close()
-            self.close()
-
-    def insert(self, data, schema, table, truncate=False, output=None, print_sql=False, chunk=1000):
-        """ Insert data in a table in SQL truncating the table if needed
-        -----------------------------
-        df = pd.DataFrame({'col1': ['a', 'b'], 'col2': [1, 2]})
-        con_.insert(df, table_schema, table_name)
-        -----------------------------
-        :param data: DataFrame containing the data to upload
-        :param schema: Schema of the table in which the data will be uploaded
-        :param table: Table in which the data will be uploaded
-        :param truncate: Indicate whether the table has to be truncated before the data is sent or not
-        :param output: Outputs the columns indicated in this list
-        :param chunk: Indicate how many rows will be uploaded at once
-        :param print_sql: boolean to indicate that you want the sql_statement to be printed on the console
-        :return: A DataFrame with the output columns requested if output is not None, else None
-        """
-        if output is None:
-            output = []
-        if data is None:
-            # no data to upload
-            return ValueError("The data provided is invalid!")
-
-        cursor = None
-        self.connect()
-        try:
-            cursor = self.conn.cursor()
-            # Truncate table if needed
-            if truncate:
-                cursor.execute("TRUNCATE TABLE %s.%s" % (schema, table))
-
-            # Convert category columns to string
-            cat_cols = data.columns[(data.dtypes == 'category').values].to_list()
-            data[cat_cols] = data[cat_cols].astype(str)
-            # Deal with bull values and apostrophes (')
-            data = data.replace("'NULL'", "NULL")
-            data = data.replace("'", "~~", regex=True)
-            data = data.fillna("null")
-            # Insert data into the table destination
-            records = [tuple(x) for x in data.values]
-            insert_ = """INSERT INTO %s.%s """ % (schema, table)
-            insert_ += str(tuple(data.columns.values)).replace("\'", "") + """ VALUES """
-            results = pd.DataFrame()
-            for batch in self._chunker(records, chunk):
-                rows = str(batch).strip('[]').replace("~~", "''")
-                rows = rows.replace("'NULL'", "NULL").replace("'null'", 'null')
-                insert_rows = insert_ + rows
-                insert_rows = self.convert_decimal_str(insert_rows)
-                insert_rows = re.sub(r"\';", "'')", insert_rows)
-                if len(output) > 0:
-                    insert_rows += " RETURNING " + ','.join(output)
-
-                if print_sql:
-                    print(insert_rows)
-                cursor.execute(insert_rows)
-                if len(output) > 0:
-                    results = pd.concat([results, pd.DataFrame.from_records(cursor.fetchall(), columns=output)])
-                self.conn.commit()
-
-            if len(output) > 0:
-                return results
-        except Exception as e:
-            raise Exception(e)
-        finally:
-            if cursor:
-                cursor.close()
-            self.close()