switch-api 0.6.20__tar.gz → 0.6.22__tar.gz

{switch_api-0.6.20 → switch_api-0.6.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: switch_api
-Version: 0.6.20
+Version: 0.6.22
 Summary: A complete package for data ingestion into the Switch Automation Platform.
 Author: Switch Automation Pty Ltd.
 License: MIT License

{switch_api-0.6.20 → switch_api-0.6.22}/setup.py

@@ -16,7 +16,7 @@ setup(
     long_description_content_type='text/markdown',
     license='MIT License',
     name="switch_api",
-    version="0.6.20",
+    version="0.6.22",
     packages=find_packages(include=["switch_api", "switch_api.*"]),
     install_requires=['pandas==1.5.3', 'requests', 'azure-storage-blob', 'pandera[io]==0.7.1', 'azure-servicebus',
                       'msal>=1.11.0', 'paho-mqtt==1.6.1', 'uvicorn==0.22.0', 'fastapi==0.98.0', 'pyodbc==4.0.39', 'cachetools==5.5.0', 

{switch_api-0.6.20 → switch_api-0.6.22}/switch_api/__init__.py

@@ -44,4 +44,4 @@ from . import _guide
 # log.addHandler(_ch)
 # https://dev.to/joaomcteixeira/setting-up-python-logging-for-a-library-app-6ml
 
-__version__ = "0.6.20"
+__version__ = "0.6.22"

{switch_api-0.6.20 → switch_api-0.6.22}/switch_api/_utils/_mqtt.py

@@ -100,9 +100,9 @@ def set_mqtt_broker_config(api_endpoint: str, ws_host: str, user_name: str, pass
             "Invalid IoT API Endpoint. The IoT host should start with 'https://'.")
 
     # # Check if host is a valid URL
-    if not ws_host.startswith('wss://'):
-        raise ValueError(
-            "Invalid IoT Websocket MQTT Host. The IoT host should start with 'wss://'.")
+    # if not ws_host.startswith('wss://'):
+    #     raise ValueError(
+    #         "Invalid IoT Websocket MQTT Host. The IoT host should start with 'wss://'.")
 
     # Check if user_name and password are not empty
     if not bypass_username_password:

{switch_api-0.6.20 → switch_api-0.6.22}/switch_api/realtime/_mqtt.py

@@ -56,15 +56,18 @@ class SwitchRealtime:
 
         self.client_id = client_id
         self.client = mqtt.Client(client_id=client_id, transport='websockets', clean_session=True)
-        # self.client.tls_set()
+        self.client.tls_set()
 
         # -- adhoc for cds engine server --
-        self.client.tls_set(
-            ca_certs=certifi.where(),
-            cert_reqs=ssl.CERT_REQUIRED,
-            tls_version=ssl.PROTOCOL_TLS_CLIENT,
-        )
-        self.client.tls_insecure_set(False)
+        # self.client.ws_set_options(path="/mqtt")
+        
+        # self.client.tls_set(
+        #     ca_certs=certifi.where(),
+        #     cert_reqs=ssl.CERT_REQUIRED,
+        #     tls_version=ssl.PROTOCOL_TLS_CLIENT,
+        # )
+        # self.client.tls_insecure_set(False)
+        # logger.info("certifi CA bundle: %s", certifi.where())
         # -- adhoc for cds engine server --
 
         if username and password:
@@ -110,7 +113,7 @@ class SwitchRealtime:
             logger.info("Reconnecting existing MQTT client network loop.")
             self.client.reconnect()
         else:
-            self.client.connect(host=url.hostname, port=self.port)
+            self.client.connect(self.host, self.port)
             self.client.loop_start() # Run network loop in background thread
             self._loop_started = True
 

{switch_api-0.6.20 → switch_api-0.6.22}/switch_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: switch_api
-Version: 0.6.20
+Version: 0.6.22
 Summary: A complete package for data ingestion into the Switch Automation Platform.
 Author: Switch Automation Pty Ltd.
 License: MIT License