kisa-utils 0.42.7__py3-none-any.whl → 0.42.9__py3-none-any.whl

kisa_utils/config.py

@@ -13,11 +13,12 @@ def _getTopicPath(topic:str):
 
     return fout
 def _initTopic(topic:str):
-    fout = _getTopicPath(topic)
-    if not os.path.isfile(fout):
-        pickle.dump({}, open(fout,'wb'))
+    foutPath = _getTopicPath(topic)
+    if not os.path.isfile(foutPath):
+        with open(foutPath,'wb') as fout:
+            pickle.dump({}, fout)
 
-    return fout
+    return foutPath
 
 def _getTopicAndKey(path:str) -> list[str,str]:
     '''
@@ -39,7 +40,8 @@ def getValue(path:str) -> Any|None:
 
     topic, key = _getTopicAndKey(path)
 
-    return pickle.load(open(_initTopic(topic),'rb')).get(key)
+    with open(_initTopic(topic),'rb') as fin:
+        return pickle.load(fin).get(key)
     
 def setValue(path:str, value:Any) -> bool:
     '''

kisa_utils/db.py

@@ -222,6 +222,8 @@ class Api:
         self._path = path
 
         if  path not in RAM_DB_PATHS:
+            path = storage.Path.getAbsolutePath(path)
+
             while path.endswith('/'): path = path[:-1]
             if not path.endswith(f'.{__EXT__}') and not os.path.isfile(path):
                 path += f'.{__EXT__}'
@@ -642,12 +644,13 @@ class Api:
 
     #---------------------------------------------------------------------------
     @__checkContext
-    def execute(self, cmd:str, cmdData:list=[]) -> dict[str,bool|str|int|sqlite3.Cursor] | Response:
+    def execute(self, cmd:str, cmdData:list=[], executingMultiple:bool=False) -> dict[str,bool|str|int|sqlite3.Cursor] | Response:
         '''
         attempt to execute arbitrary SQLite3 commands
         Args:
             cmd(str): SQLite command to run
             cmdData(list): list to hold the values for the `?` placeholders in `cmd`
+            executingMultiple(bool): indicate if we're executing/inserting multiple statements/rows at ago. this allows us to use cursor.executemany instead of cursor.execute
         Returns:
             ```
             # if a dict is returned
@@ -685,7 +688,7 @@ class Api:
                     return reply if not self.__returnKISAResponse else Error(reply['log'])
 
         try:
-            cursor = self.cursor.execute(cmd,cmdData)
+            cursor = (self.cursor.execute if not executingMultiple else self.cursor.executemany)(cmd,cmdData)
             affectedRows = cursor.rowcount
 
             if affectedRows < 0:
@@ -704,6 +707,20 @@ class Api:
         reply['status'] = True
         return reply if not self.__returnKISAResponse else Ok({'cursor':reply['cursor'], 'affectedRows':reply['affectedRows']})
 
+    @__checkContext
+    def executeScript(self, sql:str) -> Response:
+        '''
+        directly execute complex sql commands. this is useful when for you need to execute complex transactions example 
+        Args:
+            sql(str): the sql to execute
+        '''
+
+        try:
+            self.db.executescript(sql)
+        except Exception as e:
+            return Error(f'{e}')
+        return Ok()
+
     @__checkContext
     def __createFetchResultsGenerator(self, results:sqlite3.Cursor, columnTitles:list, parseJson:bool, mode:str) -> Generator[tuple|dict|SimpleNamespace,None,None]:
 
@@ -867,7 +884,7 @@ class Api:
         '''
         insert a new row(s) into the database
         Args:
-            table(str): the table itno which to insert data
+            table(str): the table into which to insert data
             data(list): 1d/2d list of the data to insert
                 + 1d = insert single row
                 + 2d = insert multple row
@@ -1370,5 +1387,9 @@ class Table:
 if __name__=='__main__':
     # Column('ab', int)
 
+    with Api('/tmp/bukman/database.db2') as handle:
+        print(handle.fetch('keys',['*'],'',[]))
+    # Column('ab', int)
+
     with Api('/tmp/bukman/database.db2') as handle:
         print(handle.fetch('keys',['*'],'',[]))

kisa_utils/queues/persistent.py

@@ -48,9 +48,10 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
 
     __schema = {
         'data': '''
-            tstamp varchar(30) not null,
-            dataType varcahr(30) not null,
-            data json not null
+            id        INTEGER PRIMARY KEY AUTOINCREMENT,
+            tstamp    VARCHAR(30) NOT NULL,
+            dataType  VARCHAR(30) NOT NULL,
+            data      JSON NOT NULL
         ''',
     }
 
@@ -107,6 +108,9 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         '''
         return self.__length
 
+    def __len__(self) -> int:
+        return self.length
+
     def __load__(self) -> Response:
         '''
         load underlying queue database
@@ -148,6 +152,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
 
         with Handle(self.dbPath, readonly=False, returnKISAResponse=True) as handle:
             if not (resp := handle.insert('data', [
+                None,
                 dates.currentTimestamp(),
                 dataType,
                 data
@@ -165,7 +170,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         index = resp.data
 
         with Handle(self.dbPath, returnKISAResponse=True) as handle:
-            if not (resp := handle.fetch('data', ['dataType', 'data'],'',[],limit=1, offset=index, parseJson=True)):
+            if not (resp := handle.fetch('data', ['dataType', 'data'],'1 order by id',[],limit=1, offset=index, parseJson=True)):
                 return resp
             
             dataType, data = resp.data[0]
@@ -185,7 +190,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
         index = resp.data
 
         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)):
+            if not (resp := handle.fetch('data', ['id','dataType', 'data'],'1 order by id',[],limit=1, offset=index, parseJson=True)):
                 return resp
             
             rowId, dataType, data = resp.data[0]
@@ -195,7 +200,7 @@ class PersistentQueue(metaclass=__PersistentQueueSingleton):
             except:
                 return Error(f'failed to convert value to data-type `{dataType}`. the database was most likely corrupted')
 
-            if not (resp := handle.delete('data','rowid=?',[rowId])):
+            if not (resp := handle.delete('data','id=?',[rowId])):
                 return resp
 
             self.__length -= 1

{kisa_utils-0.42.7.dist-info → kisa_utils-0.42.9.dist-info}/METADATA

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

{kisa_utils-0.42.7.dist-info → kisa_utils-0.42.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
 kisa_utils/__init__.py,sha256=-g5gBmI4gV840-Brg1V1aZ_R_r3n_csB-PlRRdUV_UQ,745
 kisa_utils/cache.py,sha256=WOL3e0wvoyESXTtlbVnUg9TYUoLzg64sLP9J4b4ti9k,7377
 kisa_utils/codes.py,sha256=PV_S53Skggf4XetOdYoIKtEmM8cpN5wZwUlxje70WZY,904
-kisa_utils/config.py,sha256=NfluzGKTh66qfNtC-Ae0zNb1XzMTgU2Me9Vi82R9c1E,2285
+kisa_utils/config.py,sha256=vfwka6Wuz80su6_GgjuKhxolnzj1enw8cpgQPYm17l8,2357
 kisa_utils/dataStructures.py,sha256=ZgLpttJ66jfpU1NWzLDD1Czqxzj6sWereffgTQWhlV8,2679
 kisa_utils/dates.py,sha256=JN0vm-7_fOdpzLtondVmpjpWoePPJn4aGK0NkBuyF8I,14142
-kisa_utils/db.py,sha256=-0Q7iw9VEtf4oyOIj_IhJqmzeh0CZVp3vEcwIQn4Zls,54939
+kisa_utils/db.py,sha256=fQfvpSJz1A0KFpgXOjo_fyHcLwp9-d9GcDfyH6zhvMY,55788
 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=Gie6eUX44BLzC2udO4mbP-njA6BRbsovlMcDNQKFXJM,6706
+kisa_utils/queues/persistent.py,sha256=KueLVqkVcTqvVe5yt9DEM_PvtUEannukixRS8icONTI,6872
 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.7.dist-info/METADATA,sha256=NS58kF6uyqn0xEcjltRwD6IAEQArJqSB4N0_a_j6Ctg,477
-kisa_utils-0.42.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.42.7.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
-kisa_utils-0.42.7.dist-info/RECORD,,
+kisa_utils-0.42.9.dist-info/METADATA,sha256=ggmPfO1oysfdUkAExab5IOmqtA6pgvrD5O_orx1WzaU,477
+kisa_utils-0.42.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.42.9.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
+kisa_utils-0.42.9.dist-info/RECORD,,