fixed formatting issues

This commit is contained in:
UpstreamData
2022-05-26 13:23:32 -06:00
parent 942f2a1c8d
commit c35b30e949
78 changed files with 177 additions and 173 deletions

View File

@@ -67,7 +67,7 @@ class BMMiner(BaseMiner):
# return ? if we fail to get hostname with no ssh connection
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"
except Exception as e:
except Exception:
# return ? if we fail to get hostname with an exception
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"

View File

@@ -23,6 +23,7 @@ class BOSMiner(BaseMiner):
self.api_type = "BOSMiner"
self.uname = "root"
self.pwd = "admin"
self.config = None
async def send_ssh_command(self, cmd: str) -> str or None:
"""Send a command to the miner over ssh.
@@ -121,7 +122,7 @@ class BOSMiner(BaseMiner):
else:
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"
except Exception as e:
except Exception:
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"
@@ -167,7 +168,7 @@ class BOSMiner(BaseMiner):
# if we get the version data, parse it
if version_data:
self.version = version_data.stdout.split("-")[5]
self.version = version_data.split("-")[5]
logging.debug(f"Found version for {self.ip}: {self.version}")
return self.version
@@ -206,10 +207,6 @@ class BOSMiner(BaseMiner):
offset = devs[0]["ID"]
for board in devs:
boards[board["ID"] - offset] = []
if not board["Chips"] == self.nominal_chips:
nominal = False
else:
nominal = True
if not board["Chips"] == self.nominal_chips:
nominal = False
else:
@@ -290,11 +287,11 @@ class BOSMiner(BaseMiner):
board_map = {0: "left_board", 1: "center_board", 2: "right_board"}
offset = temp[0]["ID"]
for board in temp:
id = board["ID"] - offset
_id = board["ID"] - offset
chip_temp = round(board["Chip"])
board_temp = round(board["Board"])
setattr(data, f"{board_map[id]}_chip_temp", chip_temp)
setattr(data, f"{board_map[id]}_temp", board_temp)
setattr(data, f"{board_map[_id]}_chip_temp", chip_temp)
setattr(data, f"{board_map[_id]}_temp", board_temp)
if fans:
fan_data = fans.get("FANS")
@@ -363,9 +360,9 @@ class BOSMiner(BaseMiner):
board_map = {0: "left_chips", 1: "center_chips", 2: "right_chips"}
offset = boards[0]["ID"]
for board in boards:
id = board["ID"] - offset
_id = board["ID"] - offset
chips = board["Chips"]
setattr(data, board_map[id], chips)
setattr(data, board_map[_id], chips)
return data

View File

@@ -1,11 +1,10 @@
from miners import BaseMiner
from API.bosminer import BOSMinerAPI
import toml
from config.bos import bos_config_convert, general_config_convert_bos
import logging
from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
import asyncssh
from API.bosminer import BOSMinerAPI
from miners import BaseMiner
class BOSMinerOld(BaseMiner):
def __init__(self, ip: str) -> None:

View File

@@ -43,7 +43,7 @@ class BTMiner(BaseMiner):
except APIError:
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"
except Exception as e:
except Exception:
logging.warning(f"Failed to get hostname for miner: {self}")
return "?"
@@ -141,11 +141,11 @@ class BTMiner(BaseMiner):
board_map = {0: "left_board", 1: "center_board", 2: "right_board"}
for board in temp_data:
id = board["ID"]
_id = board["ID"]
chip_temp = round(board["Chip Temp Avg"])
board_temp = round(board["Temperature"])
setattr(data, f"{board_map[id]}_chip_temp", chip_temp)
setattr(data, f"{board_map[id]}_temp", board_temp)
setattr(data, f"{board_map[_id]}_chip_temp", chip_temp)
setattr(data, f"{board_map[_id]}_temp", board_temp)
if devs:
boards = devs.get("DEVS")
@@ -158,9 +158,9 @@ class BTMiner(BaseMiner):
id_key = "ASC"
offset = boards[0][id_key]
for board in boards:
id = board[id_key] - offset
_id = board[id_key] - offset
chips = board["Effective Chips"]
setattr(data, board_map[id], chips)
setattr(data, board_map[_id], chips)
if pools:
pool_1 = None

View File

@@ -19,6 +19,7 @@ class CGMiner(BaseMiner):
self.api_type = "CGMiner"
self.uname = "root"
self.pwd = "admin"
self.config = None
async def get_model(self):
if self.model:

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S17
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S17 # noqa - Ignore access to _module
class BMMinerS17(BMMiner, S17):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S17Plus
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S17Plus # noqa - Ignore access to _module
class BMMinerS17Plus(BMMiner, S17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S17Pro
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S17Pro # noqa - Ignore access to _module
class BMMinerS17Pro(BMMiner, S17Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S17e
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S17e # noqa - Ignore access to _module
class BMMinerS17e(BMMiner, S17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import T17
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import T17 # noqa - Ignore access to _module
class BMMinerT17(BMMiner, T17):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import T17Plus
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import T17Plus # noqa - Ignore access to _module
class BMMinerT17Plus(BMMiner, T17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import T17e
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import T17e # noqa - Ignore access to _module
class BMMinerT17e(BMMiner, T17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S19
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S19 # noqa - Ignore access to _module
class BMMinerS19(BMMiner, S19):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S19Pro
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S19Pro # noqa - Ignore access to _module
class BMMinerS19Pro(BMMiner, S19Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S19a
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S19a # noqa - Ignore access to _module
class BMMinerS19a(BMMiner, S19a):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S19j
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S19j # noqa - Ignore access to _module
class BMMinerS19j(BMMiner, S19j):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S19jPro
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S19jPro # noqa - Ignore access to _module
class BMMinerS19jPro(BMMiner, S19jPro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import T19
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import T19 # noqa - Ignore access to _module
class BMMinerT19(BMMiner, T19):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S9
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S9 # noqa - Ignore access to _module
class BMMinerS9(BMMiner, S9):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import S9i
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import S9i # noqa - Ignore access to _module
class BMMinerS9i(BMMiner, S9i):

View File

@@ -1,5 +1,5 @@
from miners._backends import BMMiner
from miners._types import T9
from miners._backends import BMMiner # noqa - Ignore access to _module
from miners._types import T9 # noqa - Ignore access to _module
class BMMinerT9(BMMiner, T9):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S17
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S17 # noqa - Ignore access to _module
class BOSMinerS17(BOSMiner, S17):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S17Plus
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S17Plus # noqa - Ignore access to _module
class BOSMinerS17Plus(BOSMiner, S17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S17Pro
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S17Pro # noqa - Ignore access to _module
class BOSMinerS17Pro(BOSMiner, S17Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S17e
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S17e # noqa - Ignore access to _module
class BOSMinerS17e(BOSMiner, S17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import T17
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import T17 # noqa - Ignore access to _module
class BOSMinerT17(BOSMiner, T17):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import T17Plus
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import T17Plus # noqa - Ignore access to _module
class BOSMinerT17Plus(BOSMiner, T17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import T17e
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import T17e # noqa - Ignore access to _module
class BOSMinerT17e(BOSMiner, T17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S19
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S19 # noqa - Ignore access to _module
class BOSMinerS19(BOSMiner, S19):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S19Pro
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S19Pro # noqa - Ignore access to _module
class BOSMinerS19Pro(BOSMiner, S19Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S19j
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S19j # noqa - Ignore access to _module
class BOSMinerS19j(BOSMiner, S19j):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S19jPro
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S19jPro # noqa - Ignore access to _module
class BOSMinerS19jPro(BOSMiner, S19jPro):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import T19
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import T19 # noqa - Ignore access to _module
class BOSMinerT19(BOSMiner, T19):

View File

@@ -1,5 +1,5 @@
from miners._backends import BOSMiner
from miners._types import S9
from miners._backends import BOSMiner # noqa - Ignore access to _module
from miners._types import S9 # noqa - Ignore access to _module
class BOSMinerS9(BOSMiner, S9):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S17
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S17 # noqa - Ignore access to _module
class CGMinerS17(CGMiner, S17):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S17Plus
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S17Plus # noqa - Ignore access to _module
class CGMinerS17Plus(CGMiner, S17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S17Pro
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S17Pro # noqa - Ignore access to _module
class CGMinerS17Pro(CGMiner, S17Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S17e
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S17e # noqa - Ignore access to _module
class CGMinerS17e(CGMiner, S17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import T17
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import T17 # noqa - Ignore access to _module
class CGMinerT17(CGMiner, T17):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import T17Plus
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import T17Plus # noqa - Ignore access to _module
class CGMinerT17Plus(CGMiner, T17Plus):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import T17e
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import T17e # noqa - Ignore access to _module
class CGMinerT17e(CGMiner, T17e):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S19
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S19 # noqa - Ignore access to _module
class CGMinerS19(CGMiner, S19):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S19Pro
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S19Pro # noqa - Ignore access to _module
class CGMinerS19Pro(CGMiner, S19Pro):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S19j
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S19j # noqa - Ignore access to _module
class CGMinerS19j(CGMiner, S19j):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S19jPro
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S19jPro # noqa - Ignore access to _module
class CGMinerS19jPro(CGMiner, S19jPro):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import T19
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import T19 # noqa - Ignore access to _module
class CGMinerT19(CGMiner, T19):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import S9
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import S9 # noqa - Ignore access to _module
class CGMinerS9(CGMiner, S9):

View File

@@ -1,11 +1,9 @@
from miners._backends.cgminer import CGMiner
from miners._backends.cgminer import CGMiner # noqa - Ignore access to _module
from miners._types.antminer import T9 # noqa - Ignore access to _module
class CGMinerT9(CGMiner):
class CGMinerT9(CGMiner, T9):
def __init__(self, ip: str) -> None:
super().__init__(ip)
self.model = "T9"
self.api_type = "CGMiner"
def __repr__(self) -> str:
return f"CGMinerT9: {str(self.ip)}"

View File

@@ -1,5 +1,5 @@
from miners._backends import Hiveon
from miners._types import T9
from miners._backends import Hiveon # noqa - Ignore access to _module
from miners._types import T9 # noqa - Ignore access to _module
class HiveonT9(Hiveon, T9):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import Avalon1047
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import Avalon1047 # noqa - Ignore access to _module
class CGMinerAvalon1047(CGMiner, Avalon1047):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import Avalon1066
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import Avalon1066 # noqa - Ignore access to _module
class CGMinerAvalon1066(CGMiner, Avalon1066):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import Avalon821
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import Avalon821 # noqa - Ignore access to _module
class CGMinerAvalon821(CGMiner, Avalon821):

View File

@@ -1,5 +1,5 @@
from miners._backends import CGMiner
from miners._types import Avalon841
from miners._backends import CGMiner # noqa - Ignore access to _module
from miners._types import Avalon841 # noqa - Ignore access to _module
class CGMinerAvalon841(CGMiner, Avalon841):

View File

@@ -13,11 +13,12 @@ class Singleton(type):
class _MinerListener:
def __init__(self):
self.responses = {}
self.transport = None
def connection_made(self, transport):
self.transport = transport
def datagram_received(self, data, addr):
def datagram_received(self, data, _addr):
m = data.decode()
ip, mac = m.split(",")
new_miner = {"IP": ip, "MAC": mac.upper()}

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M20S
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M20S # noqa - Ignore access to _module
class BTMinerM20S(BTMiner, M20S):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M20SPlus
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M20SPlus # noqa - Ignore access to _module
class BTMinerM20SPlus(BTMiner, M20SPlus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M21
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M21 # noqa - Ignore access to _module
class BTMinerM21(BTMiner, M21):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M21S
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M21S # noqa - Ignore access to _module
class BTMinerM21S(BTMiner, M21S):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M21SPlus
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M21SPlus # noqa - Ignore access to _module
class BTMinerM21SPlus(BTMiner, M21SPlus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M30S
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M30S # noqa - Ignore access to _module
class BTMinerM30S(BTMiner, M30S):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M30SPlus
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M30SPlus # noqa - Ignore access to _module
class BTMinerM30SPlus(BTMiner, M30SPlus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M30SPlusPlus
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M30SPlusPlus # noqa - Ignore access to _module
class BTMinerM30SPlusPlus(BTMiner, M30SPlusPlus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M31S
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M31S # noqa - Ignore access to _module
class BTMinerM31S(BTMiner, M31S):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M31SPlus
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M31SPlus # noqa - Ignore access to _module
class BTMinerM31SPlus(BTMiner, M31SPlus):

View File

@@ -1,5 +1,5 @@
from miners._backends import BTMiner
from miners._types import M32S
from miners._backends import BTMiner # noqa - Ignore access to _module
from miners._types import M32S # noqa - Ignore access to _module
class BTMinerM32S(BTMiner, M32S):