easy-utils-dev 2.164__tar.gz → 2.166__tar.gz

{easy_utils_dev-2.164 → easy_utils_dev-2.166}/PKG-INFO

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

{easy_utils_dev-2.164 → easy_utils_dev-2.166}/easy_utils_dev/ne1830PSS.py

@@ -10,6 +10,7 @@ from easy_utils_dev.encryptor import initCryptor
 from easy_utils_dev.utils import pingAddress , lget , getTimestamp
 from easy_utils_dev import exceptions
 from typing import Optional
+import re
 
 class PSS1830 :
     def __init__(self , 
@@ -19,6 +20,7 @@ class PSS1830 :
     file_name=None,
     debug_home_path=None,
     trust_env_log_path=True,
+    connect_to_standby_ec=False,
     debugger_kwargs: Optional[DEBUGGER] = {}
     ) -> None:
         self.port = None
@@ -54,7 +56,9 @@ class PSS1830 :
         self.full_buffer=''
         self.pssRelease = None
         self.maxConnectAttempt=3
-        self.connect_to_standby_ec=False
+
+        self.connect_to_standby_ec = connect_to_standby_ec
+
         self.currentConnectAttempt=0
         self.auto_enable_tcp_forward=auto_enable_tcp_forward
         self.tcpForwardStatus=None
@@ -1004,40 +1008,42 @@ class PSS1830 :
         self.logger.debug(f"get_allcards : final return {cards_return}")
         return cards_return  
             
-
+    
     def get_xcs(self) :
-        xcs = self.cli_execute('show xc *')
-        xcs = xcs.splitlines()
+        xcs = self.cli_execute("show xc *")
         xcsList = []
-        for line in xcs.splitlines():
-            line = line.rstrip()
-            # Skip ONLY clear header/separator lines
-            if not line.strip():
-                continue
-            if line.strip().startswith("A-End"):
-                continue
-            if line.strip().startswith("---"):
-                continue
-            if "entries" in line:
-                continue
-            # Split by 2+ spaces
-            details = re.split(r"\s{2,}", line.strip())
-            if len(details) < 10:
-                print("SKIPPED:", details)
+
+        row_regex = re.compile(
+            r"^(?P<aEnd>\S+)\s+"
+            r"(?P<zEnd>\S+)\s+"
+            r"(?P<freq>\d+\.\d+)\s+"
+            r"(?P<id>\d+)\s+"
+            r"(?:(?P<label>\S.*?~)\s+)?"
+            r"(?P<width>\d+\.\d+)\s+"
+            r"(?P<type>\S+)\s+"
+            r"(?P<admin>Up|Down)\s+"
+            r"(?P<oper>Up|Down)\s+"
+            r"(?P<dir>Uni|Bi)"
+        )
+
+        for ln in xcs.splitlines():
+            ln = ln.strip()
+            if not ln:
                 continue
-            aEnd, zEnd, channel, connectionId, label, width, type_, adminState, oper, direction = details[:10]
-            xcsList.append({
-                "aEnd": aEnd,
-                "zEnd": zEnd,
-                "channel": channel,
-                "id": connectionId,
-                "label": label,
-                "width": width,
-                "type": type_,
-                "admin": adminState,
-                "operation": oper,
-                "dir": direction,
-            })
+
+            m = row_regex.search(ln)
+            if not m:
+                continue   # skip header/separators automatically
+
+            data = m.groupdict()
+            # normalize missing label to empty string instead of None
+            if data.get("label") is None:
+                data["label"] = ""
+
+            xcsList.append(data)
+
+        return xcsList
+    
                 
     def showShelf(self , shelfId=1) :
         self.logger.debug(f'show shelf for shelfId={shelfId}')

{easy_utils_dev-2.164 → easy_utils_dev-2.166}/easy_utils_dev/uiserver.py

@@ -83,29 +83,74 @@ class Stream :
         } , to=sid )
 
 class Response : 
-    def __init__(self) :
+    def __init__(self, socket : SocketIO , request : request ) :
         self.success = self.ok
         self.failure = self.error
-
-    def ok(self , result=[] , message=None , **kwargs) :
+        self.socket = socket
+        self.request = request
+
+    def _emit(self , data, role , options={} ) :
+        self.socket.emit('/stream/notify' , { **data , '_role' : role , '_options' : options } , to=self.request.sid)
+
+    def ok(self , result=[] , message=None , alert=False, toast=False , options={} , **kwargs) :
+        role = None
+        if alert :
+            role = 'alert'
+        elif toast :
+            role = 'toast'
         timestamp = getTimestamp()
-        return {'status' : 200 , 'message' : message , 'result' : result , **kwargs, 'timestamp' : timestamp}
-
-    def error(self , message=None , **kwargs) :
+        r = {'status' : 200 , 'message' : message , 'result' : result , **kwargs, 'timestamp' : timestamp}
+        if role :
+            self._emit( r , role, options)
+        return r
+
+    def error(self , message=None , alert=False, toast=False , options={}  , **kwargs) :
+        role = None
+        if alert :
+            role = 'alert'
+        elif toast :
+            role = 'toast'
         timestamp = getTimestamp()
-        return {'status' : 400 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        r = {'status' : 400 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        if role :
+            self._emit( r , role , options)
+        return r
     
-    def internal_error(self , message=None , **kwargs ) :
+    def internal_error(self , message=None , alert=False, toast=False , options={}  , **kwargs ) :
+        role = None
+        if alert :
+            role = 'alert'
+        elif toast :
+            role = 'toast'
         timestamp = getTimestamp()
-        return {'status' : 500 , 'message' : message , **kwargs , 'timestamp' : timestamp}
-
-    def not_found(self , message=None , **kwargs) :
+        r = {'status' : 500 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        if role :
+            self._emit( r , role , options)
+        return r
+
+    def not_found(self , message=None , alert=False, toast=False , options={}  , **kwargs) :
+        role = None
+        if alert :
+            role = 'alert'
+        elif toast :
+            role = 'toast'
         timestamp = getTimestamp()
-        return {'status' : 404 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        r = {'status' : 404 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        if role :
+            self._emit( r , role , options )
+        return r
     
-    def unauthorized(self , message=None , **kwargs) :
+    def unauthorized(self , message=None , alert=False, toast=False , options={}  , **kwargs) :
+        role = None
+        if alert :
+            role = 'alert'
+        elif toast :
+            role = 'toast'
         timestamp = getTimestamp()
-        return {'status' : 401 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        r = {'status' : 401 , 'message' : message , **kwargs , 'timestamp' : timestamp}
+        if role :
+            self._emit( r , role , options)
+        return r
 
 class AbortRequest :
     def __init__(self, request ) :
@@ -203,6 +248,7 @@ class UISERVER :
         self.logger = logger
         self.stream = Stream()
         self.simulate_network_delay = False
+        self.Response = Response(self.socketio , request )
         if not self.logger :
             self.logger = DEBUGGER(
                 name='easy_utils_dev_uiserver',
@@ -267,24 +313,24 @@ class UISERVER :
                     if not alive :
                         break
                     time.sleep(.25)
-                return Response().ok(message='Request aborted' , abort_timestamp=timestamp , abort_id=id , alive=alive , url=abort.request.get('path'))
+                return self.Response.ok(message='Request aborted' , abort_timestamp=timestamp , abort_id=id , alive=alive , url=abort.request.get('path'))
             
             else :
-                return Response().not_found(message='Request not found or request is not abortable. Check request headers for abortable flag.')
+                return self.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 Response().ok(message='Traceback found' , traceback=traceback.get('traceback'))
+                return self.Response.ok(message='Traceback found' , traceback=traceback.get('traceback'))
             else :
-                return Response().not_found(message='Traceback not found or expired')
+                return self.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 Response().ok(
+                return self.Response.ok(
                     message='Result of async request found' , 
                     result=request.result ,
                     in_progress=request.in_progress ,
@@ -305,7 +351,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 Response().unauthorized(message='Secret key is invalid')
+                return self.Response.unauthorized(message='Secret key is invalid')
                         
             @copy_current_request_context
             def run_async_job_results( target_func , abort : AbortRequest ) :
@@ -349,11 +395,11 @@ class UISERVER :
                 if request.headers.get('async') == 'false' : 
                     target_func = current_app.view_functions.get(request.endpoint)
                     if not target_func:
-                        return Response().not_found(message='Route not found')
+                        return self.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 Response().ok(message='Request now in running bg' , abort_id=abort.abort_id)
+                    return self.Response.ok(message='Request now in running bg' , abort_id=abort.abort_id)
     
         if self.return_exception_as_code_400 :
             @self.app.errorhandler(Exception)
@@ -392,7 +438,7 @@ 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 )
-                return Response().error( **response )
+                return self.Response.error( **response )
 
         @self.app.after_request
         def after_request(response) :

{easy_utils_dev-2.164 → easy_utils_dev-2.166}/easy_utils_dev.egg-info/PKG-INFO

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

{easy_utils_dev-2.164 → easy_utils_dev-2.166}/setup.py

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