version: bump version number.

pyasic/API/__init__.py

@@ -190,7 +190,6 @@ If you are sure you want to use this command please use API.send_command("{comma
                     d = await asyncio.wait_for(reader.read(4096), timeout=timeout)
                     if not d:
                         break
-                    print("hello", d)
                     ret_data += d
                 except (asyncio.CancelledError, asyncio.TimeoutError) as e:
                     raise e

pyasic/miners/_backends/bosminer.py

@@ -483,10 +483,9 @@ class BOSMiner(BaseMiner):
                 api_devs = d["devs"][0]
             except (KeyError, IndexError):
                 api_devs = None
-
         if api_temps:
             try:
-                offset = 6 if api_temps["TEMPS"][0]["ID"] in [6, 7, 8] else 0
+                offset = 6 if api_temps["TEMPS"][0]["ID"] in [6, 7, 8] else 1
 
                 for board in api_temps["TEMPS"]:
                     _id = board["ID"] - offset
@@ -499,7 +498,7 @@ class BOSMiner(BaseMiner):
 
         if api_devdetails:
             try:
-                offset = 6 if api_devdetails["DEVDETAILS"][0]["ID"] in [6, 7, 8] else 0
+                offset = 6 if api_devdetails["DEVDETAILS"][0]["ID"] in [6, 7, 8] else 1
 
                 for board in api_devdetails["DEVDETAILS"]:
                     _id = board["ID"] - offset
@@ -511,7 +510,7 @@ class BOSMiner(BaseMiner):
 
         if api_devs:
             try:
-                offset = 6 if api_devs["DEVS"][0]["ID"] in [6, 7, 8] else 0
+                offset = 6 if api_devs["DEVS"][0]["ID"] in [6, 7, 8] else 1
 
                 for board in api_devs["DEVS"]:
                     _id = board["ID"] - offset

pyasic/miners/innosilicon/cgminer/T3X/T3H_Plus.py

@@ -136,10 +136,10 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
 
     async def get_mac(
         self,
-        web_getAll: dict = None,
+        web_getAll: dict = None,  # noqa
         web_overview: dict = None,  # noqa: named this way for automatic functionality
     ) -> Optional[str]:
-        web_all_data = web_getAll
+        web_all_data = web_getAll.get("all")
         if not web_all_data and not web_overview:
             try:
                 web_overview = await self.send_web_command("overview")
@@ -183,7 +183,7 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
         api_summary: dict = None,
         web_getAll: dict = None,  # noqa: named this way for automatic functionality
     ) -> Optional[float]:
-        web_all_data = web_getAll
+        web_all_data = web_getAll.get("all")
         if not api_summary and not web_all_data:
             try:
                 api_summary = await self.api.summary()
@@ -209,7 +209,7 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
         api_stats: dict = None,
         web_getAll: dict = None,  # noqa: named this way for automatic functionality
     ) -> List[HashBoard]:
-        web_all_data = web_getAll
+        web_all_data = web_getAll.get("all")
         hashboards = [
             HashBoard(slot=i, expected_chips=self.nominal_chips)
             for i in range(self.ideal_hashboards)
@@ -231,8 +231,9 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
 
         if api_stats:
             if api_stats.get("STATS"):
-                for idx, board in enumerate(api_stats["STATS"]):
+                for board in api_stats["STATS"]:
                     try:
+                        idx = board["Chain ID"]
                         chips = board["Num active chips"]
                     except KeyError:
                         pass
@@ -242,25 +243,31 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
 
         if web_all_data:
             if web_all_data.get("chain"):
-                for idx, board in enumerate(web_all_data["chain"]):
-                    temp = board.get("Temp min")
-                    if temp:
-                        hashboards[idx].temp = round(temp)
+                for board in web_all_data["chain"]:
+                    idx = board.get("ASC")
+                    if idx is not None:
+                        temp = board.get("Temp min")
+                        if temp:
+                            hashboards[idx].temp = round(temp)
 
-                    hashrate = board.get("Hash Rate H")
-                    if hashrate:
-                        hashboards[idx].hashrate = round(hashrate / 1000000000000, 2)
+                        hashrate = board.get("Hash Rate H")
+                        if hashrate:
+                            hashboards[idx].hashrate = round(
+                                hashrate / 1000000000000, 2
+                            )
 
-                    chip_temp = board.get("Temp max")
-                    if chip_temp:
-                        hashboards[idx].chip_temp = round(chip_temp)
+                        chip_temp = board.get("Temp max")
+                        if chip_temp:
+                            hashboards[idx].chip_temp = round(chip_temp)
 
         return hashboards
 
     async def get_wattage(
-        self, web_getAll: dict = None
-    ) -> Optional[int]:  # noqa: named this way for automatic functionality
-        web_all_data = web_getAll
+        self,
+        web_getAll: dict = None,
+        api_stats: dict = None,  # noqa: named this way for automatic functionality
+    ) -> Optional[int]:
+        web_all_data = web_getAll.get("all")
         if not web_all_data:
             try:
                 web_all_data = await self.send_web_command("getAll")
@@ -275,11 +282,28 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
             except KeyError:
                 pass
 
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            if api_stats.get("STATS"):
+                for board in api_stats["STATS"]:
+                    try:
+                        wattage = board["power"]
+                    except KeyError:
+                        pass
+                    else:
+                        wattage = int(wattage)
+                        return wattage
+
     async def get_fans(
         self,
         web_getAll: dict = None,  # noqa: named this way for automatic functionality
     ) -> List[Fan]:
-        web_all_data = web_getAll
+        web_all_data = web_getAll.get("all")
         if not web_all_data:
             try:
                 web_all_data = await self.send_web_command("getAll")
@@ -350,3 +374,24 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
                 if not err == 0:
                     errors.append(InnosiliconError(error_code=err))
         return errors
+
+    async def get_wattage_limit(self, web_getAll: dict = None) -> Optional[int]:
+        web_all_data = web_getAll.get("all")
+        if not web_all_data:
+            try:
+                web_all_data = await self.send_web_command("getAll")
+            except APIError:
+                pass
+            else:
+                web_all_data = web_all_data["all"]
+
+        if web_all_data:
+            try:
+                level = web_all_data["running_mode"]["level"]
+            except KeyError:
+                pass
+            else:
+                # this is very possibly not correct.
+                level = int(level)
+                limit = 1250 + (250 * level)
+                return limit

pyasic/network/__init__.py

@@ -183,14 +183,14 @@ class MinerNetwork:
                 miner = await ping_and_get_miner(ip)
                 if miner:
                     return miner
-            except ConnectionRefusedError:
+            except (ConnectionRefusedError, OSError):
                 tasks = [ping_and_get_miner(ip, port=port) for port in [4029, 8889]]
                 for miner in asyncio.as_completed(tasks):
                     try:
                         miner = await miner
                         if miner:
                             return miner
-                    except ConnectionRefusedError:
+                    except (ConnectionRefusedError, OSError):
                         pass
 
 
@@ -250,6 +250,5 @@ async def ping_and_get_miner(
         # ping failed, likely with an exception
         except Exception as e:
             logging.warning(f"{str(ip)}: Ping And Get Miner Exception: {e}")
-            raise e
-        continue
+            raise ConnectionRefusedError
     return

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.28.3"
+version = "0.28.7"
 description = "A set of modules for interfacing with many common types of ASIC bitcoin miners, using both their API and SSH."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"