berryworld 1.0.0.197234__py3-none-any.whl → 1.0.0.197723__py3-none-any.whl

berryworld/sql_connenction.py

@@ -2,7 +2,6 @@ import os
 import re
 import ast
 import math
-import time
 import pyodbc
 import traceback
 import numpy as np
@@ -10,7 +9,6 @@ import pandas as pd
 import sqlalchemy as sa
 from urllib import parse
 from numbers import Number
-from threading import Thread
 from sqlalchemy.pool import QueuePool
 
 
@@ -1029,7 +1027,7 @@ class SQLPoolEngine:
     """ Connect a Pool Engine to a Microsoft SQL """
 
     def __init__(self, db_reference, server, master=False, trusted_certificate=True, encrypt=True, multi_db=False,
-                 commit_as_transaction=True, pool_size=10, max_overflow=10, pool_timeout=30, timeout=300):
+                 commit_as_transaction=True, pool_size=10, max_overflow=10, pool_timeout=30):
         """ Initialize the class
         It requires the
         SQL-DBREFERENCE-PROD = 'server_name db_name user password'
@@ -1049,7 +1047,6 @@ class SQLPoolEngine:
         :param pool_size: Number of connections to keep in the pool
         :param max_overflow: Extra connections beyond pool_size
         :param pool_timeout: Timeout for getting a connection
-        :param timeout: Connection timeout in seconds
         """
         self.con_string_read = None
         self.con_string_write = None
@@ -1060,7 +1057,6 @@ class SQLPoolEngine:
         self.pool_size = pool_size
         self.max_overflow = max_overflow
         self.pool_timeout = pool_timeout
-        self.timeout = timeout
 
         self.db_reference = db_reference.replace("_", "") if "_" in db_reference else db_reference
         self.server = server
@@ -1103,9 +1099,6 @@ class SQLPoolEngine:
 
         self.create_write_engine(commit_as_transaction=self.commit_as_transaction)
 
-        # Dispose the engine after a certain timeout
-        Thread(target=self.dispose_engine, args=(self.timeout,)).start()
-
     def credentials(self):
         """ Return the credentials used to connect to the SQL Server
         :return: Dictionary with the credentials used to connect to the SQL Server
@@ -1160,8 +1153,7 @@ class SQLPoolEngine:
                                             poolclass=QueuePool,
                                             pool_size=self.pool_size,           # Number of connections to keep in the pool
                                             max_overflow=self.max_overflow,     # Extra connections beyond pool_size
-                                            pool_timeout=self.pool_timeout,     # Timeout for getting a connection
-                                            pool_recycle=self.timeout           # Recycle connections after X minutes
+                                            pool_timeout=self.pool_timeout      # Timeout for getting a connection
                                             )
 
         if not commit_as_transaction:
@@ -1182,8 +1174,7 @@ class SQLPoolEngine:
                                              poolclass=QueuePool,
                                              pool_size=10,               # Number of connections to keep in the pool
                                              max_overflow=10,            # Extra connections beyond pool_size
-                                             pool_timeout=30,            # Timeout for getting a connection
-                                             pool_recycle=self.timeout   # Recycle connections after X minutes
+                                             pool_timeout=30             # Timeout for getting a connection
                                              )
 
         if not commit_as_transaction:
@@ -1197,13 +1188,10 @@ class SQLPoolEngine:
         self.create_read_engine(commit_as_transaction=commit_as_transaction)
         self.con = self.engine_read.connect().connection
 
-    def dispose_engine(self, timeout=0):
+    def dispose_engine(self):
         """ Dispose any opened engines with the Server
         :return: None
         """
-        if timeout > 0:
-            time.sleep(timeout)
-
         if self.engine_read:
             self.engine_read.dispose()
 
@@ -1255,26 +1243,16 @@ class SQLConnectionPool:
         self.commit_as_transaction = pool_class.commit_as_transaction
         self.db_name = pool_class.db_name
         self.server = pool_class.server
-        self.timeout = pool_class.timeout
-
-        Thread(target=self.close_connection, args=(self.timeout,)).start()
 
-    def close_connection(self, timeout=0):
+    def close_connection(self):
         """ Close any opened connections with the Server
         :return: None
         """
-        if timeout > 0:
-            time.sleep(timeout)
-
         if self.con_read is not None:
             self.con_read.close()
-            if self.engine_read:
-                self.engine_read.dispose()
 
         if self.con_write is not None:
             self.con_write.close()
-            if self.engine_write:
-                self.engine_write.dispose()
 
     def query(self, sql_query, coerce_float=False):
         """ Read data from SQL according to the sql_query

{berryworld-1.0.0.197234.dist-info → berryworld-1.0.0.197723.dist-info}/METADATA

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

{berryworld-1.0.0.197234.dist-info → berryworld-1.0.0.197723.dist-info}/RECORD

@@ -19,19 +19,19 @@ berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,
 berryworld/sharepoint_con.py,sha256=nmyZJIcaAKJ6Y-ti4gQbvzA_rRbrMGIxTDXe4eP-tiI,44950
 berryworld/snowflake_conn.py,sha256=L0ePgTKa3tvaxj88BZmsjS6cFp3ZU3rytw7S2jkuA-U,3161
 berryworld/sql_conn.py,sha256=6kUR3oLXweakz2IBc4zI1ZMqRoN8K6nbQneHhenM-7I,47668
-berryworld/sql_connenction.py,sha256=jqXaYZ204HdaIwaQjBlKvrAiJIj6QS_FASb-RYEkT-g,105053
+berryworld/sql_connenction.py,sha256=IJAOsQ7p0tMFEEucazmmkS3lNonf_YFWftyZ_kGPHj8,104150
 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.197234.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.197723.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.197234.dist-info/METADATA,sha256=uTCAY4_FLQRCSQZ-WQDjJlCD7bqH11YSbVRKZltYhRA,1445
-berryworld-1.0.0.197234.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.197234.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.197234.dist-info/RECORD,,
+berryworld-1.0.0.197723.dist-info/METADATA,sha256=Btf-waInlfkM3ovW6JgnQaM2Nytj0gy0xbMDY_ppEG8,1445
+berryworld-1.0.0.197723.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.197723.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.197723.dist-info/RECORD,,