emerald-hws 0.0.1__tar.gz → 0.0.3__tar.gz

{emerald_hws-0.0.1 → emerald_hws-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emerald_hws
-Version: 0.0.1
+Version: 0.0.3
 Summary: A package to manipulate and monitor Emerald Heat Pump Hot Water Systems
 Author-email: Ross Williamson <ross@inertia.net.nz>
 Project-URL: Homepage, https://github.com/ross-w/emerald_hws_py
@@ -12,7 +12,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3
-Requires-Dist: AWSIoTPythonSDK.MQTTLib
+Requires-Dist: AWSIoTPythonSDK
 
 # emerald_hws_py
 Python package for controlling Emerald Heat Pump Hot Water Systems

{emerald_hws-0.0.1 → emerald_hws-0.0.3}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "emerald_hws"
-version = "0.0.1"
+version = "0.0.3"
 dependencies = [
   "boto3",
-  "AWSIoTPythonSDK.MQTTLib"
+  "AWSIoTPythonSDK"
 ]
 authors = [
   { name="Ross Williamson", email="ross@inertia.net.nz" },
@@ -21,6 +21,15 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"*" = ["*.*"]
+
 [project.urls]
 "Homepage" = "https://github.com/ross-w/emerald_hws_py"
 "Bug Tracker" = "https://github.com/ross-w/emerald_hws_py/issues"

emerald_hws-0.0.3/src/emerald_hws/__assets__/SFSRootCAG2.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----

{emerald_hws-0.0.1 → emerald_hws-0.0.3}/src/emerald_hws/emeraldhws.py

@@ -1,5 +1,6 @@
 import json
 import requests
+import os
 # import logging
 import boto3
 import random
@@ -77,6 +78,8 @@ class EmeraldHWS():
         """ Establishes a connection to Amazon IOT core's MQTT service
         """
 
+        cert_path = os.path.join(os.path.dirname(__file__), '__assets__', 'SFSRootCAG2.pem')
+
         # Cognito auth
         identityPoolID = self.COGNITO_IDENTITY_POOL_ID
         region = self.MQTT_HOST.split('.')[2]
@@ -95,7 +98,7 @@ class EmeraldHWS():
 
         # AWSIoTMQTTClient configuration
         myAWSIoTMQTTClient.configureEndpoint(self.MQTT_HOST, 443)
-        myAWSIoTMQTTClient.configureCredentials("./SFSRootCAG2.pem")
+        myAWSIoTMQTTClient.configureCredentials(cert_path)
         myAWSIoTMQTTClient.configureIAMCredentials(AccessKeyId, SecretKey, SessionToken)
         myAWSIoTMQTTClient.configureAutoReconnectBackoffTime(1, 32, 20)
         myAWSIoTMQTTClient.configureOfflinePublishQueueing(-1)  # Infinite offline Publish queueing
@@ -237,6 +240,19 @@ class EmeraldHWS():
         mode_status = self.getFullStatus(id).get("last_state").get("mode")
         return mode_status
 
+    def getInfo(self, id):
+        """ Returns identifying details for the specified HWS
+        :param id: The UUID of the HWS to query
+        """
+        full_status = self.getFullStatus(id)
+
+        return {'id': id,
+                'serial_number': full_status.get("serial_number"),
+                'brand': full_status.get("brand"),
+                'hw_version': full_status.get("hw_version"),
+                'soft_version': full_status.get("soft_version")
+                }
+
     def listHWS(self):
         """ Returns a list of UUIDs of all discovered HWS
         """

{emerald_hws-0.0.1 → emerald_hws-0.0.3}/src/emerald_hws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emerald_hws
-Version: 0.0.1
+Version: 0.0.3
 Summary: A package to manipulate and monitor Emerald Heat Pump Hot Water Systems
 Author-email: Ross Williamson <ross@inertia.net.nz>
 Project-URL: Homepage, https://github.com/ross-w/emerald_hws_py
@@ -12,7 +12,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3
-Requires-Dist: AWSIoTPythonSDK.MQTTLib
+Requires-Dist: AWSIoTPythonSDK
 
 # emerald_hws_py
 Python package for controlling Emerald Heat Pump Hot Water Systems

{emerald_hws-0.0.1 → emerald_hws-0.0.3}/src/emerald_hws.egg-info/SOURCES.txt

@@ -7,4 +7,5 @@ src/emerald_hws.egg-info/PKG-INFO
 src/emerald_hws.egg-info/SOURCES.txt
 src/emerald_hws.egg-info/dependency_links.txt
 src/emerald_hws.egg-info/requires.txt
-src/emerald_hws.egg-info/top_level.txt
+src/emerald_hws.egg-info/top_level.txt
+src/emerald_hws/__assets__/SFSRootCAG2.pem

emerald_hws-0.0.3/src/emerald_hws.egg-info/requires.txt

@@ -0,0 +1,2 @@
+boto3
+AWSIoTPythonSDK

emerald_hws-0.0.1/src/emerald_hws.egg-info/requires.txt

@@ -1,2 +0,0 @@
-boto3
-AWSIoTPythonSDK.MQTTLib