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

fixes, changes, and formatting

Browse Source
This commit is contained in:
John-Paul Compagnone
2023-12-23 15:01:42 -05:00
parent 07f92557c6
commit 2e28060e05
10 changed files with 166 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pyasic/config/__init__.py
View File

@@ -160,13 +160,15 @@ class MinerConfig:
temperature=TemperatureConfig.from_bosminer(toml_conf), temperature=TemperatureConfig.from_bosminer(toml_conf),
power_scaling=PowerScalingConfig.from_bosminer(toml_conf), power_scaling=PowerScalingConfig.from_bosminer(toml_conf),
) )
@classmethod @classmethod
def from_epic(cls, web_conf: dict) -> "MinerConfig": def from_epic(cls, web_conf: dict) -> "MinerConfig":
return cls(pools=PoolConfig.from_epic(web_conf), return cls(
fan_mode=FanModeConfig.from_epic(web_conf), pools=PoolConfig.from_epic(web_conf),
temperature=TemperatureConfig.from_epic(web_conf), fan_mode=FanModeConfig.from_epic(web_conf),
mining_mode=MiningModeConfig.from_epic(web_conf)) temperature=TemperatureConfig.from_epic(web_conf),
mining_mode=MiningModeConfig.from_epic(web_conf),
)
def merge(a: dict, b: dict) -> dict: def merge(a: dict, b: dict) -> dict:

6
pyasic/config/fans.py
View File

@@ -115,16 +115,16 @@ class FanModeConfig(MinerConfigOption):
return cls.normal() return cls.normal()
else: else:
return cls.default() return cls.default()
@classmethod @classmethod
def from_epic(cls, web_conf: dict): def from_epic(cls, web_conf: dict):
if web_conf.get("Fans") is not None: try:
fan_mode = web_conf["Fans"]["Fan Mode"] fan_mode = web_conf["Fans"]["Fan Mode"]
if fan_mode.get("Manual") is not None: if fan_mode.get("Manual") is not None:
return cls.manual(speed=fan_mode.get("Manual")) return cls.manual(speed=fan_mode.get("Manual"))
else: else:
return cls.normal() return cls.normal()
else: except KeyError:
return cls.default() return cls.default()
@classmethod @classmethod

26
pyasic/config/mining.py
View File

@@ -185,19 +185,29 @@ class MiningModeConfig(MinerConfigOption):
elif int(work_mode) == 3: elif int(work_mode) == 3:
return cls.low() return cls.low()
return cls.default() return cls.default()
@classmethod @classmethod
def from_epic(cls, web_conf: dict): def from_epic(cls, web_conf: dict):
if web_conf.get("PerpetualTune") is not None: try:
work_mode = web_conf["PerpetualTune"] work_mode = web_conf["PerpetualTune"]["Running"]
if work_mode["Running"] == True: if work_mode:
if web_conf["PerpetualTune"]["Algorithm"].get("VoltageOptimizer") is not None: if (
return cls.hashrate_tuning(web_conf["PerpetualTune"]["Algorithm"]["VoltageOptimizer"].get("Target")) web_conf["PerpetualTune"]["Algorithm"].get("VoltageOptimizer")
is not None
):
return cls.hashrate_tuning(
web_conf["PerpetualTune"]["Algorithm"]["VoltageOptimizer"][
"Target"
]
)
else: else:
return cls.hashrate_tuning(web_conf["PerpetualTune"]["Algorithm"]["ChipTune"].get("Target")) return cls.hashrate_tuning(
web_conf["PerpetualTune"]["Algorithm"]["ChipTune"]["Target"]
)
else: else:
return cls.normal() return cls.normal()
return cls.default() except KeyError:
return cls.default()
@classmethod @classmethod
def from_bosminer(cls, toml_conf: dict): def from_bosminer(cls, toml_conf: dict):

10
pyasic/config/pools.py
View File

@@ -107,10 +107,12 @@ class Pool(MinerConfigValue):
@classmethod @classmethod
def from_api(cls, api_pool: dict) -> "Pool": def from_api(cls, api_pool: dict) -> "Pool":
return cls(url=api_pool["URL"], user=api_pool["User"], password="x") return cls(url=api_pool["URL"], user=api_pool["User"], password="x")
@classmethod @classmethod
def from_epic(cls, api_pool: dict) -> "Pool": def from_epic(cls, api_pool: dict) -> "Pool":
return cls(url=api_pool["pool"].replace("stratum+tcp://", ""), user=api_pool["login"], password=api_pool["password"]) return cls(
url=api_pool["pool"], user=api_pool["login"], password=api_pool["password"]
)
@classmethod @classmethod
def from_am_modern(cls, web_pool: dict) -> "Pool": def from_am_modern(cls, web_pool: dict) -> "Pool":
@@ -240,7 +242,7 @@ class PoolGroup(MinerConfigValue):
for pool in api_pool_list: for pool in api_pool_list:
pools.append(Pool.from_api(pool)) pools.append(Pool.from_api(pool))
return cls(pools=pools) return cls(pools=pools)
@classmethod @classmethod
def from_epic(cls, api_pool_list: list) -> "PoolGroup": def from_epic(cls, api_pool_list: list) -> "PoolGroup":
pools = [] pools = []
@@ -344,7 +346,7 @@ class PoolConfig(MinerConfigValue):
pool_data = sorted(pool_data, key=lambda x: int(x["POOL"])) pool_data = sorted(pool_data, key=lambda x: int(x["POOL"]))
return cls([PoolGroup.from_api(pool_data)]) return cls([PoolGroup.from_api(pool_data)])
@classmethod @classmethod
def from_epic(cls, web_conf: dict) -> "PoolConfig": def from_epic(cls, web_conf: dict) -> "PoolConfig":
pool_data = web_conf["StratumConfigs"] pool_data = web_conf["StratumConfigs"]

23
pyasic/config/temperature.py
View File

@@ -56,21 +56,18 @@ class TemperatureConfig(MinerConfigValue):
hot=temp_control.get("hot_temp"), hot=temp_control.get("hot_temp"),
danger=temp_control.get("dangerous_temp"), danger=temp_control.get("dangerous_temp"),
) )
@classmethod @classmethod
def from_epic(cls, web_conf: dict) -> "TemperatureConfig": def from_epic(cls, web_conf: dict) -> "TemperatureConfig":
## we only have a target temp if we are in auto-fan mode, so dangerous_temp = None
## we need to check for that try:
if web_conf.get("Misc") is not None:
target_temp = web_conf["Misc"]["Shutdown Temp"]
hot_temp = web_conf["Misc"]["Shutdown Temp"] hot_temp = web_conf["Misc"]["Shutdown Temp"]
dangerous_temp = web_conf["Misc"]["Shutdown Temp"] except KeyError:
hot_temp = None
if web_conf["Fans"]["Fan Mode"].get("Auto") is not None: # Need to do this in two blocks to avoid KeyError if one is missing
try:
target_temp = web_conf["Fans"]["Fan Mode"]["Auto"]["Target Temperature"] target_temp = web_conf["Fans"]["Fan Mode"]["Auto"]["Target Temperature"]
except KeyError:
target_temp = None
if web_conf.get("Misc") is not None: return cls(target=target_temp, hot=hot_temp, danger=dangerous_temp)
return cls(
target=target_temp,
hot=hot_temp,
danger=dangerous_temp
)

6
pyasic/data/__init__.py
View File

@@ -161,9 +161,9 @@ class MinerData:
percent_expected_wattage: float = field(init=False) percent_expected_wattage: float = field(init=False)
nominal: bool = field(init=False) nominal: bool = field(init=False)
config: MinerConfig = None config: MinerConfig = None
errors: List[ errors: List[Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]] = (
Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError] field(default_factory=list)
] = field(default_factory=list) )
fault_light: Union[bool, None] = None fault_light: Union[bool, None] = None
efficiency: int = field(init=False) efficiency: int = field(init=False)
is_mining: bool = True is_mining: bool = True

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

@@ -537,7 +537,7 @@ class BOSMiner(BaseMiner):
pass pass
try: try:
async with (await self._get_ssh_connection()) as conn: async with await self._get_ssh_connection() as conn:
if conn is not None: if conn is not None:
data = await conn.run("cat /proc/sys/kernel/hostname") data = await conn.run("cat /proc/sys/kernel/hostname")
host = data.stdout.strip() host = data.stdout.strip()

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

@@ -74,12 +74,12 @@ class ePIC(BMMiner):
if self.model is not None: if self.model is not None:
return self.model + " (ePIC)" return self.model + " (ePIC)"
return "? (ePIC)" return "? (ePIC)"
async def get_config(self) -> MinerConfig: async def get_config(self) -> MinerConfig:
summary = None summary = None
try: try:
summary = await self.web.summary() summary = await self.web.summary()
except APIError as e: except APIError as e:
logger.warning(e) logger.warning(e)
except LookupError: except LookupError:
pass pass
@@ -91,7 +91,7 @@ class ePIC(BMMiner):
self.config = cfg self.config = cfg
return self.config return self.config
async def restart_backend(self) -> bool: async def restart_backend(self) -> bool:
data = await self.web.restart_epic() data = await self.web.restart_epic()
if data: if data:

16
pyasic/web/bosminer/__init__.py
View File

@@ -189,11 +189,13 @@ class BOSMinerGQLAPI:
await client.post( await client.post(
url, url,
json={ json={
"query": 'mutation{auth{login(username:"' "query": (
+ "root" 'mutation{auth{login(username:"'
+ '", password:"' + "root"
+ self.pwd + '", password:"'
+ '"){__typename}}}' + self.pwd
+ '"){__typename}}}'
)
}, },
) )
@@ -233,7 +235,9 @@ class BOSMinerLuCIAPI:
login = {"luci_username": self.username, "luci_password": self.pwd} login = {"luci_username": self.username, "luci_password": self.pwd}
url = f"http://{self.ip}/cgi-bin/luci" url = f"http://{self.ip}/cgi-bin/luci"
headers = { headers = {
"User-Agent": "BTC Tools v0.1", # only seems to respond if this user-agent is set "User-Agent": (
"BTC Tools v0.1"
), # only seems to respond if this user-agent is set
"Content-Type": "application/x-www-form-urlencoded", "Content-Type": "application/x-www-form-urlencoded",
} }
await session.post(url, headers=headers, data=login) await session.post(url, headers=headers, data=login)

180
pyasic/web/bosminer/proto/braiins/bos/v1/__init__.py
View File

@@ -2357,17 +2357,21 @@ class ActionsServiceBase(ServiceBase):
RebootRequest, RebootRequest,
RebootResponse, RebootResponse,
), ),
"/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": grpclib.const.Handler( "/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": (
self.__rpc_set_locate_device_status, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_set_locate_device_status,
SetLocateDeviceStatusRequest, grpclib.const.Cardinality.UNARY_UNARY,
LocateDeviceStatusResponse, SetLocateDeviceStatusRequest,
LocateDeviceStatusResponse,
)
), ),
"/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": grpclib.const.Handler( "/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": (
self.__rpc_get_locate_device_status, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_get_locate_device_status,
GetLocateDeviceStatusRequest, grpclib.const.Cardinality.UNARY_UNARY,
LocateDeviceStatusResponse, GetLocateDeviceStatusRequest,
LocateDeviceStatusResponse,
)
), ),
} }
@@ -2644,17 +2648,21 @@ class PerformanceServiceBase(ServiceBase):
GetTunerStateRequest, GetTunerStateRequest,
GetTunerStateResponse, GetTunerStateResponse,
), ),
"/braiins.bos.v1.PerformanceService/ListTargetProfiles": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/ListTargetProfiles": (
self.__rpc_list_target_profiles, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_list_target_profiles,
ListTargetProfilesRequest, grpclib.const.Cardinality.UNARY_UNARY,
ListTargetProfilesResponse, ListTargetProfilesRequest,
ListTargetProfilesResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": (
self.__rpc_set_default_power_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_set_default_power_target,
SetDefaultPowerTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetPowerTargetResponse, SetDefaultPowerTargetRequest,
SetPowerTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/SetPowerTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetPowerTarget": grpclib.const.Handler(
self.__rpc_set_power_target, self.__rpc_set_power_target,
@@ -2662,41 +2670,53 @@ class PerformanceServiceBase(ServiceBase):
SetPowerTargetRequest, SetPowerTargetRequest,
SetPowerTargetResponse, SetPowerTargetResponse,
), ),
"/braiins.bos.v1.PerformanceService/IncrementPowerTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/IncrementPowerTarget": (
self.__rpc_increment_power_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_increment_power_target,
IncrementPowerTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetPowerTargetResponse, IncrementPowerTargetRequest,
SetPowerTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/DecrementPowerTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/DecrementPowerTarget": (
self.__rpc_decrement_power_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_decrement_power_target,
DecrementPowerTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetPowerTargetResponse, DecrementPowerTargetRequest,
SetPowerTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": (
self.__rpc_set_default_hashrate_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_set_default_hashrate_target,
SetDefaultHashrateTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetHashrateTargetResponse, SetDefaultHashrateTargetRequest,
SetHashrateTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/SetHashrateTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetHashrateTarget": (
self.__rpc_set_hashrate_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_set_hashrate_target,
SetHashrateTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetHashrateTargetResponse, SetHashrateTargetRequest,
SetHashrateTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": (
self.__rpc_increment_hashrate_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_increment_hashrate_target,
IncrementHashrateTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetHashrateTargetResponse, IncrementHashrateTargetRequest,
SetHashrateTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": (
self.__rpc_decrement_hashrate_target, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_decrement_hashrate_target,
DecrementHashrateTargetRequest, grpclib.const.Cardinality.UNARY_UNARY,
SetHashrateTargetResponse, DecrementHashrateTargetRequest,
SetHashrateTargetResponse,
)
), ),
"/braiins.bos.v1.PerformanceService/SetDPS": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetDPS": grpclib.const.Handler(
self.__rpc_set_dps, self.__rpc_set_dps,
@@ -2704,23 +2724,29 @@ class PerformanceServiceBase(ServiceBase):
SetDpsRequest, SetDpsRequest,
SetDpsResponse, SetDpsResponse,
), ),
"/braiins.bos.v1.PerformanceService/SetPerformanceMode": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/SetPerformanceMode": (
self.__rpc_set_performance_mode, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_set_performance_mode,
SetPerformanceModeRequest, grpclib.const.Cardinality.UNARY_UNARY,
PerformanceMode, SetPerformanceModeRequest,
PerformanceMode,
)
), ),
"/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": (
self.__rpc_get_active_performance_mode, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_get_active_performance_mode,
GetPerformanceModeRequest, grpclib.const.Cardinality.UNARY_UNARY,
PerformanceMode, GetPerformanceModeRequest,
PerformanceMode,
)
), ),
"/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": grpclib.const.Handler( "/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": (
self.__rpc_remove_tuned_profiles, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_remove_tuned_profiles,
RemoveTunedProfilesRequest, grpclib.const.Cardinality.UNARY_UNARY,
RemoveTunedProfilesResponse, RemoveTunedProfilesRequest,
RemoveTunedProfilesResponse,
)
), ),
} }
@@ -2836,17 +2862,21 @@ class ConfigurationServiceBase(ServiceBase):
def __mapping__(self) -> Dict[str, grpclib.const.Handler]: def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
return { return {
"/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": grpclib.const.Handler( "/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": (
self.__rpc_get_miner_configuration, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_get_miner_configuration,
GetMinerConfigurationRequest, grpclib.const.Cardinality.UNARY_UNARY,
GetMinerConfigurationResponse, GetMinerConfigurationRequest,
GetMinerConfigurationResponse,
)
), ),
"/braiins.bos.v1.ConfigurationService/GetConstraints": grpclib.const.Handler( "/braiins.bos.v1.ConfigurationService/GetConstraints": (
self.__rpc_get_constraints, grpclib.const.Handler(
grpclib.const.Cardinality.UNARY_UNARY, self.__rpc_get_constraints,
GetConstraintsRequest, grpclib.const.Cardinality.UNARY_UNARY,
GetConstraintsResponse, GetConstraintsRequest,
GetConstraintsResponse,
)
), ),
} }