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

bug: improve robustness of identifying new versions of bosminer running BOSer.

Browse Source
This commit is contained in:
UpstreamData
2022-11-14 09:49:10 -07:00
parent 74b4aeb44a
commit 6ca8582ec3
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyasic/miners/base.py
View File

@@ -52,7 +52,7 @@ class BaseMiner(ABC):
return object.__new__(cls) return object.__new__(cls)
def __repr__(self): def __repr__(self):
return f"{'' if not self.api_type else self.api_type} {'' if not self.model else self.model}: {str(self.ip)}" return f"{'' if not self.api_type else self.api_type}{'' if not self.model else ' ' + self.model}: {str(self.ip)}"
def __lt__(self, other): def __lt__(self, other):
return ipaddress.ip_address(self.ip) < ipaddress.ip_address(other.ip) return ipaddress.ip_address(self.ip) < ipaddress.ip_address(other.ip)

33
pyasic/miners/miner_factory.py
View File

@@ -411,7 +411,9 @@ class MinerFactory(metaclass=Singleton):
# miner refused connection on API port, we wont be able to get data this way # miner refused connection on API port, we wont be able to get data this way
# try ssh # try ssh
try: try:
_model = await self.__get_model_from_ssh(ip) _model = await self.__get_model_from_graphql(ip)
if not _model:
_model = await self.__get_model_from_ssh(ip)
if _model: if _model:
model = _model model = _model
api = "BOSMiner+" api = "BOSMiner+"
@@ -432,15 +434,6 @@ class MinerFactory(metaclass=Singleton):
# if we have devdetails, we can get model data from there # if we have devdetails, we can get model data from there
if devdetails: if devdetails:
try:
if devdetails[0]["STATUS"][0]["Msg"]:
model = await self.__get_model_from_graphql(ip)
if model:
api = "BOSMiner+"
return model, api, ver
except (KeyError, TypeError, ValueError, IndexError):
pass
for _devdetails_key in ["Model", "Driver"]: for _devdetails_key in ["Model", "Driver"]:
try: try:
model = devdetails["DEVDETAILS"][0][_devdetails_key].upper() model = devdetails["DEVDETAILS"][0][_devdetails_key].upper()
@@ -448,12 +441,31 @@ class MinerFactory(metaclass=Singleton):
break break
except KeyError: except KeyError:
continue continue
try:
if devdetails[0]["STATUS"][0]["Msg"]:
model = await self.__get_model_from_graphql(ip)
if model:
api = "BOSMiner+"
except (KeyError, TypeError, ValueError, IndexError):
pass
if not model: if not model:
# braiins OS bug check just in case # braiins OS bug check just in case
if "s9" in devdetails["STATUS"][0]["Description"]: if "s9" in devdetails["STATUS"][0]["Description"]:
model = "ANTMINER S9" model = "ANTMINER S9"
if "s17" in version["STATUS"][0]["Description"]: if "s17" in version["STATUS"][0]["Description"]:
model = "ANTMINER S17" model = "ANTMINER S17"
if not api:
if "boser" in version["STATUS"][0]["Description"]:
api = "BOSMiner+"
else:
try:
_model = await self.__get_model_from_graphql(ip)
if _model:
model = _model
api = "BOSMiner+"
except (KeyError, TypeError, ValueError, IndexError):
pass
# if we have version we can get API type from here # if we have version we can get API type from here
if version: if version:
@@ -545,7 +557,6 @@ class MinerFactory(metaclass=Singleton):
# don't need "Bitmain", just "ANTMINER XX" as model # don't need "Bitmain", just "ANTMINER XX" as model
if "BITMAIN " in model: if "BITMAIN " in model:
model = model.replace("BITMAIN ", "") model = model.replace("BITMAIN ", "")
return model, api, ver return model, api, ver
async def __get_devdetails_and_version( async def __get_devdetails_and_version(