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

add support for getting hashrates from each board for bosminer, bmminer, and btminer

Browse Source
This commit is contained in:
UpstreamData
2022-07-11 15:02:04 -06:00
parent 18c26adbb6
commit 2ff09a3765
6 changed files with 116 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pyasic/data/__init__.py
View File

@@ -40,6 +40,9 @@ class MinerData:
model: str = "Unknown" model: str = "Unknown"
hostname: str = "Unknown" hostname: str = "Unknown"
hashrate: float = 0 hashrate: float = 0
left_board_hashrate: float = 0
center_board_hashrate: float = 0
right_board_hashrate: float = 0
temperature_avg: int = field(init=False) temperature_avg: int = field(init=False)
env_temp: float = 0 env_temp: float = 0
left_board_temp: int = 0 left_board_temp: int = 0

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

@@ -186,6 +186,16 @@ class BMMiner(BaseMiner):
data.center_chips = boards[1].get(f"chain_acn{board_offset+1}") data.center_chips = boards[1].get(f"chain_acn{board_offset+1}")
data.right_chips = boards[1].get(f"chain_acn{board_offset+2}") data.right_chips = boards[1].get(f"chain_acn{board_offset+2}")
data.left_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset}")) / 1000, 2
)
data.center_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset+1}")) / 1000, 2
)
data.right_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset+2}")) / 1000, 2
)
if stats: if stats:
temp = stats.get("STATS") temp = stats.get("STATS")
if temp: if temp:

25
pyasic/miners/_backends/bosminer.py
View File

@@ -286,12 +286,18 @@ class BOSMiner(BaseMiner):
for i in range(DATA_RETRIES): for i in range(DATA_RETRIES):
try: try:
miner_data = await self.api.multicommand( miner_data = await self.api.multicommand(
"summary", "temps", "tunerstatus", "pools", "devdetails", "fans" "summary",
"temps",
"tunerstatus",
"pools",
"devdetails",
"fans",
"devs",
) )
except APIError as e: except APIError as e:
if str(e.message) == "Not ready": if str(e.message) == "Not ready":
miner_data = await self.api.multicommand( miner_data = await self.api.multicommand(
"summary", "tunerstatus", "pools", "fans" "summary", "tunerstatus", "pools", "fans", "devs"
) )
if miner_data: if miner_data:
break break
@@ -302,6 +308,7 @@ class BOSMiner(BaseMiner):
tunerstatus = miner_data.get("tunerstatus") tunerstatus = miner_data.get("tunerstatus")
pools = miner_data.get("pools") pools = miner_data.get("pools")
devdetails = miner_data.get("devdetails") devdetails = miner_data.get("devdetails")
devs = miner_data.get("devs")
fans = miner_data.get("fans") fans = miner_data.get("fans")
if summary: if summary:
@@ -399,6 +406,20 @@ class BOSMiner(BaseMiner):
chips = board["Chips"] chips = board["Chips"]
setattr(data, board_map[_id], chips) setattr(data, board_map[_id], chips)
if devs:
boards = devs[0].get("DEVS")
if boards:
if len(boards) > 0:
board_map = {
0: "left_board_hashrate",
1: "center_board_hashrate",
2: "right_board_hashrate",
}
offset = 6 if boards[0]["ID"] in [6, 7, 8] else boards[0]["ID"]
for board in boards:
_id = board["ID"] - offset
hashrate = board["MHS 1m"]
setattr(data, board_map[_id], hashrate)
return data return data
async def get_mac(self): async def get_mac(self):

2
pyasic/miners/_backends/btminer.py
View File

@@ -178,8 +178,10 @@ class BTMiner(BaseMiner):
_id = board["ASC"] _id = board["ASC"]
chip_temp = round(board["Chip Temp Avg"]) chip_temp = round(board["Chip Temp Avg"])
board_temp = round(board["Temperature"]) board_temp = round(board["Temperature"])
hashrate = round(board["MHS 1m"] / 1000000, 2)
setattr(data, f"{board_map[_id]}_chip_temp", chip_temp) 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]}_temp", board_temp)
setattr(data, f"{board_map[_id]}_hashrate", hashrate)
if devs: if devs:
boards = devs.get("DEVS") boards = devs.get("DEVS")

74
pyasic/miners/_backends/cgminer.py
View File

@@ -111,6 +111,9 @@ class CGMiner(BaseMiner):
async def get_data(self): async def get_data(self):
data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3) data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3)
board_offset = -1
fan_offset = -1
model = await self.get_model() model = await self.get_model()
hostname = await self.get_hostname() hostname = await self.get_hostname()
mac = await self.get_mac() mac = await self.get_mac()
@@ -126,7 +129,9 @@ class CGMiner(BaseMiner):
miner_data = None miner_data = None
for i in range(DATA_RETRIES): for i in range(DATA_RETRIES):
miner_data = await self.api.multicommand("summary", "pools", "stats") miner_data = await self.api.multicommand(
"summary", "pools", "stats", ignore_x19_error=True
)
if miner_data: if miner_data:
break break
@@ -141,25 +146,65 @@ class CGMiner(BaseMiner):
hr = summary.get("SUMMARY") hr = summary.get("SUMMARY")
if hr: if hr:
if len(hr) > 0: if len(hr) > 0:
hr = hr[0].get("GHS 1m") hr = hr[0].get("GHS av")
if hr: if hr:
data.hashrate = round(hr / 1000, 2) data.hashrate = round(hr / 1000, 2)
if stats:
boards = stats.get("STATS")
if boards:
if len(boards) > 0:
for board_num in range(1, 16, 5):
for _b_num in range(5):
b = boards[1].get(f"chain_acn{board_num + _b_num}")
if b and not b == 0 and board_offset == -1:
board_offset = board_num
if board_offset == -1:
board_offset = 1
data.left_chips = boards[1].get(f"chain_acn{board_offset}")
data.center_chips = boards[1].get(f"chain_acn{board_offset+1}")
data.right_chips = boards[1].get(f"chain_acn{board_offset+2}")
data.left_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset}")) / 1000, 2
)
data.center_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset+1}")) / 1000, 2
)
data.right_board_hashrate = round(
float(boards[1].get(f"chain_rate{board_offset+2}")) / 1000, 2
)
if stats: if stats:
temp = stats.get("STATS") temp = stats.get("STATS")
if temp: if temp:
if len(temp) > 1: if len(temp) > 1:
data.fan_1 = temp[1].get("fan1") for fan_num in range(1, 8, 4):
data.fan_2 = temp[1].get("fan2") for _f_num in range(4):
data.fan_3 = temp[1].get("fan3") f = temp[1].get(f"fan{fan_num + _f_num}")
data.fan_4 = temp[1].get("fan4") if f and not f == 0 and fan_offset == -1:
fan_offset = fan_num
if fan_offset == -1:
fan_offset = 1
for fan in range(self.fan_count):
setattr(
data, f"fan_{fan + 1}", temp[1].get(f"fan{fan_offset+fan}")
)
board_map = {1: "left_board", 2: "center_board", 3: "right_board"} board_map = {0: "left_board", 1: "center_board", 2: "right_board"}
for item in range(1, 4): env_temp_list = []
board_temp = temp[1].get(f"temp{item}") for item in range(3):
chip_temp = temp[1].get(f"temp2_{item}") board_temp = temp[1].get(f"temp{item + board_offset}")
chip_temp = temp[1].get(f"temp2_{item + board_offset}")
setattr(data, f"{board_map[item]}_chip_temp", chip_temp) setattr(data, f"{board_map[item]}_chip_temp", chip_temp)
setattr(data, f"{board_map[item]}_temp", board_temp) setattr(data, f"{board_map[item]}_temp", board_temp)
if f"temp_pcb{item}" in temp[1].keys():
env_temp = temp[1][f"temp_pcb{item}"].split("-")[0]
if not env_temp == 0:
env_temp_list.append(int(env_temp))
data.env_temp = sum(env_temp_list) / len(env_temp_list)
if pools: if pools:
pool_1 = None pool_1 = None
@@ -173,16 +218,19 @@ class CGMiner(BaseMiner):
if not pool_1_user: if not pool_1_user:
pool_1_user = pool.get("User") pool_1_user = pool.get("User")
pool_1 = pool["URL"] pool_1 = pool["URL"]
pool_1_quota = pool["Quota"] if pool.get("Quota"):
pool_2_quota = pool.get("Quota")
elif not pool_2_user: elif not pool_2_user:
pool_2_user = pool.get("User") pool_2_user = pool.get("User")
pool_2 = pool["URL"] pool_2 = pool["URL"]
pool_2_quota = pool["Quota"] if pool.get("Quota"):
pool_2_quota = pool.get("Quota")
if not pool.get("User") == pool_1_user: if not pool.get("User") == pool_1_user:
if not pool_2_user == pool.get("User"): if not pool_2_user == pool.get("User"):
pool_2_user = pool.get("User") pool_2_user = pool.get("User")
pool_2 = pool["URL"] pool_2 = pool["URL"]
pool_2_quota = pool["Quota"] if pool.get("Quota"):
pool_2_quota = pool.get("Quota")
if pool_2_user and not pool_2_user == pool_1_user: if pool_2_user and not pool_2_user == pool_1_user:
quota = f"{pool_1_quota}/{pool_2_quota}" quota = f"{pool_1_quota}/{pool_2_quota}"

29
pyasic/miners/miner_factory.py
View File

@@ -10,7 +10,9 @@ from pyasic.miners._backends.cgminer import CGMiner # noqa - Ignore _module imp
from pyasic.miners._backends.bmminer import BMMiner # noqa - Ignore _module import from pyasic.miners._backends.bmminer import BMMiner # noqa - Ignore _module import
from pyasic.miners._backends.bosminer import BOSMiner # noqa - Ignore _module import from pyasic.miners._backends.bosminer import BOSMiner # noqa - Ignore _module import
from pyasic.miners._backends.btminer import BTMiner # noqa - Ignore _module import from pyasic.miners._backends.btminer import BTMiner # noqa - Ignore _module import
from pyasic.miners._backends.bosminer_old import BOSMinerOld # noqa - Ignore _module import from pyasic.miners._backends.bosminer_old import (
BOSMinerOld,
) # noqa - Ignore _module import
from pyasic.miners.unknown import UnknownMiner from pyasic.miners.unknown import UnknownMiner
@@ -474,17 +476,20 @@ class MinerFactory(metaclass=Singleton):
# final try on a braiins OS bug with devdetails not returning # final try on a braiins OS bug with devdetails not returning
else: else:
async with asyncssh.connect( try:
str(ip), async with asyncssh.connect(
known_hosts=None, str(ip),
username="root", known_hosts=None,
password="admin", username="root",
server_host_key_algs=["ssh-rsa"], password="admin",
) as conn: server_host_key_algs=["ssh-rsa"],
cfg = await conn.run("bosminer config --data") ) as conn:
if cfg: cfg = await conn.run("bosminer config --data")
cfg = json.loads(cfg.stdout) if cfg:
model = cfg.get("data").get("format").get("model") cfg = json.loads(cfg.stdout)
model = cfg.get("data").get("format").get("model")
except asyncssh.misc.PermissionDenied:
pass
if model: if model:
# whatsminer have a V in their version string (M20SV41), remove everything after it # whatsminer have a V in their version string (M20SV41), remove everything after it