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

refactor: swap (KeyError, IndexError) for LookupError.

Browse Source
This commit is contained in:
UpstreamData
2024-01-11 15:20:33 -07:00
parent 4156f93c0d
commit a094d28a36
13 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pyasic/miners/antminer/hiveon/X9/T9.py
View File

@@ -62,14 +62,14 @@ class HiveonT9(Hiveon, T9):
try:
hashboard.board_temp = api_stats["STATS"][1][f"temp{chipset}"]
hashboard.chip_temp = api_stats["STATS"][1][f"temp2_{chipset}"]
except (KeyError, IndexError):
except LookupError:
pass
else:
hashboard.missing = False
try:
hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"]
chips += api_stats["STATS"][1][f"chain_acn{chipset}"]
except (KeyError, IndexError):
except LookupError:
pass
hashboard.hashrate = round(hashrate / 1000, 2)
hashboard.chips = chips
@@ -88,7 +88,7 @@ class HiveonT9(Hiveon, T9):
boards = api_stats.get("STATS")
try:
wattage_raw = boards[1]["chain_power"]
except (KeyError, IndexError):
except LookupError:
pass
else:
# parse wattage position out of raw data
@@ -113,7 +113,7 @@ class HiveonT9(Hiveon, T9):
env_temp = api_stats["STATS"][1][f"temp3_{chipset}"]
if not env_temp == 0:
env_temp_list.append(int(env_temp))
except (KeyError, IndexError):
except LookupError:
pass
if not env_temp_list == []:

8
pyasic/miners/backends/antminer.py
View File

@@ -189,7 +189,7 @@ class AntminerModern(BMMiner):
errors.append(X19Error(item["msg"]))
except KeyError:
continue
except (KeyError, IndexError):
except LookupError:
pass
return errors
@@ -266,7 +266,7 @@ class AntminerModern(BMMiner):
return round(expected_rate / 1000000, 2)
else:
return round(expected_rate, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def set_static_ip(
@@ -497,7 +497,7 @@ class AntminerOld(CGMiner):
fans_data[fan].speed = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0
)
except (KeyError, IndexError):
except LookupError:
pass
return fans_data
@@ -550,7 +550,7 @@ class AntminerOld(CGMiner):
if (not chips) or (not chips > 0):
hashboard.missing = True
hashboards.append(hashboard)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
return hashboards

12
pyasic/miners/backends/bfgminer.py
View File

@@ -128,7 +128,7 @@ class BFGMiner(BaseMiner):
if api_version:
try:
self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError):
except LookupError:
pass
return self.api_ver
@@ -143,7 +143,7 @@ class BFGMiner(BaseMiner):
if api_version:
try:
self.fw_ver = api_version["VERSION"][0]["CompileTime"]
except (KeyError, IndexError):
except LookupError:
pass
return self.fw_ver
@@ -168,7 +168,7 @@ class BFGMiner(BaseMiner):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["MHS 20s"] / 1000000), 2)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -220,7 +220,7 @@ class BFGMiner(BaseMiner):
if (not chips) or (not chips > 0):
hashboard.missing = True
hashboards.append(hashboard)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
return hashboards
@@ -258,7 +258,7 @@ class BFGMiner(BaseMiner):
fans_data[fan] = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0
)
except (KeyError, IndexError):
except LookupError:
pass
fans = [Fan(speed=d) if d else Fan() for d in fans_data]
@@ -291,7 +291,7 @@ class BFGMiner(BaseMiner):
return round(expected_rate / 1000000, 2)
else:
return round(expected_rate, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _is_mining(self, *args, **kwargs) -> Optional[bool]:

10
pyasic/miners/backends/bmminer.py
View File

@@ -167,7 +167,7 @@ class BMMiner(BaseMiner):
if api_version:
try:
self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError):
except LookupError:
pass
return self.api_ver
@@ -182,7 +182,7 @@ class BMMiner(BaseMiner):
if api_version:
try:
self.fw_ver = api_version["VERSION"][0]["CompileTime"]
except (KeyError, IndexError):
except LookupError:
pass
return self.fw_ver
@@ -205,7 +205,7 @@ class BMMiner(BaseMiner):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["GHS 5s"] / 1000), 2)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -308,7 +308,7 @@ class BMMiner(BaseMiner):
fans[fan].speed = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0
)
except (KeyError, IndexError):
except LookupError:
pass
return fans
@@ -340,7 +340,7 @@ class BMMiner(BaseMiner):
return round(expected_rate / 1000000, 2)
else:
return round(expected_rate, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _is_mining(self, *args, **kwargs) -> Optional[bool]:

28
pyasic/miners/backends/bosminer.py
View File

@@ -478,7 +478,7 @@ class BOSMiner(BaseMiner):
if api_version:
try:
api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError):
except LookupError:
api_ver = None
self.api_ver = api_ver
self.api.api_ver = self.api_ver
@@ -580,7 +580,7 @@ class BOSMiner(BaseMiner):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000), 2)
except (KeyError, IndexError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(
@@ -642,7 +642,7 @@ class BOSMiner(BaseMiner):
board.temp = round(hb["temperatures"][0]["degreesC"])
if len(temps) > 1:
board.chip_temp = round(hb["temperatures"][1]["degreesC"])
except (TypeError, KeyError, ValueError, IndexError):
except (LookupError, TypeError, ValueError):
pass
details = hb.get("hwDetails")
if details:
@@ -666,15 +666,15 @@ class BOSMiner(BaseMiner):
d = {}
try:
api_temps = d["temps"][0]
except (KeyError, IndexError):
except LookupError:
api_temps = None
try:
api_devdetails = d["devdetails"][0]
except (KeyError, IndexError):
except LookupError:
api_devdetails = None
try:
api_devs = d["devs"][0]
except (KeyError, IndexError):
except LookupError:
api_devs = None
if api_temps:
try:
@@ -686,7 +686,7 @@ class BOSMiner(BaseMiner):
board_temp = round(board["Board"])
hashboards[_id].chip_temp = chip_temp
hashboards[_id].temp = board_temp
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
if api_devdetails:
@@ -698,7 +698,7 @@ class BOSMiner(BaseMiner):
chips = board["Chips"]
hashboards[_id].chips = chips
hashboards[_id].missing = False
except (IndexError, KeyError):
except LookupError:
pass
if api_devs:
@@ -709,7 +709,7 @@ class BOSMiner(BaseMiner):
_id = board["ID"] - offset
hashrate = round(float(board["MHS 1m"] / 1000000), 2)
hashboards[_id].hashrate = hashrate
except (IndexError, KeyError):
except LookupError:
pass
return hashboards
@@ -750,7 +750,7 @@ class BOSMiner(BaseMiner):
return api_tunerstatus["TUNERSTATUS"][0][
"ApproximateMinerPowerConsumption"
]
except (KeyError, IndexError):
except LookupError:
pass
async def _get_wattage_limit(
@@ -781,7 +781,7 @@ class BOSMiner(BaseMiner):
if api_tunerstatus:
try:
return api_tunerstatus["TUNERSTATUS"][0]["PowerLimit"]
except (KeyError, IndexError):
except LookupError:
pass
async def _get_fans(
@@ -820,7 +820,7 @@ class BOSMiner(BaseMiner):
for n in range(self.expected_fans):
try:
fans.append(Fan(api_fans["FANS"][n]["RPM"]))
except (IndexError, KeyError):
except LookupError:
pass
return fans
return [Fan() for _ in range(self.expected_fans)]
@@ -904,7 +904,7 @@ class BOSMiner(BaseMiner):
_error = _error[0].lower() + _error[1:]
errors.append(BraiinsOSError(f"Slot {_id} {_error}"))
return errors
except (KeyError, IndexError):
except LookupError:
pass
async def _get_fault_light(self, graphql_fault_light: dict = None) -> bool:
@@ -987,7 +987,7 @@ class BOSMiner(BaseMiner):
return round(
(sum(hr_list) / len(hr_list)) * self.expected_hashboards, 2
)
except (IndexError, KeyError):
except LookupError:
pass
async def _is_mining(self, api_devdetails: dict = None) -> Optional[bool]:

22
pyasic/miners/backends/btminer.py
View File

@@ -306,7 +306,7 @@ class BTMiner(BaseMiner):
try:
mac = api_summary["SUMMARY"][0]["MAC"]
return str(mac).upper()
except (KeyError, IndexError):
except LookupError:
pass
async def _get_api_ver(self, api_get_version: dict = None) -> Optional[str]:
@@ -362,7 +362,7 @@ class BTMiner(BaseMiner):
self.fw_ver = api_summary["SUMMARY"][0]["Firmware Version"].replace(
"'", ""
)
except (KeyError, IndexError):
except LookupError:
pass
return self.fw_ver
@@ -394,7 +394,7 @@ class BTMiner(BaseMiner):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000), 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
@@ -427,7 +427,7 @@ class BTMiner(BaseMiner):
hashboards[board["ASC"]].chips = board["Effective Chips"]
hashboards[board["ASC"]].serial_number = board["PCB SN"]
hashboards[board["ASC"]].missing = False
except (KeyError, IndexError):
except LookupError:
pass
return hashboards
@@ -442,7 +442,7 @@ class BTMiner(BaseMiner):
if api_summary:
try:
return api_summary["SUMMARY"][0]["Env Temp"]
except (KeyError, IndexError):
except LookupError:
pass
async def _get_wattage(self, api_summary: dict = None) -> Optional[int]:
@@ -456,7 +456,7 @@ class BTMiner(BaseMiner):
try:
wattage = api_summary["SUMMARY"][0]["Power"]
return wattage if not wattage == -1 else None
except (KeyError, IndexError):
except LookupError:
pass
async def _get_wattage_limit(self, api_summary: dict = None) -> Optional[int]:
@@ -469,7 +469,7 @@ class BTMiner(BaseMiner):
if api_summary:
try:
return api_summary["SUMMARY"][0]["Power Limit"]
except (KeyError, IndexError):
except LookupError:
pass
async def _get_fans(
@@ -489,7 +489,7 @@ class BTMiner(BaseMiner):
Fan(api_summary["SUMMARY"][0].get("Fan Speed In", 0)),
Fan(api_summary["SUMMARY"][0].get("Fan Speed Out", 0)),
]
except (KeyError, IndexError):
except LookupError:
pass
return fans
@@ -506,7 +506,7 @@ class BTMiner(BaseMiner):
if api_summary:
try:
return int(api_summary["SUMMARY"][0]["Power Fanspeed"])
except (KeyError, IndexError):
except LookupError:
pass
if not api_get_psu:
@@ -537,7 +537,7 @@ class BTMiner(BaseMiner):
err = api_summary["SUMMARY"][0].get(f"Error Code {i}")
if err:
errors.append(WhatsminerError(error_code=err))
except (KeyError, IndexError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
if not api_get_error_code:
@@ -568,7 +568,7 @@ class BTMiner(BaseMiner):
expected_hashrate = api_summary["SUMMARY"][0]["Factory GHS"]
if expected_hashrate:
return round(expected_hashrate / 1000, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _get_fault_light(self, api_get_miner_info: dict = None) -> bool:

12
pyasic/miners/backends/cgminer.py
View File

@@ -192,7 +192,7 @@ class CGMiner(BaseMiner):
if api_version:
try:
self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError):
except LookupError:
pass
return self.api_ver
@@ -207,7 +207,7 @@ class CGMiner(BaseMiner):
if api_version:
try:
self.fw_ver = api_version["VERSION"][0]["CGMiner"]
except (KeyError, IndexError):
except LookupError:
pass
return self.fw_ver
@@ -229,7 +229,7 @@ class CGMiner(BaseMiner):
return round(
float(float(api_summary["SUMMARY"][0]["GHS 5s"]) / 1000), 2
)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -281,7 +281,7 @@ class CGMiner(BaseMiner):
if (not chips) or (not chips > 0):
hashboard.missing = True
hashboards.append(hashboard)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
return hashboards
@@ -319,7 +319,7 @@ class CGMiner(BaseMiner):
fans[fan].speed = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0
)
except (KeyError, IndexError):
except LookupError:
pass
return fans
@@ -353,7 +353,7 @@ class CGMiner(BaseMiner):
return round(expected_rate / 1000000, 2)
else:
return round(expected_rate, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _is_mining(self, *args, **kwargs) -> Optional[bool]:

14
pyasic/miners/backends/cgminer_avalon.py
View File

@@ -210,7 +210,7 @@ class CGMinerAvalon(CGMiner):
if api_devs:
try:
return round(float(api_devs["DEVS"][0]["MHS 1m"] / 1000000), 2)
except (KeyError, IndexError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -229,7 +229,7 @@ class CGMinerAvalon(CGMiner):
try:
unparsed_stats = api_stats["STATS"][0]["MM ID0"]
parsed_stats = self.parse_stats(unparsed_stats)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
return hashboards
for board in range(self.expected_hashboards):
@@ -273,7 +273,7 @@ class CGMinerAvalon(CGMiner):
unparsed_stats = api_stats["STATS"][0]["MM ID0"]
parsed_stats = self.parse_stats(unparsed_stats)
return round(float(parsed_stats["GHSmm"]) / 1000, 2)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_env_temp(self, api_stats: dict = None) -> Optional[float]:
@@ -288,7 +288,7 @@ class CGMinerAvalon(CGMiner):
unparsed_stats = api_stats["STATS"][0]["MM ID0"]
parsed_stats = self.parse_stats(unparsed_stats)
return float(parsed_stats["Temp"])
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_wattage(self) -> Optional[int]:
@@ -306,7 +306,7 @@ class CGMinerAvalon(CGMiner):
unparsed_stats = api_stats["STATS"][0]["MM ID0"]
parsed_stats = self.parse_stats(unparsed_stats)
return int(parsed_stats["MPO"])
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_fans(self, api_stats: dict = None) -> List[Fan]:
@@ -327,7 +327,7 @@ class CGMinerAvalon(CGMiner):
for fan in range(self.expected_fans):
try:
fans_data[fan].speed = int(parsed_stats[f"Fan{fan + 1}"])
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
return fans_data
@@ -349,7 +349,7 @@ class CGMinerAvalon(CGMiner):
parsed_stats = self.parse_stats(unparsed_stats)
led = int(parsed_stats["Led"])
return True if led == 1 else False
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
try:

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

@@ -216,7 +216,7 @@ class ePIC(BaseMiner):
hashrate += hb["Hashrate"][0] / ideal
return round(float(float(hashrate / 1000000)), 2)
except (IndexError, KeyError, ValueError, TypeError) as e:
except (LookupError, ValueError, TypeError) as e:
logger.error(e)
pass

12
pyasic/miners/backends/luxminer.py
View File

@@ -211,7 +211,7 @@ class LUXMiner(BaseMiner):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["GHS 5s"] / 1000), 2)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
@@ -263,7 +263,7 @@ class LUXMiner(BaseMiner):
if (not chips) or (not chips > 0):
hashboard.missing = True
hashboards.append(hashboard)
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
return hashboards
@@ -281,7 +281,7 @@ class LUXMiner(BaseMiner):
if api_power:
try:
return api_power["POWER"][0]["Watts"]
except (IndexError, KeyError, ValueError, TypeError):
except (LookupError, ValueError, TypeError):
pass
async def _get_wattage_limit(self) -> Optional[int]:
@@ -299,8 +299,8 @@ class LUXMiner(BaseMiner):
if api_fans:
for fan in range(self.expected_fans):
try:
fans.append(Fan(api_fans["FANS"][0]["RPM"]))
except (IndexError, KeyError, ValueError, TypeError):
fans.append(Fan(api_fans["FANS"][fan]["RPM"]))
except (LookupError, ValueError, TypeError):
fans.append(Fan())
return fans
@@ -333,7 +333,7 @@ class LUXMiner(BaseMiner):
return round(expected_rate / 1000000, 2)
else:
return round(expected_rate, 2)
except (KeyError, IndexError):
except LookupError:
pass
async def _is_mining(self) -> Optional[bool]:

2
pyasic/miners/backends/vnish.py
View File

@@ -181,7 +181,7 @@ class VNish(BMMiner):
return round(
float(float(api_summary["SUMMARY"][0]["GHS 5s"]) / 1000), 2
)
except (IndexError, KeyError, ValueError, TypeError) as e:
except (LookupError, ValueError, TypeError) as e:
logger.error(e)
pass

4
pyasic/miners/innosilicon/cgminer/A10X/A10X.py
View File

@@ -145,7 +145,7 @@ class CGMinerA10X(CGMiner, A10X):
return round(
float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000000000), 5
)
except (KeyError, IndexError):
except LookupError:
pass
async def get_hashboards(
@@ -303,7 +303,7 @@ class CGMinerA10X(CGMiner, A10X):
if api_version:
try:
self.fw_ver = api_version["VERSION"][0]["CGMiner"].split("-")[-1:][0]
except (KeyError, IndexError):
except LookupError:
pass
return self.fw_ver

2
pyasic/miners/innosilicon/cgminer/T3X/T3H.py
View File

@@ -122,7 +122,7 @@ class CGMinerT3HPlus(CGMiner, T3HPlus):
if api_summary:
try:
return round(float(api_summary["SUMMARY"][0]["MHS 1m"] / 1000000), 2)
except (KeyError, IndexError):
except LookupError:
pass
async def get_hashboards(