CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove parameters from get_{x} functions and move them to _get_{x}(**params). Add miner.fw_str, and miner.raw_model. Remove model from get_data exclude. Swap fan_count to expected_fans.

Browse Source
This commit is contained in:
UpstreamData
2024-01-11 11:33:44 -07:00
parent 067d5c98f5
commit 06cc84f16d
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pyasic/miners/backends/braiins_os.py
View File

@@ -458,6 +458,15 @@ class BOSMiner(BaseMiner):
return self.raw_model + " (BOS)" return self.raw_model + " (BOS)"
return "? (BOS)" return "? (BOS)"
async def get_version(
self, api_version: dict = None, graphql_version: dict = None
) -> Tuple[Optional[str], Optional[str]]:
# check if version is cached
miner_version = namedtuple("MinerVersion", "api_ver fw_ver")
api_ver = await self.get_api_ver(api_version)
fw_ver = await self.get_fw_ver(graphql_version)
return miner_version(api_ver, fw_ver)
async def _get_api_ver(self, api_version: dict = None) -> Optional[str]: async def _get_api_ver(self, api_version: dict = None) -> Optional[str]:
if not api_version: if not api_version:
try: try:
@@ -469,7 +478,7 @@ class BOSMiner(BaseMiner):
if api_version: if api_version:
try: try:
api_ver = api_version["VERSION"][0]["API"] api_ver = api_version["VERSION"][0]["API"]
except LookupError: except (KeyError, IndexError):
api_ver = None api_ver = None
self.api_ver = api_ver self.api_ver = api_ver
self.api.api_ver = self.api_ver self.api.api_ver = self.api_ver
@@ -571,7 +580,7 @@ class BOSMiner(BaseMiner):
if api_summary: if api_summary:
try: try:
return round(float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000), 2) return round(float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000), 2)
except (LookupError, ValueError, TypeError): except (KeyError, IndexError, ValueError, TypeError):
pass pass
async def _get_hashboards( async def _get_hashboards(
@@ -633,7 +642,7 @@ class BOSMiner(BaseMiner):
board.temp = round(hb["temperatures"][0]["degreesC"]) board.temp = round(hb["temperatures"][0]["degreesC"])
if len(temps) > 1: if len(temps) > 1:
board.chip_temp = round(hb["temperatures"][1]["degreesC"]) board.chip_temp = round(hb["temperatures"][1]["degreesC"])
except (LookupError, TypeError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
details = hb.get("hwDetails") details = hb.get("hwDetails")
if details: if details:
@@ -657,15 +666,15 @@ class BOSMiner(BaseMiner):
d = {} d = {}
try: try:
api_temps = d["temps"][0] api_temps = d["temps"][0]
except LookupError: except (KeyError, IndexError):
api_temps = None api_temps = None
try: try:
api_devdetails = d["devdetails"][0] api_devdetails = d["devdetails"][0]
except LookupError: except (KeyError, IndexError):
api_devdetails = None api_devdetails = None
try: try:
api_devs = d["devs"][0] api_devs = d["devs"][0]
except LookupError: except (KeyError, IndexError):
api_devs = None api_devs = None
if api_temps: if api_temps:
try: try:
@@ -677,7 +686,7 @@ class BOSMiner(BaseMiner):
board_temp = round(board["Board"]) board_temp = round(board["Board"])
hashboards[_id].chip_temp = chip_temp hashboards[_id].chip_temp = chip_temp
hashboards[_id].temp = board_temp hashboards[_id].temp = board_temp
except (LookupError, ValueError, TypeError): except (IndexError, KeyError, ValueError, TypeError):
pass pass
if api_devdetails: if api_devdetails:
@@ -689,7 +698,7 @@ class BOSMiner(BaseMiner):
chips = board["Chips"] chips = board["Chips"]
hashboards[_id].chips = chips hashboards[_id].chips = chips
hashboards[_id].missing = False hashboards[_id].missing = False
except LookupError: except (IndexError, KeyError):
pass pass
if api_devs: if api_devs:
@@ -700,7 +709,7 @@ class BOSMiner(BaseMiner):
_id = board["ID"] - offset _id = board["ID"] - offset
hashrate = round(float(board["MHS 1m"] / 1000000), 2) hashrate = round(float(board["MHS 1m"] / 1000000), 2)
hashboards[_id].hashrate = hashrate hashboards[_id].hashrate = hashrate
except LookupError: except (IndexError, KeyError):
pass pass
return hashboards return hashboards
@@ -741,7 +750,7 @@ class BOSMiner(BaseMiner):
return api_tunerstatus["TUNERSTATUS"][0][ return api_tunerstatus["TUNERSTATUS"][0][
"ApproximateMinerPowerConsumption" "ApproximateMinerPowerConsumption"
] ]
except LookupError: except (KeyError, IndexError):
pass pass
async def _get_wattage_limit( async def _get_wattage_limit(
@@ -772,7 +781,7 @@ class BOSMiner(BaseMiner):
if api_tunerstatus: if api_tunerstatus:
try: try:
return api_tunerstatus["TUNERSTATUS"][0]["PowerLimit"] return api_tunerstatus["TUNERSTATUS"][0]["PowerLimit"]
except LookupError: except (KeyError, IndexError):
pass pass
async def _get_fans( async def _get_fans(
@@ -811,7 +820,7 @@ class BOSMiner(BaseMiner):
for n in range(self.expected_fans): for n in range(self.expected_fans):
try: try:
fans.append(Fan(api_fans["FANS"][n]["RPM"])) fans.append(Fan(api_fans["FANS"][n]["RPM"]))
except LookupError: except (IndexError, KeyError):
pass pass
return fans return fans
return [Fan() for _ in range(self.expected_fans)] return [Fan() for _ in range(self.expected_fans)]
@@ -895,7 +904,7 @@ class BOSMiner(BaseMiner):
_error = _error[0].lower() + _error[1:] _error = _error[0].lower() + _error[1:]
errors.append(BraiinsOSError(f"Slot {_id} {_error}")) errors.append(BraiinsOSError(f"Slot {_id} {_error}"))
return errors return errors
except LookupError: except (KeyError, IndexError):
pass pass
async def _get_fault_light(self, graphql_fault_light: dict = None) -> bool: async def _get_fault_light(self, graphql_fault_light: dict = None) -> bool:
@@ -978,7 +987,7 @@ class BOSMiner(BaseMiner):
return round( return round(
(sum(hr_list) / len(hr_list)) * self.expected_hashboards, 2 (sum(hr_list) / len(hr_list)) * self.expected_hashboards, 2
) )
except LookupError: except (IndexError, KeyError):
pass pass
async def _is_mining(self, api_devdetails: dict = None) -> Optional[bool]: async def _is_mining(self, api_devdetails: dict = None) -> Optional[bool]:

7
pyasic/miners/backends/epic.py
View File

@@ -14,9 +14,10 @@
# limitations under the License. - # limitations under the License. -
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
from typing import List, Optional from typing import List, Optional, Tuple
from pyasic.config import MinerConfig from pyasic import MinerConfig
from pyasic.config import MinerConfig, MiningModeConfig
from pyasic.data import Fan, HashBoard from pyasic.data import Fan, HashBoard
from pyasic.data.error_codes import MinerErrorData, X19Error from pyasic.data.error_codes import MinerErrorData, X19Error
from pyasic.errors import APIError from pyasic.errors import APIError
@@ -216,7 +217,7 @@ class ePIC(BaseMiner):
hashrate += hb["Hashrate"][0] / ideal hashrate += hb["Hashrate"][0] / ideal
return round(float(float(hashrate / 1000000)), 2) return round(float(float(hashrate / 1000000)), 2)
except (LookupError, ValueError, TypeError) as e: except (IndexError, KeyError, ValueError, TypeError) as e:
logger.error(e) logger.error(e)
pass pass