Merge pull request #5 from pascalberski/issue4

bug fixed: value update
pascalberski · Apr 2, 2022 · c5c2ddc · c5c2ddc
2 parents f67cd70 + 2ddfd48
commit c5c2ddc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/custom_components/octune/api.py b/custom_components/octune/api.py
@@ -1,7 +1,6 @@
 """
 OCTune API interface
 """
-import json
 import logging
 import httpx
 
@@ -19,14 +18,27 @@ async def get_devices(self):
         devices = await self.get_devices_json()
         workers = await self.get_workers_json()
 
-        for i in range(len(devices)):
+        i = 0
+        for device in devices:
             for worker in workers:
-                if (worker.get("device_uuid") == devices[i].get("uuid")):
+                if (worker.get("device_uuid") == device.get("uuid")):
                     devices[i]["algorithms"] = worker.get("algorithms")
                     workers.remove(worker)
+            i += 1
 
         return devices
 
+    async def get_device_by_id(self, id):
+        """ return a device by id or uuid """
+        device = (await self.request("GET", "/api?command={\"id\":1,\"method\":\"device.get\",\"params\":[\"" + id + "\"]}")).get("device")
+        workers = await self.get_workers_json()
+
+        for worker in workers:
+            if (worker.get("device_uuid") == device.get("uuid")):
+                device["algorithms"] = worker.get("algorithms")
+
+        return device
+
     async def get_devices_json(self):
         """ get devices json array """
         return (await self.request("GET", "/devices_cuda")).get("devices")

diff --git a/custom_components/octune/const.py b/custom_components/octune/const.py
@@ -8,7 +8,7 @@
 NAME = "NiceHash QuickMiner OCTune"
 DOMAIN = "octune"
 DOMAIN_DATA = f"{DOMAIN}_data"
-VERSION = "0.0.1"
+VERSION = "0.0.2"
 DEFAULT_NAME = "octune"
 
 ISSUE_URL = "https://github.com/pascalberski/ha-nhqm-octune/issues"

diff --git a/custom_components/octune/devicesensors.py b/custom_components/octune/devicesensors.py
@@ -6,6 +6,8 @@
 
 from homeassistant.helpers.entity import Entity
 
+from custom_components.octune.api import OCTuneApiClient
+
 from .const import (
     ICON_HASHRATE,
 )
@@ -66,7 +68,14 @@ async def async_update(self):
 
     def _get_data(self):
         try:
-            return self.coordinator.data
+            #_LOGGER.debug("coordinator.data: %s", self.coordinator.data)
+            devices = self.coordinator.data
+
+            for device in devices:
+                #_LOGGER.debug("comapre %s == %s = %s", device.get("uuid"), self.device.get("uuid"), (device.get("uuid") == self.device.get("uuid")))
+                if (device.get("uuid") == self.device.get("uuid")):
+                    #_LOGGER.debug("device: %s", device)
+                    return device
         except Exception as exc:
             _LOGGER.error("Unable to get api data\n%s", exc)
             return None
@@ -96,7 +105,8 @@ def unique_id(self):
     @property
     def state(self):
         """Sensor state"""
-        value = float(self.device.get("gpu_temp"))
+        #_LOGGER.debug("data type: %s", str(type(self._get_data())))
+        value = float(self._get_data().get("gpu_temp"))
         self.log_updates(value)
         return value
 
@@ -126,7 +136,7 @@ def unique_id(self):
     @property
     def state(self):
         """Sensor state"""
-        value = float(self.device.get("__vram_temp"))
+        value = float(self._get_data().get("__vram_temp"))
         self.log_updates(value)
         return value
 
@@ -156,7 +166,7 @@ def unique_id(self):
     @property
     def state(self):
         """Sensor state"""
-        value = float(self.device.get("__hotspot_temp"))
+        value = float(self._get_data().get("__hotspot_temp"))
         self.log_updates(value)
         return value
 
@@ -190,7 +200,7 @@ def unique_id(self):
     @property
     def state(self):
         """Sensor state"""
-        value = round(float(self.device.get("algorithms")[0].get("speed"))/1000000, 2)
+        value = round(float(self._get_data().get("algorithms")[0].get("speed"))/1000000, 2)
         self.log_updates(value)
         return value
 

diff --git a/custom_components/octune/manifest.json b/custom_components/octune/manifest.json
@@ -4,7 +4,8 @@
   "documentation": "https://github.com/pascalberski/ha-nhqm-octune",
   "issue_tracker": "https://github.com/pascalberski/ha-nhqm-octune/issues",
   "dependencies": [],
-  "version": "0.0.1",
+  "version": "0.0.2",
+  "iot_class": "local_polling",
   "codeowners": [
     "@pascalberski"
   ],