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

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

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

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

@@ -16,7 +16,7 @@ setup(
     long_description_content_type='text/markdown',
     license='MIT License',
     name="switch_api",
-    version="0.6.22",
+    version="0.6.25",
     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.22 → switch_api-0.6.25}/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.22"
+__version__ = "0.6.25"

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

@@ -17,6 +17,7 @@ global _control_ws_port
 global _control_ws_username
 global _control_ws_password
 global _control_ws_max_timeout
+global _control_ws_ssl_pwd
 
 _control_api_endpoint = ''
 _control_ws_host = ''
@@ -24,6 +25,7 @@ _control_ws_port = WS_DEFAULT_PORT
 _control_ws_username = ''
 _control_ws_password = ''
 _control_ws_max_timeout = WS_MQTT_DEFAULT_MAX_TIMEOUT
+_control_ws_ssl_pwd = ''
 
 def get_control_config():
     """
@@ -51,6 +53,8 @@ def get_control_config():
             Username for MQTT authentication.
         - password : str
             Password for MQTT authentication.
+        - ssl_pwd : str
+            Password for SSL authentication.
         - max_timeout : int
             Maximum timeout (in seconds) for control operations.
     """
@@ -60,11 +64,12 @@ def get_control_config():
         "ws_port": _control_ws_port,
         "username": _control_ws_username,
         "password": _control_ws_password,
+        "ssl_pwd": _control_ws_ssl_pwd,
         "max_timeout": _control_ws_max_timeout,
     }
 
 
-def set_mqtt_broker_config(api_endpoint: str, ws_host: str, user_name: str, password: str,
+def set_mqtt_broker_config(api_endpoint: str, ws_host: str, user_name: str, password: str, ws_ssl_pwd: str,
                           ws_port: int = WS_DEFAULT_PORT, max_timeout: int = WS_MQTT_DEFAULT_MAX_TIMEOUT, bypass_username_password: bool = False):
     """Set Control Variables
 
@@ -93,6 +98,7 @@ def set_mqtt_broker_config(api_endpoint: str, ws_host: str, user_name: str, pass
     global _control_ws_username
     global _control_ws_password
     global _control_ws_max_timeout
+    global _control_ws_ssl_pwd
 
     # Check if endpoint is a valid URL
     if not api_endpoint.startswith('https://'):
@@ -121,4 +127,5 @@ def set_mqtt_broker_config(api_endpoint: str, ws_host: str, user_name: str, pass
     _control_ws_port = ws_port
     _control_ws_username = user_name
     _control_ws_password = password
+    _control_ws_ssl_pwd = ws_ssl_pwd
     _control_ws_max_timeout = max_timeout

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

@@ -44,6 +44,7 @@ class SwitchRealtime:
         port: int,
         username: str,
         password: str,
+        ssl_pwd: str,
         client_id: str,
         email: str, 
         project_id: str
@@ -56,18 +57,25 @@ 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.ws_set_options(path="/mqtt")
-        
+        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())
+        self.client.tls_set(
+            ca_certs='/usr/share/ca-certificates/mozilla/Go_Daddy_Root_Certificate_Authority_-_G2.crt',
+            cert_reqs=ssl.CERT_REQUIRED,
+            tls_version=ssl.PROTOCOL_TLS_CLIENT,
+            certfile='/agent-data/app/CDSTaskOrchestrator.Worker/switch-cert.pem',
+            keyfile='/agent-data/app/CDSTaskOrchestrator.Worker/switch-key.pem',
+            keyfile_password=ssl_pwd
+        )
+        self.client.tls_insecure_set(False)
+        logger.info("certifi CA bundle: %s", certifi.where())
         # -- adhoc for cds engine server --
 
         if username and password:
@@ -113,7 +121,7 @@ class SwitchRealtime:
             logger.info("Reconnecting existing MQTT client network loop.")
             self.client.reconnect()
         else:
-            self.client.connect(self.host, self.port)
+            self.client.connect(url.hostname, self.port)
             self.client.loop_start() # Run network loop in background thread
             self._loop_started = True
 

{switch_api-0.6.22 → switch_api-0.6.25}/switch_api/realtime/realtime.py

@@ -300,6 +300,7 @@ def submit_realtime_updates(
             port=mqtt_config["ws_port"],
             username=mqtt_config["username"],
             password=mqtt_config["password"],
+            ssl_pwd=mqtt_config["ssl_pwd"],
             client_id=api_inputs.data_feed_id,
             email=api_inputs.email_address,
             project_id=api_inputs.api_project_id,

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

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