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

fixed more bugs with avalonminers

Browse Source
This commit is contained in:
UpstreamData
2022-01-10 13:48:25 -07:00
parent 2610d642fa
commit 01a64e63c6
7 changed files with 106 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
miners/antminer/S9/bosminer.py
View File

@@ -1,7 +1,7 @@
from miners.bosminer import BOSminer
from miners.bosminer import BOSMiner
class BOSMinerS9(BOSminer):
class BOSMinerS9(BOSMiner):
def __init__(self, ip: str) -> None:
super().__init__(ip)
self.model = "S9"

4
miners/antminer/X17/bosminer.py
View File

@@ -1,7 +1,7 @@
from miners.bosminer import BOSminer
from miners.bosminer import BOSMiner
class BOSMinerX17(BOSminer):
class BOSMinerX17(BOSMiner):
def __init__(self, ip: str) -> None:
super().__init__(ip)
self.api_type = "BOSMiner"

2
miners/bosminer.py
View File

@@ -5,7 +5,7 @@ import toml
from config.bos import bos_config_convert, general_config_convert_bos
class BOSminer(BaseMiner):
class BOSMiner(BaseMiner):
def __init__(self, ip: str) -> None:
api = BOSMinerAPI(ip)
super().__init__(ip, api)

6
miners/cgminer.py
View File

@@ -1,5 +1,6 @@
from miners import BaseMiner
from API.cgminer import CGMinerAPI
from API import APIError
import asyncssh
@@ -18,7 +19,10 @@ class CGMiner(BaseMiner):
async def get_model(self):
if self.model:
return self.model
version_data = await self.api.devdetails()
try:
version_data = await self.api.devdetails()
except APIError:
return None
if version_data:
self.model = version_data["DEVDETAILS"][0]["Model"].replace("Antminer ", "")
return self.model

36
miners/miner_factory.py
View File

@@ -17,7 +17,14 @@ from miners.whatsminer.M32 import BTMinerM32
from miners.avalonminer import CGMinerAvalon
from miners.cgminer import CGMiner
from miners.bmminer import BMMiner
from miners.bosminer import BOSMiner
from miners.unknown import UnknownMiner
from API import APIError
import asyncio
import ipaddress
import json
@@ -95,6 +102,14 @@ class MinerFactory:
miner = BTMinerM31(str(ip))
elif "M32" in model:
miner = BTMinerM32(str(ip))
else:
if api:
if "BOSMiner" in api:
miner = BOSMiner(str(ip))
elif "CGMiner" in api:
miner = CGMiner(str(ip))
elif "BMMiner" in api:
miner = BMMiner(str(ip))
self.miners[ip] = miner
return miner
@@ -110,26 +125,26 @@ class MinerFactory:
if data.get("STATUS"):
if not isinstance(data["STATUS"], str):
if data["STATUS"][0].get("STATUS") not in ["I", "S"]:
try:
data = await self._send_api_command(str(ip), "version")
model = data["VERSION"][0]["Type"]
except:
print(f"Get Model Exception: {ip}")
data = await self._send_api_command(str(ip), "version")
if data:
if data.get("VERSION"):
if data["VERSION"][0].get("Type"):
model = data["VERSION"][0]["Type"]
else:
if not data["DEVDETAILS"][0]["Model"] == "":
model = data["DEVDETAILS"][0]["Model"]
else:
model = data["DEVDETAILS"][0]["Driver"]
else:
try:
data = await self._send_api_command(str(ip), "version")
model = data["VERSION"][0]["Type"]
except:
print(f"Get Model Exception: {ip}")
data = await self._send_api_command(str(ip), "version")
model = data["VERSION"][0]["Type"]
if model:
return model
except APIError as e:
return None
except OSError as e:
if e.winerror == 121:
print(e)
return None
else:
print(ip, e)
@@ -192,7 +207,6 @@ class MinerFactory:
return data
async def _get_api_type(self, ip: ipaddress.ip_address or str) -> dict or None:
"""Get data on the version of the miner to return the right miner."""
api = None