easy-utils-dev 2.136__py3-none-any.whl → 2.137__py3-none-any.whl

easy_utils_dev/wsnoclib.py

@@ -14,6 +14,7 @@ from .FastQueue import FastQueue
 import tempfile , os 
 from kafka import KafkaConsumer
 from easy_utils_dev.utils import kill_thread
+import atexit
 
 
 
@@ -35,6 +36,8 @@ class KafkaConfig :
         self.base_url = None
         self.kafka_thread=None
 
+
+
 class WSNOCLIB : 
     def __init__( 
         self, 
@@ -46,7 +49,8 @@ class WSNOCLIB :
         debug_homepath='./debug/',
         request_max_count=30,
         tmp_dir = tempfile.gettempdir() ,
-        kafka = KafkaConfig()
+        kafka = KafkaConfig(),
+        register_atexit=True
     ): 
         self.logger = DEBUGGER(f'{debug_name}-{ip}',level=debug_level,homePath=debug_homepath)
         self.disabledWarnings = self.disableUrlWarnings()
@@ -55,6 +59,8 @@ class WSNOCLIB :
         self.username = username
         self.password = password
         self.external_nsp = False
+        self.api_count = 0
+        self.api_count_limit = 999999999999
         self.temp_dir = os.path.join(tmp_dir , 'wsnoclib' )
         self.baseUrl = self.createBaseUrl()
         self.session = requests.Session()
@@ -69,8 +75,12 @@ class WSNOCLIB :
         self.nes=[]
         self.loggedOut = False
         self.alarms_store=[]
+        self.refresh_inprogress = False
         self.kafka = kafka
         self.refresh_thread = None
+        self.session = WSNOCSession(self)
+        if register_atexit :
+            atexit.register(self.goodbye)
 
     def getLogger(self) : 
         return self.logger
@@ -157,15 +167,11 @@ class WSNOCLIB :
     def logout(self,logout=True) :
         self.logger.info(f"Logging out from {self.address} ...")
         body = f"token={self.access_token}&token_type_hint=token"
-        self.logger.debug(f"logout body={body}")
         header = {"Content-Type": "application/x-www-form-urlencoded"}
-        self.logger.debug(f"logout header={header} address={self.address}")
         URL = f"https://{self.address}/rest-gateway/rest/api/v1/auth/revocation"
-        self.logger.debug(f'Logout URL {URL}')
-        r = requests.post(
+        r = self.session.post(
             url = URL ,
             auth=BAuth(self.username, self.password),
-            verify=False,
             data=body,
             headers=header
         )
@@ -177,29 +183,31 @@ class WSNOCLIB :
             kill_thread(self.kafka.kafka_thread)
         except :
             pass
-        self.logger.info(f"Logging out from '{self.address}' response.code={r.status_code}")
-        self.logger.debug(f"Logout response is {r.text}")
-        if r.status_code != 200 :
-            self.logger.debug(f'fail message is {r.text}')
-            self.logger.error(f"Failed logging out from {self.address}")
-        self.numberOfRequests = 0
         if logout :
             self.loggedOut = True
-        self.logger.debug("logout function completed. return TRUE exit status")
         try :
             r.close()
         except :
             pass
         return True
 
+    def goodbye(self):
+        try :
+            self.logout(True)
+        except :
+            pass
+
     def runAutoRefreshThread(self) : 
         self.logger.info(f'Waiting for auto refresh in {self.tokenRefreshPeriod}sec...')
         sleep(self.tokenRefreshPeriod)
         self.logger.info(f"Waiting period completed. Starting Revoking/Login process ...")
+        self.refresh_inprogress = True
         self.logout(logout=False)
-        sleep(10)
+        sleep(30)
         self.logger.info(f"Logout process completed. Starting Reconnecting ...")
         self.connect(self.auto_refresh_token)
+        self.refresh_inprogress = False
+        self.event.dispatchEvent('onTokenRefresh', self.token)
 
     def kafka_connect( self , 
             user , 
@@ -660,6 +668,44 @@ class WSNOCLIB :
         URL = "/oms1350/data/common/sessionInfo"
         return self.get(URL)
 
+
+class WSNOCSession(requests.Session):
+    from easy_utils_dev.wsnoclib import WSNOCLIB
+    def __init__(self, wsnoc : WSNOCLIB):
+        super().__init__()
+        self.headers.update({"Content-Type": "application/json"})  # base defaults
+        self._wsnoc = wsnoc
+        self.verify = False
+        
+    def rebuild_auth(self, prepared_request, response):
+        return
+
+    def hold_for_token_refresh(self) :
+        while self._wsnoc.refresh_inprogress :
+            sleep(.1)
+
+    def request(self, method, url , retries=0 , **kwargs):
+        self._wsnoc.logger.debug(f'[{method}] : {url}')
+        self.hold_for_token_refresh()
+        self._wsnoc.api_count += 1
+        token = self._wsnoc.getLatestToken().get('bearer_token')
+        request_headers = kwargs.get('headers' , {})
+        if not request_headers.get('Authorization') :
+            request_headers['Authorization'] = token
+        kwargs['headers'] = request_headers
+        request = super().request(method, url, **kwargs  )
+        for i in range(retries) :
+            if request.ok :
+                break
+            if not request.ok :
+                sleep(1)
+                self.hold_for_token_refresh()
+                request = super().request(method, url, **kwargs )
+                self._wsnoc.logger.debug(f'[Try-{i}] [{method}] : {url}- {request.status_code}')
+        self._wsnoc.logger.info(f'[{method}] : {url}- {request.status_code}')
+        return request
+
+
 if __name__ == '__main__' :
     # noc = WSNOCLIB('10.20.30.55' , 'admin' , 'Nokia@2024') 
     # noc.connect(auto_refresh_token=True)

{easy_utils_dev-2.136.dist-info → easy_utils_dev-2.137.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy-utils-dev
-Version: 2.136
+Version: 2.137
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.136.dist-info → easy_utils_dev-2.137.dist-info}/RECORD

@@ -1,5 +1,5 @@
 easy_utils_dev/EasySsh.py,sha256=PbFK1vSBcnt_SfkZXZGh5wg6Sg9R2WlXeGdvjZluJ9E,3592
-easy_utils_dev/Events.py,sha256=MdI53gAyXX_2jmChpayayQM0ZitgjtkyUNrQYGEEZnw,2978
+easy_utils_dev/Events.py,sha256=LlD1oFLCtFmodOVJW3U7PIG_gaRM4NjRRQrNYnjTdL0,2993
 easy_utils_dev/FastQueue.py,sha256=Drt8B_hEdmg9eAt7OWSgTyoJ3rUHkeJHk9xdaehtEsY,5622
 easy_utils_dev/NameObject.py,sha256=Z4Qp3qfMcQeMPw35PV_xOu8kigRtfSRZ4h7woR0t3Gg,270
 easy_utils_dev/__init__.py,sha256=cHuXcH3IjYRApwVhVjKmgMSVGIJBmGWJhgtsKawq6_0,801
@@ -8,10 +8,10 @@ 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=08lYSg9Mx0l440aCk4Z1ofNUlN9pTL9um2CL_cCyUKs,18305
+easy_utils_dev/debugger.py,sha256=Oz4WcT59FbHouTpprslocljDvevFdmP9hc_zNRVmSdE,18318
 easy_utils_dev/easy_oracle.py,sha256=Jyc3HSl6eyLayjS8NoE4GOaf8otQlonR5_qOg2h1DjE,2157
 easy_utils_dev/encryptor.py,sha256=f5Zjn0DGtXCyhldpVnBtfcTb4h4Wp0eQPHusEYwIags,1512
-easy_utils_dev/ept.py,sha256=YXO2lJv4ngu1gOQqwyJjaQCgXA1CBAIoHNTTezmuf1U,21598
+easy_utils_dev/ept.py,sha256=X-Z0_XCNfKK1TxQZquPMBqo3ZuxnK4TvWAYPnBUMlPI,25363
 easy_utils_dev/exceptions.py,sha256=6eTYBa8AIXC0wI6zgkqsLreSXyPf459G-ToO7ziQuK4,1669
 easy_utils_dev/filescompressor.py,sha256=iKAtLfkEXOuvvqF56jH0D9KAAeZ7iaa_sRaJnyYkxiE,2875
 easy_utils_dev/generate_license.py,sha256=fr_eoSjKCmDmAEBc6FWFXZxGQOHx9XO6hEK8dcyVUlA,3319
@@ -27,11 +27,11 @@ easy_utils_dev/temp_memory.py,sha256=gfC-izYw8Sg1DD5iOdL8R5-fdB5RK0qkXZie9WmFjPA
 easy_utils_dev/uiserver.py,sha256=d9jImwgSURMH4MIU4Zkro2b20cAbuV8rO_If42FVyZ4,6826
 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=pCF7bxrV_5rMJNaxQX2wYvnOqgv2yMmUjww8l40mKXA,29423
+easy_utils_dev/wsnoclib.py,sha256=z18kdPJJeNYAaomqH1t6KfTWm77BNPx6aPAW9P0PSOc,30813
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
 easy_utils_dev/ept_sql/create_dirs.sql,sha256=KWfX-Nc6lvr_BC-P6O97NE0idoPW4GNKUKUCgonJhto,3508
 easy_utils_dev/ept_sql/create_ept_tables.sql,sha256=WDHyIyeReV8_QaYBPIpSy-lto3OKvZtex1tWs-FPURQ,67737
-easy_utils_dev-2.136.dist-info/METADATA,sha256=-pOOYCl11uWfcwI41QfnHYAY2sgVwR8W-BoDZmV-6jk,510
-easy_utils_dev-2.136.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.136.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.136.dist-info/RECORD,,
+easy_utils_dev-2.137.dist-info/METADATA,sha256=YmtJqRufCetuY1EsAVhwuib0-WbzKJbjoMB9x8MxdEY,510
+easy_utils_dev-2.137.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.137.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.137.dist-info/RECORD,,