Avalon Nano3s Fixes (#374)

* Avalon Nano3s Fixes

* Fix to handle both cases

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: PixelByProxy

pyasic/miners/avalonminer/cgminer/nano/nano3.py

@@ -178,8 +178,7 @@ async def _get_wattage(self, rpc_estats: dict = None) -> Optional[int]:
 
         if rpc_estats is not None:
             try:
-                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
-                parsed_estats = self.parse_estats(unparsed_estats)
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
                 return int(parsed_estats["PS"][6])
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
@@ -193,8 +192,7 @@ async def _get_hashrate(self, rpc_estats: dict = None) -> Optional[AlgoHashRate]
 
         if rpc_estats is not None:
             try:
-                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
-                parsed_estats = self.parse_estats(unparsed_estats)
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
                 return self.algo.hashrate(
                     rate=float(parsed_estats["GHSspd"]), unit=self.algo.unit.GH
                 ).into(self.algo.unit.default)
@@ -212,14 +210,13 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
 
         if rpc_estats is not None:
             try:
-                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
-                parsed_estats = self.parse_estats(unparsed_estats)
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
             except (IndexError, KeyError, ValueError, TypeError):
                 return hashboards
 
             for board in range(len(hashboards)):
                 try:
-                    board_hr = parsed_estats["GHSspd"][board]
+                    board_hr = parsed_estats["GHSspd"]
                     hashboards[board].hashrate = self.algo.hashrate(
                         rate=float(board_hr), unit=self.algo.unit.GH
                     ).into(self.algo.unit.default)

pyasic/miners/backends/avalonminer.py

@@ -305,10 +305,12 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
                     hashboards[board].chip_temp = int(
                         parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
                     )
-                except LookupError:
+                except (LookupError, TypeError):
                     try:
                         hashboards[board].chip_temp = int(
-                            parsed_estats["STATS"][0]["MM ID0"]["Tmax"]
+                            parsed_estats["STATS"][0]["MM ID0"].get(
+                                "Tmax", parsed_estats["STATS"][0]["MM ID0"]["TMax"]
+                            )
                         )
                     except LookupError:
                         pass
@@ -317,10 +319,12 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
                     hashboards[board].temp = int(
                         parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
                     )
-                except LookupError:
+                except (LookupError, TypeError):
                     try:
                         hashboards[board].temp = int(
-                            parsed_estats["STATS"][0]["MM ID0"]["Tavg"]
+                            parsed_estats["STATS"][0]["MM ID0"].get(
+                                "Tavg", parsed_estats["STATS"][0]["MM ID0"]["TAvg"]
+                            )
                         )
                     except LookupError:
                         pass
@@ -329,7 +333,7 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
                     hashboards[board].inlet_temp = int(
                         parsed_estats["STATS"][0]["MM ID0"]["MTavg"][board]
                     )
-                except LookupError:
+                except (LookupError, TypeError):
                     try:
                         hashboards[board].inlet_temp = int(
                             parsed_estats["STATS"][0]["MM ID0"]["HBITemp"]
@@ -341,7 +345,7 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
                     hashboards[board].outlet_temp = int(
                         parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
                     )
-                except LookupError:
+                except (LookupError, TypeError):
                     try:
                         hashboards[board].outlet_temp = int(
                             parsed_estats["STATS"][0]["MM ID0"]["HBOTemp"]
@@ -356,7 +360,7 @@ async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
                         hashboards[board].chips = len(
                             [item for item in chip_data if not item == "0"]
                         )
-                except LookupError:
+                except (LookupError, TypeError):
                     try:
                         chip_data = parsed_estats["STATS"][0]["HBinfo"][f"HB{board}"][
                             f"PVT_T{board}"