kisa-utils 0.37.12__py3-none-any.whl → 0.37.13__py3-none-any.whl

kisa_utils/db.py

@@ -6,6 +6,7 @@ from typing import Generator, Any, Callable
 import inspect
 import traceback
 import re
+from threading import get_native_id as getCurrentThreadId, Lock
 
 from . import storage
 from . import codes
@@ -52,6 +53,8 @@ TRIGGERS:dict = {
 
 JSON_SEPARATOR = '::'
 
+RAM_DB_PATHS:list[str] = [':memory:', ':ram:',':RAM:']
+
 # *********************************************************************
 def _getNumberOfArgsAndKwargs(function:Callable) -> tuple[int]:
     '''
@@ -69,6 +72,39 @@ def _getNumberOfArgsAndKwargs(function:Callable) -> tuple[int]:
     return nArgs, nKwargs
 
 class Api:
+    __lock = Lock()
+    __openDatabases:dict = {
+        # path:str -> {
+        #     threadId:int -> instance:Api,
+        #     ...
+        # }
+    }
+
+    # make this class a singleton
+    def __new__(cls, *args, **kwargs) -> 'Api':
+        path = ''
+        if args: path=args[0]
+        else: path = kwargs.get(path, RAM_DB_PATHS[0])
+
+        if path not in RAM_DB_PATHS:
+            threadId = getCurrentThreadId()
+            with Api.__lock:
+                if path not in Api.__openDatabases:
+                    Api.__openDatabases[path] = {}
+
+                if threadId in Api.__openDatabases[path]:
+                    instance = Api.__openDatabases[path][threadId]
+                    # print(f'using existing db handle: {threadId} {path}')
+                else:
+                    instance = super().__new__(cls)
+                    # print(f'new db handle: {threadId} {path}')
+                    Api.__openDatabases[path][threadId] = instance
+        else:
+            instance = super().__new__(cls)
+
+        return instance
+
+
     def __checkContext(method):
         '''
         this decorator will be used to enforce the calling of Api class instances
@@ -162,6 +198,9 @@ class Api:
             useWALMode(bool): if set to `True`, WAL mode will be used for the underlying sqlite3 database
             returnKISAResponse(bool|None): if not set, `kisa_utils.db.RETURN_KISA_RESPONSES` will be used. if set to `True`, all public methods that dont return `None` will return KISA Response objects
         '''
+        if getattr(self, "_dbInitializedInThread", False):
+            return
+        self._dbInitializedInThread = True
 
         self._in_with_statement = False
         self.isOpen = False
@@ -172,7 +211,9 @@ class Api:
         self.__withContextCount = 0
         self.__returnKISAResponse = RETURN_KISA_RESPONSES if None==returnKISAResponse else returnKISAResponse
 
-        if  path not in [':memory:', ':ram:',':RAM:']:
+        self._path = path
+
+        if  path not in RAM_DB_PATHS:
             while path.endswith('/'): path = path[:-1]
             if not path.endswith(f'.{__EXT__}') and not os.path.isfile(path):
                 path += f'.{__EXT__}'
@@ -700,13 +741,19 @@ class Api:
                 + 1d = insert single row
                 + 2d = insert multple row
         '''
-        self.cursor.execute(f'select * from {table}')
-        column_value_placeholders = ['?' for description in self.cursor.description]
+        reply = {'status':False, 'log':'', 'affectedRows':0}
+
+        try:
+            self.cursor.execute(f'select * from {table}')
+            column_value_placeholders = ['?' for description in self.cursor.description]
+        except Exception as e:
+            if self.__transactionMode: self.__transactionData['insert']['failed'] += 1
+            reply['log'] = str(e)
+            return reply if not self.__returnKISAResponse else Error(reply['log'])
         
         if not isinstance(data, (list, tuple)):
             data = [data]
 
-        reply = {'status':False, 'log':'', 'affectedRows':0}
         try:
             data = self.__encodeIncomingData(data)
             if isinstance(data[0],(list,tuple)):
@@ -979,10 +1026,15 @@ class Api:
         return reply if not self.__returnKISAResponse else Ok()
 
     # @__checkContext
-    def close(self) -> None:
+    def close(self) -> bool:
         '''
         close the sqlite connection
         '''
+        
+        if self.__withContextCount > 0:
+            return False
+        
+        # print('>>>closed DB<<<<', self._path)
         if self.isOpen:
             # self.db.execute('pragma optimize;')
             if self.__transactionMode:
@@ -995,12 +1047,24 @@ class Api:
                 # self.db, self.cursor = None,None
                 self.isOpen = False
 
+        return True
+
     # @__checkContext
     def release(self) -> None:
         '''
         close the sqlite3 connection
         '''
-        return self.close()
+
+        path = self._path
+
+        if not self.close(): 
+            return
+
+        if path in RAM_DB_PATHS: return
+
+        threadId = getCurrentThreadId()
+        with Api.__lock:
+            del Api.__openDatabases[path][threadId]
 
     # methods to add context to the handle
     def __enter__(self) -> 'Api':
@@ -1059,7 +1123,7 @@ def transaction(*dbArgs, **dbKwargs) -> dict|Response:
     
     '''
 
-    returnKISAResponse = dbKwargs.get('returnKISAResponse',False)
+    returnKISAResponse = dbKwargs.get('returnKISAResponse',RETURN_KISA_RESPONSES)
 
     def handler(func) -> dict:
         def wrapper(*args, **kwargs) -> dict:

{kisa_utils-0.37.12.dist-info → kisa_utils-0.37.13.dist-info}/METADATA

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

{kisa_utils-0.37.12.dist-info → kisa_utils-0.37.13.dist-info}/RECORD

@@ -3,7 +3,7 @@ kisa_utils/cache.py,sha256=4Ue5G3QhHSQAmIfQKYgWKWjNL4rA4wLLd_RdBLb2ABY,7345
 kisa_utils/codes.py,sha256=PV_S53Skggf4XetOdYoIKtEmM8cpN5wZwUlxje70WZY,904
 kisa_utils/config.py,sha256=NfluzGKTh66qfNtC-Ae0zNb1XzMTgU2Me9Vi82R9c1E,2285
 kisa_utils/dates.py,sha256=kcNqoY_iguG9hSzABMIBqeL3MGz3n4MRIXuW4OxRHLs,12662
-kisa_utils/db.py,sha256=RtO3vh6K6HYYvJcz4fbe1pYT--9j_n1Eqg7z0Zr3H3E,44461
+kisa_utils/db.py,sha256=8WwJs2a1h2hdPc2U65effJ5MYLVadaeGNLR2iPqd6FA,46391
 kisa_utils/encryption.py,sha256=nFzNpzWV_D9uSEq4FsgCnlS7FQtqWP9fvM_81rsfcLo,4218
 kisa_utils/enqueue.py,sha256=VIliaMvw4MUdOqts0dXdZCYNxs-QrOVjIRAR3scGrRM,11786
 kisa_utils/figures.py,sha256=pYIpQzu1OXRSsY1d98GhgPifnIRmgl-r7S32ai-Ms0c,3731
@@ -23,7 +23,7 @@ kisa_utils/servers/flask.py,sha256=o76cJKlQ3L8EOVdHUF092qwoAZMzgttuLt0mMhtCsGI,4
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
 kisa_utils/structures/utils.py,sha256=l56NQiPVcFijpuLqt2n9ZwnVKT4XzK6oknRVallRzwQ,2573
 kisa_utils/structures/validator.py,sha256=Y4UmB4TH7N-GkK22EV1WOsPWjTeqxVWLTentl1keZD4,4053
-kisa_utils-0.37.12.dist-info/METADATA,sha256=dJyypLrTFm2KcUP4HLzISVtQ0EwUoDc1OxwHmY1HXNU,478
-kisa_utils-0.37.12.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.37.12.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
-kisa_utils-0.37.12.dist-info/RECORD,,
+kisa_utils-0.37.13.dist-info/METADATA,sha256=CVP00b5I9CF2mKMRXXv0XaGaHPqp741ggky_7256efo,478
+kisa_utils-0.37.13.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+kisa_utils-0.37.13.dist-info/top_level.txt,sha256=URxY4sRuqmirOxWtztpVmPoGQdksEMYO6hmYsEDGz2Y,75
+kisa_utils-0.37.13.dist-info/RECORD,,

{kisa_utils-0.37.12.dist-info → kisa_utils-0.37.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any