bug: fix more identification issues and issues with 3.14

Author: b-rowan

pyasic/data/__init__.py

@@ -215,7 +215,7 @@ def hashrate(self) -> AlgoHashRateType | None:
                     return sum(
                         hr_data,
                         start=self.device_info.algo.hashrate(
-                            rate=0, unit=GenericUnit.H
+                            rate=0, unit=self.device_info.algo.unit.default
                         ),
                     )
                 else:

pyasic/miners/backends/btminer.py

@@ -24,6 +24,7 @@
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
 from pyasic.data.pools import PoolMetrics, PoolUrl
+from pyasic.device import MinerAlgo
 from pyasic.device.algorithm import AlgoHashRateType
 from pyasic.errors import APIError
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
@@ -1163,7 +1164,11 @@ async def _get_hashboards(
         board_count = (
             rpc_get_device_info.get("msg", {}).get("hardware", {}).get("boards", 3)
         )
-        edevs = rpc_get_miner_status_edevs.get("msg", {}).get("edevs", [])
+        edevs_base = rpc_get_miner_status_edevs.get("msg", {})
+        if isinstance(edevs_base, dict):
+            edevs = edevs_base.get("edevs", [])
+        else:
+            edevs = []
         for idx in range(board_count):
             board_data = edevs[idx] if idx < len(edevs) else {}
             boards.append(
@@ -1262,12 +1267,19 @@ async def _get_hashrate(
         if rpc_get_miner_status_summary is None:
             return None
 
-        return (
+        res = (
             rpc_get_miner_status_summary.get("msg", {})
             .get("summary", {})
             .get("hash-realtime")
         )
 
+        if res is not None:
+            return self.algo.hashrate(
+                rate=float(res),
+                unit=self.algo.unit.TH,  # type: ignore[attr-defined]
+            ).into(self.algo.unit.default)  # type: ignore[attr-defined]
+        return None
+
     async def _get_expected_hashrate(
         self, rpc_get_miner_status_summary: dict | None = None
     ) -> AlgoHashRateType | None:
@@ -1288,7 +1300,13 @@ async def _get_expected_hashrate(
             -0.001 * self.expected_hashboards
         ):
             return None
-        return res
+
+        if res is not None:
+            return self.algo.hashrate(
+                rate=float(res),
+                unit=self.algo.unit.TH,  # type: ignore[attr-defined]
+            ).into(self.algo.unit.default)  # type: ignore[attr-defined]
+        return None
 
     async def _get_env_temp(
         self, rpc_get_miner_status_summary: dict | None = None

pyasic/miners/factory.py

@@ -994,7 +994,7 @@ async def _socket_ping(ip: str, cmd: str) -> str | None:
             try:
                 await writer.wait_closed()
             except (ConnectionError, OSError):
-                return None
+                pass
         if data:
             return data.decode("utf-8")
         return None
@@ -1272,10 +1272,11 @@ async def get_miner_model_whatsminer(self, ip: str) -> str | None:
                 return miner_model
             except (TypeError, LookupError):
                 pass
-        else:
-            sock_json_data_v3 = await self.send_btminer_v3_api_command(
-                ip, "get.device.info"
-            )
+
+        sock_json_data_v3 = await self.send_btminer_v3_api_command(
+            ip, "get.device.info"
+        )
+        if sock_json_data_v3 is not None:
             try:
                 miner_model = sock_json_data_v3["msg"]["miner"]["type"].replace("_", "")
                 miner_model = miner_model[:-1] + "0"