easy-utils-dev 2.155__tar.gz → 2.156__tar.gz

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/PKG-INFO

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

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/easy_utils_dev/debugger.py

@@ -45,7 +45,8 @@ class DEBUGGER:
             global_debugger=None,
             disable_log_write=False,
             file_name=None,
-            seperate_files=True
+            seperate_files=True,
+            trust_env_log_path=True
         ):
         env = custom_env()
         setupEnvironment( 'debugger' )
@@ -63,6 +64,7 @@ class DEBUGGER:
         self.create_log_path(homePath, file_name)
         self.fullSyntax=fullSyntax
         self.onScreen= onscreen
+        self.trust_env_log_path = trust_env_log_path
         self.id = id
         self.stream_service = None
         if not env['debugger'].get(name) :
@@ -118,8 +120,9 @@ class DEBUGGER:
         start_thread(target=self.checks_in_bg)
 
     def create_log_path(self , base_path , logname ) :
+        # print(f"Creating log path : {base_path} {logname}")
         if not base_path :
-            base_path = os.path.join(os.getcwd() , 'debug')
+            base_path = os.getcwd()
         if not logname :
             logname = self.name
         if base_path :
@@ -128,10 +131,7 @@ class DEBUGGER:
             self.filename = logname
             self.lastAbsoluteHomePath = base_path
             self.log_path_with_filename = os.path.join(base_path, f'{logname}.log')
-            # print(f"Filename : {self.filename}")
-        # print(f"Base Home Path : {self.baseHomePath}")
-        # print(f"Log path With Filename : {self.log_path_with_filename}")
-        # print(f"Last Absolute Home Path : {self.lastAbsoluteHomePath}")
+
 
     def fix_file_not_found_file_rotation(self) : 
         for i in range(self.BACKUP_COUNT) :
@@ -165,6 +165,8 @@ class DEBUGGER:
         self.console.setFormatter(self.formatter)    
 
     def updateGlobalHomePath(self ) :
+        if not self.trust_env_log_path :
+            return
         if not self.isLogWriteDisabled :
             getFromEnv = self.env.get('debugger_homepath' , None )
             # print(f"getFromEnv : {getFromEnv}")
@@ -273,7 +275,8 @@ class DEBUGGER:
                     self.logger.error(f'EASY_UTILS_DEBUG_LEVEL ENV must be one of [info,debug,warning,error,critical] | Current Env Variable Is "{EASY_UTILS_DEBUG_LEVEL}". Skipping ')
                 else :
                     self.set_level(EASY_UTILS_DEBUG_LEVEL)
-            self.updateGlobalHomePath()
+            if self.trust_env_log_path :
+                self.updateGlobalHomePath()
             if os.environ.get("EASY_UTILS_ENABLE_PRINT" , '' ).lower() == 'true' :
                 self.enable_print()
             sleep(10)
@@ -314,12 +317,13 @@ class DEBUGGER:
     def changeHomePath( self , path ) :
         def delet_later(lastAbsoluteHomePath) :
             if lastAbsoluteHomePath :
-                sleep(3)
+                sleep(1)
                 try :
                     shutil.rmtree(lastAbsoluteHomePath)
                 except :
                     pass
         start_thread(target=delet_later, args=[self.lastAbsoluteHomePath])
+        sleep(.5)
         self.create_log_path( path , self.filename)
         self.file_handler_class = self.createRotateFileHandler(self.log_path_with_filename)
 

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/easy_utils_dev/ne1830PSS.py

@@ -12,9 +12,23 @@ from easy_utils_dev import exceptions
 
 
 class PSS1830 :
-    def __init__(self , sim=False , debug_name='Auto1830PSS' , auto_enable_tcp_forward=False,file_name=None,debug_home_path=None ) -> None:
+    def __init__(self , 
+    sim=False , 
+    debug_name='Auto1830PSS' , 
+    auto_enable_tcp_forward=False,
+    file_name=None,
+    debug_home_path=None,
+    trust_env_log_path=True,
+    debugger_kwargs={}
+    ) -> None:
         self.port = None
-        self.logger = DEBUGGER(debug_name,file_name=file_name, homePath=debug_home_path)
+        self.trust_env_log_path = trust_env_log_path
+        self.logger = DEBUGGER(
+            debug_name,file_name=file_name, 
+            homePath=debug_home_path,
+            trust_env_log_path=trust_env_log_path,
+            **debugger_kwargs
+        )
         self.connected = False
         self.channel = None
         self.nodeName = None

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/easy_utils_dev/uiserver.py

@@ -1,9 +1,12 @@
 import gc
+import json
 import time
+from flask.ctx import F
 from werkzeug.serving import ThreadedWSGIServer
-from easy_utils_dev.utils import getRandomKey , generateToken , getTimestamp
+from easy_utils_dev.utils import convertTimestampToDate, getRandomKey , generateToken , getTimestamp
 from flask_socketio import SocketIO
 from engineio.async_drivers import gevent
+from engineio.async_drivers import threading as threading_engineio
 from flask_cors import CORS
 import logging  , os
 from flask import jsonify, request , current_app , copy_current_request_context
@@ -18,6 +21,9 @@ from werkzeug.serving import make_ssl_devcert
 from time import sleep
 from easy_utils_dev.utils import start_thread , getRandomKeysAndStr , mkdirs
 from easy_utils_dev.temp_memory import TemporaryMemory
+from easy_utils_dev.debugger import DEBUGGER
+import signal
+import sys
 
 def getClassById( id ) :
     return cenv[id]
@@ -92,6 +98,7 @@ class SocketClientObject :
 
 class UISERVER :
     def __init__(self ,
+            logger : DEBUGGER = None,
             id=getRandomKey(n=15),
             secretkey=generateToken(),
             serve_with_secret_key=False,
@@ -121,6 +128,7 @@ class UISERVER :
         self.bg_requests = {}
         self.socketio_clients = []
         self.abort_base_url = '/request/abort'
+        self.return_exception_as_code_400 = True
         self.request_reply_base_url= '/request/result'
         if https :
             self.httpProtocol = 'https'
@@ -133,6 +141,10 @@ class UISERVER :
         start_thread(target=self.delete_very_old_requests)
         self.secret_key_execlude_urls = []
         self.socketio_rooms = {}
+        self.log_url_requests = True
+        self.logger = logger
+        self.simulate_network_delay = False
+
 
     def update_cert(self , crt, ssl ) :
         self.ssl_crt=crt
@@ -158,6 +170,7 @@ class UISERVER :
 
     def delete_very_old_requests(self) :
         while True :
+            sleep(320)
             now = getTimestamp()
             for key, value in list(self.bg_requests.items()) :
                 value : AbortRequest = value
@@ -165,7 +178,6 @@ class UISERVER :
                     if value.delete_async_request_ts > now :
                         del self.bg_requests[key]
             gc.collect()
-            sleep(320)
 
     def create_room(self , room_id : str , members : list[str] ) :
         self.socketio_rooms[room_id] = members
@@ -197,6 +209,14 @@ class UISERVER :
             else :
                 return { 'status' : 404 , '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') }
+            else :
+                return { 'status' : 404 , '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)
@@ -217,6 +237,10 @@ class UISERVER :
 
         @self.app.before_request
         def before_request() :
+            if self.log_url_requests and self.logger :
+                self.logger.info(f'[{request.method}]: {request.url}'  , source='WebServer')
+
+                
             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
                         
@@ -257,26 +281,72 @@ class UISERVER :
                 if request.headers.get('async') == 'false' : 
                     target_func = current_app.view_functions.get(request.endpoint)
                     if not target_func:
-                        return jsonify({"error": "Route not found"}), 404
+                        return {"error": "Route not found"}, 404
                     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
     
+        if self.return_exception_as_code_400 :
+            @self.app.errorhandler(Exception)
+            def handle_exception(e):
+
+                exc_type, exc_value, exc_traceback = sys.exc_info()
+                key = getRandomKeysAndStr(n=10)
+                tb_last = traceback.extract_tb(exc_traceback)[-1]  # Get last traceback frame
+                # Example: file, line, function, text
+                error_file = tb_last.filename
+                error_line = tb_last.lineno
+                error_func = tb_last.name
+                error_code = tb_last.line
+
+                # Log the full traceback (optional)
+                traceback.print_exc()
+                # Customize the error response
+                t = getTimestamp()
+                response = {
+                    "status" : 400 ,
+                    "key" : key,
+                    "error": str(e),
+                    "message": str(e),
+                    "type": type(e).__name__ ,
+                    "request_full_url" : request.url ,
+                    "request_method" : request.method ,
+                    "endpoint" : request.endpoint ,
+                    "request_path" : request.path ,
+                    "error_file" : os.path.basename(error_file).replace('.py' , ''),
+                    "error_line" : error_line,
+                    "error_func" : error_func,
+                    "error_code" : error_code,
+                    'timestamp' : t ,
+                    "date" : convertTimestampToDate(t) ,
+                    'traceback_url' : f"/request/traceback/{key}"
+                }
+                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
 
         @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
                 response.headers['start_ts'] = request.start_ts
                 response.headers['end_ts'] = now
-                response.headers['execution'] = round(now - request.start_ts, 2)
+                x = round(now - request.start_ts, 2)
+                response.headers['execution'] = x
                 if request.abortable :
                     response.headers['abortid'] = request.abort_id 
                     response.headers['abortable'] = True
             except :
                 response.headers['abortable'] = False
+            if self.log_url_requests and self.logger :
+                self.logger.info(f'[{request.method}]: {request.url} - [{response.status_code}] [secs:{x}]'  , source='WebServer')
             return response
 
         # socketio client connected.
@@ -322,12 +392,18 @@ class UISERVER :
         return self.wsgi_server
     
     def shutdownUi(self) :
+        if hasattr(self, 'wsgi_server') and self.wsgi_server:
+            try:
+                self.wsgi_server.shutdown()
+                self.wsgi_server.server_close()
+            except:
+                pass
         kill_thread(self.thread)
-        self.wsgi_server.server_close()
-        self.wsgi_server.shutdown()
 
     def _wait_th(self , t ) :
-        t.join()
+        # t.join()
+        while True :
+            time.sleep(10)
     
 
     def thrStartUi(self , suppress_prints=True) :
@@ -356,15 +432,46 @@ class UISERVER :
         log.setLevel(logging.ERROR)
         wsgi_server.serve_forever()
     
-    def startUi(self ,daemon , suppress_prints=True) :
+    def on_ctrl_c(self , sig=None, frame=None):
+        self.stopUi()
+        pid = os.getpid()
+        os.kill(pid, signal.SIGTERM)
+        sys.exit(0)
+
+
+    def startUi(self , daemon=False , suppress_prints=True , block=False) :
         self.start_before_request()
         self.thread = self.flaskprocess = Thread(target=self.thrStartUi , args=[suppress_prints])
-        self.flaskprocess.daemon = False
+        self.flaskprocess.daemon = daemon
         self.flaskprocess.start()
         start_thread(target=self._wait_th , args=[self.thread] , daemon=daemon)
+        signal.signal(signal.SIGINT, self.on_ctrl_c )
+        if block:
+            self.wait()
         return self.thread
     
+    def wait(self):
+        """
+        Block the main thread to keep it alive for signal handling (Ctrl+C).
+        This allows Ctrl+C to be properly detected. Call this after startUi() 
+        if you want signal handling to work.
+        """
+        try:
+            while self.flaskprocess.is_alive():
+                self.flaskprocess.join(timeout=0.1)
+        except KeyboardInterrupt:
+            if not hasattr(self, '_shutting_down'):
+                self._shutting_down = True
+                self.on_ctrl_c()
+        except SystemExit:
+            # Re-raise SystemExit to allow proper program termination
+            raise
+    
     def stopUi(self) :
+        if hasattr(self, 'wsgi_server') and self.wsgi_server:
+            try:
+                self.wsgi_server.shutdown()
+            except:
+                pass
         kill_thread(self.thread)
-        return True
-    
+        return True

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/easy_utils_dev.egg-info/PKG-INFO

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

{easy_utils_dev-2.155 → easy_utils_dev-2.156}/setup.py

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