Compare commits

..

26 Commits

Author SHA1 Message Date
b-rowan
c50d55e87c version: bump version number. 2024-02-07 20:16:26 -07:00
b-rowan
5e5516bfb3 bug: fix serial numbers for antminer. 2024-02-07 20:15:38 -07:00
UpstreamData
4b068c57c5 version: bump version number. 2024-02-07 11:17:29 -07:00
UpstreamData
203f199aec feature: add wmt.pyasic.org. 2024-02-07 11:09:27 -07:00
b-rowan
895f17aaf9 version: bump version number. 2024-02-03 00:36:44 -07:00
b-rowan
8a64ff3559 bug: swap to asyncio.read() in base RPC to try to handle possible missed messages. 2024-02-03 00:36:03 -07:00
UpstreamData
4c45d356c4 version: bump version number. 2024-02-02 10:07:08 -07:00
UpstreamData
4dec329f11 bug: Try to return something when checking vnish fw version. 2024-02-02 10:06:33 -07:00
UpstreamData
b563ed118e bug: fix vnish firmware version bug. 2024-02-02 10:05:34 -07:00
UpstreamData
75b2ec40b1 bug: fix ePIC config parsing to use hashrate tuning instead of power tuning. 2024-01-31 09:21:32 -07:00
b-rowan
d9adaf6667 version: bump version number. 2024-01-30 21:41:49 -07:00
b-rowan
9343308f41 feature: Add support for new whatsminers, and try to handle whatsminer errors when receiving data. 2024-01-30 21:41:10 -07:00
UpstreamData
88769e40ae version: bump version number. 2024-01-30 13:34:24 -07:00
UpstreamData
be45eb7400 bug: fix issues with bosminer multicommand, and update X17 to use BOSMiner instead of BOSer. 2024-01-30 13:34:00 -07:00
b-rowan
2f719a03a4 version: bump version number. 2024-01-29 20:57:01 -07:00
b-rowan
64196f9754 bug: update whatsminer set_target_freq to match docs. 2024-01-29 20:56:36 -07:00
UpstreamData
49a77f1b79 version: bump version number. 2024-01-29 12:47:54 -07:00
UpstreamData
3838c4f2f9 bug: fix missing validation import for BTMiner. 2024-01-29 12:47:30 -07:00
UpstreamData
80d89c95b5 version: bump version number. 2024-01-29 12:33:07 -07:00
UpstreamData
30cd8b5cfe bug: fix some issues with rpc renaming. 2024-01-29 12:32:54 -07:00
b-rowan
c443170f78 refactor: improve epic web send_command implementation. 2024-01-27 09:42:35 -07:00
b-rowan
a2c2aa2377 version: bump version number. 2024-01-27 09:26:13 -07:00
b-rowan
4f0eb49a02 bug: fix some issues with epic send config. 2024-01-27 09:25:20 -07:00
b-rowan
a821357b4f Merge pull request #102 from jpcomps/master
fix send_config for ePIC
2024-01-27 09:05:23 -07:00
John-Paul Compagnone
3c7679a22d fix send_config for ePIC 2024-01-27 10:50:37 -05:00
UpstreamData
a52737e236 refactor: add some type hints for epic config. 2024-01-26 13:58:08 -07:00
27 changed files with 243 additions and 147 deletions

View File

@@ -108,31 +108,31 @@ class MiningModeHPM(MinerConfigValue):
return {"mode": {"mode": "turbo"}} return {"mode": {"mode": "turbo"}}
class StandardPowerTuneAlgo(MinerConfigValue): class StandardTuneAlgo(MinerConfigValue):
mode: str = field(init=False, default="standard") mode: str = field(init=False, default="standard")
def as_epic(self): def as_epic(self) -> str:
return VOptPowerTuneAlgo().as_epic() return VOptAlgo().as_epic()
class VOptPowerTuneAlgo(MinerConfigValue): class VOptAlgo(MinerConfigValue):
mode: str = field(init=False, default="standard") mode: str = field(init=False, default="standard")
def as_epic(self): def as_epic(self) -> str:
return "VoltageOptimizer" return "VoltageOptimizer"
class ChipTunePowerTuneAlgo(MinerConfigValue): class ChipTuneAlgo(MinerConfigValue):
mode: str = field(init=False, default="standard") mode: str = field(init=False, default="standard")
def as_epic(self): def as_epic(self) -> str:
return "ChipTune" return "ChipTune"
class PowerTunerAlgo(MinerConfigOption): class TunerAlgo(MinerConfigOption):
standard = StandardPowerTuneAlgo standard = StandardTuneAlgo
voltage_optimizer = VOptPowerTuneAlgo voltage_optimizer = VOptAlgo
chip_tune = ChipTunePowerTuneAlgo chip_tune = ChipTuneAlgo
@classmethod @classmethod
def default(cls): def default(cls):
@@ -143,7 +143,7 @@ class PowerTunerAlgo(MinerConfigOption):
class MiningModePowerTune(MinerConfigValue): class MiningModePowerTune(MinerConfigValue):
mode: str = field(init=False, default="power_tuning") mode: str = field(init=False, default="power_tuning")
power: int = None power: int = None
algo: PowerTunerAlgo = field(default_factory=PowerTunerAlgo.default) algo: TunerAlgo = field(default_factory=TunerAlgo.default)
@classmethod @classmethod
def from_dict(cls, dict_conf: dict | None) -> "MiningModePowerTune": def from_dict(cls, dict_conf: dict | None) -> "MiningModePowerTune":
@@ -183,14 +183,12 @@ class MiningModePowerTune(MinerConfigValue):
def as_auradine(self) -> dict: def as_auradine(self) -> dict:
return {"mode": {"mode": "custom", "tune": "power", "power": self.power}} return {"mode": {"mode": "custom", "tune": "power", "power": self.power}}
def as_epic(self) -> dict:
return {"ptune": {**self.algo.as_epic(), "target": self.power}}
@dataclass @dataclass
class MiningModeHashrateTune(MinerConfigValue): class MiningModeHashrateTune(MinerConfigValue):
mode: str = field(init=False, default="hashrate_tuning") mode: str = field(init=False, default="hashrate_tuning")
hashrate: int = None hashrate: int = None
algo: TunerAlgo = field(default_factory=TunerAlgo.default)
@classmethod @classmethod
def from_dict(cls, dict_conf: dict | None) -> "MiningModeHashrateTune": def from_dict(cls, dict_conf: dict | None) -> "MiningModeHashrateTune":
@@ -218,6 +216,9 @@ class MiningModeHashrateTune(MinerConfigValue):
def as_auradine(self) -> dict: def as_auradine(self) -> dict:
return {"mode": {"mode": "custom", "tune": "ths", "ths": self.hashrate}} return {"mode": {"mode": "custom", "tune": "ths", "ths": self.hashrate}}
def as_epic(self) -> dict:
return {"ptune": {"algo": self.algo.as_epic(), "target": self.hashrate}}
@dataclass @dataclass
class ManualBoardSettings(MinerConfigValue): class ManualBoardSettings(MinerConfigValue):
@@ -313,14 +314,14 @@ class MiningModeConfig(MinerConfigOption):
if tuner_running: if tuner_running:
algo_info = web_conf["PerpetualTune"]["Algorithm"] algo_info = web_conf["PerpetualTune"]["Algorithm"]
if algo_info.get("VoltageOptimizer") is not None: if algo_info.get("VoltageOptimizer") is not None:
return cls.power_tuning( return cls.hashrate_tuning(
power=algo_info["VoltageOptimizer"]["Target"], hashrate=algo_info["VoltageOptimizer"]["Target"],
algo=PowerTunerAlgo.voltage_optimizer, algo=TunerAlgo.voltage_optimizer,
) )
else: else:
return cls.power_tuning( return cls.hashrate_tuning(
power=algo_info["ChipTune"]["Target"], hashrate=algo_info["ChipTune"]["Target"],
algo=PowerTunerAlgo.chip_tune, algo=TunerAlgo.chip_tune,
) )
else: else:
return cls.normal() return cls.normal()

View File

@@ -265,15 +265,7 @@ class PoolGroup(MinerConfigValue):
return [p.as_auradine(user_suffix=user_suffix) for p in self.pools] return [p.as_auradine(user_suffix=user_suffix) for p in self.pools]
def as_epic(self, user_suffix: str = None) -> dict: def as_epic(self, user_suffix: str = None) -> dict:
if len(self.pools) > 0: return [p.as_epic(user_suffix=user_suffix) for p in self.pools]
conf = {
"name": self.name,
"pool": [pool.as_epic(user_suffix=user_suffix) for pool in self.pools],
}
if self.quota is not None:
conf["quota"] = self.quota
return conf
return {"name": self.name, "pool": []}
@classmethod @classmethod
def from_dict(cls, dict_conf: dict | None) -> "PoolGroup": def from_dict(cls, dict_conf: dict | None) -> "PoolGroup":
@@ -421,9 +413,7 @@ class PoolConfig(MinerConfigValue):
return { return {
"pools": { "pools": {
"coin": "Btc", "coin": "Btc",
"stratum_configs": [ "stratum_configs": self.groups[0].as_epic(user_suffix=user_suffix),
g.as_epic(user_suffix=user_suffix) for g in self.groups
],
"unique_id": False, "unique_id": False,
} }
} }

View File

@@ -43,9 +43,9 @@ class TemperatureConfig(MinerConfigValue):
def as_epic(self) -> dict: def as_epic(self) -> dict:
temps_config = {"temps": {}, "fans": {"Auto": {}}} temps_config = {"temps": {}, "fans": {"Auto": {}}}
if self.target is not None: if self.target is not None:
temps_config["fans"]["Target Temperature"] = self.target temps_config["fans"]["Auto"]["Target Temperature"] = self.target
else: else:
temps_config["fans"]["Target Temperature"] = 60 temps_config["fans"]["Auto"]["Target Temperature"] = 60
if self.danger is not None: if self.danger is not None:
temps_config["temps"]["shutdown"] = self.danger temps_config["temps"]["shutdown"] = self.danger
return temps_config return temps_config

View File

@@ -14,21 +14,21 @@
# limitations under the License. - # limitations under the License. -
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
from pyasic.miners.backends import BOSer from pyasic.miners.backends import BOSMiner
from pyasic.miners.models import S17, S17e, S17Plus, S17Pro from pyasic.miners.models import S17, S17e, S17Plus, S17Pro
class BOSMinerS17(BOSer, S17): class BOSMinerS17(BOSMiner, S17):
pass pass
class BOSMinerS17Plus(BOSer, S17Plus): class BOSMinerS17Plus(BOSMiner, S17Plus):
pass pass
class BOSMinerS17Pro(BOSer, S17Pro): class BOSMinerS17Pro(BOSMiner, S17Pro):
pass pass
class BOSMinerS17e(BOSer, S17e): class BOSMinerS17e(BOSMiner, S17e):
pass pass

View File

@@ -14,17 +14,17 @@
# limitations under the License. - # limitations under the License. -
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
from pyasic.miners.backends import BOSer from pyasic.miners.backends import BOSMiner
from pyasic.miners.models import T17, T17e, T17Plus from pyasic.miners.models import T17, T17e, T17Plus
class BOSMinerT17(BOSer, T17): class BOSMinerT17(BOSMiner, T17):
pass pass
class BOSMinerT17Plus(BOSer, T17Plus): class BOSMinerT17Plus(BOSMiner, T17Plus):
pass pass
class BOSMinerT17e(BOSer, T17e): class BOSMinerT17e(BOSMiner, T17e):
pass pass

View File

@@ -206,7 +206,7 @@ class AntminerModern(BMMiner):
] ]
try: try:
rpc_stats = await self.rpc.send_command("stats", new_rpc=True) rpc_stats = await self.rpc.send_command("stats", new_api=True)
except APIError: except APIError:
return hashboards return hashboards

View File

@@ -68,7 +68,7 @@ class BFGMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -84,11 +84,11 @@ class BFGMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

View File

@@ -72,7 +72,7 @@ class BMMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -88,11 +88,11 @@ class BMMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

View File

@@ -305,10 +305,10 @@ class BOSMiner(BaseMiner):
rpc_ver = rpc_version["VERSION"][0]["API"] rpc_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
rpc_ver = None rpc_ver = None
self.rpc_ver = rpc_ver self.api_ver = rpc_ver
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]: async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]:
if web_bos_info is None: if web_bos_info is None:
@@ -731,10 +731,10 @@ class BOSer(BaseMiner):
rpc_ver = rpc_version["VERSION"][0]["API"] rpc_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
rpc_ver = None rpc_ver = None
self.rpc_ver = rpc_ver self.api_ver = rpc_ver
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]: async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]:
if grpc_miner_details is None: if grpc_miner_details is None:

View File

@@ -234,7 +234,7 @@ class BTMiner(BaseMiner):
pass pass
if pools is not None: if pools is not None:
cfg = MinerConfig.from_rpc(pools) cfg = MinerConfig.from_api(pools)
else: else:
cfg = MinerConfig() cfg = MinerConfig()
@@ -325,14 +325,14 @@ class BTMiner(BaseMiner):
rpc_ver = rpc_get_version["Msg"] rpc_ver = rpc_get_version["Msg"]
if not isinstance(rpc_ver, str): if not isinstance(rpc_ver, str):
rpc_ver = rpc_ver["rpc_ver"] rpc_ver = rpc_ver["rpc_ver"]
self.rpc_ver = rpc_ver.replace("whatsminer v", "") self.api_ver = rpc_ver.replace("whatsminer v", "")
except (KeyError, TypeError): except (KeyError, TypeError):
pass pass
else: else:
self.rpc.rpc_ver = self.rpc_ver self.rpc.rpc_ver = self.api_ver
return self.rpc_ver return self.api_ver
return self.rpc_ver return self.api_ver
async def _get_fw_ver( async def _get_fw_ver(
self, rpc_get_version: dict = None, rpc_summary: dict = None self, rpc_get_version: dict = None, rpc_summary: dict = None

View File

@@ -71,7 +71,7 @@ class CGMiner(BaseMiner):
except APIError: except APIError:
return self.config return self.config
self.config = MinerConfig.from_rpc(pools) self.config = MinerConfig.from_api(pools)
return self.config return self.config
################################################## ##################################################
@@ -87,11 +87,11 @@ class CGMiner(BaseMiner):
if rpc_version is not None: if rpc_version is not None:
try: try:
self.rpc_ver = rpc_version["VERSION"][0]["API"] self.api_ver = rpc_version["VERSION"][0]["API"]
except LookupError: except LookupError:
pass pass
return self.rpc_ver return self.api_ver
async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]: async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
if rpc_version is None: if rpc_version is None:

View File

@@ -116,6 +116,7 @@ class ePIC(BaseMiner):
if not conf.get("temps", {}) == {}: if not conf.get("temps", {}) == {}:
await self.web.set_shutdown_temp(conf["temps"]["shutdown"]) await self.web.set_shutdown_temp(conf["temps"]["shutdown"])
# Fans # Fans
# set with sub-keys instead of conf["fans"] because sometimes both can be set
if not conf["fans"].get("Manual", {}) == {}: if not conf["fans"].get("Manual", {}) == {}:
await self.web.set_fan({"Manual": conf["fans"]["Manual"]}) await self.web.set_fan({"Manual": conf["fans"]["Manual"]})
elif not conf["fans"].get("Auto", {}) == {}: elif not conf["fans"].get("Auto", {}) == {}:

View File

@@ -205,13 +205,14 @@ class VNish(BMMiner):
if web_summary is None: if web_summary is None:
web_summary = await self.web.summary() web_summary = await self.web.summary()
fw_ver = None
if web_summary is not None: if web_summary is not None:
try: try:
fw_ver = web_summary["miner"]["miner_type"] fw_ver = web_summary["miner"]["miner_type"]
fw_ver = fw_ver.split("(Vnish ")[1].replace(")", "") fw_ver = fw_ver.split("(Vnish ")[1].replace(")", "")
return fw_ver return fw_ver
except KeyError: except LookupError:
pass return fw_ver
async def get_config(self) -> MinerConfig: async def get_config(self) -> MinerConfig:
try: try:

View File

@@ -289,7 +289,9 @@ MINER_CLASSES = {
"M50S++VK30": BTMinerM50SPlusPlusVK30, "M50S++VK30": BTMinerM50SPlusPlusVK30,
"M53VH30": BTMinerM53VH30, "M53VH30": BTMinerM53VH30,
"M53SVH30": BTMinerM53SVH30, "M53SVH30": BTMinerM53SVH30,
"M53SVJ40": BTMinerM53SVJ40,
"M53S+VJ30": BTMinerM53SPlusVJ30, "M53S+VJ30": BTMinerM53SPlusVJ30,
"M53S++VK10": BTMinerM53SPlusPlusVK10,
"M56VH30": BTMinerM56VH30, "M56VH30": BTMinerM56VH30,
"M56SVH30": BTMinerM56SVH30, "M56SVH30": BTMinerM56SVH30,
"M56S+VJ30": BTMinerM56SPlusVJ30, "M56S+VJ30": BTMinerM56SPlusVJ30,
@@ -968,6 +970,7 @@ class MinerFactory:
miner_factory = MinerFactory() miner_factory = MinerFactory()
# abstracted version of get miner that is easier to access # abstracted version of get miner that is easier to access
async def get_miner(ip: ipaddress.ip_address | str) -> AnyMiner: async def get_miner(ip: ipaddress.ip_address | str) -> AnyMiner:
return await miner_factory.get_miner(ip) return await miner_factory.get_miner(ip)

View File

@@ -20,3 +20,8 @@ from pyasic.miners.makes import WhatsMinerMake
class M53SVH30(WhatsMinerMake): class M53SVH30(WhatsMinerMake):
raw_model = "M53S VH30" raw_model = "M53S VH30"
expected_fans = 0 expected_fans = 0
class M53SVJ40(WhatsMinerMake):
raw_model = "M53S VJ40"
expected_fans = 0

View File

@@ -0,0 +1,22 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from pyasic.miners.makes import WhatsMinerMake
class M53SPlusPlusVK10(WhatsMinerMake):
raw_model = "M53S++ VK10"
expected_fans = 0

View File

@@ -42,8 +42,9 @@ from .M50S import (
from .M50S_Plus import M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30, M50SPlusVK20 from .M50S_Plus import M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30, M50SPlusVK20
from .M50S_Plus_Plus import M50SPlusPlusVK10, M50SPlusPlusVK20, M50SPlusPlusVK30 from .M50S_Plus_Plus import M50SPlusPlusVK10, M50SPlusPlusVK20, M50SPlusPlusVK30
from .M53 import M53VH30 from .M53 import M53VH30
from .M53S import M53SVH30 from .M53S import M53SVH30, M53SVJ40
from .M53S_Plus import M53SPlusVJ30 from .M53S_Plus import M53SPlusVJ30
from .M53S_Plus_Plus import M53SPlusPlusVK10
from .M56 import M56VH30 from .M56 import M56VH30
from .M56S import M56SVH30 from .M56S import M56SVH30
from .M56S_Plus import M56SPlusVJ30 from .M56S_Plus import M56SPlusVJ30

View File

@@ -15,8 +15,12 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
from pyasic.miners.backends import M5X from pyasic.miners.backends import M5X
from pyasic.miners.models import M53SVH30 from pyasic.miners.models import M53SVH30, M53SVJ40
class BTMinerM53SVH30(M5X, M53SVH30): class BTMinerM53SVH30(M5X, M53SVH30):
pass pass
class BTMinerM53SVJ40(M5X, M53SVJ40):
pass

View File

@@ -0,0 +1,22 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from pyasic.miners.backends import M5X
from pyasic.miners.models import M53SPlusPlusVK10
class BTMinerM53SPlusPlusVK10(M5X, M53SPlusPlusVK10):
pass

View File

@@ -51,8 +51,9 @@ from .M50S_Plus_Plus import (
BTMinerM50SPlusPlusVK30, BTMinerM50SPlusPlusVK30,
) )
from .M53 import BTMinerM53VH30 from .M53 import BTMinerM53VH30
from .M53S import BTMinerM53SVH30 from .M53S import BTMinerM53SVH30, BTMinerM53SVJ40
from .M53S_Plus import BTMinerM53SPlusVJ30 from .M53S_Plus import BTMinerM53SPlusVJ30
from .M53S_Plus_Plus import BTMinerM53SPlusPlusVK10
from .M56 import BTMinerM56VH30 from .M56 import BTMinerM56VH30
from .M56S import BTMinerM56SVH30 from .M56S import BTMinerM56SVH30
from .M56S_Plus import BTMinerM56SPlusVJ30 from .M56S_Plus import BTMinerM56SPlusVJ30

View File

@@ -107,3 +107,4 @@ def validate_command_output(data: dict) -> tuple[bool, str | None]:
if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]: if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]:
# this is an error # this is an error
return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"] return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"]
return True, None

View File

@@ -78,6 +78,9 @@ class BaseMinerRPCAPI:
# send the command # send the command
data = await self._send_bytes(json.dumps(cmd).encode("utf-8")) data = await self._send_bytes(json.dumps(cmd).encode("utf-8"))
if data is None:
raise APIError("No data returned from the API.")
if data == b"Socket connect failed: Connection refused\n": if data == b"Socket connect failed: Connection refused\n":
if not ignore_errors: if not ignore_errors:
raise APIError(data.decode("utf-8")) raise APIError(data.decode("utf-8"))
@@ -90,7 +93,7 @@ class BaseMinerRPCAPI:
if not validation[0]: if not validation[0]:
if not ignore_errors: if not ignore_errors:
# validate the command succeeded # validate the command succeeded
raise APIError(validation[1]) raise APIError(f"{command}: {validation[1]}")
if allow_warning: if allow_warning:
logging.warning( logging.warning(
f"{self.ip}: API Command Error: {command}: {validation[1]}" f"{self.ip}: API Command Error: {command}: {validation[1]}"
@@ -193,12 +196,15 @@ If you are sure you want to use this command please use API.send_command("{comma
async def _send_bytes( async def _send_bytes(
self, self,
data: bytes, data: bytes,
port: int = None,
timeout: int = 100, timeout: int = 100,
) -> bytes: ) -> bytes:
if port is None:
port = self.port
logging.debug(f"{self} - ([Hidden] Send Bytes) - Sending") logging.debug(f"{self} - ([Hidden] Send Bytes) - Sending")
try: try:
# get reader and writer streams # get reader and writer streams
reader, writer = await asyncio.open_connection(str(self.ip), self.port) reader, writer = await asyncio.open_connection(str(self.ip), port)
# handle OSError 121 # handle OSError 121
except OSError as e: except OSError as e:
if e.errno == 121: if e.errno == 121:
@@ -208,39 +214,14 @@ If you are sure you want to use this command please use API.send_command("{comma
return b"{}" return b"{}"
# send the command # send the command
data_task = asyncio.create_task(self._read_bytes(reader, timeout=timeout))
logging.debug(f"{self} - ([Hidden] Send Bytes) - Writing") logging.debug(f"{self} - ([Hidden] Send Bytes) - Writing")
writer.write(data) writer.write(data)
logging.debug(f"{self} - ([Hidden] Send Bytes) - Draining") logging.debug(f"{self} - ([Hidden] Send Bytes) - Draining")
await writer.drain() await writer.drain()
try:
# TO address a situation where a whatsminer has an unknown PW -AND-
# Fix for stupid whatsminer bug, reboot/restart seem to not load properly in the loop
# have to receive, save the data, check if there is more data by reading with a short timeout
# append that data if there is more, and then onto the main loop.
# the password timeout might need to be longer than 1, but it seems to work for now.
ret_data = await asyncio.wait_for(reader.read(1), timeout=1)
except asyncio.TimeoutError:
return b"{}"
try:
ret_data += await asyncio.wait_for(reader.read(4096), timeout=timeout)
except ConnectionAbortedError:
return b"{}"
# loop to receive all the data await data_task
logging.debug(f"{self} - ([Hidden] Send Bytes) - Receiving") ret_data = data_task.result()
try:
while True:
try:
d = await asyncio.wait_for(reader.read(4096), timeout=timeout)
if not d:
break
ret_data += d
except (asyncio.CancelledError, asyncio.TimeoutError) as e:
raise e
except (asyncio.CancelledError, asyncio.TimeoutError) as e:
raise e
except Exception as e:
logging.warning(f"{self} - ([Hidden] Send Bytes) - API Command Error {e}")
# close the connection # close the connection
logging.debug(f"{self} - ([Hidden] Send Bytes) - Closing") logging.debug(f"{self} - ([Hidden] Send Bytes) - Closing")
@@ -249,6 +230,19 @@ If you are sure you want to use this command please use API.send_command("{comma
return ret_data return ret_data
async def _read_bytes(self, reader: asyncio.StreamReader, timeout: int) -> bytes:
ret_data = b""
# loop to receive all the data
logging.debug(f"{self} - ([Hidden] Send Bytes) - Receiving")
try:
ret_data = await asyncio.wait_for(reader.read(), timeout=timeout)
except (asyncio.CancelledError, asyncio.TimeoutError) as e:
raise e
except Exception as e:
logging.warning(f"{self} - ([Hidden] Send Bytes) - API Command Error {e}")
return ret_data
@staticmethod @staticmethod
def _load_api_data(data: bytes) -> dict: def _load_api_data(data: bytes) -> dict:
# some json from the API returns with a null byte (\x00) on the end # some json from the API returns with a null byte (\x00) on the end

View File

@@ -24,12 +24,13 @@ import logging
import re import re
from typing import Literal, Union from typing import Literal, Union
import httpx
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
from passlib.handlers.md5_crypt import md5_crypt from passlib.handlers.md5_crypt import md5_crypt
from pyasic import settings from pyasic import settings
from pyasic.errors import APIError from pyasic.errors import APIError
from pyasic.misc import api_min_version from pyasic.misc import api_min_version, validate_command_output
from pyasic.rpc.base import BaseMinerRPCAPI from pyasic.rpc.base import BaseMinerRPCAPI
### IMPORTANT ### ### IMPORTANT ###
@@ -240,6 +241,28 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
ignore_errors: bool = False, ignore_errors: bool = False,
timeout: int = 10, timeout: int = 10,
**kwargs, **kwargs,
) -> dict:
try:
return await self._send_privileged_command(
command=command, ignore_errors=ignore_errors, timeout=timeout, **kwargs
)
except APIError as e:
if not e.message == "can't access write cmd":
raise
try:
await self.open_api()
except Exception as e:
raise APIError("Failed to open whatsminer API.") from e
return await self._send_privileged_command(
command=command, ignore_errors=ignore_errors, timeout=timeout, **kwargs
)
async def _send_privileged_command(
self,
command: Union[str, bytes],
ignore_errors: bool = False,
timeout: int = 10,
**kwargs,
) -> dict: ) -> dict:
logging.debug( logging.debug(
f"{self} - (Send Privileged Command) - {command} " + f"with args {kwargs}" f"{self} - (Send Privileged Command) - {command} " + f"with args {kwargs}"
@@ -272,7 +295,7 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
if not ignore_errors: if not ignore_errors:
# if it fails to validate, it is likely an error # if it fails to validate, it is likely an error
validation = self._validate_command_output(data) validation = validate_command_output(data)
if not validation[0]: if not validation[0]:
raise APIError(validation[1]) raise APIError(validation[1])
@@ -321,6 +344,30 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
logging.debug(f"{self} - (Get Token) - Gathered token data: {self.token}") logging.debug(f"{self} - (Get Token) - Gathered token data: {self.token}")
return self.token return self.token
async def open_api(self):
async with httpx.AsyncClient() as c:
stage1_req = (
await c.post(
"https://wmt.pyasic.org/v1/stage1",
json={"ip": self.ip},
follow_redirects=True,
)
).json()
stage1_res = binascii.hexlify(
await self._send_bytes(binascii.unhexlify(stage1_req), port=8889)
)
stage2_req = (
await c.post(
"https://wmt.pyasic.org/v1/stage2",
json={"ip": self.ip, "stage1_result": stage1_res.decode("utf-8")},
)
).json()
try:
await self._send_bytes(binascii.unhexlify(stage2_req), timeout=3, port=8889)
except asyncio.TimeoutError:
pass
return True
#### PRIVILEGED COMMANDS #### #### PRIVILEGED COMMANDS ####
# Please read the top of this file to learn # Please read the top of this file to learn
# how to configure the Whatsminer API to # how to configure the Whatsminer API to
@@ -607,10 +654,10 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
A reply informing of the status of setting the frequency. A reply informing of the status of setting the frequency.
</details> </details>
""" """
if not -10 < percent < 100: if not -100 < percent < 100:
raise APIError( raise APIError(
f"Frequency % is outside of the allowed " f"Frequency % is outside of the allowed "
f"range. Please set a % between -10 and " f"range. Please set a % between -100 and "
f"100" f"100"
) )
return await self.send_privileged_command( return await self.send_privileged_command(

View File

@@ -70,13 +70,15 @@ class BOSerWebAPI(BaseWebAPI):
not func.startswith("__") and not func.startswith("_") not func.startswith("__") and not func.startswith("_")
] ]
async def multicommand(self, *commands: str) -> dict: async def multicommand(
self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
) -> dict:
result = {"multicommand": True} result = {"multicommand": True}
tasks = {} tasks = {}
for command in commands: for command in commands:
try: try:
tasks[command] = asyncio.create_task(getattr(self, command)()) tasks[command] = asyncio.create_task(getattr(self, command)())
except AttributeError: except (APIError, AttributeError):
result["command"] = {} result["command"] = {}
await asyncio.gather(*list(tasks.values())) await asyncio.gather(*list(tasks.values()))

View File

@@ -59,10 +59,14 @@ class BOSMinerWebAPI(BaseWebAPI):
return {} return {}
raise APIError(f"LUCI web command failed: command={command}") raise APIError(f"LUCI web command failed: command={command}")
async def multicommand(self, *commands: str) -> dict: async def multicommand(
self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
) -> dict:
data = {} data = {}
for command in commands: for command in commands:
data[command] = await self.send_command(command, ignore_errors=True) data[command] = await self.send_command(
command, ignore_errors=ignore_errors
)
return data return data
async def auth(self, session: httpx.AsyncClient) -> None: async def auth(self, session: httpx.AsyncClient) -> None:

View File

@@ -44,40 +44,37 @@ class ePICWebAPI(BaseWebAPI):
post = privileged or not parameters == {} post = privileged or not parameters == {}
async with httpx.AsyncClient(transport=settings.transport()) as client: async with httpx.AsyncClient(transport=settings.transport()) as client:
for i in range(settings.get("get_data_retries", 1) + 1): try:
try: if post:
if post: response = await client.post(
response = await client.post( f"http://{self.ip}:{self.port}/{command}",
f"http://{self.ip}:{self.port}/{command}", timeout=5,
timeout=5, json={
json={ **parameters,
**parameters, "password": self.pwd,
"password": self.pwd, },
}, )
else:
response = await client.get(
f"http://{self.ip}:{self.port}/{command}",
timeout=5,
)
if not response.status_code == 200:
if not ignore_errors:
raise APIError(
f"Web command {command} failed with status code {response.status_code}"
) )
else: return {}
response = await client.get( json_data = response.json()
f"http://{self.ip}:{self.port}/{command}", if json_data:
timeout=5, # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
) if not json_data.get("result", True) and not post:
if not response.status_code == 200: if not ignore_errors:
continue raise APIError(json_data["error"])
json_data = response.json() return json_data
if json_data: return {"success": True}
# The API can return a fail status if the miner cannot return the requested data. Catch this and pass except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
if ( pass
"result" in json_data
and json_data["result"] is False
and not post
):
if not i > settings.get("get_data_retries", 1):
continue
if not ignore_errors:
raise APIError(json_data["error"])
return json_data
return {"success": True}
except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
pass
async def multicommand( async def multicommand(
self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
@@ -95,19 +92,19 @@ class ePICWebAPI(BaseWebAPI):
return await self.send_command("reboot", privileged=True) return await self.send_command("reboot", privileged=True)
async def set_shutdown_temp(self, params: int) -> dict: async def set_shutdown_temp(self, params: int) -> dict:
return await self.send_command("shutdowntemp", parameters=params) return await self.send_command("shutdowntemp", param=params)
async def set_fan(self, params: dict) -> dict: async def set_fan(self, params: dict) -> dict:
return await self.send_command("fanspeed", parameters=params) return await self.send_command("fanspeed", param=params)
async def set_ptune_enable(self, params: bool) -> dict: async def set_ptune_enable(self, params: bool) -> dict:
return await self.send_command("perpetualtune", parameters=params) return await self.send_command("perpetualtune", param=params)
async def set_ptune_algo(self, params: dict) -> dict: async def set_ptune_algo(self, params: dict) -> dict:
return await self.send_command("perpetualtune/algo", parameters=params) return await self.send_command("perpetualtune/algo", param=params)
async def set_pools(self, params: dict) -> dict: async def set_pools(self, params: dict) -> dict:
return await self.send_command("coin", parameters=params) return await self.send_command("coin", param=params)
async def pause_mining(self) -> dict: async def pause_mining(self) -> dict:
return await self.send_command("miner", param="Stop") return await self.send_command("miner", param="Stop")

View File

@@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "pyasic" name = "pyasic"
version = "0.50.1" version = "0.51.1"
description = "A simplified and standardized interface for Bitcoin ASICs." description = "A simplified and standardized interface for Bitcoin ASICs."
authors = ["UpstreamData <brett@upstreamdata.ca>"] authors = ["UpstreamData <brett@upstreamdata.ca>"]
repository = "https://github.com/UpstreamData/pyasic" repository = "https://github.com/UpstreamData/pyasic"