kisa-utils 0.42.14__py3-none-any.whl → 0.42.16__py3-none-any.whl

kisa_utils/remote.py

@@ -1,6 +1,7 @@
 import requests
+from kisa_utils.dataStructures import KDict
 
-def sendRequest(url:str|bytes, method:str|bytes='post', jsonPayload:dict={}, timeout:int=180, **requestKwargs:dict) -> dict:
+def sendRequest(url:str|bytes, method:str|bytes='post', jsonPayload:dict={}, timeout:int=180, **requestKwargs:dict) -> KDict:
     '''
     attempt to send request with JSON payload.
     Args:
@@ -23,7 +24,7 @@ def sendRequest(url:str|bytes, method:str|bytes='post', jsonPayload:dict={}, tim
     @return {'status':BOOL, 'log':STR, }
     '''
 
-    reply = {'status':False, 'log':'', 'response':None}
+    reply = KDict({'status':False, 'log':'', 'response':None, 'statusCode': None})
 
     method = method.lower()
     if method not in ['get','post']:
@@ -39,6 +40,8 @@ def sendRequest(url:str|bytes, method:str|bytes='post', jsonPayload:dict={}, tim
             reply['log'] = 'invalid method given'
             return reply
 
+        reply.statusCode = response.status_code
+
         if response.status_code!=200:
             try: reply['response'] = response.json()
             except: pass
@@ -48,11 +51,11 @@ def sendRequest(url:str|bytes, method:str|bytes='post', jsonPayload:dict={}, tim
 
         try:
             responseJSON = response.json()
-            reply['response'] = responseJSON
+            reply['response'] = KDict(responseJSON) if isinstance(responseJSON, dict) else responseJSON
             reply['status'] = True
             return reply
-        except:
-            reply['log'] = 'no JSON reply got'
+        except Exception as e:
+            reply['log'] = f'no JSON reply got: {e}'
             return reply
             
     except requests.exceptions.Timeout:

kisa_utils/threads.py

@@ -106,6 +106,8 @@ class Group:
             **self._functions[functionId]['kwargs'],
         ).data for functionId in self._functions]
 
+        futuresList = [_ for _ in futuresList if _]
+
         resultsDict = {}
         for future in futures.as_completed(futuresList):
             result = future.result()
@@ -131,7 +133,7 @@ def runOnce(function:Callable, *args:tuple, **kwargs:dict) -> Response:
         return Error(f'`{function}` is not callable')
 
     try:
-        return Ok(__executor.run(function, *args, **kwargs).result())
+        return Ok(__executor.run(function, *args, **kwargs))
     except Exception as e:
         return Error(f'failed to run task: {e}')
 

{kisa_utils-0.42.14.dist-info → kisa_utils-0.42.16.dist-info}/METADATA

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

{kisa_utils-0.42.14.dist-info → kisa_utils-0.42.16.dist-info}/RECORD

@@ -9,11 +9,11 @@ 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
 kisa_utils/log.py,sha256=0TYdxcIBts026RCSuVIQBcZ-CW1ES7n3M1nEIjmeLTM,2295
-kisa_utils/remote.py,sha256=e6Ho78Lc1hd1PO_NrDydo4ssP1GQCyBGAImJn-s6rPs,2172
+kisa_utils/remote.py,sha256=z5QTKC0Mb_wMWVHWfUHR1XOOek-A2fNjo1GyFPhAB8s,2373
 kisa_utils/response.py,sha256=asETUBkeF5OlSTwa-coa7lZDCKmQlHCmHf6eaZFl8CU,4560
 kisa_utils/standardize.py,sha256=nt-uzHQFoKxGscD_MpDYXw65Teg3724whAqa6Kh_zhE,2231
 kisa_utils/storage.py,sha256=6NdEVrHMS7WB_vmCwiGigIinu-EjxalFJhk1kj-_vWs,5990
-kisa_utils/threads.py,sha256=xQLlt4jnc03iNW5is7IBZLckVj5LT6xdV-uT8VSeQ74,13093
+kisa_utils/threads.py,sha256=PstMHimkOABXlYmKJi5SHcevzm1JuFGNZSlF0bGzuGk,13137
 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
@@ -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=oCSgY_itst6bZdC5g8yVU4-lSH2xnUsOx3X-oPyV7nA,4626
-kisa_utils-0.42.14.dist-info/METADATA,sha256=d6Sf9x9qzX_h4o2beeujr1bqy9cpXlo49mCbQPidFpE,478
-kisa_utils-0.42.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.42.14.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
-kisa_utils-0.42.14.dist-info/RECORD,,
+kisa_utils-0.42.16.dist-info/METADATA,sha256=QpmdDDEFdlFivDSSUJHi96YMgxbauPELUz7BD8DO4Zk,478
+kisa_utils-0.42.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.42.16.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
+kisa_utils-0.42.16.dist-info/RECORD,,