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

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

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

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

@@ -9,7 +9,7 @@ from easy_utils_dev.debugger import DEBUGGER
 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
 
 class PSS1830 :
     def __init__(self , 
@@ -19,7 +19,7 @@ class PSS1830 :
     file_name=None,
     debug_home_path=None,
     trust_env_log_path=True,
-    debugger_kwargs={}
+    debugger_kwargs: Optional[DEBUGGER] = {}
     ) -> None:
         self.port = None
         self.trust_env_log_path = trust_env_log_path
@@ -215,7 +215,7 @@ class PSS1830 :
             if ("authentication failed") in str(new_data).lower() : 
                 raise exceptions.CliAuthenticationFailure(str(new_data))
         if not isPasswordOk :
-            raise exceptions.CliAuthenticationFailure(f"Password {self.cliPw} is not found in the login prompt.")
+            raise exceptions.CliAuthenticationFailure(f"Invalid expected password Prompt")
         if self.resetRequired:
             self.newUserPwdReset()
             sleep(1)
@@ -337,6 +337,7 @@ class PSS1830 :
             return result  
 
     def newUserPwdReset(self):
+        self.logger.info(f"Changing Password from tmp password {self.tmpPassword} to user password ..." , source=self.neip)
         self.logger.debug(f'Changing Password for the Newely Created User')
         for i in range(30) :
             self.logger.debug(f"Try {i}/30 to change the password on login ..")
@@ -507,6 +508,7 @@ class PSS1830 :
                 local_addr = ( current_ec_ip , 5122 )  # dummy source addre ss
                 channel = jump_transport.open_channel('direct-tcpip', dest_addr, local_addr)
                 client = self.createClient()
+                self.logger.debug(f"Trying to connect to remote controller root@{self.neip}::{remote_ec_ip}:5122:pw:{self.rootPw}")
                 client.connect( self.neip , 5122 , "root" , self.rootPw , sock=channel )
                 self.client = client
                 self.logger.debug(f"switching to standby EC {remote_ec_ip} completed")
@@ -592,6 +594,7 @@ class PSS1830 :
             self.logger.censor.add_censored_string(str(rootpw))
             self.logger.censor.add_censored_string(str(neip))
             self.logger.censor.add_censored_string(str(pw))
+        
         self.logger.debug(f'Opening SSH  connection to NE {mode}::{neip} -resetRequired={resetRequired}')
         self.cliUser = user
         self.mode = mode
@@ -1006,33 +1009,36 @@ class PSS1830 :
         xcs = self.cli_execute('show xc *')
         xcs = xcs.splitlines()
         xcsList = []
-        for _ , line in enumerate(xcs) : 
-            if "A-End" in line or 'OCH Trail' in line or "Admin Oper" in line or "entries" in line or " "*20 in line or "------------" in line : 
+        for line in xcs.splitlines():
+            line = line.rstrip()
+            # Skip ONLY clear header/separator lines
+            if not line.strip():
                 continue
-            details = line.split('  ')
-            details = [ i for i in details if i != "" ]
-            if len(details) == 0 : 
+            if line.strip().startswith("A-End"):
                 continue
-            try :
-                aEnd = details[0]
-                zEnd = details[1]
-                channel = details[2]
-                connectionId = details[3]
-                label = details[4]
-                width = details[5]
-                type = details[6]
-                adminState = details[7]
-                oper = details[8]
-                dir = details[9]
-            except :
+            if line.strip().startswith("---"):
+                continue
+            if "entries" in line:
                 continue
-            tmp = {'aEnd' : aEnd , 'zEnd' : zEnd , 'channel' : channel , "id" : connectionId ,
-                   "label" : label , 'width' : width , "type" : type , "admin" : adminState , 
-                   "operation" : oper , 'dir' : dir
-                   }
-            xcsList.append(tmp)
-        return xcsList        
-         
+            # Split by 2+ spaces
+            details = re.split(r"\s{2,}", line.strip())
+            if len(details) < 10:
+                print("SKIPPED:", details)
+                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,
+            })
+                
     def showShelf(self , shelfId=1) :
         self.logger.debug(f'show shelf for shelfId={shelfId}')
         cli= f'show shelf {shelfId}'
@@ -1094,7 +1100,6 @@ class PSS1830 :
                 })
         return result
 
-
     def get_cards(self) :
         cards = self.cli_execute('show card inven *')
         raw_return = cards

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

@@ -19,11 +19,15 @@ from multiprocessing import Process
 import traceback
 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.utils import start_thread , getRandomKeysAndStr , mkdirs , lget
 from easy_utils_dev.temp_memory import TemporaryMemory
 from easy_utils_dev.debugger import DEBUGGER
 import signal
-import sys
+import sys 
+from tempfile import gettempdir
+from urllib.parse import parse_qs
+
+TMP_PATH = gettempdir()
 
 def getClassById( id ) :
     return cenv[id]
@@ -51,6 +55,33 @@ def clone_request(request):
         "cookies": request.cookies,
     }
 
+class Stream :
+    def __init__(self) :
+        self.rows = []
+
+    def register_row(self , row , options={}) :
+        _row_stream_id = getRandomKeysAndStr(n=20)
+        row['_row_stream_id'] = _row_stream_id
+        for key , value in options.items() :
+            if not key.startswith('_') :
+                raise ValueError(f"Option key '{key}' must start with '_'")
+            row[key] = value
+        return row
+
+    def send_cell_update(self , row , cell , value , sid=None ) :
+        _row_stream_id = row['_row_stream_id']
+        self.socketio.emit(f'/stream/{_row_stream_id}/{cell}' , value , to=sid)
+
+    def send_new_row(self , tid , row , sid=None , insert_ontop=False ) :
+        if not row.get('_row_stream_id') :
+            row = self.register_table_row_stream(row)
+        self.socketio.emit(f'/stream/table/{tid}/row' , {
+            'row' : row,
+            'options' : {
+                'insert_ontop' : insert_ontop
+            }
+        } , to=sid )
+
 class Response : 
     def __init__(self) :
         self.success = self.ok
@@ -118,7 +149,9 @@ class SocketClientObject :
         self.client : SocketIO
         self.internalid : str = None
         self.request = {}
+        self.sid = None
         self.rooms = None
+        self.csid = None
 
 class UISERVER :
     def __init__(self ,
@@ -154,6 +187,7 @@ class UISERVER :
         self.abort_base_url = '/request/abort'
         self.return_exception_as_code_400 = True
         self.request_reply_base_url= '/request/result'
+        self.sessions = {}
         if https :
             self.httpProtocol = 'https'
         else :
@@ -167,9 +201,13 @@ class UISERVER :
         self.socketio_rooms = {}
         self.log_url_requests = True
         self.logger = logger
+        self.stream = Stream()
         self.simulate_network_delay = False
-
-
+        if not self.logger :
+            self.logger = DEBUGGER(
+                name='easy_utils_dev_uiserver',
+                homePath=TMP_PATH
+            )
     def update_cert(self , crt, ssl ) :
         self.ssl_crt=crt
         self.ssl_key=ssl
@@ -290,9 +328,14 @@ class UISERVER :
                 abort.delete_async_request_ts = getTimestamp(after_seconds=3600)
 
 
+            request.sid = ''
             abortable = request.headers.get('abortable')
             requestId = getRandomKeysAndStr(n=10)
             request.start_ts = getTimestamp()
+            client : SocketClientObject = self.sessions.get(request.headers.get('csid'))
+            request.sid = client.sid
+            request.client = client
+            request.csid = request.headers.get('csid')
             request.internalid = requestId
             if abortable :
                 abort = self.register_abortable_request(request)
@@ -356,12 +399,12 @@ class UISERVER :
 
             if self.simulate_network_delay :
                 time.sleep(self.simulate_network_delay)
+            now = getTimestamp()
+            x = round(now - request.start_ts, 2)
             try :
-                now = getTimestamp()
                 response.headers['internalid'] = request.internalid
                 response.headers['start_ts'] = request.start_ts
                 response.headers['end_ts'] = now
-                x = round(now - request.start_ts, 2)
                 response.headers['execution'] = x
                 if request.abortable :
                     response.headers['abortid'] = request.abort_id 
@@ -372,6 +415,7 @@ class UISERVER :
                 self.logger.info(f'[{request.method}]: {request.url} - [{response.status_code}] [secs:{x}]'  , source='WebServer')
             return response
 
+
         # socketio client connected.
         @self.socketio.on('connect')
         def handle_client_connect():
@@ -380,6 +424,9 @@ class UISERVER :
             client.internalid = getRandomKeysAndStr(n=20)
             client.sid = sid
             client.request = request
+            query = parse_qs(request.query_string.decode('utf-8'))
+            csid = lget(query.get('csid') , 0 , None )
+            client.csid = csid
             client.rooms = self.socketio_rooms
             self.socketio_clients.append(client)
             self.socketio.emit('/internal/connect', { 
@@ -390,7 +437,9 @@ class UISERVER :
             }, 
                 to=sid
             )
-            print(f'client connected : {sid} | Clients : {len(self.socketio_clients)}')
+            if csid :
+                self.sessions[csid] = client
+            print(f'client connected : csid={csid} | SID={sid} | Clients : {len(self.socketio_clients)}')
         
         # socketio client connected.
         @self.socketio.on('disconnect')
@@ -398,22 +447,19 @@ class UISERVER :
             for i , c in enumerate(list(self.socketio_clients)) :
                 print(f'c.sid : {c.sid} | request.sid : {request.sid}')
                 if c.sid == request.sid :
-                    del self.socketio_clients[i]
-                    print(f'client disconnected : {request.sid} | Clients : {len(self.socketio_clients)}')
+                    try :
+                        del self.socketio_clients[i]
+                    except :
+                        pass
+                    print(f'client disconnected : csid={c.csid} | SID={request.sid} | Clients : {len(self.socketio_clients)}')
                     break
 
-    def getInstance(self) :
-        return self.getFlask() , self.getSocketio() , self.getWsgi()
-    
     def getSocketio( self ):
         return self.socketio
     
     def getFlask( self ):
         return self.app
     
-    def getWsgi(self) :
-        return self.wsgi_server
-    
     def shutdownUi(self) :
         if hasattr(self, 'wsgi_server') and self.wsgi_server:
             try:

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

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

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

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