easy-utils-dev 2.123__py3-none-any.whl → 2.125__py3-none-any.whl

easy_utils_dev/debugger.py

@@ -34,18 +34,18 @@ def setGlobalDebugLevel(level='info') :
 
 class DEBUGGER:
     def __init__(self 
-                , name
-                , level='info', 
-                fullSyntax=True, 
-                onscreen=True,
-                log_rotation=3,
-                homePath=None,
-                id=getRandomKey(9) , 
-                global_debugger=None,
-                disable_log_write=False,
-                file_name=None,
-                seperate_files=True
-                ):
+            , name
+            , level='info', 
+            fullSyntax=True, 
+            onscreen=True,
+            log_rotation=3,
+            homePath=None,
+            id=getRandomKey(9) , 
+            global_debugger=None,
+            disable_log_write=False,
+            file_name=None,
+            seperate_files=True
+        ):
         env = custom_env()
         setupEnvironment( 'debugger' )
         debugger_on_screen = env.get('debugger_on_screen' , True)
@@ -116,6 +116,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)
+        if os.environ.get("EASY_UTILS_ENABLE_PRINT" , False ).lower() == 'true' :
+            self.enable_print()
 
     def switch_full_syntax(self , toggle) :
         if toggle :
@@ -241,7 +243,9 @@ class DEBUGGER:
                 else :
                     self.set_level(EASY_UTILS_DEBUG_LEVEL)
             self.updateGlobalHomePath()
-            sleep(3)
+            if os.environ.get("EASY_UTILS_ENABLE_PRINT" , False ).lower() == 'true' :
+                self.enable_print()
+            sleep(5)
 
     def close(self) :
         try :
@@ -261,7 +265,6 @@ class DEBUGGER:
                 self.homePath = path
             else :
                 self.homePath = os.path.join(os.getcwd() , 'debug')
-
         if not os.path.exists( self.homePath ) :
             try : 
                 os.makedirs( self.homePath )
@@ -284,13 +287,10 @@ class DEBUGGER:
             ('error', logging.ERROR),
             ('critical', logging.CRITICAL),
         ]
-
         # Optional custom level
         if hasattr(logging, 'SCREEN'):
             levels_order.append(('screen', logging.SCREEN))
-
         current_level = self.logger.level
-
         # Return all levels with numeric value >= current_level
         return [name for name, value in levels_order if value >= current_level]
 

easy_utils_dev/ne1830PSS.py

@@ -711,25 +711,20 @@ class PSS1830 :
     def disconnect(self) :
         self.logger.debug(f'Disconnecting from PSS ...')
         try :
-            self.logger.debug(f'Disconnecting from PSS  [gmre , cli ] ...')
             self.close_cliconnection()
         except :
             pass
 
         try :
-            self.logger.debug(f'Disconnecting from PSS  [cient.channel] ...')
             self.client.close()
         except :
             pass
         
         try :
-            self.logger.debug(f'Disconnecting from PSS  [ssh] ...')
             self.close_ssh()
         except :
             pass
-        self.logger.info('Disconnecting from pss completed')
         try :
-            self.logger.debug(f'Disconnecting from PSS  [logger] ...')
             self.logger.close()
             del self.logger
         except :

easy_utils_dev/wsnoclib.py

@@ -28,9 +28,10 @@ class KafkaConfig :
         self.nsp_cert = None
         self.ca_cert = None
         self.kafka_api_port =8443
-        self.kafka_refresh_period = 3000
+        self.kafka_refresh_period = 1500
         self.kafka_nsp_os_name = None
-        self.kafka_subscription_deleted = False
+        self.kafka_subscription_deleted = False 
+        self.base_url = None
 
 class WSNOCLIB : 
     def __init__( 
@@ -269,15 +270,15 @@ class WSNOCLIB :
             sftp.get('/tmp/nsp.pem' , f'{self.temp_dir}/nsp.pem')
             sftp.get('/tmp/nsp.key' , f'{self.temp_dir}/nsp.key')
             self.kafka.ca_cert = f'{self.temp_dir}/nsp.pem'
-            baseUrl = None
+            baseUrl = self.kafka.base_url = None
             port = self.kafka.kafka_api_port
         else :
             self.logger.debug(f"Working on external NSP to copy the files ...")
             CertLoc = f"""find /var/lib/kubelet/pods/ -type d -path "*/volumes/kubernetes.io~empty-dir/shared-tls-volume" | head -n1"""
             CertLoc = self.ssh.ssh_execute(CertLoc).replace('\n','')
             self.logger.debug(f"CertLoc Host: {CertLoc}")
-            baseUrl = f'https://{nsp_address}'
-            port = None
+            baseUrl = self.kafka.base_url = f'https://{nsp_address}'
+            port = self.kafka.kafka_port = None
             if len(CertLoc) > 15 :
                 self.logger.debug(f"Copying cert files from nsp host machine ....")
                 copies = [
@@ -291,7 +292,7 @@ class WSNOCLIB :
                 self.kafka.ca_cert = f'{self.temp_dir}/cert.pem'
             else :
                 self.logger.error(f'invalid shared volume location: {CertLoc}')
-                raise Exception(f'invalid nsp os containerId')
+                raise Exception(f'invalid shared volume location')
         if sftp :
             sftp.close()
         if len(severities) == 0 :
@@ -336,7 +337,7 @@ class WSNOCLIB :
             self.kafka.response = response
             self.kafka.topicId = response['response']['data']['topicId']
             if auto_refresh :
-                start_thread(target=self.renewSubscription , args=[self.kafka.kafka_api_port])
+                start_thread(target=self.renewSubscription)
             self.killed=False
         else :
             self.logger.error(f"Failed to create kafka subscription.")
@@ -347,7 +348,7 @@ class WSNOCLIB :
     def change_kafka_refresh_period(self , period : int =3000) :
         self.kafka.kafka_refresh_period = period
 
-    def renewSubscription(self , kafka_port ) :
+    def renewSubscription(self) :
         while True :
             try :
                 sleep(self.kafka.kafka_refresh_period) 
@@ -356,12 +357,13 @@ class WSNOCLIB :
                 self.logger.info('Renewing subscription ...')
                 self.kafka.refresh_inprogress = True
                 URL = f"/nbi-notification/api/v1/notifications/subscriptions/{self.kafka.subscriptionId}/renewals"
-                self.post(
+                response = self.post(
                     url=URL,
-                    return_json=True,
-                    port=kafka_port,
+                    baseUrl=self.kafka.base_url,
+                    port=self.kafka.kafka_port,
                 )
-                self.logger.info(f'Renewing subscription completed successfully. sleep {int(self.kafka.kafka_refresh_period)/60} minutes.')
+                self.logger.info(f'Renewing subscription [{response.status_code}]')
+                self.logger.info(f'Renewing subscription Response: [{response.text}]')
             except Exception as error :
                 self.logger.error(f'failed to renew subscription. {error}')
                 self.logger.debug(traceback.format_exc())
@@ -504,6 +506,11 @@ class WSNOCLIB :
         if r.status_code not in [200,201,206]:
             self.logger.error(f'request [POST]: {url} status code: [{r.status_code}]')
             return False
+        try :
+            if 'sign in' in r.text.lower() :
+                raise Exception("WSNOC Authentication Failed")
+        except :
+            pass
         if return_json :
             return r.json()
         return r

{easy_utils_dev-2.123.dist-info → easy_utils_dev-2.125.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy-utils-dev
-Version: 2.123
+Version: 2.125
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 License-File: license.dat

{easy_utils_dev-2.123.dist-info → easy_utils_dev-2.125.dist-info}/RECORD

@@ -8,7 +8,7 @@ easy_utils_dev/brevosmtp.py,sha256=A5n13MnVQnDuSjYQ91-MLftmqfg3VQ-36Zqw9OtoTB4,3
 easy_utils_dev/check_license.py,sha256=C8vKXwaduoF3FSuDJ-J_j5jStNNyUdS-mOdLNfsCjmc,4825
 easy_utils_dev/cplib.py,sha256=TPCFNQh4jYSGsm_CrMdivmD3G5B1rprco2O4B0BSnzo,19570
 easy_utils_dev/custom_env.py,sha256=vxrjikpSNJlKfoBE-ef88UExlpXucUe-HcwHMn3gfB0,1510
-easy_utils_dev/debugger.py,sha256=sRfYoWIYg-sQfynCueZk2I-LtsP-tlPJrSuJoV55tzk,18131
+easy_utils_dev/debugger.py,sha256=3ENr91vsWoHKFSa2YR9P-H7GJhgZKAfOr4NQFKp0Shg,18311
 easy_utils_dev/easy_oracle.py,sha256=Jyc3HSl6eyLayjS8NoE4GOaf8otQlonR5_qOg2h1DjE,2157
 easy_utils_dev/encryptor.py,sha256=f5Zjn0DGtXCyhldpVnBtfcTb4h4Wp0eQPHusEYwIags,1512
 easy_utils_dev/exceptions.py,sha256=6eTYBa8AIXC0wI6zgkqsLreSXyPf459G-ToO7ziQuK4,1669
@@ -16,7 +16,7 @@ easy_utils_dev/filescompressor.py,sha256=iKAtLfkEXOuvvqF56jH0D9KAAeZ7iaa_sRaJnyY
 easy_utils_dev/generate_license.py,sha256=fr_eoSjKCmDmAEBc6FWFXZxGQOHx9XO6hEK8dcyVUlA,3319
 easy_utils_dev/keycloakapi.py,sha256=eHnc5fSC-YVYQU6EFs3ehutITnkHNJktx5BH_hpfxwM,7116
 easy_utils_dev/lralib.py,sha256=3IjaZbTK_hhyETNP7eALsFyQjWM-jb2rg-rjvgdDDIc,6328
-easy_utils_dev/ne1830PSS.py,sha256=egwrIoQmjJTc0K5AIFoBxxAPl8bB373ks5NqOsiNzu8,70462
+easy_utils_dev/ne1830PSS.py,sha256=WWfSMQLrQgjShIebwjhxovuRq30OsoH5zQkWJZcIjjo,70103
 easy_utils_dev/nsp_kafka.py,sha256=oPJUk8GYMLjqXP_H0EbXQwLkpBxf_uGr6l2QtZO1cc8,10725
 easy_utils_dev/openid_server.py,sha256=_odeg6omuizSUEJLtbAVn2PnG9vkcUAQ7rU3K5yXk_I,2545
 easy_utils_dev/optics_utils.py,sha256=G-hFX2iiUCSJjk7BICBRGvVoDq0IBONLZSjagoB5FMg,964
@@ -26,10 +26,10 @@ easy_utils_dev/temp_memory.py,sha256=gfC-izYw8Sg1DD5iOdL8R5-fdB5RK0qkXZie9WmFjPA
 easy_utils_dev/uiserver.py,sha256=aU4RRuOCg31hWDsup4BI5WDiSy7hffB-UZYXzwz5-wI,6811
 easy_utils_dev/utils.py,sha256=BmVnbxc336c6WTeDFcEHN6Mavt7fJrIEyK4GXODV3gI,13345
 easy_utils_dev/winserviceapi.py,sha256=2ZP6jaSt1-5vEJYXqwBhwX-1-eQ3V3YzntsoOoko2cw,18804
-easy_utils_dev/wsnoclib.py,sha256=_MYO6JRBcyl5EVUImLO4vwJqUV0NAa_vLmm1D7mMbuA,28783
+easy_utils_dev/wsnoclib.py,sha256=tC-RmjddaLpihPCRBLGC2RnRpFJqexhvExUr1KncoQM,29063
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
-easy_utils_dev-2.123.dist-info/METADATA,sha256=NBp3UThffmQWbWovlWGL2yb87ODQtcbMNKd7YzvMtFw,537
-easy_utils_dev-2.123.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.123.dist-info/license.dat,sha256=hTRbLnrYZdH7UOsZRYC3IntAhyUkUUXi4TuizI7gca4,74
-easy_utils_dev-2.123.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.123.dist-info/RECORD,,
+easy_utils_dev-2.125.dist-info/METADATA,sha256=NOtO0hyknj91mVqerN1MGks8mjQWI2Evry-Qi2vSDIw,537
+easy_utils_dev-2.125.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.125.dist-info/license.dat,sha256=hTRbLnrYZdH7UOsZRYC3IntAhyUkUUXi4TuizI7gca4,74
+easy_utils_dev-2.125.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.125.dist-info/RECORD,,