kisa-utils 0.42.4__py3-none-any.whl → 0.42.6__py3-none-any.whl

kisa_utils/db.py

@@ -7,6 +7,7 @@ import inspect
 import traceback
 import re
 from threading import get_native_id as getCurrentThreadId, Lock
+import random, time
 
 from . import storage
 from . import codes
@@ -142,6 +143,7 @@ class Api:
         accessFromMultipleThreads:bool = False,
         useWALMode:bool = True,
         returnKISAResponse:bool|None = None,
+        connectionTimeout:float = 30.0
     ):
         '''
         attempt to open an sqlite3 database connection object/instance
@@ -238,9 +240,21 @@ class Api:
 
         self._readonly = True if readonly else False 
 
-        self.db:sqlite3.Connection = sqlite3.connect(path)
+        self.db:sqlite3.Connection
+
+        max_retries = 4
+        for attempt in range(max_retries):
+            try:
+                self.db = sqlite3.connect(path, check_same_thread = not accessFromMultipleThreads, timeout=connectionTimeout)
+                break
+            except sqlite3.OperationalError as e:
+                if attempt == max_retries - 1:
+                    raise  # Re-raise on final attempt
+                
+                wait_time = (2 ** attempt) + random.uniform(0, 1)  # Exponential backoff with jitter
+                print(f"Database connection attempt {attempt + 1} failed: {e}. Retrying in {wait_time:.2f}s...")
+                time.sleep(wait_time)
 
-        self.db = sqlite3.connect(path, check_same_thread = not accessFromMultipleThreads)
         if useWALMode:
             self.db.executescript(f'''
                 /* set journal mode to WAL and `synchronous` to best value, which works best for WAL mode*/

kisa_utils/queues/persistent.py

@@ -1,5 +1,4 @@
 from kisa_utils.db import Handle
-from kisa_utils import db
 from kisa_utils.queues.callables import queueCallsInThreads
 from kisa_utils.response import Response, Error, Ok
 from kisa_utils.dataStructures import KDict
@@ -8,8 +7,6 @@ from kisa_utils import dates
 from kisa_utils.functionUtils import enforceRequirements
 from kisa_utils.structures.utils import Value
 
-db.RETURN_KISA_RESPONSES = True
-
 class __PersistentQueueSingleton(type):
     _instances = {}
 
@@ -115,7 +112,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         load underlying queue database
         '''
 
-        with Handle(self.dbPath, tables=self.__schema) as handle:
+        with Handle(self.dbPath, tables=self.__schema, returnKISAResponse=True) as handle:
             if not (resp := handle.fetch('data', ['count(*)'],'',[])):
                 return resp
             
@@ -149,7 +146,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
             return Error(f'failed to get data-type of `{data}`')
 
 
-        with Handle(self.dbPath, readonly=False) as handle:
+        with Handle(self.dbPath, readonly=False, returnKISAResponse=True) as handle:
             if not (resp := handle.insert('data', [
                 dates.currentTimestamp(),
                 dataType,
@@ -167,7 +164,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         if not (resp := self.__resolveIndex(index)): return resp
         index = resp.data
 
-        with Handle(self.dbPath) as handle:
+        with Handle(self.dbPath, returnKISAResponse=True) as handle:
             if not (resp := handle.fetch('data', ['dataType', 'data'],'',[],limit=1, offset=index, parseJson=True)):
                 return resp
             
@@ -187,7 +184,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         if not (resp := self.__resolveIndex(index)): return resp
         index = resp.data
 
-        with Handle(self.dbPath, readonly=False) as handle:
+        with Handle(self.dbPath, readonly=False, returnKISAResponse=True) as handle:
             if not (resp := handle.fetch('data', ['rowid','dataType', 'data'],'',[],limit=1, offset=index, parseJson=True)):
                 return resp
             

{kisa_utils-0.42.4.dist-info → kisa_utils-0.42.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kisa-utils
-Version: 0.42.4
+Version: 0.42.6
 Summary: Utility functions and modules for KISA Developers
 Author: Tom Bukenya
 Author-email: glayn2bukman@gmail.com

{kisa_utils-0.42.4.dist-info → kisa_utils-0.42.6.dist-info}/RECORD

@@ -4,7 +4,7 @@ kisa_utils/codes.py,sha256=PV_S53Skggf4XetOdYoIKtEmM8cpN5wZwUlxje70WZY,904
 kisa_utils/config.py,sha256=NfluzGKTh66qfNtC-Ae0zNb1XzMTgU2Me9Vi82R9c1E,2285
 kisa_utils/dataStructures.py,sha256=ZgLpttJ66jfpU1NWzLDD1Czqxzj6sWereffgTQWhlV8,2679
 kisa_utils/dates.py,sha256=zxe4n0PdKReZjK5ZkvnCZtJ55lk5oqu9oS8VX_nLozw,13966
-kisa_utils/db.py,sha256=hWxkW21lgViOqFijxL4cD-Wpt4koWz6jzcE1v0IiT1c,54341
+kisa_utils/db.py,sha256=-0Q7iw9VEtf4oyOIj_IhJqmzeh0CZVp3vEcwIQn4Zls,54939
 kisa_utils/encryption.py,sha256=nFzNpzWV_D9uSEq4FsgCnlS7FQtqWP9fvM_81rsfcLo,4218
 kisa_utils/figures.py,sha256=pYIpQzu1OXRSsY1d98GhgPifnIRmgl-r7S32ai-Ms0c,3731
 kisa_utils/functionUtils.py,sha256=PlXjnmU1uJWNdISlJJ3SCgavTsgNBoebaa9dtWSFhRA,6553
@@ -18,7 +18,7 @@ kisa_utils/token.py,sha256=Y2qglWYWpmHxoXBh-TH0r1as0uPV5LLqMNcunLvM4vM,7850
 kisa_utils/permissions/__config__.py,sha256=i3ELkOydDnjKx2ozQTxLZdZ8DXSeUncnl2kRxANjFmM,613
 kisa_utils/permissions/__init__.py,sha256=iAsGEf5Ktw3gPJ5ZKL8BnuqX8e_S4QgsCVgfaRYi4Qg,48068
 kisa_utils/queues/__init__.py,sha256=VvhceyN5qeiMel1JFQwLRuVk48oBXaWvDtriCubDOms,48
-kisa_utils/queues/persistent.py,sha256=e4s2SK0Wvqq8wVcqPm1Gr_4ip0-0l25WKcMUNTSK_QY,6665
+kisa_utils/queues/persistent.py,sha256=Gie6eUX44BLzC2udO4mbP-njA6BRbsovlMcDNQKFXJM,6706
 kisa_utils/queues/callables/__init__.py,sha256=OJL3AQnaAS1Eek4H6WBH3WefA2wf-x03cwFmRSK8hoU,141
 kisa_utils/queues/callables/enqueueFunctionCalls.py,sha256=VIliaMvw4MUdOqts0dXdZCYNxs-QrOVjIRAR3scGrRM,11786
 kisa_utils/queues/callables/executorQueues.py,sha256=x6bAqxBSZRZ_kL8CK1lSN6JYAYFLxzM84LC1RmwaOLw,6626
@@ -27,7 +27,7 @@ kisa_utils/servers/flask.py,sha256=XZYY1pWnP1mSvaS5Uv8G3EFJV5BJBQtU2gDbO8suvLc,4
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
 kisa_utils/structures/utils.py,sha256=665rXIapGwFqejizeJwy3DryeskCQOdgP25BCdLkGvk,2898
 kisa_utils/structures/validator.py,sha256=JhD9jcfbjTwBr_7OfuNaJd_cYr7wR2emFhsCEo5MCHQ,4323
-kisa_utils-0.42.4.dist-info/METADATA,sha256=zPsxgOPL6JSpSJ235A0R0I2r0toVt-4E-jIoUXt_B90,477
-kisa_utils-0.42.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.42.4.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
-kisa_utils-0.42.4.dist-info/RECORD,,
+kisa_utils-0.42.6.dist-info/METADATA,sha256=Dyk0-x1A4skPorhBkLVW6Dwf2Qs7WgilsaMlLR3mXTE,477
+kisa_utils-0.42.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.42.6.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
+kisa_utils-0.42.6.dist-info/RECORD,,