easy-utils-dev 2.159__tar.gz → 2.160__tar.gz

{easy_utils_dev-2.159 → easy_utils_dev-2.160}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.159
+Version: 2.160
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.159 → easy_utils_dev-2.160}/easy_utils_dev/uiserver.py

@@ -56,25 +56,25 @@ class Response :
         self.success = self.ok
         self.failure = self.error
 
-    def ok(self , result=[] , message=None , payload={}) :
+    def ok(self , result=[] , message=None , **kwargs) :
         timestamp = getTimestamp()
-        return {'status' : 200 , 'message' : message , 'result' : result , **payload, 'timestamp' : timestamp}
+        return {'status' : 200 , 'message' : message , 'result' : result , **kwargs, 'timestamp' : timestamp}
 
-    def error(self , message=None , payload={}) :
+    def error(self , message=None , **kwargs) :
         timestamp = getTimestamp()
-        return {'status' : 400 , 'message' : message , **payload , 'timestamp' : timestamp}
+        return {'status' : 400 , 'message' : message , **kwargs , 'timestamp' : timestamp}
     
-    def internal_error(self , message=None , payload={}) :
+    def internal_error(self , message=None , **kwargs ) :
         timestamp = getTimestamp()
-        return {'status' : 500 , 'message' : message , **payload , 'timestamp' : timestamp}
+        return {'status' : 500 , 'message' : message , **kwargs , 'timestamp' : timestamp}
 
-    def not_found(self , message=None , payload={}) :
+    def not_found(self , message=None , **kwargs) :
         timestamp = getTimestamp()
-        return {'status' : 404 , 'message' : message , **payload , 'timestamp' : timestamp}
+        return {'status' : 404 , 'message' : message , **kwargs , 'timestamp' : timestamp}
     
-    def unauthorized(self , message=None , payload={}) :
+    def unauthorized(self , message=None , **kwargs) :
         timestamp = getTimestamp()
-        return {'status' : 401 , 'message' : message , **payload , 'timestamp' : timestamp}
+        return {'status' : 401 , 'message' : message , **kwargs , 'timestamp' : timestamp}
 
 class AbortRequest :
     def __init__(self, request ) :
@@ -229,35 +229,37 @@ class UISERVER :
                     if not alive :
                         break
                     time.sleep(.25)
-                return { 'status' : 200 , 'message' : 'Request aborted' , 'abort_timestamp' : timestamp , 'abort_id' : id , 'alive' : alive  , 'url' : abort.request.get('path')}
+                return Response().ok(message='Request aborted' , abort_timestamp=timestamp , abort_id=id , alive=alive , url=abort.request.get('path'))
+            
             else :
-                return { 'status' : 404 , 'message' : 'Request not found or request is not abortable. Check request headers for abortable flag.'}
+                return Response().not_found(message='Request not found or request is not abortable. Check request headers for abortable flag.')
         
         @self.app.route(f"/request/traceback/<key>" , methods=['GET'])
         def get_traceback(key : str ) :
             traceback = self.cache.get(key)
             if traceback :
-                return { 'status' : 200 , 'traceback' : traceback.get('traceback') }
+                return Response().ok(message='Traceback found' , traceback=traceback.get('traceback'))
             else :
-                return { 'status' : 404 , 'message' : 'Traceback not found or expired' }
+                return Response().not_found(message='Traceback not found or expired')
 
         @self.app.route(f'{self.request_reply_base_url}/<id>' , methods=['GET'])
         def get_result_of_async_request(id : str ) :
             request : AbortRequest = self.bg_requests.get(id)
             if request :
-                return {
-                    'status' : 200 , 
-                    'internalid' : id , 
-                    'result' : request.result ,
-                    'in_progress' : request.in_progress ,
-                    'async_request' : request.async_request ,
-                    'internalid' : request.internalid ,
-                    'start_ts' : request.start_ts ,
-                    'end_ts' : request.end_ts ,
-                    'execution' : request.execution,
-                    'success' : request.success,
-                    'killed' : request.killed
-                }
+                return Response().ok(
+                    message='Result of async request found' , 
+                    internalid=id ,
+                    result=request.result ,
+                    in_progress=request.in_progress ,
+                    async_request=request.async_request ,
+                    internalid=request.internalid , 
+                    start_ts=request.start_ts , 
+                    end_ts=request.end_ts , 
+                    execution=request.execution ,
+                    success=request.success ,
+                    killed=request.killed
+                )
+
 
         @self.app.before_request
         def before_request() :
@@ -266,7 +268,7 @@ class UISERVER :
 
                 
             if (self.serve_with_secret_key) and (request.path not in self.secret_key_execlude_urls) and (request.headers.get('secretkey') != self.secretkey):
-                return jsonify({"error": "Secret key is invalid"}), 401
+                return Response().unauthorized(message='Secret key is invalid')
                         
             @copy_current_request_context
             def run_async_job_results( target_func , abort : AbortRequest ) :
@@ -305,11 +307,11 @@ class UISERVER :
                 if request.headers.get('async') == 'false' : 
                     target_func = current_app.view_functions.get(request.endpoint)
                     if not target_func:
-                        return {"error": "Route not found"}, 404
+                        return Response().not_found(message='Route not found')
                     th = start_thread(target=run_async_job_results, args=[target_func , abort ])
                     abort.thread = th
                     self.bg_requests[requestId] = abort
-                    return {"status": 200, "message": "Request now in running bg", "abort_id": abort.abort_id} , 200
+                    return Response().ok(message='Request now in running bg' , abort_id=abort.abort_id)
     
         if self.return_exception_as_code_400 :
             @self.app.errorhandler(Exception)
@@ -348,15 +350,13 @@ class UISERVER :
                 }
                 self.logger.error(f'error: {json.dumps(response , indent=4)}')
                 self.cache.set( custom_key=key , item={**response , 'traceback' : str(traceback.format_exc())} , auto_destroy_period=1800 , store_deleted_key=False )
-                # del response['traceback']
-                return response , 200
+                return Response().error( **response )
 
         @self.app.after_request
         def after_request(response) :
 
             if self.simulate_network_delay :
                 time.sleep(self.simulate_network_delay)
-
             try :
                 now = getTimestamp()
                 response.headers['internalid'] = request.internalid

{easy_utils_dev-2.159 → easy_utils_dev-2.160}/easy_utils_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy_utils_dev
-Version: 2.159
+Version: 2.160
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.159 → easy_utils_dev-2.160}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '2.159'
+VERSION = '2.160'
 
 # Setting up
 setup(