easy-utils-dev 2.131__py3-none-any.whl → 2.133__py3-none-any.whl

easy_utils_dev/simple_sqlite.py

@@ -212,7 +212,7 @@ class initDB :
             os.makedirs(outputPath)
         if os.path.exists(fullPath) :
             os.remove(fullPath)
-        with open(fullPath, 'a+') as f:
+        with open(fullPath, 'a+' , encoding='utf-8') as f:
             inside_create = False
             for line in conn.iterdump():
                 # Check if we're inside a CREATE TABLE or CREATE VIEW statement

easy_utils_dev/wsnoclib.py

@@ -13,6 +13,7 @@ import xmltodict
 from .FastQueue import FastQueue
 import tempfile , os 
 from kafka import KafkaConsumer
+from easy_utils_dev.utils import kill_thread
 
 
 
@@ -32,6 +33,7 @@ class KafkaConfig :
         self.kafka_nsp_os_name = None
         self.kafka_subscription_deleted = False 
         self.base_url = None
+        self.kafka_thread=None
 
 class WSNOCLIB : 
     def __init__( 
@@ -68,6 +70,7 @@ class WSNOCLIB :
         self.loggedOut = False
         self.alarms_store=[]
         self.kafka = kafka
+        self.refresh_thread = None
 
     def getLogger(self) : 
         return self.logger
@@ -142,7 +145,7 @@ class WSNOCLIB :
         self.token = r.json()
         self.token.update({'bearer_token' :  self.bearer_token })
         if auto_refresh_token :
-            self.autoRefreshThread = start_thread(target=self.runAutoRefreshThread)
+            self.autoRefreshThread = self.refresh_thread = start_thread(target=self.runAutoRefreshThread)
         self.logger.debug(f'token => {r.text}')
         return self.token
 
@@ -166,6 +169,14 @@ class WSNOCLIB :
             data=body,
             headers=header
         )
+        try :
+            kill_thread(self.refresh_thread)
+        except :
+            pass
+        try :
+            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 :
@@ -337,7 +348,7 @@ class WSNOCLIB :
             self.kafka.response = response
             self.kafka.topicId = response['response']['data']['topicId']
             if auto_refresh :
-                start_thread(target=self.renewSubscription)
+                self.kafka.kafka_thread = start_thread(target=self.renewSubscription)
             self.killed=False
         else :
             self.logger.error(f"Failed to create kafka subscription.")

{easy_utils_dev-2.131.dist-info → easy_utils_dev-2.133.dist-info}/METADATA

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

{easy_utils_dev-2.131.dist-info → easy_utils_dev-2.133.dist-info}/RECORD

@@ -11,7 +11,7 @@ easy_utils_dev/custom_env.py,sha256=vxrjikpSNJlKfoBE-ef88UExlpXucUe-HcwHMn3gfB0,
 easy_utils_dev/debugger.py,sha256=08lYSg9Mx0l440aCk4Z1ofNUlN9pTL9um2CL_cCyUKs,18305
 easy_utils_dev/easy_oracle.py,sha256=Jyc3HSl6eyLayjS8NoE4GOaf8otQlonR5_qOg2h1DjE,2157
 easy_utils_dev/encryptor.py,sha256=f5Zjn0DGtXCyhldpVnBtfcTb4h4Wp0eQPHusEYwIags,1512
-easy_utils_dev/ept.py,sha256=NJemxZR5yNgI-kGp-bcDJtKqKwVWM-wcl1t1LT7iDpA,15666
+easy_utils_dev/ept.py,sha256=kZUBBB0jv4Ang5SNLRwVjVyf8tEO5BuZN8VAZDNDn1I,21657
 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
@@ -22,15 +22,16 @@ easy_utils_dev/nsp_kafka.py,sha256=oPJUk8GYMLjqXP_H0EbXQwLkpBxf_uGr6l2QtZO1cc8,1
 easy_utils_dev/openid_server.py,sha256=_odeg6omuizSUEJLtbAVn2PnG9vkcUAQ7rU3K5yXk_I,2545
 easy_utils_dev/optics_utils.py,sha256=G-hFX2iiUCSJjk7BICBRGvVoDq0IBONLZSjagoB5FMg,964
 easy_utils_dev/require_auth.py,sha256=UsYAxfLX5wda6hd0nfLR_tl0bGQ4DYIpaTowsYSku-E,881
-easy_utils_dev/simple_sqlite.py,sha256=q7_7mDE07Hqjt9LZD7wota6OlQctxN9O1NrVVIJmNTs,13094
+easy_utils_dev/simple_sqlite.py,sha256=J-mcTUnHmAn0eCPD8j-WEoA19uzHRXJ4YRJsyx9B-do,13113
 easy_utils_dev/temp_memory.py,sha256=gfC-izYw8Sg1DD5iOdL8R5-fdB5RK0qkXZie9WmFjPA,1431
 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=tC-RmjddaLpihPCRBLGC2RnRpFJqexhvExUr1KncoQM,29063
+easy_utils_dev/wsnoclib.py,sha256=pCF7bxrV_5rMJNaxQX2wYvnOqgv2yMmUjww8l40mKXA,29423
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
 easy_utils_dev/ept_sql/create_dirs.sql,sha256=Tdd7eaZ1BmIe9DY4gnt2VQ0y_TSYWe9DxObfW2UbL-c,3510
-easy_utils_dev-2.131.dist-info/METADATA,sha256=Uc3_docYtsWYchRIrgJijuyytttLcD55g6MqTbK3DXs,510
-easy_utils_dev-2.131.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.131.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.131.dist-info/RECORD,,
+easy_utils_dev/ept_sql/create_ept_tables.sql,sha256=3qAMuoLjo6Xdw06938jdc8iO4swlNtf_TQDy2H_7es4,64349
+easy_utils_dev-2.133.dist-info/METADATA,sha256=MuhzCxJO1wsoK8LMhGiSvJI5ZKElE1WPkArgyhAcfk0,510
+easy_utils_dev-2.133.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.133.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.133.dist-info/RECORD,,