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

refactor: swap except (KeyError, ValueError) to except LookupError.

Browse Source
This commit is contained in:
UpstreamData
2024-01-11 10:20:18 -07:00
parent 014896ae1b
commit 895fb1b43e
10 changed files with 36 additions and 36 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: try:
hashboard.board_temp = api_stats["STATS"][1][f"temp{chipset}"] hashboard.board_temp = api_stats["STATS"][1][f"temp{chipset}"]
hashboard.chip_temp = api_stats["STATS"][1][f"temp2_{chipset}"] hashboard.chip_temp = api_stats["STATS"][1][f"temp2_{chipset}"]
except (KeyError, IndexError): except LookupError:
pass pass
else: else:
hashboard.missing = False hashboard.missing = False
try: try:
hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"] hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"]
chips += api_stats["STATS"][1][f"chain_acn{chipset}"] chips += api_stats["STATS"][1][f"chain_acn{chipset}"]
except (KeyError, IndexError): except LookupError:
pass pass
hashboard.hashrate = round(hashrate / 1000, 2) hashboard.hashrate = round(hashrate / 1000, 2)
hashboard.chips = chips hashboard.chips = chips
@@ -88,7 +88,7 @@ class HiveonT9(Hiveon, T9):
boards = api_stats.get("STATS") boards = api_stats.get("STATS")
try: try:
wattage_raw = boards[1]["chain_power"] wattage_raw = boards[1]["chain_power"]
except (KeyError, IndexError): except LookupError:
pass pass
else: else:
# parse wattage position out of raw data # parse wattage position out of raw data
@@ -113,7 +113,7 @@ class HiveonT9(Hiveon, T9):
env_temp = api_stats["STATS"][1][f"temp3_{chipset}"] env_temp = api_stats["STATS"][1][f"temp3_{chipset}"]
if not env_temp == 0: if not env_temp == 0:
env_temp_list.append(int(env_temp)) env_temp_list.append(int(env_temp))
except (KeyError, IndexError): except LookupError:
pass pass
if not env_temp_list == []: if not env_temp_list == []:

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

@@ -190,7 +190,7 @@ class AntminerModern(BMMiner):
errors.append(X19Error(item["msg"])) errors.append(X19Error(item["msg"]))
except KeyError: except KeyError:
continue continue
except (KeyError, IndexError): except LookupError:
pass pass
return errors return errors
@@ -267,7 +267,7 @@ class AntminerModern(BMMiner):
return round(expected_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(expected_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def set_static_ip( async def set_static_ip(
@@ -499,7 +499,7 @@ class AntminerOld(CGMiner):
fans_data[fan].speed = api_stats["STATS"][1].get( fans_data[fan].speed = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0 f"fan{fan_offset+fan}", 0
) )
except (KeyError, IndexError): except LookupError:
pass pass
return fans_data return fans_data

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

@@ -134,7 +134,7 @@ class BFGMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.api_ver = api_version["VERSION"][0]["API"] self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.api_ver return self.api_ver
@@ -153,7 +153,7 @@ class BFGMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.fw_ver = api_version["VERSION"][0]["CompileTime"] self.fw_ver = api_version["VERSION"][0]["CompileTime"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.fw_ver return self.fw_ver
@@ -311,7 +311,7 @@ class BFGMiner(BaseMiner):
return round(expected_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(expected_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def is_mining(self, *args, **kwargs) -> Optional[bool]: async def is_mining(self, *args, **kwargs) -> Optional[bool]:

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

@@ -173,7 +173,7 @@ class BMMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.api_ver = api_version["VERSION"][0]["API"] self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.api_ver return self.api_ver
@@ -192,7 +192,7 @@ class BMMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.fw_ver = api_version["VERSION"][0]["CompileTime"] self.fw_ver = api_version["VERSION"][0]["CompileTime"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.fw_ver return self.fw_ver
@@ -360,7 +360,7 @@ class BMMiner(BaseMiner):
return round(expected_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(expected_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def is_mining(self, *args, **kwargs) -> Optional[bool]: async def is_mining(self, *args, **kwargs) -> Optional[bool]:

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

@@ -386,7 +386,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 (KeyError, IndexError): except LookupError:
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
@@ -459,7 +459,7 @@ class BOSMiner(BaseMiner):
d = {} d = {}
try: try:
api_temps = d["temps"][0] api_temps = d["temps"][0]
except (KeyError, IndexError): except LookupError:
api_temps = None api_temps = None
try: try:
api_devdetails = d["devdetails"][0] api_devdetails = d["devdetails"][0]
@@ -467,7 +467,7 @@ class BOSMiner(BaseMiner):
api_devdetails = None api_devdetails = None
try: try:
api_devs = d["devs"][0] api_devs = d["devs"][0]
except (KeyError, IndexError): except LookupError:
api_devs = None api_devs = None
if api_temps: if api_temps:
try: try:
@@ -522,7 +522,7 @@ class BOSMiner(BaseMiner):
return api_tunerstatus["TUNERSTATUS"][0][ return api_tunerstatus["TUNERSTATUS"][0][
"ApproximateMinerPowerConsumption" "ApproximateMinerPowerConsumption"
] ]
except (KeyError, IndexError): except LookupError:
pass pass
async def get_wattage_limit(self, api_tunerstatus: dict = None) -> Optional[int]: async def get_wattage_limit(self, api_tunerstatus: dict = None) -> Optional[int]:
@@ -535,7 +535,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 (KeyError, IndexError): except LookupError:
pass pass
async def get_fans(self, api_fans: dict = None) -> List[Fan]: async def get_fans(self, api_fans: dict = None) -> List[Fan]:
@@ -1091,7 +1091,7 @@ class BOSer(BaseMiner):
if api_version: if api_version:
try: try:
api_ver = api_version["VERSION"][0]["API"] api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError): except LookupError:
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
@@ -1283,7 +1283,7 @@ class BOSer(BaseMiner):
api_temps = None api_temps = None
try: try:
api_devdetails = d["devdetails"][0] api_devdetails = d["devdetails"][0]
except (KeyError, IndexError): except LookupError:
api_devdetails = None api_devdetails = None
try: try:
api_devs = d["devs"][0] api_devs = d["devs"][0]
@@ -1363,7 +1363,7 @@ class BOSer(BaseMiner):
return api_tunerstatus["TUNERSTATUS"][0][ return api_tunerstatus["TUNERSTATUS"][0][
"ApproximateMinerPowerConsumption" "ApproximateMinerPowerConsumption"
] ]
except (KeyError, IndexError): except LookupError:
pass pass
async def get_wattage_limit( async def get_wattage_limit(
@@ -1517,7 +1517,7 @@ class BOSer(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 (KeyError, IndexError): except LookupError:
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:

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

@@ -309,7 +309,7 @@ class BTMiner(BaseMiner):
try: try:
mac = api_summary["SUMMARY"][0]["MAC"] mac = api_summary["SUMMARY"][0]["MAC"]
return str(mac).upper() return str(mac).upper()
except (KeyError, IndexError): except LookupError:
pass pass
async def get_version( async def get_version(
@@ -383,7 +383,7 @@ class BTMiner(BaseMiner):
self.fw_ver = api_summary["SUMMARY"][0]["Firmware Version"].replace( self.fw_ver = api_summary["SUMMARY"][0]["Firmware Version"].replace(
"'", "" "'", ""
) )
except (KeyError, IndexError): except LookupError:
pass pass
return self.fw_ver return self.fw_ver
@@ -448,7 +448,7 @@ class BTMiner(BaseMiner):
hashboards[board["ASC"]].chips = board["Effective Chips"] hashboards[board["ASC"]].chips = board["Effective Chips"]
hashboards[board["ASC"]].serial_number = board["PCB SN"] hashboards[board["ASC"]].serial_number = board["PCB SN"]
hashboards[board["ASC"]].missing = False hashboards[board["ASC"]].missing = False
except (KeyError, IndexError): except LookupError:
pass pass
return hashboards return hashboards
@@ -477,7 +477,7 @@ class BTMiner(BaseMiner):
try: try:
wattage = api_summary["SUMMARY"][0]["Power"] wattage = api_summary["SUMMARY"][0]["Power"]
return wattage if not wattage == -1 else None return wattage if not wattage == -1 else None
except (KeyError, IndexError): except LookupError:
pass pass
async def get_wattage_limit(self, api_summary: dict = None) -> Optional[int]: async def get_wattage_limit(self, api_summary: dict = None) -> Optional[int]:
@@ -510,7 +510,7 @@ class BTMiner(BaseMiner):
Fan(api_summary["SUMMARY"][0].get("Fan Speed In", 0)), Fan(api_summary["SUMMARY"][0].get("Fan Speed In", 0)),
Fan(api_summary["SUMMARY"][0].get("Fan Speed Out", 0)), Fan(api_summary["SUMMARY"][0].get("Fan Speed Out", 0)),
] ]
except (KeyError, IndexError): except LookupError:
pass pass
return fans return fans
@@ -589,7 +589,7 @@ class BTMiner(BaseMiner):
expected_hashrate = api_summary["SUMMARY"][0]["Factory GHS"] expected_hashrate = api_summary["SUMMARY"][0]["Factory GHS"]
if expected_hashrate: if expected_hashrate:
return round(expected_hashrate / 1000, 2) return round(expected_hashrate / 1000, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def get_fault_light(self, api_get_miner_info: dict = None) -> bool: async def get_fault_light(self, api_get_miner_info: dict = None) -> bool:

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

@@ -206,7 +206,7 @@ class CGMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.api_ver = api_version["VERSION"][0]["API"] self.api_ver = api_version["VERSION"][0]["API"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.api_ver return self.api_ver
@@ -224,7 +224,7 @@ class CGMiner(BaseMiner):
if api_version: if api_version:
try: try:
self.fw_ver = api_version["VERSION"][0]["CGMiner"] self.fw_ver = api_version["VERSION"][0]["CGMiner"]
except (KeyError, IndexError): except LookupError:
pass pass
return self.fw_ver return self.fw_ver
@@ -336,7 +336,7 @@ class CGMiner(BaseMiner):
fans[fan].speed = api_stats["STATS"][1].get( fans[fan].speed = api_stats["STATS"][1].get(
f"fan{fan_offset+fan}", 0 f"fan{fan_offset+fan}", 0
) )
except (KeyError, IndexError): except LookupError:
pass pass
return fans return fans
@@ -370,7 +370,7 @@ class CGMiner(BaseMiner):
return round(expected_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(expected_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def is_mining(self, *args, **kwargs) -> Optional[bool]: async def is_mining(self, *args, **kwargs) -> Optional[bool]:

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

@@ -346,7 +346,7 @@ class LUXMiner(BaseMiner):
return round(expected_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(expected_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except LookupError:
pass pass
async def is_mining(self) -> Optional[bool]: async def is_mining(self) -> Optional[bool]:

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

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

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

@@ -123,7 +123,7 @@ class CGMinerT3HPlus(CGMiner, T3HPlus):
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 (KeyError, IndexError): except LookupError:
pass pass
async def get_hashboards( async def get_hashboards(